summaryrefslogtreecommitdiff
path: root/doGui.go
diff options
context:
space:
mode:
Diffstat (limited to 'doGui.go')
-rw-r--r--doGui.go27
1 files changed, 27 insertions, 0 deletions
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() {