diff --git a/doVerifyUser.go b/doVerifyUser.go index 2f5cf5c..ae1a0ff 100644 --- a/doVerifyUser.go +++ b/doVerifyUser.go @@ -3,11 +3,7 @@ package main -import ( - "go.wit.com/lib/protobuf/gitpb" - "go.wit.com/log" -) - +/* func doVerifyUser() error { me.found = new(gitpb.Repos) all := me.forge.Repos.SortByFullPath() @@ -32,29 +28,10 @@ func doVerifyUser() error { if argv.Verbose { log.Printf("Start clean devel branch: %s %s\n", repo.GetGoPath(), devel) } - - /* - // check if devel branch exists in remote repo - if repo.IsBranchRemote(devel) { - if err := doCleanDevelRepo(repo); err != nil { - log.Info(repo.GetGoPath(), "verify clean failed") - } - // can not continue - continue - } - */ - // devel branch is only local - /* - todo: something? - devname := repo.GetDevelBranchName() - if err := requiresGitPush(repo, devname); err != nil { - log.Info(repo.GetGoPath(), "is out of sync with upstream") - return err - } - */ } return nil } func verifyRemoteUserBranch(repo *gitpb.Repo) { } +*/ diff --git a/windowRepoProblems.go b/windowRepoProblems.go index 012e0f2..4ff6be4 100644 --- a/windowRepoProblems.go +++ b/windowRepoProblems.go @@ -8,6 +8,7 @@ import ( "go.wit.com/lib/gadgets" "go.wit.com/lib/protobuf/forgepb" + "go.wit.com/lib/protobuf/gitpb" "go.wit.com/log" "go.wit.com/gui" @@ -73,16 +74,38 @@ func makeRepoProblemsWindow() *repoProblemsWindow { // sets the hidden flag to false so Toggle() works pw.win.Hide() } - pw.stack.NewGroup("things") + pw.stack.NewGroup("things (these don't work yet)") grid := pw.stack.RawGrid() grid.NewButton("devel is behind master", func() { log.Info("not done yet") + me.found = new(gitpb.Repos) + all := me.forge.Repos.SortByFullPath() + for all.Scan() { + repo := all.Next() + if repo.GetDevelVersion() == repo.GetMasterVersion() { + continue + } + me.found.AppendByGoPath(repo) + + } + makeStandardReposWindow(me.found) }) grid.NewButton("user branch is remote", func() { log.Info("not done yet") + me.found = new(gitpb.Repos) + all := me.forge.Repos.SortByFullPath() + for all.Scan() { + repo := all.Next() + username := repo.GetUserBranchName() + if repo.IsBranchRemote(username) { + me.found.AppendByGoPath(repo) + } + + } + makeStandardReposWindow(me.found) }) grid.NewButton("unknown branches", func() {