attempt to rescan the changes
This commit is contained in:
parent
c9f948de9f
commit
5bfc643962
|
@ -3,6 +3,8 @@ package main
|
||||||
import (
|
import (
|
||||||
"go.wit.com/lib/gadgets"
|
"go.wit.com/lib/gadgets"
|
||||||
"go.wit.com/lib/gui/repolist"
|
"go.wit.com/lib/gui/repolist"
|
||||||
|
"go.wit.com/lib/protobuf/forgepb"
|
||||||
|
"go.wit.com/lib/protobuf/gitpb"
|
||||||
"go.wit.com/log"
|
"go.wit.com/log"
|
||||||
|
|
||||||
"go.wit.com/gui"
|
"go.wit.com/gui"
|
||||||
|
@ -60,15 +62,6 @@ func makeRepoView() *repoWindow {
|
||||||
r.View.Enable()
|
r.View.Enable()
|
||||||
|
|
||||||
r.View.ScanRepositories()
|
r.View.ScanRepositories()
|
||||||
|
|
||||||
/*
|
|
||||||
r.View = repolist.AutotypistView(r.box)
|
|
||||||
|
|
||||||
showncount := r.View.MirrorShownCount()
|
|
||||||
r.topbox.Append(showncount)
|
|
||||||
duration := r.View.MirrorScanDuration()
|
|
||||||
r.topbox.Append(duration)
|
|
||||||
*/
|
|
||||||
return r
|
return r
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -161,6 +154,19 @@ func (r *repoWindow) mergeAllDevelToMain() bool {
|
||||||
}
|
}
|
||||||
if result, err := repo.MergeDevelToMaster(); err == nil {
|
if result, err := repo.MergeDevelToMaster(); err == nil {
|
||||||
log.Warn("A SINGLE MERGE WORKED. PAUSING", repo.GetFullPath())
|
log.Warn("A SINGLE MERGE WORKED. PAUSING", repo.GetFullPath())
|
||||||
|
me.forge = forgepb.Init()
|
||||||
|
me.found = new(gitpb.Repos)
|
||||||
|
me.repos = makeRepoView()
|
||||||
|
me.repos.Show()
|
||||||
|
|
||||||
|
// remap the repo.pb
|
||||||
|
/*
|
||||||
|
loop := me.repos.View.ReposSortByName()
|
||||||
|
for loop.Scan() {
|
||||||
|
var repo *repolist.RepoRow
|
||||||
|
repo = loop.Repo()
|
||||||
|
}
|
||||||
|
*/
|
||||||
return true
|
return true
|
||||||
// continue
|
// continue
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue