diff options
| -rw-r--r-- | doCheckout.go | 16 | ||||
| -rw-r--r-- | doNormal.go | 10 | ||||
| -rw-r--r-- | main.go | 4 |
3 files changed, 14 insertions, 16 deletions
diff --git a/doCheckout.go b/doCheckout.go index 7dffed7..aec1da2 100644 --- a/doCheckout.go +++ b/doCheckout.go @@ -26,6 +26,8 @@ func doCheckout() error { 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)) + me.forge.ScanRepoDir() // looks for new dirs, checks existing repos for changes + me.forge.SaveRepos() if err != nil { badExit(err) } @@ -44,18 +46,8 @@ func doCheckout() error { setForgeMode(forgepb.ForgeMode_MASTER) err := me.forge.DoAllCheckoutMaster() - count := me.forge.RillReload() - log.Info("rillreload 1 count", count) - if count != 0 { - me.forge.ConfigSave() - } - count = me.forge.RillReload() - log.Info("rillreload 2 count", count) - if count != 0 { - me.forge.ConfigSave() - } - stats := me.forge.RillFuncError(didRepoChangeDir) - log.Printf("total stats len%d\n", len(stats)) + me.forge.ScanRepoDir() // looks for new dirs, checks existing repos for changes + me.forge.SaveRepos() if err != nil { badExit(err) } diff --git a/doNormal.go b/doNormal.go index 242a7be..0a92a32 100644 --- a/doNormal.go +++ b/doNormal.go @@ -25,6 +25,7 @@ func doNormal() bool { var count int stats := me.forge.RillRepos(checkNormalRepoState) + for path, stat := range stats { dur := stat.End.Sub(stat.Start) if dur > 10*time.Second { @@ -148,8 +149,13 @@ func checkNormalRepoState(repo *gitpb.Repo) error { err = log.Errorf("now on user branch") } - if me.forge.Config.IsReadOnly(repo.GetGoPath()) != repo.GetReadOnly() { - repo.ReadOnly = me.forge.Config.IsReadOnly(repo.GetGoPath()) + if repo.Namespace != repo.GetGoPath() { + log.Info(repo.Namespace, repo.GetGoPath()) + } + + // verify read-only + if me.forge.Config.IsReadOnly(repo.GetNamespace()) != repo.GetReadOnly() { + repo.ReadOnly = me.forge.Config.IsReadOnly(repo.GetNamespace()) log.Info("damnit", repo.FullPath) err = log.Errorf("readonly bit wrong") } @@ -101,8 +101,8 @@ func main() { if argv.Mode != nil { if argv.Mode.Normal != nil { - if me.forge.Config.Mode == forgepb.ForgeMode_NORMAL { - log.Info("you are already in the normal state") + if doNormal() { + log.Infof("all your %d repos are in a normal stete for development\n", me.forge.Repos.Len()) okExit("") } start := time.Now() |