diff options
Diffstat (limited to 'main.go')
| -rw-r--r-- | main.go | 14 |
1 files changed, 12 insertions, 2 deletions
@@ -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") |