From 34cc35ad7ba062c4840a151678392754c26a8ed2 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Fri, 14 Feb 2025 19:15:39 -0600 Subject: button to do it all --- doGui.go | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'doGui.go') diff --git a/doGui.go b/doGui.go index 3c80e2b..95edc0e 100644 --- a/doGui.go +++ b/doGui.go @@ -243,6 +243,33 @@ func drawWindow(win *gadgets.BasicWindow) { mergeDevelToMaster(me.autoCreateBranches.Checked()) }) + + grid.NewButton("merge all", func() { + win.Disable() + defer win.Enable() + + me.argvCheckoutUser = false + me.argvCheckoutDevel = true + me.argvCheckoutMaster = false + if err := doCheckoutShared(); err != nil { + log.Info("checkout error:", err) + } else { + log.Info("checkout was ok") + } + + mergeDevelToMaster(me.autoCreateBranches.Checked()) + + me.argvCheckoutUser = false + me.argvCheckoutDevel = false + me.argvCheckoutMaster = true + if err := doCheckoutShared(); err != nil { + log.Info("checkout error:", err) + } else { + log.Info("checkout was ok") + } + + mergeDevelToMaster(me.autoCreateBranches.Checked()) + }) } func findMergeToDevel() { -- cgit v1.2.3