button to do it all

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() {

windowRepos.go

@@ -4,11 +4,8 @@
 package main
 
 import (
-	"time"
-
 	"go.wit.com/lib/gadgets"
 	"go.wit.com/lib/gui/repolist"
-	"go.wit.com/lib/gui/shell"
 	"go.wit.com/log"
 
 	"go.wit.com/gui"
@@ -18,8 +15,8 @@ type repoWindow struct {
 	win    *gadgets.BasicWindow // the window widget itself
 	box    *gui.Node            // notsure
 	topbox *gui.Node            // the top box of the repolist window
-	mergeDevel  *gui.Node            // the buttton for merging user into devel
+	// mergeDevel  *gui.Node            // the buttton for merging user into devel
-	mergeMaster *gui.Node            // the buttton for merging devel into master
+	// mergeMaster *gui.Node            // the buttton for merging devel into master
 	View *repolist.RepoList // old code
 }
 
@@ -42,15 +39,16 @@ func (r *repoWindow) Show() {
 	}
 	r.win.Show()
 
+	/*
 		now := time.Now()
 		// check for devel branches
 		total, count, nope, _ := IsEverythingOnDevel()
 		log.Printf("Devel branch check. %d total repos. (%d ok) (%d not on devel branch) (%s)\n", total, count, nope, shell.FormatDuration(time.Since(now)))
 		if nope != 0 {
-		r.mergeDevel.Disable()
+			// r.mergeDevel.Disable()
 		} else {
 			// everything is on the devel branch
-		r.mergeDevel.Enable()
+			// r.mergeDevel.Enable()
 		}
 
 		// check for master branches
@@ -62,6 +60,7 @@ func (r *repoWindow) Show() {
 			// everything is on the master branch
 			r.mergeMaster.Enable()
 		}
+	*/
 
 	// updates the rows not hidden
 	loop := r.View.ReposSortByName()
@@ -148,6 +147,7 @@ func (r *repoWindow) repoMenu() *gui.Node {
 		}
 	}
 
+	/*
 		r.mergeDevel = box2.NewButton("merge to devel", func() {
 			r.Disable()
 			defer r.Enable()
@@ -227,6 +227,7 @@ func (r *repoWindow) repoMenu() *gui.Node {
 			}
 			me.forge.ConfigSave()
 		})
+	*/
 	box2.NewButton("update", func() {
 		r.Disable()
 		defer r.Enable()