diff options
| -rw-r--r-- | doCheckout.go | 8 | ||||
| -rw-r--r-- | doExamine.go | 2 | ||||
| -rw-r--r-- | main.go | 6 | ||||
| -rw-r--r-- | windowRepos.go | 17 |
4 files changed, 27 insertions, 6 deletions
diff --git a/doCheckout.go b/doCheckout.go index 6de3d3c..a314d25 100644 --- a/doCheckout.go +++ b/doCheckout.go @@ -96,3 +96,11 @@ func doAllCheckoutUser() bool { } return true } + +func doCheckoutMaster() { + me.forge.CheckoutMaster() + me.forge = forgepb.Init() + me.found = new(gitpb.Repos) + argv.Checkout.Master.findRepos() + me.forge.PrintHumanTable(me.found) +} diff --git a/doExamine.go b/doExamine.go index 4609c68..20610da 100644 --- a/doExamine.go +++ b/doExamine.go @@ -101,7 +101,7 @@ func examineBranch(repo *gitpb.Repo) error { if repo.CurrentTag.Refname == repo.GetMasterBranchName() { err = fmt.Errorf("examineBranch() SPECIAL CASE. %s is the master branch", repo.CurrentTag.Refname) log.Info(err) - return err + return nil } err = fmt.Errorf("examineBranch() branch differs. patch diff len == 0. PROBABLY DELETE BRANCH %s", repo.CurrentTag.Refname) @@ -111,11 +111,7 @@ func main() { } if argv.Checkout.Master != nil { - me.forge.CheckoutMaster() - me.forge = forgepb.Init() - me.found = new(gitpb.Repos) - argv.Checkout.Master.findRepos() - me.forge.PrintHumanTable(me.found) + doCheckoutMaster() } log.Info("make 'user' the default here?") okExit("") diff --git a/windowRepos.go b/windowRepos.go index 055a871..4d675e6 100644 --- a/windowRepos.go +++ b/windowRepos.go @@ -161,6 +161,23 @@ func (r *repoWindow) repoMenu() *gui.Node { } me.forge.PrintHumanTable(me.found) }) + box2.NewButton("Prep for release()", func() { + r.Disable() + defer r.Enable() + if IsAnythingDirty() { + log.Info("You can't apply patches when repos are dirty") + me.forge.PrintHumanTable(me.found) + return + } + if !r.mergeAllUserToDevel() { + return + } + if !r.mergeAllDevelToMain() { + return + } + doCheckoutMaster() + + }) return box2 } |