diff options
| author | Jeff Carr <[email protected]> | 2025-09-04 21:34:39 -0500 |
|---|---|---|
| committer | Jeff Carr <[email protected]> | 2025-09-04 21:34:39 -0500 |
| commit | 13aff0d5dca8615b5e692c062e9a8b8381596270 (patch) | |
| tree | 067fae910b69b1846770150a412944d0c19f9a47 /doNormal.go | |
| parent | 4063e031081cf2e6b19fe6e0a47b2d7500a5665e (diff) | |
try to figure out why this fails
Diffstat (limited to 'doNormal.go')
| -rw-r--r-- | doNormal.go | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/doNormal.go b/doNormal.go index da28acd..08044ee 100644 --- a/doNormal.go +++ b/doNormal.go @@ -8,6 +8,7 @@ package main import ( "time" + "go.wit.com/lib/gui/shell" "go.wit.com/lib/protobuf/gitpb" "go.wit.com/log" ) @@ -20,13 +21,13 @@ func doNormal() bool { for path, stat := range stats { dur := stat.End.Sub(stat.Start) if dur > 10*time.Second { - log.Infof("%-30v %s checkNormalRepoState() took a long time\n", dur, path) + log.Infof("%s checkNormalRepoState() took a long time (%s)\n", path, shell.FormatDuration(dur)) } if stat.Err == nil { continue } // log.Infof("%-60s, %-60s %v %s\n", stat.Start, stat.End.String(), dur, path) - log.Infof("%-30v %s %v\n", dur, path, stat.Err) + // log.Infof("%-30v %s %v\n", dur, path, stat.Err) // log.Info("got path", path, stat.Err) count += 1 } @@ -57,16 +58,13 @@ func checkNormalRepoState(repo *gitpb.Repo) error { if repo.GetUserBranchName() == "" { return log.Errorf("user branch name blank") } - if _, err := repo.MakeLocalDevelBranch(); err != nil { - return err - } + repo.MakeLocalDevelBranch() + if repo.GetCurrentBranchName() != repo.GetUserBranchName() { configSave = true - if err := repo.CheckoutUser(); err != nil { - return err - } - _, err := me.forge.ReAdd(repo) - return err + repo.CheckoutUser() + repo.Reload() + return log.Errorf("now on user branch") } return nil } |
