diff options
Diffstat (limited to 'windowRepos.go')
| -rw-r--r-- | windowRepos.go | 35 |
1 files changed, 8 insertions, 27 deletions
diff --git a/windowRepos.go b/windowRepos.go index 3e2915f..97e5ade 100644 --- a/windowRepos.go +++ b/windowRepos.go @@ -98,12 +98,12 @@ func (r *repoWindow) repoMenu() *gui.Node { box2.NewButton("test master merge", func() { r.Disable() r.mergeAllDevelToMain() - /* - me.forge = forgepb.Init() - me.found = new(gitpb.Repos) - me.repos = makeRepoView() - me.repos.Show() - */ + // re-read everything + me.forge = forgepb.Init() + me.found = new(gitpb.Repos) + me.repos = makeRepoView() + me.repos.Show() + // update the protobuf pointers loop := me.forge.Repos.All() for loop.Scan() { @@ -169,27 +169,8 @@ 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() - return true - - /* - // remap the repo.pb - */ - // continue + log.Warn("MERGE WORKED", repo.GetFullPath()) + continue } else { log.Warn("THINGS FAILED ", repo.GetFullPath()) log.Warn("err", err) |