code reorg and clean

Signed-off-by: Jeff Carr <[email protected]>

1 files changed, 14 insertions, 157 deletions

diff --git a/draw.go b/draw.go
index c1094c2..6c8b61a 100644
--- a/draw.go
+++ b/draw.go
@@ -20,81 +20,14 @@ func (rs *RepoStatus) draw() {
 	rs.drawGitStatus()
 
 	// display the git branches and options
-	rs.drawGitBranches()
+	rs.makeBranchesBox()
 
 	// show standard git commit and merge controls
 	rs.drawGitCommands()
 }
 
-func (rs *RepoStatus) drawGitBranches() {
-	rs.gitBranchesGroup = rs.window.Box().NewGroup("branches")
-	newgrid := rs.gitBranchesGroup.NewGrid("gridnuts", 2, 2)
-
-	rs.lasttag = gadgets.NewOneLiner(newgrid, "last tag")
-
-	rs.masterBranchVersion = gadgets.NewOneLiner(newgrid, "master")
-	rs.develBranchVersion = gadgets.NewOneLiner(newgrid, "devel")
-	rs.userBranchVersion = gadgets.NewOneLiner(newgrid, "user")
-
-	rs.currentBranch = gadgets.NewOneLiner(newgrid, "current branch")
-	rs.currentVersion = gadgets.NewOneLiner(newgrid, "current version")
-
-	rs.showBranchesButton = newgrid.NewButton("getBranches()", func() {
-		all := rs.getBranches()
-		i := len(all)
-		log.Log(WARN, "branch count =", i)
-	})
-
-	rs.checkBranchesButton = newgrid.NewButton("CheckBranches()", func() {
-		if rs.CheckBranches() {
-			log.Log(WARN, "Branches are perfect")
-		} else {
-			log.Log(WARN, "Branches are not perfect")
-		}
-	})
-
-	newgrid.NewButton("show .git/config", func() {
-		if rs.gitConfig == nil {
-			log.Log(WARN, "Nonexistant or damaged .git/config", rs.String())
-			return
-		}
-		log.Log(WARN, ".git/config:", rs.realPath.String())
-
-		// The info:
-		for name, remote := range rs.gitConfig.remotes {
-			log.Log(WARN, "  ", name, "url:", remote.url)
-		}
-		for name, branch := range rs.gitConfig.branches {
-			log.Log(WARN, "  ", name, "remote:", branch.remote, "merge", branch.merge)
-		}
-	})
-
-	newgrid.NewButton("CheckDirty()", func() {
-		if rs.CheckDirty() {
-			log.Log(WARN, "is dirty")
-		} else {
-			log.Log(WARN, "is not dirty")
-		}
-	})
-
-	rs.TagsW = rs.TagWindow()
-
-	newgrid.NewButton("Show tags", func() {
-		if rs.TagsW == nil {
-			log.Warn("error: found rs.TagsW == nil")
-			rs.TagsW = rs.TagWindow()
-			return
-		}
-		if rs.TagsW.Hidden() {
-			rs.TagsW.Show()
-		} else {
-			rs.TagsW.Show()
-		}
-	})
-}
-
 func (rs *RepoStatus) drawGitStatus() {
-	rs.gitStatusGroup = rs.window.Box().NewGroup("What GO Knows It Has")
+	rs.gitStatusGroup = rs.window.Box().NewGroup("What GIT Knows It Has")
 	newgrid := rs.gitStatusGroup.NewGrid("gridnuts", 2, 2)
 	newgrid.Margin()
 	newgrid.Pad()
@@ -109,16 +42,19 @@ func (rs *RepoStatus) drawGitStatus() {
 	rs.develWorkingName.SetValue("devel")
 	rs.userWorkingName = gadgets.NewOneLiner(newgrid, "user working branch")
 	rs.userWorkingName.SetValue("uid")
-	rs.tagsDrop = gadgets.NewBasicDropdown(newgrid, "all releases")
 
-	// git for-each-ref --sort=taggerdate --format '%(tag) ,,,_,,, %(subject)' refs/tags
-	var cmd []string
-	cmd = append(cmd, "git", "for-each-ref", "--sort=taggerdate", "--format", "%(tag) %(subject)", "refs/tags")
-	_, _, output := RunCmd(rs.realPath.String(), cmd)
-	log.Log(INFO, output)
-	for _, line := range strings.Split(output, "\n") {
-		rs.tagsDrop.AddText(line)
-	}
+	/*
+		rs.tagsDrop = gadgets.NewBasicDropdown(newgrid, "all releases")
+
+		// git for-each-ref --sort=taggerdate --format '%(tag) ,,,_,,, %(subject)' refs/tags
+		var cmd []string
+		cmd = append(cmd, "git", "for-each-ref", "--sort=taggerdate", "--format", "%(tag) %(subject)", "refs/tags")
+		_, _, output := rs.RunCmd(cmd)
+		log.Log(INFO, output)
+		for _, line := range strings.Split(output, "\n") {
+			rs.tagsDrop.AddText(line)
+		}
+	*/
 
 	rs.dirtyLabel = gadgets.NewOneLiner(newgrid, "dirty")
 	rs.readOnly = gadgets.NewOneLiner(newgrid, "read only")
@@ -202,85 +138,6 @@ func (rs *RepoStatus) runFullAutomation() bool {
 	return true
 }
 
-func (rs *RepoStatus) drawGitCommands() {
-	rs.gitCommandsGroup = rs.window.Box().NewGroup("git commands")
-	newgrid := rs.gitCommandsGroup.NewGrid("gridnuts", 2, 2)
-
-	newgrid.NewButton("update", func() {
-		rs.Update()
-	})
-
-	newgrid.NewButton("git pull", func() {
-		var cmd []string
-		cmd = append(cmd, "git", "pull")
-		err, b, output := RunCmd(rs.realPath.String(), cmd)
-		log.Warn("Did git pull here", err, b, output)
-	})
-
-	label := "merge " + rs.userWorkingName.String() + " to " + rs.develWorkingName.String()
-	rs.develMergeB = newgrid.NewButton(label, func() {
-		rs.Disable()
-		if rs.RunDevelMergeB() {
-			log.Warn("THINGS SEEM OK fullAutomation() returned true.")
-		} else {
-			log.Warn("THINGS FAILED fullAutomation() returned false")
-		}
-		rs.Enable()
-	})
-
-	label = "merge " + rs.develWorkingName.String() + " to " + rs.mainWorkingName.String()
-	rs.mainMergeB = newgrid.NewButton(label, func() {
-		rs.Disable()
-		if rs.RunDevelMergeB() {
-			log.Warn("THINGS SEEM OK fullAutomation() returned true.")
-		} else {
-			log.Warn("THINGS FAILED fullAutomation() returned false")
-		}
-		rs.Enable()
-	})
-
-	rs.major = gadgets.NewBasicCombobox(newgrid, "major")
-	rs.major.Custom = func() {
-		rs.setTag()
-		rs.generateCmd()
-	}
-	rs.major.Hide()
-	rs.minor = gadgets.NewBasicCombobox(newgrid, "minor")
-	rs.minor.Custom = func() {
-		rs.setTag()
-		rs.generateCmd()
-	}
-	rs.minor.Hide()
-	rs.revision = gadgets.NewBasicCombobox(newgrid, "revision")
-	rs.revision.Custom = func() {
-		rs.setTag()
-		rs.generateCmd()
-	}
-	rs.revision.Hide()
-
-	// newgrid.NewLabel("new tag version")
-	rs.newversion = newgrid.NewLabel("0.0.1")
-	rs.newversion.Hide()
-
-	rs.versionMessage = gadgets.NewBasicEntry(newgrid, "tag message")
-	rs.versionMessage.Custom = func() {
-		rs.generateCmd()
-	}
-	rs.versionMessage.Hide()
-
-	rs.versionCmdOutput = gadgets.NewOneLiner(newgrid, "tag cmd")
-	rs.versionCmdOutput.Hide()
-
-	rs.releaseVersion = newgrid.NewButton("tag and release new version", func() {
-		rs.Disable()
-		rs.runReleaseVersionB()
-	})
-	rs.releaseVersion.Hide()
-
-	newgrid.Margin()
-	newgrid.Pad()
-}
-
 var releaseRevision string = ""
 
 // over ride the computation of this if a release is being created