this process is annoying

1 files changed, 14 insertions, 30 deletions

diff --git a/releaseBox.go b/releaseBox.go
index d49b0a0..15f68c8 100644
--- a/releaseBox.go
+++ b/releaseBox.go
@@ -3,7 +3,6 @@ package main
 
 import (
 	"fmt"
-	"os"
 	"time"
 
 	"go.wit.com/gui"
@@ -51,14 +50,14 @@ func createReleaseBox(box *gui.Node) {
 
 	me.release.releaseVersionB = me.release.grid.NewButton("release version", func() {
 		buttonDisable()
-		if doRelease() {
+		if err := doRelease(); err == nil {
 			buttonEnable()
 			log.Info("doRelease() worked")
 		} else {
-			log.Info("doRelease() failed")
+			log.Info("doRelease() failed", err, me.current.GetGoPath())
 		}
 	})
-	me.release.grid.NewButton("Find Next Releasable", func() {
+	me.release.grid.NewButton("Find Next", func() {
 		me.Disable()
 		defer me.Enable()
 		if findNext() {
@@ -66,6 +65,15 @@ func createReleaseBox(box *gui.Node) {
 			return
 		}
 	})
+	me.release.grid.NewButton("Show Next", func() {
+		check := me.current
+		if check == nil {
+			log.Info("boo, current is missing", me.current.GetGoPath())
+			return
+		}
+		testGoRepo(check)
+		me.forge.HumanPrintRepo(check)
+	})
 	me.release.grid.NextRow()
 
 	me.release.repo = gadgets.NewOneLiner(me.release.grid, "repo")
@@ -181,21 +189,6 @@ func createReleaseBox(box *gui.Node) {
 		buttonEnable()
 	})
 	grid.NextRow()
-
-	group = me.release.box.NewGroup("experimental and potentially dangerous stuff")
-	grid = group.NewGrid("buildOptions", 0, 0)
-
-	me.setBranchesToMasterB = grid.NewButton("set all branches to master", func() {
-		me.Disable()
-		defer me.Enable()
-		/*
-			if setAllBranchesToMaster() {
-				// if it succeeds, disable this button
-				me.setBranchesToMasterB.Disable()
-			}
-		*/
-	})
-	grid.NextRow()
 }
 
 func doReleaseAll() (bool, time.Duration) {
@@ -210,19 +203,10 @@ func doReleaseAll() (bool, time.Duration) {
 				worked = false
 				break
 			}
-			if doRelease() {
+			if err := doRelease(); err == nil {
 				log.Info("doRelease() worked. findCounter =", findCounter)
 			} else {
-				if os.Getenv("FindNextDone") == "true" {
-					log.Info("findNext says it was done. findCounter =", findCounter)
-					log.Info("findNext says it was done. findCounter =", findCounter)
-					log.Info("we can exit here")
-				}
-				if me.release.status.String() == "ALL DONE?" {
-					log.Info("maybe ALL DONE?. findCounter =", findCounter)
-					worked = true
-				}
-				log.Info("doRelease() failed. findCounter =", findCounter)
+				log.Info("doRelease() failed. findCounter =", findCounter, err)
 				worked = false
 				break
 			}