jcarr
/
forge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add some more useful buttons

This commit is contained in:
Jeff Carr 2025-01-08 01:16:27 -06:00
parent bcabf1b3b7
commit 06ad922780
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
windowRepos.go
View File

@ -113,6 +113,7 @@ func (r *repoWindow) repoMenu() *gui.Node {
box2.NewButton("merge user to devel", func() { box2.NewButton("merge user to devel", func() {
r.Disable() r.Disable()
defer r.Enable()
if IsAnythingDirty() { if IsAnythingDirty() {
log.Info("You can't apply patches when repos are dirty") log.Info("You can't apply patches when repos are dirty")
me.forge.PrintHumanTable(me.found) me.forge.PrintHumanTable(me.found)
@ -121,7 +122,6 @@ func (r *repoWindow) repoMenu() *gui.Node {
if !r.mergeAllUserToDevel() { if !r.mergeAllUserToDevel() {
return return
} }
r.Enable()
}) })
box2.NewButton("test master merge", func() { box2.NewButton("test master merge", func() {
@ -149,17 +149,30 @@ func (r *repoWindow) repoMenu() *gui.Node {
log.Info("re-scanning now") log.Info("re-scanning now")
r.reInitForge() 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 return box2
} }
func (r *repoWindow) mergeAllDevelToMain() bool { func (r *repoWindow) mergeAllDevelToMain() bool {
var count int
log.Info("merge all here") log.Info("merge all here")
loop := me.forge.Repos.All() loop := me.forge.Repos.All()
for loop.Scan() { for loop.Scan() {
repo := loop.Next() repo := loop.Next()
if me.forge.Config.IsReadOnly(repo.GetGoPath()) { if me.forge.Config.IsReadOnly(repo.GetGoPath()) {
// log.Info("skipping readonly", repo.GetFullPath()) log.Info("skipping readonly", repo.GetFullPath())
continue continue
} }
if repo.IsDirty() { if repo.IsDirty() {
@ -171,9 +184,10 @@ func (r *repoWindow) mergeAllDevelToMain() bool {
continue continue
} }
if repo.GetDevelVersion() == repo.GetMasterVersion() { 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 continue
} }
count += 1
if result, err := repo.MergeDevelToMaster(); err == nil { if result, err := repo.MergeDevelToMaster(); err == nil {
log.Warn("MERGE WORKED", repo.GetFullPath()) log.Warn("MERGE WORKED", repo.GetFullPath())
repo.Reload() repo.Reload()
@ -182,6 +196,7 @@ func (r *repoWindow) mergeAllDevelToMain() bool {
vrepo.UpdatePb(repo) vrepo.UpdatePb(repo)
vrepo.NewScan() vrepo.NewScan()
} }
me.forge.SetConfigSave(true)
// continue // continue
continue continue
} else { } else {
@ -196,7 +211,7 @@ func (r *repoWindow) mergeAllDevelToMain() bool {
return false return false
} }
} }
log.Warn("EVERYTHING WORKED") log.Warn("EVERYTHING WORKED count =", count)
return true return true
} }
@ -225,6 +240,7 @@ func (r *repoWindow) mergeAllUserToDevel() bool {
vrepo.UpdatePb(repo) vrepo.UpdatePb(repo)
vrepo.NewScan() vrepo.NewScan()
} }
me.forge.SetConfigSave(true)
continue continue
} else { } else {
log.Warn("THINGS FAILED ", repo.GetFullPath()) log.Warn("THINGS FAILED ", repo.GetFullPath())