From 06ad9227807c4a2a21c0b1a4f053b36aacf993cf Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Wed, 8 Jan 2025 01:16:27 -0600 Subject: [PATCH] add some more useful buttons --- windowRepos.go | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/windowRepos.go b/windowRepos.go index c9fb3af..5205162 100644 --- a/windowRepos.go +++ b/windowRepos.go @@ -113,6 +113,7 @@ func (r *repoWindow) repoMenu() *gui.Node { box2.NewButton("merge user to devel", func() { r.Disable() + defer r.Enable() if IsAnythingDirty() { log.Info("You can't apply patches when repos are dirty") me.forge.PrintHumanTable(me.found) @@ -121,7 +122,6 @@ func (r *repoWindow) repoMenu() *gui.Node { if !r.mergeAllUserToDevel() { return } - r.Enable() }) box2.NewButton("test master merge", func() { @@ -149,17 +149,30 @@ func (r *repoWindow) repoMenu() *gui.Node { log.Info("re-scanning now") r.reInitForge() }) + box2.NewButton("ConfigSave()", func() { + me.forge.ConfigSave() + }) + box2.NewButton("Table()", func() { + me.found = new(gitpb.Repos) + loop := me.forge.Repos.All() + for loop.Scan() { + repo := loop.Next() + me.found.AppendUniqueGoPath(repo) + } + me.forge.PrintHumanTable(me.found) + }) return box2 } func (r *repoWindow) mergeAllDevelToMain() bool { + var count int log.Info("merge all here") loop := me.forge.Repos.All() for loop.Scan() { repo := loop.Next() if me.forge.Config.IsReadOnly(repo.GetGoPath()) { - // log.Info("skipping readonly", repo.GetFullPath()) + log.Info("skipping readonly", repo.GetFullPath()) continue } if repo.IsDirty() { @@ -171,9 +184,10 @@ func (r *repoWindow) mergeAllDevelToMain() bool { continue } if repo.GetDevelVersion() == repo.GetMasterVersion() { - // log.Info("devel and master branch are the same", repo.GetFullPath()) + log.Info("devel and master branch are the same", repo.GetFullPath()) continue } + count += 1 if result, err := repo.MergeDevelToMaster(); err == nil { log.Warn("MERGE WORKED", repo.GetFullPath()) repo.Reload() @@ -182,6 +196,7 @@ func (r *repoWindow) mergeAllDevelToMain() bool { vrepo.UpdatePb(repo) vrepo.NewScan() } + me.forge.SetConfigSave(true) // continue continue } else { @@ -196,7 +211,7 @@ func (r *repoWindow) mergeAllDevelToMain() bool { return false } } - log.Warn("EVERYTHING WORKED") + log.Warn("EVERYTHING WORKED count =", count) return true } @@ -225,6 +240,7 @@ func (r *repoWindow) mergeAllUserToDevel() bool { vrepo.UpdatePb(repo) vrepo.NewScan() } + me.forge.SetConfigSave(true) continue } else { log.Warn("THINGS FAILED ", repo.GetFullPath())