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

good deal

This commit is contained in:
Jeff Carr 2025-01-07 06:51:58 -06:00
parent e579b7ca26
commit 745bafccc8
1 changed files with 8 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
windowRepos.go
View File

@ -98,12 +98,12 @@ func (r *repoWindow) repoMenu() *gui.Node {
box2.NewButton("test master merge", func() { box2.NewButton("test master merge", func() {
r.Disable() r.Disable()
r.mergeAllDevelToMain() r.mergeAllDevelToMain()
/* // re-read everything
me.forge = forgepb.Init() me.forge = forgepb.Init()
me.found = new(gitpb.Repos) me.found = new(gitpb.Repos)
me.repos = makeRepoView() me.repos = makeRepoView()
me.repos.Show() me.repos.Show()
*/
// update the protobuf pointers // update the protobuf pointers
loop := me.forge.Repos.All() loop := me.forge.Repos.All()
for loop.Scan() { for loop.Scan() {
@ -169,27 +169,8 @@ func (r *repoWindow) mergeAllDevelToMain() bool {
continue continue
} }
if result, err := repo.MergeDevelToMaster(); err == nil { if result, err := repo.MergeDevelToMaster(); err == nil {
gopath := repo.GetGoPath() log.Warn("MERGE WORKED", repo.GetFullPath())
log.Warn("A SINGLE MERGE WORKED. PAUSING", repo.GetFullPath()) continue
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
} else { } else {
log.Warn("THINGS FAILED ", repo.GetFullPath()) log.Warn("THINGS FAILED ", repo.GetFullPath())
log.Warn("err", err) log.Warn("err", err)