diff --git a/doCheckout.go b/doCheckout.go index f24e3fc..0f47d60 100644 --- a/doCheckout.go +++ b/doCheckout.go @@ -5,13 +5,21 @@ package main import ( "fmt" + "time" + + "go.wit.com/lib/gui/shell" + "go.wit.com/log" ) // trys to figure out if there is still something to update func doCheckout() error { if argv.Checkout.User != nil { - if err := me.forge.DoAllCheckoutUser(argv.Force); err != nil { + start := time.Now() + err := me.forge.DoAllCheckoutUser(argv.Force) + dur := time.Since(start) + log.Printf("Checked out %d user braches in %s\n", me.forge.Repos.Len(), shell.FormatDuration(dur)) + if err != nil { badExit(err) } okExit("") diff --git a/main.go b/main.go index 5152f1e..d9eb8d9 100644 --- a/main.go +++ b/main.go @@ -10,9 +10,11 @@ import ( "fmt" "os" "strings" + "time" "go.wit.com/dev/alexflint/arg" "go.wit.com/gui" + "go.wit.com/lib/gui/shell" "go.wit.com/lib/protobuf/forgepb" "go.wit.com/lib/protobuf/gitpb" "go.wit.com/log" @@ -149,14 +151,22 @@ func main() { if argv.Merge != nil { if argv.Merge.Devel != nil { - if _, err := doMergeDevel(); err != nil { + start := time.Now() + repos, err := doMergeDevel() + dur := time.Since(start) + log.Printf("Merged %d devel branches in %s\n", repos.Len(), shell.FormatDuration(dur)) + if err != nil { badExit(err) } okExit("devel merge ok") } if argv.Merge.Master != nil { - if _, err := doMergeMaster(); err != nil { + start := time.Now() + repos, err := doMergeMaster() + dur := time.Since(start) + log.Printf("Merged %d master branches in %s\n", repos.Len(), shell.FormatDuration(dur)) + if err != nil { badExit(err) } okExit("master merge ok")