changes for the autotypistv0.12.17

    go mod automation testing
    read tags

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

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

1 files changed, 40 insertions, 30 deletions

diff --git a/draw.go b/draw.go
index 6ab130e..fd5af1f 100644
--- a/draw.go
+++ b/draw.go
@@ -75,7 +75,6 @@ func (rs *RepoStatus) drawGitBranches() {
 func (rs *RepoStatus) drawGitStatus() {
 	rs.gitStatusGroup = rs.window.Box().NewGroup("What GO Knows It Has")
 	newgrid := rs.gitStatusGroup.NewGrid("gridnuts", 2, 2)
-	// newgrid.SetNext(1,1)
 	newgrid.Margin()
 	newgrid.Pad()
 
@@ -84,6 +83,16 @@ func (rs *RepoStatus) drawGitStatus() {
 	rs.lasttag = gadgets.NewOneLiner(newgrid, "last tag")
 	rs.currentVersion = gadgets.NewOneLiner(newgrid, "Version")
 	rs.tagsDrop = gadgets.NewBasicDropdown(newgrid, "existing tags")
+
+	// 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("/home/jcarr/go/src/"+rs.repopath, cmd)
+	log.Info(output)
+	for _, line := range strings.Split(output, "\n") {
+		rs.tagsDrop.AddText(line)
+	}
+
 	rs.masterBranchVersion = gadgets.NewOneLiner(newgrid, "master")
 	rs.develBranchVersion = gadgets.NewOneLiner(newgrid, "devel")
 	rs.userBranchVersion = gadgets.NewOneLiner(newgrid, "user")
@@ -102,23 +111,7 @@ func (rs *RepoStatus) drawGitCommands() {
 		rs.Update()
 	})
 
-	label := "merge " + rs.masterDrop.String() + " to devel"
-	rs.develMerge = newgrid.NewButton(label, func() {
-		rs.Disable()
-		master := rs.masterDrop.String()
-		rs.checkoutBranch("master", master)
-		if rs.getCurrentBranchName() != master {
-			log.Warn("something went wrong switching to the master branch. full stop!")
-			return
-		}
-		if !rs.runGitCommands() {
-			log.Warn("SOMETHING WENT WRONG")
-			return
-		}
-		rs.Update()
-		rs.Enable()
-		log.Warn("THINGS SEEM OK")
-	})
+	newgrid.NewLabel("tmp")
 
 	rs.major = gadgets.NewBasicCombobox(newgrid, "major")
 	rs.major.Custom = func() {
@@ -136,7 +129,7 @@ func (rs *RepoStatus) drawGitCommands() {
 		rs.generateCmd()
 	}
 	newgrid.NewLabel("new tag version")
-	rs.newversion = newgrid.NewLabel("3.1.4")
+	rs.newversion = newgrid.NewLabel("0.0.1")
 
 	rs.versionMessage = gadgets.NewBasicEntry(newgrid, "tag message")
 	rs.versionMessage.Custom = func() {
@@ -144,6 +137,24 @@ func (rs *RepoStatus) drawGitCommands() {
 	}
 	rs.versionCmdOutput = gadgets.NewOneLiner(newgrid, "tag cmd")
 
+	label := "merge " + rs.masterDrop.String() + " to devel"
+	rs.develMerge = newgrid.NewButton(label, func() {
+		rs.Disable()
+		master := rs.masterDrop.String()
+		rs.checkoutBranch("master", master)
+		if rs.getCurrentBranchName() != master {
+			log.Warn("something went wrong switching to the master branch. full stop!")
+			return
+		}
+		if !rs.runGitCommands() {
+			log.Warn("SOMETHING WENT WRONG")
+			return
+		}
+		rs.Update()
+		rs.Enable()
+		log.Warn("THINGS SEEM OK")
+	})
+
 	rs.releaseVersion = newgrid.NewButton("tag and release new version", func() {
 		if !rs.generateCmd() {
 			log.Warn("something is wrong. fix the errors first")
@@ -179,12 +190,12 @@ func (rs *RepoStatus) setTag() bool {
 	newver := strconv.Itoa(newa)
 	if newa < olda {
 		log.Warn("new version bad", newver, "vs old version", lasttag, "newa =", newa, "olda =", olda)
-		rs.newversion.SetText("bad")
+		rs.newversion.SetLabel("bad")
 		return false
 	}
 	if newa > olda {
 		log.Warn("new version ok", newver, "vs old version", lasttag)
-		rs.newversion.SetText(newver)
+		rs.newversion.SetLabel(newver)
 		rs.minor.SetText("")
 		rs.revision.SetText("")
 		return true
@@ -194,13 +205,13 @@ func (rs *RepoStatus) setTag() bool {
 	newver = strconv.Itoa(newa) + "." + strconv.Itoa(newb)
 	if newb < oldb {
 		log.Warn("new version bad", newver, "vs old version", lasttag, "newb =", newb, "oldb =", oldb)
-		rs.newversion.SetText("bad")
+		rs.newversion.SetLabel("bad")
 		return false
 	}
 
 	if newb > oldb {
 		log.Warn("new version ok", newver, "vs old version", lasttag)
-		rs.newversion.SetText(newver)
+		rs.newversion.SetLabel(newver)
 		rs.revision.SetText("")
 		return true
 	}
@@ -209,11 +220,11 @@ func (rs *RepoStatus) setTag() bool {
 	newver = strconv.Itoa(newa) + "." + strconv.Itoa(newb) + "." + strconv.Itoa(newc)
 	if newc <= oldc {
 		log.Warn("new version bad", newver, "vs old version", lasttag)
-		rs.newversion.SetText("bad")
+		rs.newversion.SetLabel("bad")
 		return false
 	}
 	log.Warn("new version ok", newver, "vs old version", lasttag)
-	rs.newversion.SetText(newver)
+	rs.newversion.SetLabel(newver)
 	return true
 }
 
@@ -253,8 +264,8 @@ func (rs *RepoStatus) recommend() {
 		log.Warn("merge or squash?")
 		rs.EnableMergeDevel()
 		rs.setMergeUserCommands()
-		label := "merge " + rs.GetUserBranchName() + " into " + rs.GetDevelBranchName()
-		rs.develMerge.SetText(label)
+		label := "merge user into " + rs.GetDevelBranchName()
+		rs.develMerge.SetLabel(label)
 		return
 	}
 	log.Warn("Does master == devel? ", rs.masterBranchVersion.String(), rs.develBranchVersion.String())
@@ -262,8 +273,8 @@ func (rs *RepoStatus) recommend() {
 		log.Warn("master does not equal devel. merge devel into master")
 		rs.EnableMergeDevel()
 		rs.setMergeDevelCommands()
-		label := "merge " + rs.GetDevelBranchName() + " into " + rs.GetMasterBranchName()
-		rs.develMerge.SetText(label)
+		label := "merge devel into " + rs.GetMasterBranchName()
+		rs.develMerge.SetLabel(label)
 		return
 	}
 	rs.getLastTagVersion()
@@ -272,7 +283,6 @@ func (rs *RepoStatus) recommend() {
 		rs.incrementVersion()
 		rs.EnableSelectTag()
 		rs.setTag()
-		rs.versionMessage.SetText("TODO: set globally")
 		return
 	}
 	log.Warn("Is repo pushed upstream? git.wit.org or github?")