diff options
Diffstat (limited to 'repolist.go')
| -rw-r--r-- | repolist.go | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/repolist.go b/repolist.go index 0d6ffd6..c99e97f 100644 --- a/repolist.go +++ b/repolist.go @@ -201,7 +201,7 @@ func repoAllButtons(box *gui.Node) { grid1.NewButton("merge all user to devel", func() { reposwin.Disable() - if ! mergeAllUserToDevel() { + if !mergeAllUserToDevel() { return } reposwin.Enable() @@ -209,7 +209,7 @@ func repoAllButtons(box *gui.Node) { grid1.NewButton("merge all devel to main", func() { reposwin.Disable() - if ! mergeAllDevelToMain() { + if !mergeAllDevelToMain() { return } reposwin.Enable() @@ -217,10 +217,10 @@ func repoAllButtons(box *gui.Node) { grid1.NewButton("merge it all", func() { reposwin.Disable() - if ! mergeAllUserToDevel() { + if !mergeAllUserToDevel() { return } - if ! mergeAllDevelToMain() { + if !mergeAllDevelToMain() { return } reposwin.Enable() @@ -265,31 +265,31 @@ func mergeAllDevelToMain() bool { } func mergeAllUserToDevel() bool { - log.Info("merge all here") - for _, repo := range me.allrepos { - if repo.status.ReadOnly() { - log.Info("skipping readonly", repo.String(), repo.dirtyLabel.String()) - continue - } - if repo.dirtyLabel.String() != "merge to devel" { - log.Info("skipping. not merge to devel", repo.String(), repo.dirtyLabel.String()) - continue - } - if repo.status.CheckDirty() { - log.Info("skipping dirty", repo.String(), repo.dirtyLabel.String()) - continue - } - log.Info("found", repo.String(), repo.dirtyLabel.String()) - // repo.status.Update() - if repo.status.RunDevelMergeB() { - log.Warn("THINGS SEEM OK fullAutomation() returned true.") - } else { - log.Warn("THINGS FAILED fullAutomation() returned false") - return false - } - repo.status.Update() - repo.newScan() + log.Info("merge all here") + for _, repo := range me.allrepos { + if repo.status.ReadOnly() { + log.Info("skipping readonly", repo.String(), repo.dirtyLabel.String()) + continue + } + if repo.dirtyLabel.String() != "merge to devel" { + log.Info("skipping. not merge to devel", repo.String(), repo.dirtyLabel.String()) + continue + } + if repo.status.CheckDirty() { + log.Info("skipping dirty", repo.String(), repo.dirtyLabel.String()) + continue } - log.Warn("EVERYTHING WORKED") - return true + log.Info("found", repo.String(), repo.dirtyLabel.String()) + // repo.status.Update() + if repo.status.RunDevelMergeB() { + log.Warn("THINGS SEEM OK fullAutomation() returned true.") + } else { + log.Warn("THINGS FAILED fullAutomation() returned false") + return false + } + repo.status.Update() + repo.newScan() + } + log.Warn("EVERYTHING WORKED") + return true } |