diff --git a/windowRepos.go b/windowRepos.go index 863d02a..f7ee1cc 100644 --- a/windowRepos.go +++ b/windowRepos.go @@ -153,20 +153,32 @@ func (r *repoWindow) mergeAllDevelToMain() bool { continue } if result, err := repo.MergeDevelToMaster(); err == nil { + gopath := repo.GetGoPath() log.Warn("A SINGLE MERGE WORKED. PAUSING", repo.GetFullPath()) me.forge = forgepb.Init() me.found = new(gitpb.Repos) me.repos = makeRepoView() me.repos.Show() + // findAll() + + newr := me.forge.FindByGoPath(gopath) + if newr == nil { + log.Info("crapnuts. gopath nil", gopath) + return true + } + me.found.Append(newr) + doCobol() + + vrepo := me.repos.View.FindByPath(gopath) + vrepo.NewScan3(newr) // remap the repo.pb - /* - loop := me.repos.View.ReposSortByName() - for loop.Scan() { - var repo *repolist.RepoRow - repo = loop.Repo() - } - */ + loop := me.repos.View.ReposSortByName() + for loop.Scan() { + var repo *repolist.RepoRow + repo = loop.Repo() + repo.NewScan2() + } return true // continue } else {