diff options
| -rw-r--r-- | doDirty.go | 17 | ||||
| -rw-r--r-- | doPull.go | 6 | ||||
| -rw-r--r-- | main.go | 6 |
3 files changed, 20 insertions, 9 deletions
@@ -3,14 +3,23 @@ package main -func doDirty() { +import "go.wit.com/lib/protobuf/gitpb" + +func doDirty() (string, error) { found := me.forge.CheckDirty() if found.Len() == 0 { - return + return "nothing dirty", nil } + var footer string if argv.Verbose { - me.forge.PrintHumanTableDirty(found) + footer = me.forge.PrintHumanTableDirty(found) } else { - me.forge.PrintHumanTable(found) + footer = me.forge.PrintHumanTable(found) } + return footer, nil +} + +func getDirty() (*gitpb.Repos, string, error) { + found := me.forge.CheckDirty() + return found, "", nil } @@ -108,12 +108,12 @@ func doPull() error { log.Info("path deleted while running?", path) continue } - r := repoerr.Append(repo) - r.State = "git pull failed" + r := repoerr.Clone(repo) + r.State = "git pull failed" + repo.State dur := stat.End.Sub(stat.Start) if dur > 1*time.Second { msg := log.Sprintf("pull time (%s)", config.FormatDuration(dur)) - r.State = msg + r.State = msg + repo.State } } repoerr.SortNamespace() @@ -189,8 +189,10 @@ func doDefaultBehavior() (string, error) { func doShow() (string, error) { if argv.Show.Dirty != nil { - doDirty() - return "dirty repos shown", nil + // s, err := doDirty() + _, s, err := getDirty() + me.forge.Repos.Save() + return s, err } if argv.Show.Tag != nil { |