minor gui stuff
This commit is contained in:
parent
fb945a5295
commit
1966246169
|
@ -92,18 +92,25 @@ func (r *repoWindow) repoMenu() *gui.Node {
|
|||
if !r.mergeAllUserToDevel() {
|
||||
return
|
||||
}
|
||||
/* no longer do this here! yay! long live forge
|
||||
if !r.mergeAllDevelToMain() {
|
||||
return
|
||||
}
|
||||
*/
|
||||
r.Enable()
|
||||
})
|
||||
|
||||
box2.NewButton("test master merge", func() {
|
||||
r.Disable()
|
||||
if !r.mergeAllDevelToMain() {
|
||||
return
|
||||
r.mergeAllDevelToMain()
|
||||
/*
|
||||
me.forge = forgepb.Init()
|
||||
me.found = new(gitpb.Repos)
|
||||
me.repos = makeRepoView()
|
||||
me.repos.Show()
|
||||
*/
|
||||
loop := me.forge.Repos.All()
|
||||
for loop.Scan() {
|
||||
repo := loop.Next()
|
||||
vrepo := me.repos.View.FindByPath(repo.GetGoPath())
|
||||
if vrepo != nil {
|
||||
vrepo.NewScan3(repo)
|
||||
}
|
||||
}
|
||||
r.Enable()
|
||||
})
|
||||
|
@ -168,18 +175,24 @@ func (r *repoWindow) mergeAllDevelToMain() bool {
|
|||
}
|
||||
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()
|
||||
repo.NewScan2()
|
||||
}
|
||||
return true
|
||||
|
||||
/*
|
||||
loop1 := me.forge.Repos.All()
|
||||
for loop1.Scan() {
|
||||
repo := loop1.Next()
|
||||
vrepo := me.repos.View.FindByPath(repo.GetGoPath())
|
||||
vrepo.NewScan3(repo)
|
||||
}
|
||||
|
||||
// remap the repo.pb
|
||||
loop := me.repos.View.ReposSortByName()
|
||||
for loop.Scan() {
|
||||
var repo *repolist.RepoRow
|
||||
repo = loop.Repo()
|
||||
repo.NewScan2()
|
||||
}
|
||||
*/
|
||||
// continue
|
||||
} else {
|
||||
log.Warn("THINGS FAILED ", repo.GetFullPath())
|
||||
|
|
Loading…
Reference in New Issue