start clean up and rearrage buttons

globalDisplayOptions.go

@@ -12,6 +12,19 @@ import (
 
 func showHideRepos() {
 	for _, repo := range me.repos.View.AllRepos() {
+		// always show dirty repos
+		if repo.IsDirty() {
+			repo.Show()
+			continue
+		}
+		// always show repos that have not been merged to main
+		if repo.GoState() == "merge to devel" {
+			repo.Show()
+			continue
+		}
+
+		// hide read-only repos. These are repos that do not
+		// match things in the users config file (.config/autotypist)
 		if me.autoHideReadOnly.Checked() {
 			if repo.Status.ReadOnly() {
 				repo.Hide()
@@ -227,8 +240,16 @@ func globalDisplayOptions(box *gui.Node) {
 		log.Info("All repos seem okay")
 	})
 
-	group1.NewButton("initialize all the repos", func() {
+	group1.NewButton("git checkout master", func() {
-		setRepoState()
+		setBranchToMaster()
+	})
+
+	group1.NewButton("set target version", func() {
+		setTargetVersion()
+	})
+
+	group1.NewButton("re-scan all repos", func() {
+		me.repos.View.ScanRepositories()
 	})
 
 	group1.NewButton("scanForReady()", func() {

main.go

@@ -71,7 +71,6 @@ func main() {
 	// scan in the repo map first
 	// hopefully this is the list of all the golang packages and only the GUI golang packages
 	me.repos = makeRepoView()
-	log.Sleep(3)
 
 	// create the right side of the main window
 	createReleaseBox(me.mainBox)
@@ -101,16 +100,10 @@ func main() {
 	})
 }
 
-func setRepoState() {
+// start the initail scan and make sure each repo is set
-	// start the initail scan and make sure each repo is set
+// to the master branch
-	// to the master branch
+func setBranchToMaster() {
 	for _, repo := range me.repos.View.AllRepos() {
-		if repo.ReadOnly() {
-			continue
-		}
-		if whitelist(repo.GoPath()) {
-			continue
-		}
 		if repo.Status.CheckoutMaster() {
 			log.Warn("git checkout master branch worked", repo.Name())
 		} else {
@@ -118,6 +111,9 @@ func setRepoState() {
 		}
 		repo.NewScan()
 	}
+}
+
+func setTargetVersion() {
 	// go through and set the target versions for each repo
 	// todo: add sanity checking in repolist to verify these and/or autocompute them
 	// for now, just don't be stupid when you set your ENV vars
@@ -147,8 +143,6 @@ func setRepoState() {
 			lasttag := repo.Status.GetLastTagVersion()
 			repo.Status.SetTargetVersion(lasttag)
 		}
-	}
-	for _, repo := range me.repos.View.AllRepos() {
 		repo.NewScan()
 	}
 }

releaseBox.go

@@ -64,8 +64,8 @@ func createReleaseBox(box *gui.Node) {
 	initWhitelist()
 
 	release.box = box
-	release.group = release.box.NewGroup("things")
+	release.group = release.box.NewGroup("Current Repo")
-	release.grid = release.group.NewGrid("buildOptions", 2, 1)
+	release.grid = release.group.NewGrid("buildOptions", 0, 0)
 
 	// do an initial scan of all the repos
 	scanGoSum()
@@ -76,7 +76,6 @@ func createReleaseBox(box *gui.Node) {
 		me.Enable()
 	})
 	release.grid.NewButton("findNextDirty()", func() {
-		/*
 			me.Disable()
 			defer me.Enable()
 			if findNextDirty("PRIMATIVE") {
@@ -87,7 +86,6 @@ func createReleaseBox(box *gui.Node) {
 				log.Info("findNextDirty() found a repo")
 				return
 			}
-		*/
 	})
 
 	release.releaseVersionB = release.grid.NewButton("release version", func() {
@@ -104,20 +102,30 @@ func createReleaseBox(box *gui.Node) {
 		release.current.Status.Toggle()
 	})
 	release.openrepo.Disable()
+	release.grid.NextRow()
 
 	release.repo = gadgets.NewOneLiner(release.grid, "repo")
+	release.grid.NextRow()
 	release.status = gadgets.NewOneLiner(release.grid, "status")
+	release.grid.NextRow()
 	release.readOnly = gadgets.NewOneLiner(release.grid, "read-only")
+	release.grid.NextRow()
 	release.notes = gadgets.NewOneLiner(release.grid, "notes")
+	release.grid.NextRow()
 
 	release.version = gadgets.NewOneLiner(release.grid, "version")
+	release.grid.NextRow()
 
 	release.reason = gadgets.NewBasicEntry(release.grid, "release reason")
 	release.reason.SetText(me.releaseReasonS)
+	release.grid.NextRow()
 
 	me.autoWorkingPwd = gadgets.NewOneLiner(release.grid, "working directory (pwd)")
+	release.grid.NextRow()
 	me.userHomePwd = gadgets.NewOneLiner(release.grid, "user home")
+	release.grid.NextRow()
 	me.goSrcPwd = gadgets.NewOneLiner(release.grid, "go src home")
+	release.grid.NextRow()
 
 	homeDir, err := os.UserHomeDir()
 	if err != nil {
@@ -195,6 +203,7 @@ func createReleaseBox(box *gui.Node) {
 		}
 		buttonEnable()
 	})
+	release.grid.NextRow()
 
 	release.grid.NewButton("release all", func() {
 		var worked bool = true
@@ -222,6 +231,7 @@ func createReleaseBox(box *gui.Node) {
 		log.Info("release returned", worked, "and ran for", s)
 		buttonEnable()
 	})
+	release.grid.NextRow()
 }
 
 func fullDoubleCheckFix() bool {