diff options
| -rw-r--r-- | branchesBox.go | 2 | ||||
| -rw-r--r-- | git.go | 17 | ||||
| -rw-r--r-- | modifyBox.go | 5 | ||||
| -rw-r--r-- | unix.go | 10 | ||||
| -rw-r--r-- | update.go | 6 |
5 files changed, 34 insertions, 6 deletions
diff --git a/branchesBox.go b/branchesBox.go index 669b0d7..96ef42e 100644 --- a/branchesBox.go +++ b/branchesBox.go @@ -44,7 +44,7 @@ func (rs *RepoStatus) makeBranchesBox(parent *gui.Node) { newgrid.NextRow() // runs "git branch --all" - rs.gitBranchAll() + // rs.gitBranchAll() rs.showBranchesButton = newgrid.NewButton("find jcarr and devel", func() { if rs.TagExists("jcarr") { @@ -20,6 +20,10 @@ func (rs *RepoStatus) GetCurrentBranchVersion() string { return rs.currentVersion.String() } +func (rs *RepoStatus) LastGitPull() (time.Time, error) { + return rs.mtime(".git/FETCH_HEAD") +} + func (rs *RepoStatus) Age() time.Duration { var t *Tag t = rs.NewestTag() @@ -35,6 +39,19 @@ func (rs *RepoStatus) Age() time.Duration { return time.Since(tagTime) } +func (rs *RepoStatus) GitPull() error { + var cmd []string + cmd = append(cmd, "git", "pull") + err, _, output := RunCmd(rs.realPath.String(), cmd) + if err == nil { + log.Log(REPOWARN,"git pull ran", rs.Path()) + log.Log(REPOWARN,"git pull output", output) + } else { + log.Log(REPOWARN,"git pull error", rs.Path(), err) + } + return err +} + /* // this isn't right func (rs *RepoStatus) LastTagAge() (time.Time, string) { diff --git a/modifyBox.go b/modifyBox.go index a7c76b9..ae577a2 100644 --- a/modifyBox.go +++ b/modifyBox.go @@ -40,10 +40,7 @@ func (rs *RepoStatus) drawGitCommands(box *gui.Node) { newgrid.NextRow() newgrid.NewButton("git pull", func() { - var cmd []string - cmd = append(cmd, "git", "pull") - err, b, output := RunCmd(rs.realPath.String(), cmd) - log.Warn("Did git pull here", err, b, output) + rs.GitPull() }) newgrid.NextRow() @@ -233,6 +233,16 @@ func (rs *RepoStatus) Exists(filename string) bool { return false } +func (rs *RepoStatus) mtime(filename string) (time.Time, error) { + pathf := filepath.Join(rs.Path(), filename) + statf, err := os.Stat(pathf) + if err == nil { + return statf.ModTime(), nil + } + log.Log(REPOWARN, "mtime() error", pathf, err) + return time.Now(), err +} + // returns true if the file exists func Exists(file string) bool { _, err := os.Stat(file) @@ -11,8 +11,12 @@ import ( func (rs *RepoStatus) gitBranchAll() { err, out := rs.RunCmd([]string{"git", "branch", "--all"}) + log.Log(WARN, "git branch failed string =", rs.String()) + log.Log(WARN, "git branch failed realpath =", rs.realPath.String()) if err != nil { - log.Log(WARN, "git branch failed", rs.String()) + log.Log(WARN, "git branch failed string =", rs.String()) + log.Log(WARN, "git branch failed realpath =", rs.realPath.String()) + return } all := strings.Split(out, "\n") for _, s := range all { |