rm GOSRC

Makefile

@@ -1,4 +1,4 @@
-all:
+all: goimports
 	GO111MODULE=off go vet
 
 goimports:
@@ -10,3 +10,6 @@ redomod:
 	GO111MODULE= go mod init
 	GO111MODULE= go mod tidy
 
+clean:
+	rm -f go.*
+	go-mod-clean --purge

branchesBox.go

@@ -2,70 +2,36 @@ package repostatus
 
 import (
 	"go.wit.com/gui"
-	"go.wit.com/lib/gadgets"
 	"go.wit.com/log"
 )
 
 func (rs *RepoStatus) makeBranchesBox(parent *gui.Node) {
+	repo := rs.pb
 	rs.gitBranchesGroup = parent.NewGroup("branches") // `progname:"BRANCHES"` // can the toolkits use these for i18n support?
-	newgrid := rs.gitBranchesGroup.NewGrid("gridnuts", 0, 0)
+	grid := rs.gitBranchesGroup.RawGrid()
 
-	rs.lasttag = gadgets.NewOneLiner(newgrid, "last tag") // `progname:"LASTTAG"`
+	var win *repoBranchesWindow
-	newgrid.NextRow()
+	grid.NewButton("Branches Window", func() {
-
+		if win != nil {
-	rs.mainBranchVersion = gadgets.NewOneLiner(newgrid, "master") // `progname:"MASTERBRANCH"`
+			win.Toggle()
-	newgrid.NextRow()
+			return
-	rs.develBranchVersion = gadgets.NewOneLiner(newgrid, "devel") // `progname:"DEVELBRANCH"`
-	newgrid.NextRow()
-	rs.userBranchVersion = gadgets.NewOneLiner(newgrid, "user") // `progname:"USERBRANCH"`
-	newgrid.NextRow()
-
-	rs.currentBranch = gadgets.NewOneLiner(newgrid, "current branch") // `progname:"CURRENTBRANCH"`
-	newgrid.NextRow()
-	rs.currentVersion = gadgets.NewOneLiner(newgrid, "current version") // `progname:"CURRENTVERSION"`
-	newgrid.NextRow()
-
-	rs.switchBranchB = newgrid.NewButton("Switch Branch", func() { // `progname:"SWITCH"`
-		bname := rs.targetBranch.String()
-		log.Info("Should switch to branch", bname, "here")
-
-		var all [][]string
-		all = append(all, []string{"git", "checkout", bname})
-		if rs.DoAll(all) {
-			log.Info("branch switched to", bname)
-		} else {
-			log.Info("branch switched to", bname, "failed")
 		}
-		rs.updateNew()
+		log.Info("redo this")
+		win = MakeRepoBranchesWindow(repo)
+		win.Show()
 	})
+	grid.NextRow()
 
-	rs.targetBranch = newgrid.NewDropdown() // `progname:"TARGET"`
+	var mergeWin *repoMergeWindow
-	newgrid.NextRow()
+	grid.NewButton("Merge Window", func() {
-
+		if mergeWin != nil {
-	rs.showBranchesButton = newgrid.NewButton("find jcarr and devel", func() {
+			mergeWin.Toggle()
-		if rs.TagExists("jcarr") {
+			return
-			log.Log(WARN, "tag jcarr exists")
-		} else {
-			log.Log(WARN, "tag jcarr does not exist")
-		}
-		if rs.TagExists("devel") {
-			log.Log(WARN, "tag devel exists")
-		} else {
-			log.Log(WARN, "tag devel does not exist")
 		}
+		log.Info("redo this")
+		mergeWin = rs.MakeRepoMergeWindow(repo)
+		mergeWin.Show()
 	})
-	newgrid.NextRow()
+	grid.NextRow()
 
-	rs.checkBranchesButton = newgrid.NewButton("CheckBranches()", func() {
-		if rs.CheckBranches() {
-			log.Log(WARN, "Branches are perfect")
-		} else {
-			log.Log(WARN, "Branches are not perfect")
-		}
-	})
-	newgrid.NextRow()
-
-	newgrid.NewButton("Revert master to devel", func() {
-		rs.RevertMasterToDevel()
-	})
 }

common.go

@@ -1,11 +1,6 @@
 package repostatus
 
 import (
-	"os"
-	"strings"
-	"unicode"
-
-	"go.wit.com/lib/gui/shell"
 	"go.wit.com/log"
 )
 
@@ -26,30 +21,10 @@ func (rs *RepoStatus) getChanges() string {
 }
 
 func (rs *RepoStatus) NoteChange(s string) {
-	log.Log(REPOWARN, "NoteChange() got", rs.String(), s)
 	rs.changed = true
 	rs.changes += s + "\n"
 }
 
-// deprecate this. returns the gopath right now
-func (rs *RepoStatus) String() string {
-	// log.Warn("RepoStatus.String() is to be deprecated")
-	return rs.path.String()
-}
-
-// returns the filesystem path to the repo
-func (rs *RepoStatus) Path() string {
-	if rs == nil {
-		log.Warn("rs == nil")
-		return ""
-	}
-	if rs.realPath == nil {
-		log.Warn("rs.realPath == nil")
-		return ""
-	}
-	return rs.realPath.String()
-}
-
 func (rs *RepoStatus) Show() {
 	if !rs.Ready() {
 		return
@@ -88,137 +63,59 @@ func (rs *RepoStatus) Ready() bool {
 	return rs.ready
 }
 
-func (rs *RepoStatus) IsGoLang() bool {
+// disable all things besides Update() button
-	if !rs.Ready() {
+func (rs *RepoStatus) DisableEverything() {
-		return false
+	log.Log(INFO, "DisableEverything()")
-	}
+
-	if rs.isGoLang.String() == "true" {
+	// choosing a major, minor or revision
-		return true
+	rs.major.Disable()
-	}
+	rs.minor.Disable()
-	return false
+	rs.revision.Disable()
+
+	// disable adding a tag message
+	rs.versionMessage.Disable()
+
+	// disable the merge devel to master button
+	rs.develMergeB.Disable()
+
+	// disable the tag a new version button
+	rs.releaseVersion.Disable()
 }
 
-// experiment to determine the golang package type
+// this means devel needs to be merged to master
-func (rs *RepoStatus) RepoType() string {
+func (rs *RepoStatus) EnableMergeDevel() {
-	if !rs.IsGoLang() {
+	rs.DisableEverything()
-		return ""
+
-	}
+	rs.develMergeB.Enable()
-	if !rs.Exists("go.mod") {
-		return ""
-	}
-	os.Setenv("GO111MODULE", "off")
-	cmd := []string{"go", "list", "-f", "'{{if eq .Name \"main\"}}binary{{else}}library{{end}}'"}
-	r := shell.PathRunLog(rs.Path(), cmd, INFO)
-	output := strings.TrimSpace(strings.Join(r.Stdout, "\n"))
-	if r.Error != nil {
-		log.Info("go package error:", r.Error)
-	}
-	return output
 }
 
-func (rs *RepoStatus) BinaryName() string {
+func (rs *RepoStatus) Disable() {
-	// get the package name from the repo name
+	rs.window.Disable()
-	path := rs.String()
-	parts := strings.Split(path, "/")
-	name := parts[len(parts)-1]
-	return name
 }
 
-func (rs *RepoStatus) Build() bool {
+func (rs *RepoStatus) Enable() {
-	if !rs.IsGoLang() {
+	rs.window.Enable()
-		return false
-	}
-	name := rs.BinaryName()
-	// removes the binary if it already exists
-	rs.Run([]string{"rm", "-f", name})
-	if rs.Exists(name) {
-		log.Warn("file could not be removed filename =", name)
-		return false
-	}
-	log.Info("need to build here", rs.String())
-	// rs.RunCmd([]string{"go", "build", "-v", "-x"})
-	rs.XtermBash([]string{"go", "build", "-v", "-x"})
-	if rs.Exists(name) {
-		log.Warn("build worked", name)
-		return true
-	}
-	log.Warn("build failed", name)
-	return false
 }
 
-func (rs *RepoStatus) GetTargetVersion() string {
+// this means you need to release a new version of the master repository
-	return rs.targetReleaseVersion.String()
+func (rs *RepoStatus) EnableSelectTag() {
-}
+	rs.DisableEverything()
 
-func (rs *RepoStatus) GetCurrentVersion() string {
+	// choosing a major, minor or revision
-	return rs.currentVersion.String()
+	rs.major.Enable()
-}
+	rs.minor.Enable()
+	rs.revision.Enable()
 
-func (rs *RepoStatus) LastTag() string {
+	// disable adding a tag message
-	return rs.lasttag.String()
+	rs.versionMessage.Enable()
-}
 
-func (rs *RepoStatus) IncrementVersion() bool {
+	rs.develMergeB.SetLabel("ready to release")
-	rs.incrementRevision()
-	rs.EnableSelectTag()
-	rs.setTag()
-	newtag := "v" + rs.newversion.String()
-	rs.targetReleaseVersion.SetText(newtag)
-	return true
-}
 
-// TODO: run this through the sanity check!
+	if len(rs.versionMessage.String()) == 0 {
-func (rs *RepoStatus) SetTargetVersion(s string) {
+		// force there to be a commit message
-	// todo: redo setTag to do increment logic
+		rs.releaseVersion.Disable()
-	// func (rs *RepoStatus) setTag() bool {
-	rs.targetReleaseVersion.SetText(s)
-}
-
-func (rs *RepoStatus) IsPrivate() bool {
-	if rs.private.String() == "true" {
-		return true
-	}
-	return false
-}
-
-func (rs *RepoStatus) SetPrivate(b bool) {
-	if b {
-		rs.private.SetText("true")
 	} else {
-		rs.private.SetText("false")
+		// rs.generateCmd()
+		rs.releaseVersion.Enable()
 	}
 }
-
-func trimNonNumericFromStart(s string) string {
-	for i, r := range s {
-		if unicode.IsDigit(r) {
-			return s[i:]
-		}
-	}
-	return ""
-}
-
-func (rs *RepoStatus) DebianReleaseVersion() string {
-	lasttag := rs.GetLastTagVersion()
-	newv := trimNonNumericFromStart(lasttag)
-	if newv == "" {
-		newv = "0.0"
-		if lasttag != "" {
-			newv += "-" + lasttag
-		}
-	}
-	return newv
-}
-
-func (rs *RepoStatus) DebianCurrentVersion() string {
-	cbversion := rs.GetCurrentBranchVersion()
-
-	newv := trimNonNumericFromStart(cbversion)
-	if newv == "" {
-		newv = "0.0"
-	}
-	if rs.CheckDirty() {
-		newv += "-dirty"
-	}
-	return newv
-}

git.go

@@ -1,308 +1,34 @@
 package repostatus
 
-import (
+// most everything here needs to be deprecated now
-	"errors"
+func (rs *RepoStatus) Path() string {
-	"fmt"
+	return rs.realPath.String()
-	"os/user"
-	"strings"
-	"time"
-	"unicode/utf8"
-
-	"io/ioutil"
-
-	"go.wit.com/lib/gui/shell"
-	"go.wit.com/log"
-)
-
-func (rs *RepoStatus) GetCurrentBranchName() string {
-	return rs.currentBranch.String()
 }
 
-func (rs *RepoStatus) GetCurrentBranchVersion() string {
-	return rs.currentVersion.String()
-}
-
-func (rs *RepoStatus) LastGitPull() (time.Time, error) {
-	return rs.mtime(".git/FETCH_HEAD")
-}
-
-func (rs *RepoStatus) Age() time.Duration {
-	var t *Tag
-	t = rs.NewestTag()
-
-	if t != nil {
-		log.Log(REPO, "newest tag:", t.date.String(), t.tag.String(), t.Name())
-		return t.Age()
-	}
-
-	const gitLayout = "Mon Jan 2 15:04:05 2006 -0700"
-	const madeuptime = "Mon Jun 3 15:04:05 2013 -0700"
-	tagTime, _ := time.Parse(gitLayout, madeuptime)
-	return time.Since(tagTime)
-}
-
-var ErrorMissingGitConfig error = errors.New("missing .git/config")
-var ErrorGitPullOnLocal error = errors.New("git pull on local only branch")
-
 /*
-func (rs *RepoStatus) GitPull() (string, error) {
-	currentName := rs.GetCurrentBranchName()
-	if rs.IsOnlyLocalTag(currentName) {
-		return "", ErrorGitPullOnLocal
-	}
-	var cmd []string
-	cmd = append(cmd, "git", "pull")
-	r := rs.Run(cmd)
-	output := strings.Join(r.Stdout, "\n")
-	if r.Error != nil {
-		output = "git error_,,,_a_,,,_b_,,,c"
-	}
-	if r.Error == nil {
-		log.Log(REPOWARN, "git pull ran", rs.Path())
-		log.Log(REPOWARN, "git pull output", output)
-	} else {
-		log.Log(REPOWARN, "git pull error", rs.Path(), r.Error)
-	}
-	return output, r.Error
-}
-*/
-
-func (rs *RepoStatus) checkoutBranch(level string, branch string) {
-	if rs.CheckDirty() {
-		log.Log(REPO, "checkoutBranch() checkDirty() == true for repo", rs.realPath.String(), "looking for branch:", branch)
-		return
-	}
-	out := run(rs.realPath.String(), "git", "checkout "+branch)
-	log.Log(REPO, rs.realPath.String(), "git checkout "+branch, "returned", out)
-
-	realname := rs.GetCurrentBranchName()
-	realversion := rs.GetCurrentBranchVersion()
-	log.Log(REPO, rs.realPath.String(), "realname =", realname, "realversion =", realversion)
-
-	switch level {
-	case "master":
-		rs.mainBranchVersion.SetValue(realversion)
-	case "devel":
-		rs.develBranchVersion.SetValue(realversion)
-	case "user":
-		rs.userBranchVersion.SetValue(realversion)
-	default:
-	}
-}
-
-func (rs *RepoStatus) guessDevelWorkingName() {
-	if rs.TagExists("guidevel") {
-		rs.develWorkingName.SetValue("guidevel")
-		rs.develBranchVersion.SetLabel("guidevel")
-		return
-	}
-	if rs.TagExists("devel") {
-		rs.develWorkingName.SetValue("devel")
-		rs.develBranchVersion.SetLabel("devel")
-		return
-	}
-
-	// figure out what to do here
-	rs.develWorkingName.SetValue("develFIXME")
-	rs.develBranchVersion.SetLabel("develFIXME")
-}
-
-func (rs *RepoStatus) setUserWorkingName() {
-	usr, _ := user.Current()
-	uname := usr.Username
-	if rs.TagExists(uname) {
-		rs.userWorkingName.SetValue(uname)
-		rs.userBranchVersion.SetLabel(uname)
-		return
-	}
-	rs.userWorkingName.SetValue("need to create " + uname)
-	rs.userBranchVersion.SetLabel("need to create " + uname)
-}
-
-// returns "master", "devel", os.Username, etc
-func (rs *RepoStatus) GetMasterBranchName() string {
-	name := rs.mainWorkingName.String()
-	return name
-}
-func (rs *RepoStatus) GetDevelBranchName() string {
-	name := rs.develWorkingName.String()
-	return name
-}
-
-func (rs *RepoStatus) GetUserBranchName() string {
-	name := rs.userWorkingName.String()
-	return name
-}
-
-// returns the git versions like "1.3-2-laksdjf" or whatever
-func (rs *RepoStatus) GetMasterVersion() string {
-	name := rs.mainBranchVersion.String()
-	return name
-}
-func (rs *RepoStatus) GetDevelVersion() string {
-	name := rs.develBranchVersion.String()
-	return name
-}
-func (rs *RepoStatus) GetUserVersion() string {
-	name := rs.userBranchVersion.String()
-	return name
-}
-
-func (rs *RepoStatus) setMasterVersion(s string) {
-	old := rs.GetMasterVersion()
-	if old == s {
-		return
-	}
-	rs.mainBranchVersion.SetValue(s)
-	if old == "" {
-		return // don't note if there was nothing before
-	}
-	rs.NoteChange("master branch has been changed from " + old + " to " + s)
-}
-
-func (rs *RepoStatus) setDevelVersion(s string) {
-	old := rs.GetDevelVersion()
-	if old == s {
-		return
-	}
-	if old == "" {
-		// don't note nothing
-	} else {
-		rs.NoteChange("devel branch has been changed from " + old + " to " + s)
-	}
-	rs.develBranchVersion.SetValue(s)
-}
-
-func (rs *RepoStatus) setUserVersion(s string) {
-	old := rs.GetUserVersion()
-	if old == s {
-		return
-	}
-	if old == "" {
-		// don't note nothing
-	} else {
-		rs.NoteChange("user branch has been changed from " + old + " to " + s)
-	}
-	rs.userBranchVersion.SetValue(s)
-}
-
 func (rs *RepoStatus) GitState() string {
 	return rs.gitState.String()
 }
-
+*/
-func (rs *RepoStatus) CheckGitState() string {
-	rs.setState()
-	return rs.gitState.String()
-}
 
 func (rs *RepoStatus) GetStatus() string {
 	return rs.gitState.String()
 }
 
-func (rs *RepoStatus) setState() {
-	rs.changed = false
-	if rs.CheckDirty() {
-		log.Log(REPO, "CheckDirty() true")
-		rs.gitState.SetText("dirty")
-		return
-	}
-	if rs.GetUserVersion() != rs.GetDevelVersion() {
-		rs.gitState.SetText("merge to devel")
-		return
-	}
-	if rs.GetDevelVersion() != rs.GetMasterVersion() {
-		rs.gitState.SetText("merge to main")
-		return
-	}
-	if rs.lasttag.String() != rs.GetMasterVersion() {
-		rs.gitState.SetText("unchanged")
-		return
-	}
-
-	if rs.CheckBranches() {
-		log.Log(REPO, "Branches are Perfect")
-		rs.gitState.SetText("PERFECT")
-		return
-	}
-	log.Log(REPO, rs.String(), "Branches are not Perfect")
-	rs.gitState.SetText("unknown branches")
-}
-
-// TODO: make this report the error somewhere
-// This is supposed to check all the branches to make sure
-// the are the same. that was originally what this was for
-// now I think it's jsut probably dumb old code that doesn't
-// need to be here
-
-// actually, this is to attempt to verify absolutely everything
-// is pushed upstream before doing a rm -rf ~/go/src
-// TODO: revisit this code in the autotypist later
-func (rs *RepoStatus) CheckBranches() bool {
-	var hashCheck string
-	var perfect bool = true
-	all := rs.getBranches()
-	path := rs.realPath.String() + "/.git/refs/"
-	for _, b := range all {
-		parts := strings.Split(b, "/")
-		rdir := "heads"
-		if len(parts) == 2 {
-			rdir = "remotes"
-		}
-		fullfile := path + "/" + rdir + "/" + b
-
-		// check if the ref name is "HEAD". if so, skip
-		runeCount := utf8.RuneCountInString(fullfile)
-		// Convert the string to a slice of runes
-		runes := []rune(fullfile)
-		// Slice the last 4 runes
-		lastFour := runes[runeCount-4:]
-		if string(lastFour) == "HEAD" {
-			log.Log(REPO, "skip HEAD fullfile", fullfile)
-			continue
-		}
-
-		content, _ := ioutil.ReadFile(fullfile)
-		hash := strings.TrimSpace(string(content))
-		if hashCheck == "" {
-			hashCheck = hash
-		}
-		var cmd []string
-		cmd = append(cmd, "git", "show", "-s", "--format=%ci", hash)
-		r := shell.PathRunLog(rs.Path(), cmd, INFO)
-		if r.Error != nil {
-			log.Log(WARN, "CheckBranches() git show error:", r.Error)
-		}
-		// git show -s --format=%ci <hash> will give you the time
-		// log.Log(REPO, fullfile)
-		if hash == hashCheck {
-			log.Log(REPO, "notsure why this git show is here", hash)
-		} else {
-			// log.Log(WARN, rs.String(), hash, output, b)
-			// log.Log(WARN, "UNKNOWN BRANCHES IN THIS REPO", cmd)
-			rs.versionCmdOutput.SetText("UNKNOWN BRANCHES")
-			perfect = false
-			// parts := strings.Split(b, "/")
-			// log.Warn("git push", parts)
-		}
-	}
-	return perfect
-}
-
-/*
-// this isn't right
-func (rs *RepoStatus) LastTagAge() (time.Time, string) {
-	return time.Now(), rs.lasttag.String()
-}
-*/
-
 func (rs *RepoStatus) GetLastTagVersion() string {
 	return rs.lasttag.String()
 }
 
+func (rs *RepoStatus) displayCurrentBranchName() string {
+	out := rs.pb.GetCurrentBranchName()
+	rs.currentBranch.SetValue(out)
+	return out
+}
+
 // stores the current branch name
 func (rs *RepoStatus) checkCurrentBranchName() string {
 	currentname := rs.currentBranch.String()
-	out := run(rs.realPath.String(), "git", "branch --show-current")
+	out := rs.pb.GetCurrentBranchName()
 	if currentname == out {
 		// nothing changed
 		return currentname
@@ -314,256 +40,3 @@ func (rs *RepoStatus) checkCurrentBranchName() string {
 	rs.NoteChange("current branch has changed from " + currentname + " to " + out)
 	return out
 }
-
-func (rs *RepoStatus) gitDescribeByHash(hash string) (string, error) {
-	if hash == "" {
-		return "", errors.New("hash was blank")
-	}
-	r := shell.PathRunLog(rs.Path(), []string{"git", "describe", "--tags", "--always", hash}, INFO)
-	out := strings.Join(r.Stdout, "\n")
-	if r.Error != nil {
-		log.Warn("not in a git repo or bad hash?", r.Error, rs.Path())
-		return out, r.Error
-	}
-	return out, r.Error
-}
-
-func (rs *RepoStatus) gitDescribeByName(name string) (string, error) {
-	name = strings.TrimSpace(name)
-
-	if name == "" {
-		// git will return the current tag
-		r := shell.PathRunLog(rs.Path(), []string{"git", "describe", "--tags", "--always"}, INFO)
-		output := strings.Join(r.Stdout, "\n")
-		if r.Error != nil {
-			log.Warn("gitDescribeByName() not in a git repo?", r.Error, rs.Path())
-		}
-		return strings.TrimSpace(output), r.Error
-	}
-	if !rs.LocalTagExists(name) {
-		// tag does not exist
-		return "", errors.New("gitDescribeByName() git fatal: Not a valid object name")
-	}
-	cmd := []string{"git", "describe", "--tags", "--always", name}
-	r := shell.PathRunLog(rs.Path(), cmd, INFO)
-	output := strings.Join(r.Stdout, "\n")
-	if r.Error != nil {
-		log.Warn("cmd =", cmd)
-		log.Warn("err =", r.Error)
-		log.Warn("not in a git repo or bad tag?", rs.Path())
-	}
-
-	return strings.TrimSpace(output), r.Error
-}
-
-// todo: don't run git every time?
-func (rs *RepoStatus) checkCurrentBranchVersion() string {
-	out, _ := rs.gitDescribeByName("")
-	log.Log(REPO, "checkCurrentBranchVersion()", out)
-	rs.currentVersion.SetValue(out)
-	return out
-}
-
-// this should get the most recent tag
-func (rs *RepoStatus) setLastTagVersion() {
-	hash := run(rs.realPath.String(), "git", "rev-list --tags --max-count=1")
-	log.Log(REPO, "getLastTagVersion()", hash)
-
-	name, _ := rs.gitDescribeByHash(hash)
-	rs.lasttag.SetText(name)
-	return
-}
-
-func (rs *RepoStatus) populateTags() {
-	tmp := rs.realPath.String() + "/.git/refs/tags"
-	log.Log(REPO, "populateTags() path =", tmp)
-	for _, tag := range listFiles(tmp) {
-		if rs.tags[tag] == "" {
-			log.Log(REPO, "populateTags() Adding new tag", tag)
-			// rs.tagsDrop.AddText(tag)
-			rs.tags[tag] = "origin"
-		}
-	}
-	// rs.tagsDrop.SetText(rs.lasttagrev)
-}
-
-func (rs *RepoStatus) getBranches() []string {
-	var all []string
-	var heads []string
-	var remotes []string
-	heads = listFiles(rs.realPath.String() + "/.git/refs/heads")
-	remotes = listFiles(rs.realPath.String() + "/.git/refs/remotes")
-
-	all = heads
-
-	all = append(all, remotes...)
-
-	for _, branch := range all {
-		log.Log(REPO, "getBranches()", branch)
-	}
-	return all
-}
-
-// returns quickly based on the last time it was checked
-func (rs *RepoStatus) IsDirty() bool {
-	if rs.dirtyLabel.String() == "no" {
-		return false
-	}
-	return true
-}
-
-// return the list of dirty files (but ignores go.mod & go.sum)
-func (rs *RepoStatus) DirtyList() []string {
-	var all []string
-	for _, line := range strings.Split(rs.dirtyList, "\n") {
-		line = strings.TrimSpace(line)
-		parts := strings.Split(line, " ")
-		if len(parts) != 2 {
-			continue
-		}
-		if parts[1] == "go.mod" {
-			continue
-		}
-		if parts[1] == "go.sum" {
-			continue
-		}
-		all = append(all, parts[1])
-	}
-	return all
-}
-
-func (rs *RepoStatus) CheckDirty() bool {
-	var start string = rs.dirtyLabel.String()
-	cmd := []string{"git", "status", "--porcelain"}
-	r := shell.PathRunLog(rs.Path(), cmd, INFO)
-	out := strings.Join(r.Stdout, "\n")
-	if r.Error != nil {
-		log.Warn("CheckDirty() status cmd =", cmd)
-		log.Warn("CheckDirty() status out =", out)
-		log.Warn("CheckDirty() status err =", r.Error)
-		log.Error(r.Error, "CheckDirty() git status error")
-		rs.dirtyLabel.SetValue("error")
-		if start != "error" {
-			rs.NoteChange("git status is in error " + fmt.Sprint(r.Error))
-		}
-		return true
-	}
-
-	rs.dirtyList = out
-
-	// last := out[strings.LastIndex(out, "\n")+1:]
-	// if last == "nothing to commit, working tree clean" {
-
-	if len(rs.DirtyList()) == 0 {
-		log.Log(REPO, "CheckDirty() no", rs.realPath.String())
-		rs.dirtyLabel.SetValue("no")
-		if start == "" {
-			// don't record a change as this is the initial run
-			return false
-		}
-		if start != "no" {
-			log.Log(REPOWARN, "is no longer dirty")
-			rs.NoteChange("is no longer dirty")
-		}
-		return false
-	}
-
-	rs.dirtyLabel.SetValue("dirty")
-	if start == "" {
-		// don't record a change as this is the initial run
-		return false
-	}
-	if start != "dirty" {
-		log.Log(REPOWARN, "is now dirty")
-		rs.NoteChange("is now dirty")
-	}
-	return true
-
-}
-
-func (rs *RepoStatus) CheckoutBranch(bname string) bool {
-	if rs.CheckDirty() {
-		log.Log(REPO, rs.realPath.String(), "is dirty")
-		log.Info(bname, "is dirty", rs.Path())
-		return false
-	}
-	if !rs.TagExists(bname) {
-		// tag does not exist
-		log.Log(REPO, "repo does not have branch", bname, rs.Path())
-		return false
-	}
-	cName := rs.GetCurrentBranchName()
-	if cName == bname {
-		// already on branch
-		return true
-	}
-	cmd := []string{"git", "checkout", bname}
-	r := rs.Run(cmd)
-	if r.Error != nil {
-		log.Log(REPO, "git checkout error:", r.Error)
-		return false
-	}
-	rs.checkCurrentBranchName()
-	rs.checkCurrentBranchVersion()
-	return true
-}
-
-func (rs *RepoStatus) CheckoutMaster() bool {
-	if rs.CheckDirty() {
-		log.Log(REPO, rs.realPath.String(), "is dirty")
-		return false
-	}
-	mName := rs.GetMasterBranchName()
-	if rs.CheckoutBranch(mName) {
-		return true
-	}
-	return true
-}
-
-func (rs *RepoStatus) CheckoutDevel() bool {
-	devel := rs.develWorkingName.String()
-	// user := rs.userWorkingName.String()
-	if devel == "" {
-		return false
-	}
-	if rs.CheckDirty() {
-		log.Log(REPO, rs.realPath.String(), "is dirty")
-		return false
-	}
-
-	log.Log(REPO, "checkoutBranch", devel)
-	rs.checkoutBranch("devel", devel)
-	// log.Log(REPO, "checkoutBranch", user)
-	// rs.checkoutBranch("user", user)
-	return true
-}
-
-func (rs *RepoStatus) CheckoutUser() bool {
-	bName := rs.GetUserBranchName()
-	if bName == "" {
-		return false
-	}
-	if rs.CheckDirty() {
-		log.Log(REPO, rs.realPath.String(), "is dirty")
-		return false
-	}
-	if !rs.BranchExists(bName) {
-		return false
-	}
-	cmd := []string{"git", "checkout", bName}
-	r := rs.Run(cmd)
-	if r.Error != nil {
-		log.Log(REPO, "git checkout error:", r.Error)
-	}
-
-	realname := rs.GetCurrentBranchName()
-	realversion := rs.GetCurrentBranchVersion()
-	log.Log(REPO, rs.realPath.String(), "realname =", realname, "realversion =", realversion)
-
-	if realname != bName {
-		log.Log(REPO, "git checkout failed", rs.realPath.String(), bName, "!=", realname)
-		return false
-	}
-	rs.userBranchVersion.SetValue(realversion)
-	return true
-}

gitConfig.go

@@ -1,293 +0,0 @@
-package repostatus
-
-import (
-	"bufio"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"go.wit.com/log"
-)
-
-// GitConfig represents the parsed .git/config data
-// type GitConfig map[string]map[string]string
-// TODO: switch to protobuf
-
-type remote struct {
-	url   string
-	fetch string
-}
-
-type branch struct {
-	remote string
-	merge  string
-}
-
-type GitConfig struct {
-	core       map[string]string  // map[origin] = "https:/git.wit.org/gui/gadgets"
-	remotes    map[string]*remote // map[origin] = "https:/git.wit.org/gui/gadgets"
-	branches   map[string]*branch // map[guimaster] = origin guimaster
-	submodules map[string]string
-	hashes     map[string]string
-	versions   map[string]string
-}
-
-// type GoConfig map[string]string
-
-func ListGitDirectories() []string {
-	var all []string
-	homeDir, err := os.UserHomeDir()
-	if err != nil {
-		log.Log(WARN, "Error getting home directory:", err)
-		return nil
-	}
-
-	srcDir := filepath.Join(homeDir, "go/src")
-
-	err = filepath.Walk(srcDir, func(path string, info os.FileInfo, err error) error {
-		if err != nil {
-			log.Log(WARN, "Error accessing path:", path, err)
-			return nil
-		}
-
-		// Check if the current path is a directory and has a .git subdirectory
-		if info.IsDir() && IsGitDir(path) {
-			all = append(all, path)
-			// fmt.Println(path)
-		}
-
-		return nil
-	})
-
-	if err != nil {
-		log.Log(WARN, "Error walking the path:", srcDir, err)
-	}
-
-	return all
-}
-
-// IsGitDir checks if a .git directory exists inside the given directory
-func IsGitDir(dir string) bool {
-	gitDir := filepath.Join(dir, ".git")
-	info, err := os.Stat(gitDir)
-	if os.IsNotExist(err) {
-		return false
-	}
-	return info.IsDir()
-}
-
-// readGitConfig reads and parses the .git/config file
-func (rs *RepoStatus) readGitConfig() error {
-	filename := filepath.Join(rs.realPath.String(), "/.git/config")
-	file, err := os.Open(filename)
-	if err != nil {
-		log.Log(WARN, "readGitConfig() failed for file:", filename)
-		filename = filepath.Join(rs.realPath.String(), "../.git/config")
-		log.Log(WARN, "readGitConfig() trying up one directory instead", filename)
-		file, err = os.Open(filename)
-		if err != nil {
-			return err
-		}
-	}
-	defer file.Close()
-
-	var currentSection string = ""
-	var currentName string = ""
-
-	rs.gitConfig = new(GitConfig)
-	rs.gitConfig.core = make(map[string]string)
-	rs.gitConfig.remotes = make(map[string]*remote)
-	rs.gitConfig.branches = make(map[string]*branch)
-	rs.gitConfig.submodules = make(map[string]string)
-	rs.gitConfig.versions = make(map[string]string)
-	rs.gitConfig.hashes = make(map[string]string)
-
-	scanner := bufio.NewScanner(file)
-	for scanner.Scan() {
-		line := strings.TrimSpace(scanner.Text())
-
-		// Skip empty lines and comments
-		if line == "" || strings.HasPrefix(line, "#") || strings.HasPrefix(line, ";") {
-			continue
-		}
-
-		// Check for section headers
-		if strings.HasPrefix(line, "[") && strings.HasSuffix(line, "]") {
-			line = strings.Trim(line, "[]")
-			parts := strings.Split(line, " ")
-			currentSection = parts[0]
-
-			if len(parts) == 2 {
-				line = strings.Trim(line, "[]")
-				currentName = strings.Trim(parts[1], "\"")
-			}
-			continue
-		}
-
-		partsNew := strings.SplitN(line, "=", 2)
-		if len(partsNew) != 2 {
-			log.Log(WARN, "error on config section:", currentSection, "line:", line)
-		}
-
-		key := strings.TrimSpace(partsNew[0])
-		key = strings.TrimSuffix(key, "\"")
-
-		value := strings.TrimSpace(partsNew[1])
-		value = strings.TrimSuffix(value, "\"")
-
-		switch currentSection {
-		case "core":
-			rs.gitConfig.core[key] = value
-		case "pull":
-			// don't store git config pull settings here
-			// probably has 'rebase = false'
-		case "remote":
-			test, ok := rs.gitConfig.remotes[currentName]
-			if !ok {
-				test = new(remote)
-				rs.gitConfig.remotes[currentName] = test
-			}
-			log.Log(INFO, "switch currentSection", currentSection, currentName)
-			switch key {
-			case "url":
-				if test.url == value {
-					continue
-				}
-				if test.url == "" {
-					test.url = value
-					continue
-				}
-				log.Log(REPO, "error url mismatch", test.url, value)
-			case "fetch":
-				if test.fetch == value {
-					continue
-				}
-				if test.fetch == "" {
-					test.fetch = value
-					continue
-				}
-				log.Log(REPO, "error fetch mismatch", test.fetch, value)
-			default:
-				log.Log(REPO, "unknown remote:", rs.Path(), line)
-			}
-		case "branch":
-			test, ok := rs.gitConfig.branches[currentName]
-			if !ok {
-				test = new(branch)
-				rs.gitConfig.branches[currentName] = test
-				rs.processBranch(currentName)
-			}
-			switch key {
-			case "remote":
-				rs.gitConfig.branches[currentName].remote = value
-			case "merge":
-				rs.gitConfig.branches[currentName].merge = value
-			default:
-				log.Log(REPO, "error unknown remote:", currentSection, currentName, key, value)
-				log.Log(REPO, "unknown branch:", rs.Path(), line)
-			}
-		case "submodule":
-			// test, ok := rs.gitConfig.submodules[currentName]
-			switch key {
-			case "active":
-				// probably 'true' or 'false'
-			case "url":
-				rs.gitConfig.submodules[currentName] = value
-			default:
-				log.Log(REPOWARN, "unknown submodule line:", rs.Path(), line)
-			}
-		default:
-			log.Log(REPOWARN, "unknown line:", rs.Path(), line)
-		}
-	}
-
-	if err := scanner.Err(); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (rs *RepoStatus) GitURL() string {
-	origin, ok := rs.gitConfig.remotes["origin"]
-	if ok {
-		return origin.url
-	}
-	for i, s := range rs.gitConfig.remotes {
-		log.Log(WARN, "remote:", i, s.url)
-	}
-	log.Log(WARN, "GitURL() repo has non-standard origin or is not uploaded")
-	return ""
-}
-
-func (rs *RepoStatus) GitLsFiles() (bool, string) {
-	r := rs.Run([]string{"git", "ls-files"})
-	output := strings.Join(r.Stdout, "\n")
-	if r.Error != nil {
-		log.Warn("git ls-files failed err =", r.Error)
-		log.Warn("git ls-files failed output =", output)
-		return false, output
-	}
-	return true, output
-}
-
-func (rs *RepoStatus) ReadOnly() bool {
-	if rs.readOnly.String() == "true" {
-		return true
-	} else {
-		return false
-	}
-}
-
-func (rs *RepoStatus) SetReadOnly(b bool) {
-	if b {
-		rs.readOnly.SetText("true")
-	} else {
-		rs.readOnly.SetText("false")
-	}
-}
-
-func (rs *RepoStatus) processBranch(branch string) {
-	fullpath := rs.realPath.String()
-	log.Log(INFO, "    ", branch)
-	hash, ok := rs.gitConfig.hashes[branch]
-	filename := fullpath + "/.git/refs/heads/" + branch
-	log.Log(INFO, "      hash: need to open", filename)
-
-	data, err := ioutil.ReadFile(filename)
-	if err != nil {
-		log.Log(WARN, "hash: read failed", filename, rs.String())
-		return
-	}
-	newhash := strings.TrimSpace(string(data))
-	log.Log(INFO, "      hash:", newhash)
-	rs.gitConfig.hashes[branch] = newhash
-	if ok {
-		if hash != newhash {
-			log.Log(WARN, "hash changed", hash, rs.String())
-		}
-	}
-
-	name, _ := rs.gitDescribeByHash(newhash)
-	rs.gitConfig.versions[newhash] = name
-	log.Log(INFO, "      hash: version", name)
-}
-
-func (rs *RepoStatus) BranchExists(branch string) bool {
-	hash, ok := rs.gitConfig.hashes[branch]
-	if ok {
-		log.Log(REPOWARN, rs.Path(), "found branch", branch, hash)
-		return true
-	}
-	for i, t := range rs.Tags.tags {
-		base := filepath.Base(t.tag.String())
-		if base == branch {
-			log.Info("found branch tag:", i, t.tag.String())
-			return true
-		}
-		// log.Info("not tag:", i, t.tag.String())
-	}
-	log.Log(REPOWARN, rs.Path(), "did not find branch", branch)
-	return false
-}

goConfig.go

@@ -1,30 +0,0 @@
-package repostatus
-
-// does processing on the go.mod and go.sum files
-
-import (
-	"go.wit.com/log"
-)
-
-// for now, even check cmd.Exit
-func (rs *RepoStatus) strictRun(cmd []string) (bool, error) {
-	r := rs.Run(cmd)
-	if r.Error != nil {
-		log.Log(REPO, "go mod init failed err:", r.Error)
-		return false, r.Error
-	}
-	if r.Exit != 0 {
-		log.Log(REPO, "go mod init exit =", r.Exit)
-		return false, r.Error
-	}
-	return true, nil
-}
-
-/*
-func (rs *RepoStatus) IsReleased() bool {
-	if rs.GetTargetVersion() == rs.GetCurrentVersion() {
-		return true
-	}
-	return false
-}
-*/

merge.go

@@ -1,468 +0,0 @@
-package repostatus
-
-import (
-	"errors"
-	"strconv"
-	"strings"
-
-	"go.wit.com/log"
-	"go.wit.com/widget"
-)
-
-// used to block commits on non-user branches
-func (rs *RepoStatus) IsUserBranch() bool {
-	if rs.GetCurrentBranchName() == rs.GetUserBranchName() {
-		return true
-	}
-	return false
-}
-
-func (rs *RepoStatus) DeleteUserBranch(force bool) bool {
-	log.Log(REPOWARN, "figure out what to do here")
-	return false
-}
-
-func (rs *RepoStatus) ResetBranches() bool {
-	log.Log(REPOWARN, "figure out what to do here")
-	return false
-}
-
-func (rs *RepoStatus) FetchMaster() (error, string) {
-	// log.Log(REPOWARN, "FetchMaster() start", rs.Name())
-	master := rs.GetMasterBranchName()
-	return rs.fetchBranchByName(master)
-}
-
-func (rs *RepoStatus) FetchDevel() (error, string) {
-	devel := rs.GetDevelBranchName()
-	return rs.fetchBranchByName(devel)
-}
-
-// fetch the branch by name
-func (rs *RepoStatus) fetchBranchByName(bname string) (error, string) {
-	if rs.GetCurrentBranchName() != rs.GetUserBranchName() {
-		return errors.New("not in user branch"), ""
-	}
-	if rs.gitConfig == nil {
-		return errors.New("missing .git/config"), ""
-	}
-	for name, branch := range rs.gitConfig.branches {
-		if name == bname {
-			// found the branch!
-			log.Log(REPO, "  ", name, "remote:", branch.remote, "merge", branch.merge)
-			cmd := []string{"git", "fetch", branch.remote, bname + ":" + bname}
-			r := rs.Run(cmd)
-			output := strings.Join(r.Stdout, "\n")
-			return r.Error, strings.TrimSpace(output)
-		}
-	}
-	return errors.New("branch " + bname + " not found"), ""
-}
-
-/*
-func (rs *RepoStatus) runFullAutomation() bool {
-	if !rs.MergeUserToDevel() {
-		log.Warn("THINGS FAILED returned false")
-		return false
-	}
-	log.Warn("THINGS SEEM OK returned true. can run this again?")
-	return true
-}
-*/
-
-var releaseRevision string = ""
-
-// over ride the computation of this if a release is being created
-func (rs *RepoStatus) setRevision(c string) {
-	if releaseRevision == "" {
-		rs.revision.SetText(c)
-	}
-	rs.revision.SetText(releaseRevision)
-}
-
-func (rs *RepoStatus) SetVersion(a, b, c string, reason string) {
-	rs.major.SetText(a)
-	rs.minor.SetText(b)
-	releaseRevision = c
-	rs.setRevision(c)
-
-	rs.targetReleaseVersion.SetText("v" + a + "." + b + "." + c)
-
-	rs.versionMessage.SetLabel(reason)
-	rs.versionMessage.SetText(reason)
-	// rs.versionMessage.SetValue(reason)
-}
-
-func (rs *RepoStatus) IncrementMinorVersion(reason string) {
-	lasttag := rs.lasttag.String()
-	var major, minor, revision string
-	major, minor, revision = splitVersion(lasttag)
-
-	olda, _ := strconv.Atoi(major)
-	oldb, _ := strconv.Atoi(minor)
-	oldc, _ := strconv.Atoi(revision)
-
-	oldb += 1
-	oldc = 0
-
-	newa := strconv.Itoa(olda)
-	newb := strconv.Itoa(oldb)
-	newc := strconv.Itoa(oldc)
-
-	rs.SetVersion(newa, newb, newc, reason)
-}
-
-func (rs *RepoStatus) IncrementRevisionVersion(reason string) {
-	lasttag := rs.lasttag.String()
-	var major, minor, revision string
-	major, minor, revision = splitVersion(lasttag)
-
-	olda, _ := strconv.Atoi(major)
-	oldb, _ := strconv.Atoi(minor)
-	oldc, _ := strconv.Atoi(revision)
-
-	oldc += 1
-
-	newa := strconv.Itoa(olda)
-	newb := strconv.Itoa(oldb)
-	newc := strconv.Itoa(oldc)
-
-	rs.SetVersion(newa, newb, newc, reason)
-}
-
-func (rs *RepoStatus) setTag() bool {
-	lasttag := rs.lasttag.String()
-	var major, minor, revision string
-	major, minor, revision = splitVersion(lasttag)
-
-	olda, _ := strconv.Atoi(major)
-	oldb, _ := strconv.Atoi(minor)
-	oldc, _ := strconv.Atoi(revision)
-
-	log.Log(INFO, "current version here", lasttag)
-	log.Log(INFO, "current release a,b,c =", major, minor, revision)
-
-	newa, _ := strconv.Atoi(rs.major.String())
-
-	newver := strconv.Itoa(newa)
-	if newa < olda {
-		log.Warn("new version bad", newver, "vs old version", lasttag, "newa =", newa, "olda =", olda)
-		rs.newversion.SetLabel("bad")
-		return false
-	}
-	if newa > olda {
-		log.Log(INFO, "new version ok", newver, "vs old version", lasttag)
-		rs.minor.SetText("0")
-		rs.setRevision("0")
-		newver := strconv.Itoa(newa) + ".0.0"
-		rs.newversion.SetLabel(newver)
-		return true
-	}
-
-	newb, _ := strconv.Atoi(rs.minor.String())
-	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.SetLabel("bad")
-		return false
-	}
-
-	if newb > oldb {
-		log.Log(INFO, "new version ok", newver, "vs old version", lasttag)
-		newver = strconv.Itoa(newa) + "." + strconv.Itoa(newb) + ".0"
-		rs.newversion.SetLabel(newver)
-		rs.setRevision("0")
-		return true
-	}
-
-	newc, _ := strconv.Atoi(rs.revision.String())
-	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.SetLabel("bad")
-		return false
-	}
-	log.Log(INFO, "new version ok", newver, "vs old version", lasttag)
-	rs.newversion.SetLabel(newver)
-	return true
-}
-
-// the newversion field goes through some sanity checking
-// to make sure it's greater than the existing tag and
-// valid according to golang -- it must be format 'v1.2.3'
-func (rs *RepoStatus) GetNewVersionTag() string {
-	return rs.newversion.String()
-}
-
-func (rs *RepoStatus) incrementRevision() {
-	lasttag := rs.lasttag.String()
-	var major, minor, revision string
-	if rs.targetReleaseVersion.String() == "" {
-		major, minor, revision = splitVersion(lasttag)
-		log.Warn("Should release version here", lasttag)
-		log.Log(INFO, "Should release a,b,c", major, minor, revision)
-	} else {
-		// this means there is a specific release version trying to be done
-		// use the target release version instead
-		major, minor, revision = splitVersion(rs.targetReleaseVersion.String())
-		log.Warn("Should release version here", lasttag)
-		log.Log(INFO, "Should release a,b,c", major, minor, revision)
-	}
-
-	a, _ := strconv.Atoi(major)
-	b, _ := strconv.Atoi(minor)
-	c, _ := strconv.Atoi(revision)
-
-	rs.major.AddText(widget.GetString(a))
-	rs.major.AddText(widget.GetString(a + 1))
-	rs.major.SetText(widget.GetString(a))
-
-	rs.minor.AddText(widget.GetString(b))
-	rs.minor.AddText(widget.GetString(b + 1))
-	rs.minor.SetText(widget.GetString(b))
-
-	// rs.c := strconv.Atoi(revision)
-	rs.revision.AddText(strconv.Itoa(c + 1))
-	rs.revision.AddText(strconv.Itoa(c + 2))
-	rs.revision.SetText(strconv.Itoa(c + 1))
-	// rs.setRevision(widget.GetString(c + 1))
-}
-
-func (rs *RepoStatus) recommend() {
-	log.Log(INFO, "Is repo dirty?", rs.dirtyLabel.String())
-	log.Log(INFO, "list the known tags")
-	rs.DisableEverything()
-	rs.populateTags()
-	log.Log(INFO, "Does devel == user?", rs.develBranchVersion.String(), rs.userBranchVersion.String())
-	if rs.develBranchVersion.String() != rs.userBranchVersion.String() {
-		log.Log(INFO, "devel does not equal user")
-		log.Log(INFO, "merge or squash?")
-		rs.EnableMergeDevel()
-		rs.setMergeUserCommands()
-		label := "merge user into " + rs.GetDevelBranchName()
-		rs.develMergeB.SetLabel(label)
-		return
-	}
-	log.Log(INFO, "Does master == devel? ", rs.GetMasterVersion(), rs.GetDevelVersion())
-	if rs.GetMasterVersion() != rs.GetDevelVersion() {
-		log.Log(INFO, "master does not equal devel. merge devel into master")
-		rs.EnableMergeDevel()
-		rs.setMergeDevelCommands()
-		label := "merge devel into " + rs.GetMasterBranchName()
-		rs.develMergeB.SetLabel(label)
-		return
-	}
-	if rs.lasttag.String() != rs.GetMasterVersion() {
-		log.Log(INFO, "master does not equal last tag")
-		rs.incrementRevision()
-		rs.EnableSelectTag()
-		rs.setTag()
-		return
-	}
-	log.Log(INFO, "Is repo pushed upstream? git.wit.org or github?")
-}
-
-func (rs *RepoStatus) generateCmd() bool {
-	// the length of 24 is arbitrary, but should be short
-	// they should be things like perhaps, major release names
-	// or something the users might see.
-	// aka: "Topsy", "Picasso", "Buzz", etc
-
-	if !rs.setTag() {
-		log.Log(INFO, "tag sucked. fix your tag version")
-		rs.versionMessage.SetLabel("tag message (bad version)")
-		rs.releaseVersion.Disable()
-		return false
-	}
-
-	log.Log(INFO, "tag is valid!!!!")
-	rs.setGitCommands()
-
-	if rs.versionMessage.String() == "" {
-		log.Log(INFO, "tag message is empty!!!!")
-		rs.releaseVersion.Disable()
-		return false
-	}
-	if len(rs.versionMessage.String()) > 24 {
-		rs.versionMessage.SetLabel("tag message (too long)")
-	} else {
-		rs.versionMessage.SetLabel("tag message")
-	}
-	rs.releaseVersion.SetLabel("Release Tag!")
-	rs.releaseVersion.Enable()
-	return true
-}
-
-func (rs *RepoStatus) runGitCommands(verbose bool) bool {
-	var line []string
-	for _, line = range rs.versionCmds {
-		s := strings.Join(line, " ")
-		if verbose {
-			log.Log(WARN, "RUNNING:", s)
-		}
-		rs.develMergeB.SetText(s)
-		r := rs.Run(line)
-		output := strings.TrimSpace(strings.Join(r.Stdout, "\n"))
-		if r.Error != nil {
-			log.Warn("ABEND EXECUTION")
-			log.Warn("error =", r.Error)
-			log.Warn("output =", output)
-			return false
-		}
-		if r.Exit != 0 {
-			log.Warn("Returned with exit =", r.Exit)
-			log.Warn("output was =", output)
-		}
-		log.Log(INFO, "RUN DONE")
-	}
-	return true
-}
-
-func (rs *RepoStatus) setGitCommands() {
-	var line1, line2, line3 []string
-	var all [][]string
-
-	newTag := rs.newversion.String()
-	line1 = append(line1, "git", "tag", "v"+newTag, "-m", rs.versionMessage.String())
-	all = append(all, line1)
-	line2 = append(line2, "git", "push", "--tags")
-	all = append(all, line2)
-	line3 = append(line3, "git", "push", "--prune", "--tags")
-	all = append(all, line3)
-
-	rs.versionCmds = all
-
-	var tmp []string
-	// convert to displayable to the user text
-	for _, line := range all {
-		s := strings.Join(line, " ")
-		log.Log(INFO, "s =", s)
-		tmp = append(tmp, s)
-	}
-
-	rs.versionCmdOutput.SetValue(strings.Join(tmp, "\n"))
-}
-
-func (rs *RepoStatus) setMergeDevelCommands() {
-	var line1, line2, line3 []string
-	var all [][]string
-
-	master := rs.GetMasterBranchName()
-	devel := rs.GetDevelBranchName()
-
-	line1 = append(line1, "git", "checkout", master)
-	all = append(all, line1)
-	line2 = append(line2, "git", "merge", devel)
-	all = append(all, line2)
-	line3 = append(line3, "git", "push")
-	all = append(all, line3)
-
-	rs.versionCmds = all
-
-	var tmp []string
-	// convert to displayable to the user text
-	for _, line := range all {
-		s := strings.Join(line, " ")
-		log.Log(INFO, "s =", s)
-		tmp = append(tmp, s)
-	}
-
-	rs.versionCmdOutput.SetValue(strings.Join(tmp, "\n"))
-}
-
-func (rs *RepoStatus) setMergeUserCommands() {
-	var line1, line2, line3 []string
-	var all [][]string
-
-	devel := rs.GetDevelBranchName()
-	user := rs.userWorkingName.String()
-
-	line1 = append(line1, "git", "checkout", devel)
-	all = append(all, line1)
-	line2 = append(line2, "git", "merge", user)
-	all = append(all, line2)
-	line3 = append(line3, "git", "push")
-	all = append(all, line3)
-
-	rs.versionCmds = all
-
-	var tmp []string
-	// convert to displayable to the user text
-	for _, line := range all {
-		s := strings.Join(line, " ")
-		log.Log(INFO, "s =", s)
-		tmp = append(tmp, s)
-	}
-
-	rs.versionCmdOutput.SetValue(strings.Join(tmp, "\n"))
-}
-
-func (rs *RepoStatus) IsCorrectMode(mode string) bool {
-	switch mode {
-	case "master":
-		if rs.GetCurrentBranchName() == rs.GetMasterBranchName() {
-			return true
-		} else {
-			return false
-		}
-	case "devel":
-		if rs.GetCurrentBranchName() == rs.GetDevelBranchName() {
-			return true
-		} else {
-			return false
-		}
-	case "user":
-		if rs.GetCurrentBranchName() == rs.GetUserBranchName() {
-			return true
-		} else {
-			return false
-		}
-	}
-	return false
-}
-
-/* moved to gitpb
-func (rs *RepoStatus) MergeUserToDevel() bool {
-	startbranch := rs.GetCurrentBranchName()
-	devel := rs.GetDevelBranchName()
-	user := rs.GetUserBranchName()
-
-	log.Info("MergeUserToDevel() checking out", devel, "started on", startbranch, "merge", user)
-
-	var all [][]string
-	all = append(all, []string{"git", "checkout", devel})
-	all = append(all, []string{"git", "merge", user})
-	all = append(all, []string{"git", "push"})
-
-	if rs.DoAll(all) {
-		log.Log(WARN, "MergeUserToDevel() failed", rs.Path())
-		rs.updateNew()
-		return true
-	}
-	// DoAll failed
-	rs.updateNew()
-	return false
-}
-
-func (rs *RepoStatus) MergeDevelToMaster() bool {
-	startbranch := rs.GetCurrentBranchName()
-	devel := rs.GetDevelBranchName()
-	main := rs.GetMasterBranchName()
-
-	log.Info("MergeDevelToMaster() checking out", main, "started on", startbranch, "merge", devel)
-
-	var all [][]string
-	all = append(all, []string{"git", "checkout", main})
-	all = append(all, []string{"git", "merge", devel})
-	all = append(all, []string{"git", "push"})
-
-	if rs.DoAll(all) {
-		log.Log(WARN, "MergeDevelToMaster() failed", rs.Path())
-		rs.updateNew()
-		return true
-	}
-	// DoAll failed
-	rs.updateNew()
-	return false
-}
-*/

mirror.go

@@ -1,42 +0,0 @@
-package repostatus
-
-import (
-	"go.wit.com/gui"
-	// "go.wit.com/gui/gui"
-)
-
-// this is experiemental work on making 'View's or Table Row's
-// this may or may not be a good idea
-
-// returns a widget of the last tag that acts as a mirror
-func (rs *RepoStatus) MirrorLastTag() *gui.Node {
-	return rs.lasttag.MirrorValue()
-}
-
-func (rs *RepoStatus) MirrorTargetVersion() *gui.Node {
-	return rs.targetReleaseVersion.MirrorValue()
-}
-
-func (rs *RepoStatus) MirrorCurrentVersion() *gui.Node {
-	return rs.currentVersion.MirrorValue()
-}
-
-func (rs *RepoStatus) MirrorCurrentName() *gui.Node {
-	return rs.currentBranch.MirrorValue()
-}
-
-func (rs *RepoStatus) MirrorGitState() *gui.Node {
-	return rs.gitState.MirrorValue()
-}
-
-func (rs *RepoStatus) MirrorMasterVersion() *gui.Node {
-	return rs.mainBranchVersion.MirrorValue()
-}
-
-func (rs *RepoStatus) MirrorDevelVersion() *gui.Node {
-	return rs.develBranchVersion.MirrorValue()
-}
-
-func (rs *RepoStatus) MirrorUserVersion() *gui.Node {
-	return rs.userBranchVersion.MirrorValue()
-}

revert.go

@@ -1,41 +0,0 @@
-package repostatus
-
-import "go.wit.com/log"
-
-// reverts master to devel
-// used in the unwind process of making GUI releases
-func (rs *RepoStatus) RevertMasterToDevel() bool {
-	if rs.CheckDirty() {
-		log.Info("sorry, it's still dirty")
-		return false
-	}
-
-	curName := rs.GetCurrentBranchName()
-	dName := rs.GetDevelBranchName()
-	mName := rs.GetMasterBranchName()
-	if curName != mName {
-		log.Info("repo is not working from main branch", curName, "!=", mName)
-		return false
-	}
-
-	log.Info("reset master to devel", curName, rs.String())
-
-	var all [][]string
-	all = append(all, []string{"git", "checkout", dName}) // switch to the devel branch
-	all = append(all, []string{"git", "branch", "-D", mName})
-	all = append(all, []string{"git", "branch", mName}) // make a master branch based on devel
-	all = append(all, []string{"git", "checkout", mName})
-	all = append(all, []string{"git", "push", "--set-upstream", "--force", "origin", mName})
-
-	// don't do anything with tags here
-	// all = append(all, []string{"git", "tag", "--delete", release.version.String()})
-	// all = append(all, []string{"git", "push", "--delete", "origin", release.version.String()})
-
-	if rs.DoAll(all) {
-		log.Info("EVERYTHING OK. RERELEASED", rs.String())
-		return true
-	}
-
-	log.Info("SOMETHING FAILED")
-	return false
-}

structs.go

@@ -10,8 +10,8 @@ type RepoStatus struct {
 	ready   bool
 	changed bool // keeps track of changes that might have happened
 	changes string
-	tags    map[string]string
+	// tags    map[string]string
-	InitOk  bool // it takes a second or so to init these
+	InitOk bool // it takes a second or so to init these
 
 	pb *gitpb.Repo // the protobuf
 
@@ -74,7 +74,7 @@ type RepoStatus struct {
 	speed       *gadgets.OneLiner
 	speedActual *gadgets.OneLiner
 
-	gitConfig *GitConfig
+	// gitConfig *GitConfig
 	// goConfig  GoConfig
 
 	switchBranchB *gui.Node

tagWindow.go

@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"go.wit.com/gui"
+	"go.wit.com/lib/gui/shell"
 	"go.wit.com/log"
 )
 
@@ -51,7 +52,7 @@ func (rs *RepoStatus) makeTagBox(box *gui.Node) error {
 	}
 	tagB := new(GitTagBox)
 	rs.Tags = tagB
-	tagB.group = box.NewGroup(".git tags for " + rs.String())
+	tagB.group = box.NewGroup(".git tags for " + rs.Path())
 
 	//	tagB.group.NewButton("prune tags", func() {
 	//		tagB.Prune()
@@ -69,14 +70,16 @@ func (rs *RepoStatus) makeTagBox(box *gui.Node) error {
 		}
 	}
 	tagB.group.NewButton("delete all", func() {
-		for i, t := range tagB.tags {
+		/*
-			if t.hidden {
+			for i, t := range tagB.tags {
-				// log.Info("tag is hidden", i, t.tag.String())
+				if t.hidden {
-				continue
+					// log.Info("tag is hidden", i, t.tag.String())
+					continue
+				}
+				log.Info("tag is shown", i, t.tag.String())
+				// rs.DeleteTag(t)
 			}
-			log.Info("tag is shown", i, t.tag.String())
+		*/
-			rs.DeleteTag(t)
-		}
 	})
 
 	grid := tagB.group.NewGrid("tags", 0, 0)
@@ -97,23 +100,25 @@ func (rs *RepoStatus) makeTagBox(box *gui.Node) error {
 		rTag.ref = grid.NewEntrybox(tag.GetHash())
 
 		ctime := tag.GetAuthordate().AsTime()
-		dur := getDurationStamp(ctime)
+		dur := shell.GetDurationStamp(ctime)
 		rTag.date = grid.NewLabel(ctime.Format("YYYY/MM/DD"))
 		rTag.duration = grid.NewLabel(dur)
 
 		rTag.subject = grid.NewLabel(tag.GetSubject())
 		rTag.deleteB = grid.NewButton("delete", func() {
-			tagversion := tag.GetRefname()
+			/*
-			log.Info("remove tag", tagversion)
+				tagversion := tag.GetRefname()
-			var all [][]string
+				log.Info("remove tag", tagversion)
-			all = append(all, []string{"git", "tag", "--delete", tagversion})
+				var all [][]string
-			all = append(all, []string{"git", "push", "--delete", "origin", tagversion})
+				all = append(all, []string{"git", "tag", "--delete", tagversion})
+				all = append(all, []string{"git", "push", "--delete", "origin", tagversion})
 
-			if rs.DoAll(all) {
+				if rs.DoAll(all) {
-				log.Info("TAG DELETED", rs.String(), tagversion)
+					log.Info("TAG DELETED", rs.Path(), tagversion)
-			} else {
+				} else {
-				log.Info("TAG DELETE FAILED", rs.String(), tagversion)
+					log.Info("TAG DELETE FAILED", rs.Path(), tagversion)
-			}
+				}
+			*/
 		})
 
 		tagB.tags = append(tagB.tags, rTag)
@@ -215,6 +220,7 @@ func (rtags *GitTagBox) PruneSmart() {
 	}
 }
 
+/*
 // deleting it locally triggers some but when
 // the git server was uncontactable (over IPv6 if that matters, probably it doesn't)
 // and then the local delete re-added it into the tag
@@ -240,6 +246,7 @@ func (rs *RepoStatus) DeleteTag(rt *Tag) {
 	log.Info("output:", output)
 
 }
+*/
 
 func (rt *Tag) TagString() string {
 	return rt.tag.String()

timer.go

@@ -1,19 +0,0 @@
-package repostatus
-
-import (
-	"time"
-)
-
-// timeFunction takes a function as an argument and returns the execution time.
-func timeFunction(f func()) time.Duration {
-	startTime := time.Now()      // Record the start time
-	f()                          // Execute the function
-	return time.Since(startTime) // Calculate the elapsed time
-}
-
-func (ls *RepoStatus) SetSpeedActual(s string) {
-	if !ls.Ready() {
-		return
-	}
-	ls.speedActual.SetValue(s)
-}

unix.go

@@ -1,402 +0,0 @@
-package repostatus
-
-import (
-	"fmt"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"regexp"
-	"strings"
-	"time"
-
-	"github.com/go-cmd/cmd"
-	"go.wit.com/lib/gui/shell"
-	"go.wit.com/log"
-)
-
-func run(path string, thing string, cmdline string) string {
-	parts := strings.Split(cmdline, " ")
-	// Create the command
-	cmd := exec.Command(thing, parts...)
-
-	// Set the working directory
-	cmd.Dir = path
-
-	// Execute the command
-	output, err := cmd.CombinedOutput()
-	tmp := string(output)
-	tmp = strings.TrimSpace(tmp)
-
-	if err != nil {
-		log.Log(WARN, "run()", path, thing, cmdline, "=", tmp)
-		log.Error(err, "cmd error'd out", parts)
-		return ""
-	}
-
-	// Print the output
-	log.Log(INFO, "run()", path, thing, cmdline, "=", tmp)
-	return tmp
-}
-
-// goes in one directory so it gets remote branch names
-func listFiles(directory string) []string {
-	var files []string
-	fileInfo, err := os.ReadDir(directory)
-	if err != nil {
-		log.Error(err)
-		return nil
-	}
-
-	for _, file := range fileInfo {
-		if file.IsDir() {
-			dirname := file.Name()
-			newdir, _ := os.ReadDir(directory + "/" + dirname)
-			for _, file := range newdir {
-				if !file.IsDir() {
-					files = append(files, dirname+"/"+file.Name())
-				}
-			}
-		} else {
-			files = append(files, file.Name())
-		}
-	}
-
-	return files
-}
-
-/*
-// string handling examples that might be helpful for normalizeInt()
-isAlpha := regexp.MustCompile(`^[A-Za-z]+$`).MatchString
-
-for _, username := range []string{"userone", "user2", "user-three"} {
-    if !isAlpha(username) {
-        log.Log(GUI, "%q is not valid\n", username)
-    }
-}
-
-const alpha = "abcdefghijklmnopqrstuvwxyz"
-
-func alphaOnly(s string) bool {
-   for _, char := range s {
-      if !strings.Contains(alpha, strings.ToLower(string(char))) {
-         return false
-      }
-   }
-   return true
-}
-*/
-
-func normalizeVersion(s string) string {
-	// reg, err := regexp.Compile("[^a-zA-Z0-9]+")
-	parts := strings.Split(s, "-")
-	if len(parts) == 0 {
-		return ""
-	}
-	reg, err := regexp.Compile("[^0-9.]+")
-	if err != nil {
-		log.Log(WARN, "normalizeVersion() regexp.Compile() ERROR =", err)
-		return parts[0]
-	}
-	clean := reg.ReplaceAllString(parts[0], "")
-	log.Log(INFO, "normalizeVersion() s =", clean)
-	return clean
-}
-
-func splitVersion(version string) (a, b, c string) {
-	tmp := normalizeVersion(version)
-	parts := strings.Split(tmp, ".")
-	switch len(parts) {
-	case 1:
-		return parts[0], "", ""
-	case 2:
-		return parts[0], parts[1], ""
-	default:
-		return parts[0], parts[1], parts[2]
-	}
-}
-
-func (rs *RepoStatus) Run(cmd []string) cmd.Status {
-	path := rs.realPath.String()
-	r := shell.PathRun(path, cmd)
-	output := strings.Join(r.Stdout, "\n")
-	if r.Error != nil {
-		log.Log(WARN, "cmd:", cmd)
-		log.Log(WARN, "ouptput:", output)
-		log.Log(WARN, "failed with error:", r.Error)
-	}
-	return r
-}
-
-// Set the path to the package
-func getfiles(pathToPackage string) {
-	// List files in the directory
-	err := filepath.Walk(pathToPackage, nil) // compiles but crashes
-	if err == nil {
-		log.Log(INFO, "directory ok", pathToPackage)
-	} else {
-		log.Warn("directory wrong", pathToPackage)
-	}
-}
-
-func IsDirectory(path string) bool {
-	info, err := os.Stat(path)
-	if err != nil {
-		return false
-	}
-	return info.IsDir()
-}
-
-func (rs *RepoStatus) Exists(filename string) bool {
-	if rs == nil {
-		log.Warn("rs == nil for Exists()")
-		panic(-1)
-	}
-	testf := filepath.Join(rs.Path(), filename)
-	if Exists(testf) {
-		return true
-	}
-	return false
-}
-
-func (rs *RepoStatus) mtime(filename string) (time.Time, error) {
-	pathf := filepath.Join(rs.Path(), filename)
-	statf, err := os.Stat(pathf)
-	if err == nil {
-		return statf.ModTime(), nil
-	}
-	log.Log(REPOWARN, "mtime() error", pathf, err)
-	return time.Now(), err
-}
-
-// returns true if the file exists
-func Exists(file string) bool {
-	_, err := os.Stat(file)
-	if err != nil {
-		return false
-	}
-	return true
-}
-
-/*
-func readFileToString(filename string) (string, error) {
-	data, err := ioutil.ReadFile(filename)
-	if err != nil {
-		return "", err
-	}
-	return strings.TrimSpace(string(data)), nil
-}
-
-// converts a git for-each-ref date. "Wed Feb 7 10:13:38 2024 -0600"
-func getGitDateStamp(gitdefault string) (time.Time, string, string) {
-	// now := time.Now().Format("Wed Feb 7 10:13:38 2024 -0600")
-	const gitLayout = "Mon Jan 2 15:04:05 2006 -0700"
-	tagTime, err := time.Parse(gitLayout, gitdefault)
-	if err != nil {
-		log.Warn("GOT THIS IN PARSE AAA." + gitdefault + ".AAA")
-		log.Warn(err)
-		return time.Now(), "Feb 1 12:34:56 1978 -0600", ""
-	}
-	return tagTime, gitdefault, getDurationStamp(tagTime)
-}
-func getRawDateStamp(raw string) (time.Time, string, string) {
-	parts := strings.Split(raw, " ")
-	if len(parts) == 0 {
-		// raw was blank here
-		// return "Jan 4 1977", "40y" // eh, why not. it'll be easy to grep for this
-		return time.Now(), "Jan 4 1977", "40y" // eh, why not. it'll be easy to grep for this
-	}
-	i, err := strconv.ParseInt(parts[0], 10, 64) // base 10 string, return int64
-	if err != nil {
-		log.Warn("Error converting timestamp:", raw)
-		log.Warn("Error converting timestamp err =", err)
-		return time.Now(), "", ""
-	}
-
-	// Parse the Unix timestamp into a time.Time object
-	gitTagDate := time.Unix(i, 0)
-	return gitTagDate, gitTagDate.UTC().Format("2006/01/02 15:04:05 UTC"), getDurationStamp(gitTagDate)
-}
-*/
-
-func getDurationStamp(t time.Time) string {
-
-	// Get the current time
-	currentTime := time.Now()
-
-	// Calculate the duration between t current time
-	duration := currentTime.Sub(t)
-
-	return formatDuration(duration)
-}
-
-func formatDuration(d time.Duration) string {
-	seconds := int(d.Seconds()) % 60
-	minutes := int(d.Minutes()) % 60
-	hours := int(d.Hours()) % 24
-	days := int(d.Hours()) / 24
-	years := int(d.Hours()) / (24 * 365)
-
-	result := ""
-	if years > 0 {
-		result += fmt.Sprintf("%dy ", years)
-		return result
-	}
-	if days > 0 {
-		result += fmt.Sprintf("%dd ", days)
-		return result
-	}
-	if hours > 0 {
-		result += fmt.Sprintf("%dh ", hours)
-		return result
-	}
-	if minutes > 0 {
-		result += fmt.Sprintf("%dm ", minutes)
-		return result
-	}
-	if seconds > 0 {
-		result += fmt.Sprintf("%ds", seconds)
-	}
-	return result
-}
-
-func (rs *RepoStatus) XtermNohup(cmdline string) {
-	shell.XtermCmd(rs.Path(), []string{cmdline})
-}
-func (rs *RepoStatus) Xterm(cmdline string) {
-	shell.XtermCmd(rs.Path(), []string{cmdline})
-}
-func (rs *RepoStatus) XtermWait(cmdline string) {
-	shell.XtermCmdWait(rs.Path(), []string{cmdline})
-}
-
-/*
-func (rs *RepoStatus) XtermNohup(args []string) {
-	var argsX = []string{"xterm", "-geometry", "120x40"}
-	argsX = append(argsX, "-e", "bash", "-c")
-	argsX = append(argsX, args...)
-	log.Info("xterm cmd=", argsX)
-	// set less to not exit on small diff's
-	os.Setenv("LESS", "-+F -+X -R")
-	cmd := exec.Command("nohup", argsX...)
-	path := rs.realPath.String()
-	cmd.Dir = path
-	log.Info("path =", path)
-	log.Info("cmd =", strings.Join(args, " "))
-	if err := cmd.Run(); err != nil {
-		log.Info("xterm.Run() failed")
-		log.Info("path =", path)
-		log.Info("cmd =", argsX)
-	} else {
-		log.Info("xterm.Run() worked")
-		log.Info("path =", path)
-		log.Info("cmd =", argsX)
-	}
-}
-*/
-
-/*
-func (rs *RepoStatus) Xterm(args []string) {
-	var argsX = []string{"-geometry", "120x40"}
-	argsX = append(argsX, "-e", "bash", "-c")
-	argsX = append(argsX, args...)
-	log.Info("xterm cmd=", argsX)
-	// set less to not exit on small diff's
-	os.Setenv("LESS", "-+F -+X -R")
-	cmd := exec.Command("xterm", argsX...)
-	path := rs.realPath.String()
-	cmd.Dir = path
-	if err := cmd.Run(); err != nil {
-		log.Info("xterm.Run() failed")
-		log.Info("path =", path)
-		log.Info("cmd = xterm", argsX)
-	} else {
-		log.Info("xterm.Run() worked")
-		log.Info("path =", path)
-		log.Info("cmd = xterm", argsX)
-	}
-}
-*/
-
-/*
-func (rs *RepoStatus) XtermHold(args []string) {
-	var argsX = []string{"-hold", "-geometry", "120x40"}
-	tmp := strings.Join(args, " ") + ";bash"
-	argsX = append(argsX, "-e", "bash", "-c", tmp)
-	argsX = append(argsX, args...)
-	log.Info("xterm cmd=", argsX)
-	// set less to not exit on small diff's
-	os.Setenv("LESS", "-+F -+X -R")
-	cmd := exec.Command("xterm", argsX...)
-	path := rs.realPath.String()
-	cmd.Dir = path
-	if err := cmd.Run(); err != nil {
-		log.Info("xterm.Run() failed")
-		log.Info("path =", path)
-		log.Info("cmd = xterm", argsX)
-	} else {
-		log.Info("xterm.Run() worked")
-		log.Info("path =", path)
-		log.Info("cmd = xterm", argsX)
-	}
-}
-*/
-
-func (rs *RepoStatus) XtermBash(args []string) {
-	var argsX = []string{"-geometry", "120x40"}
-	tmp := strings.Join(args, " ") + ";bash"
-	argsX = append(argsX, "-e", "bash", "-c", tmp)
-	argsX = append(argsX, args...)
-	log.Info("xterm cmd=", argsX)
-	// set less to not exit on small diff's
-	os.Setenv("LESS", "-+F -+X -R")
-	cmd := exec.Command("xterm", argsX...)
-	path := rs.realPath.String()
-	cmd.Dir = path
-	if err := cmd.Run(); err != nil {
-		log.Log(WARN, "xterm.Run() failed")
-		log.Log(WARN, "path =", path)
-		log.Log(WARN, "cmd = xterm", argsX)
-	} else {
-		log.Log(WARN, "xterm.Run() worked")
-		log.Log(WARN, "path =", path)
-		log.Log(WARN, "cmd = xterm", argsX)
-	}
-}
-
-func (rs *RepoStatus) DoAll(all [][]string) bool {
-	for _, cmd := range all {
-		log.Log(WARN, "doAll() RUNNING: cmd =", cmd)
-		r := rs.Run(cmd)
-		if r.Error != nil {
-			log.Log(WARN, "doAll() err =", r.Error)
-			log.Log(WARN, "doAll() out =", r.Stdout)
-			return false
-		}
-	}
-	return true
-}
-
-/*
-func ScanGitDirectories(srcDir string) []string {
-	var all []string
-	err := filepath.Walk(srcDir, func(path string, info os.FileInfo, err error) error {
-		if err != nil {
-			log.Log(REPOWARN, "Error accessing path:", path, err)
-			return nil
-		}
-
-		// Check if the path is a directory and has a .git subdirectory
-		if info.IsDir() && IsGitDir(path) {
-			all = append(all, path)
-		}
-
-		return nil
-	})
-
-	if err != nil {
-		log.Log(REPOWARN, "Error walking the path:", srcDir, err)
-	}
-
-	return all
-}
-*/

update.go

@@ -2,156 +2,48 @@ package repostatus
 
 import (
 	"errors"
-	"fmt"
-	"time"
 
 	"go.wit.com/log"
 )
 
-func (rs *RepoStatus) gitBranchAll() {
-	r := rs.Run([]string{"git", "branch", "--all"})
-	if r.Error != nil {
-		log.Log(WARN, "git branch failed string =", rs.String())
-		log.Log(WARN, "git branch failed realpath =", rs.realPath.String())
-		return
-	}
-	for _, s := range r.Stdout {
-		rs.targetBranch.AddText(s)
-	}
-}
-
-func (rs *RepoStatus) updateNew() {
-	if !rs.Ready() {
-		log.Log(WARN, "can't update yet. ready is false")
-		log.Error(errors.New("Update() is not ready yet"))
-		return
-	}
-
-	// store the current checked out branch name and version
-	rs.checkCurrentBranchName()
-	rs.checkCurrentBranchVersion()
-
-	// read in the tags
-	rs.populateTags()
-
-	// record if the repo is dirty
-	rs.CheckDirty()
-
-	// store the last tag version
-	rs.setLastTagVersion()
-
-	// store the master branch version
-	mName := rs.GetMasterBranchName()
-	out, _ := rs.gitDescribeByName(mName)
-	rs.setMasterVersion(out)
-
-	// store the devel branch version
-	dName := rs.GetDevelBranchName()
-	if dName == "" {
-		rs.setDevelVersion("")
-	} else {
-		out, _ = rs.gitDescribeByName(dName)
-		rs.setDevelVersion(out)
-	}
-
-	// store the user branch version
-	uName := rs.GetUserBranchName()
-	if uName == "" {
-		rs.setUserVersion("")
-	} else {
-		out, _ = rs.gitDescribeByName(uName)
-		rs.setUserVersion(out)
-	}
-
-	// populates a string into the rs.gitState widget
-	// todo: make the values from this function a bit cleaner
-	rs.CheckGitState()
-}
-
 func (rs *RepoStatus) Update() {
 	if !rs.Ready() {
 		log.Log(WARN, "can't update yet. ready is false")
 		log.Error(errors.New("Update() is not ready yet"))
 		return
 	}
-	log.Log(INFO, "Update() START")
+
-	duration := timeFunction(func() {
+	pb := rs.pb
-		rs.updateNew()
+
-	})
+	// store the current checked out branch name and version
-	rs.setSpeed(duration)
+	rs.checkCurrentBranchName()
-	log.Log(INFO, "Update() END")
+	out := rs.pb.GetCurrentVersion()
+	rs.currentVersion.SetValue(out)
+
+	// read in the tags
+	// rs.populateTags()
+
+	// record if the repo is dirty
+	pb.CheckDirty()
+
+	// display the last tag version
+	name := rs.pb.GetLastTagVersion()
+	rs.lasttag.SetText(name)
+
+	// store the master branch version
+	ver := pb.GetMasterVersion()
+	rs.mainBranchVersion.SetValue(ver)
+
+	rs.develBranchVersion.SetValue(pb.GetDevelVersion())
+	rs.userBranchVersion.SetValue(pb.GetUserVersion())
+
+	// populates a string into the rs.gitState widget
+	// todo: make the values from this function a bit cleaner
+	rs.CheckGitState()
 }
 
-func (rs *RepoStatus) setSpeed(duration time.Duration) {
+func (rs *RepoStatus) CheckGitState() string {
-	s := fmt.Sprint(duration)
+	state := rs.pb.GetState()
-	if rs.speedActual == nil {
+	rs.gitState.SetText(state)
-		log.Log(WARN, "rs.speedActual == nil")
+	return state
-		return
-	}
-	rs.speedActual.SetValue(s)
-
-	if duration > 200*time.Millisecond {
-		rs.speed.SetValue("SLOW")
-	} else if duration > 50*time.Millisecond {
-		rs.speed.SetValue("OK")
-	} else {
-		rs.speed.SetValue("FAST")
-	}
-}
-
-// disable all things besides Update() button
-func (rs *RepoStatus) DisableEverything() {
-	log.Log(INFO, "DisableEverything()")
-
-	// choosing a major, minor or revision
-	rs.major.Disable()
-	rs.minor.Disable()
-	rs.revision.Disable()
-
-	// disable adding a tag message
-	rs.versionMessage.Disable()
-
-	// disable the merge devel to master button
-	rs.develMergeB.Disable()
-
-	// disable the tag a new version button
-	rs.releaseVersion.Disable()
-}
-
-// this means devel needs to be merged to master
-func (rs *RepoStatus) EnableMergeDevel() {
-	rs.DisableEverything()
-
-	rs.develMergeB.Enable()
-}
-
-func (rs *RepoStatus) Disable() {
-	rs.window.Disable()
-}
-
-func (rs *RepoStatus) Enable() {
-	rs.window.Enable()
-}
-
-// this means you need to release a new version of the master repository
-func (rs *RepoStatus) EnableSelectTag() {
-	rs.DisableEverything()
-
-	// choosing a major, minor or revision
-	rs.major.Enable()
-	rs.minor.Enable()
-	rs.revision.Enable()
-
-	// disable adding a tag message
-	rs.versionMessage.Enable()
-
-	rs.develMergeB.SetLabel("ready to release")
-
-	if len(rs.versionMessage.String()) == 0 {
-		// force there to be a commit message
-		rs.releaseVersion.Disable()
-	} else {
-		rs.generateCmd()
-		rs.releaseVersion.Enable()
-	}
 }

windowBranches.go

@@ -0,0 +1,127 @@
+package repostatus
+
+import (
+	"go.wit.com/lib/gadgets"
+	"go.wit.com/lib/protobuf/gitpb"
+	"go.wit.com/log"
+
+	"go.wit.com/gui"
+)
+
+type repoBranchesWindow struct {
+	repo  *gitpb.Repo          // the repo protobuf
+	win   *gadgets.BasicWindow // the patches window
+	stack *gui.Node            // the top box set as vertical
+	//shelf   *gui.Node            // the first box in the stack, set as horizontal
+	//grid    *gui.Node            // the list of available patches
+	//setgrid *gui.Node            // the list of each patchset
+}
+
+// todo: autogenerate these or make them standared 'gui' package functions
+// make this an go interface somehow
+
+// is the window hidden right now?
+func (w *repoBranchesWindow) Hidden() bool {
+	return w.win.Hidden()
+}
+
+// switches between the window being visable or hidden on the desktop
+func (w *repoBranchesWindow) Toggle() {
+	if w.Hidden() {
+		w.Show()
+	} else {
+		w.Hide()
+	}
+}
+
+// hides the window completely
+func (w *repoBranchesWindow) Show() {
+	w.win.Show()
+}
+
+func (w *repoBranchesWindow) Hide() {
+	w.win.Hide()
+}
+
+// should be the first box/widget in the window
+// greys out the window to the user
+func (w *repoBranchesWindow) Disable() {
+	w.stack.Disable()
+}
+
+func (w *repoBranchesWindow) Enable() {
+	w.stack.Enable()
+}
+
+// you can only have one of these
+func MakeRepoBranchesWindow(repo *gitpb.Repo) *repoBranchesWindow {
+	pw := new(repoBranchesWindow)
+
+	// sync.Once()
+	pw.win = gadgets.RawBasicWindow("Branches for " + repo.GetGoPath())
+	pw.win.Make()
+
+	pw.stack = pw.win.Box().NewBox("bw vbox", false)
+	// me.reposwin.Draw()
+	pw.win.Custom = func() {
+		log.Info("Got close. setting win.Hide()")
+		// sets the hidden flag to false so Toggle() works
+		pw.win.Hide()
+	}
+
+	grid := pw.stack.NewGrid("", 0, 0)
+
+	grid.NewGroup("Branches")
+	grid.NextRow()
+
+	grid.NewGroup("Name")
+	grid.NewGroup("Forge use")
+	grid.NewGroup("Ref Version")
+	grid.NewGroup("Type")
+	grid.NewGroup("Hash")
+	grid.NextRow()
+
+	/*
+		for _, b := range repo.GetLocalBranches() {
+			hash := repo.GetBranchHash(b)
+			grid.NewLabel(b)
+			grid.NewLabel(repo.GetBranchVersion(b))
+			if s, err := repo.GetHashName(hash); err == nil {
+				grid.NewLabel(s)
+			} else {
+				grid.NewLabel("err")
+			}
+			grid.NewLabel("local")
+
+			grid.NewLabel(hash)
+			grid.NewButton("Delete", func() {
+				repo.RunVerbose([]string{"git", "branch", "-D", b})
+			})
+			grid.NextRow()
+		}
+
+		for _, b := range repo.GetRemoteBranches() {
+			hash := repo.GetBranchHash(b)
+			grid.NewLabel(b)
+			forgeuse := repo.GetBranchVersion(b)
+			grid.NewLabel(forgeuse)
+			if s, err := repo.GetHashName(hash); err == nil {
+				grid.NewLabel(s)
+			} else {
+				grid.NewLabel("")
+			}
+			grid.NewLabel("remote")
+
+			grid.NewLabel(hash)
+			if b == "origin/HEAD" || forgeuse == "remote master" {
+				// can't delete these
+			} else {
+				grid.NewButton("Delete Remote", func() {
+				})
+			}
+			grid.NextRow()
+		}
+	*/
+
+	return pw
+}

windowMain.go

@@ -1,8 +1,6 @@
 package repostatus
 
 import (
-	"os"
-
 	"go.wit.com/lib/gadgets"
 	"go.wit.com/lib/protobuf/gitpb"
 	"go.wit.com/log"
@@ -14,27 +12,6 @@ func init() {
 	windowMap = make(map[string]*RepoStatus)
 }
 
-// deprecate this
-func ListAllOld() {
-	for path, rs := range windowMap {
-		log.Warn(rs.GetMasterVersion(), path)
-	}
-}
-
-// returns the object for the path
-// deprecate this
-func FindPathOld(path string) *RepoStatus {
-	if windowMap[path] == nil {
-		log.Log(INFO, "FindPath() not initialized yet", path)
-		return nil
-	}
-	return windowMap[path]
-}
-
-func SetWorkPath(path string) {
-	os.Setenv("REPO_WORK_PATH", path)
-}
-
 // makes a window of the status of the repo
 // don't worry, you can think of it like Sierpinski carpet
 // it's doesn't need to be displayed so it'll work fine even in an embedded space
@@ -55,7 +32,7 @@ func NewRepoStatusWindow(repo *gitpb.Repo) (*RepoStatus, error) {
 	//	realpath := repo.FullPath
 	//	isGoLang := true
 
-	rs.tags = make(map[string]string)
+	// rs.tags = make(map[string]string)
 	rs.window = gadgets.RawBasicWindow("GO Repo Details " + path)
 	rs.window.Horizontal()
 	rs.window.Make()
@@ -63,7 +40,7 @@ func NewRepoStatusWindow(repo *gitpb.Repo) (*RepoStatus, error) {
 	group := basebox.NewGroup("stuff")
 	primarybox := group.Box()
 	primarybox.Horizontal()
-	box2 := group.Box()
+	// box2 := group.Box()
 	rs.ready = true
 	rs.window.Custom = func() {
 		rs.Hide()
@@ -76,39 +53,10 @@ func NewRepoStatusWindow(repo *gitpb.Repo) (*RepoStatus, error) {
 	// display the git branches and options
 	rs.makeBranchesBox(primarybox)
 
+	// var win *gadgets.BasicWindow
 	// show standard git commit and merge controls
 	rs.drawGitCommands(primarybox)
 
-	// save ~/go/src & the whole path strings
-	rs.path.SetValue(path)
-	rs.goSrcPath.SetValue(os.Getenv("FORGE_GOSRC"))
-	rs.realPath.SetValue(rs.pb.GetFullPath())
-
-	// add all the tags
-	rs.makeTagBox(box2)
-
-	rs.readGitConfig()
-
-	if rs.pb.GetReadOnly() {
-		rs.readOnly.SetValue("true")
-	} else {
-		rs.readOnly.SetValue("false")
-	}
-	rs.mainWorkingName.SetText(rs.pb.GetMasterBranchName())
-	rs.mainBranchVersion.SetLabel(rs.pb.GetMasterBranchName())
-
-	rs.develWorkingName.SetText(rs.pb.GetDevelBranchName())
-	rs.develBranchVersion.SetLabel(rs.pb.GetDevelBranchName())
-
-	rs.userWorkingName.SetText(rs.pb.GetUserBranchName())
-	rs.userBranchVersion.SetLabel(rs.pb.GetUserBranchName())
-
-	if rs.pb.GetGoPath ()== "" {
-		// not golang repo
-	} else {
-		rs.isGoLang.SetText("true")
-		rs.goPath.SetText(rs.pb.GetGoPath())
-	}
 	windowMap[path] = rs
 	return rs, nil
 }

windowMerge.go

@@ -0,0 +1,216 @@
+package repostatus
+
+import (
+	"go.wit.com/lib/gadgets"
+	"go.wit.com/lib/protobuf/gitpb"
+	"go.wit.com/log"
+
+	"go.wit.com/gui"
+)
+
+type repoMergeWindow struct {
+	repo               *gitpb.Repo          // the repo protobuf
+	win                *gadgets.BasicWindow // the patches window
+	stack              *gui.Node            // the top box set as vertical
+	lasttag            *gadgets.OneLiner    // the last tag version
+	mainBranchVersion  *gadgets.OneLiner    // the primary branch version
+	develBranchVersion *gadgets.OneLiner    // the devel branch version
+	userBranchVersion  *gadgets.OneLiner    // the user branch version
+	currentVersion     *gadgets.OneLiner    // the devel branch version
+	currentBranch      *gadgets.OneLiner    // the user branch version
+	mergeD             *gui.Node            // the merge button
+	mergeM             *gui.Node            // the merge button
+}
+
+// todo: autogenerate these or make them standared 'gui' package functions
+// make this an go interface somehow
+
+// is the window hidden right now?
+func (w *repoMergeWindow) Hidden() bool {
+	return w.win.Hidden()
+}
+
+// switches between the window being visable or hidden on the desktop
+func (w *repoMergeWindow) Toggle() {
+	if w.Hidden() {
+		w.Show()
+	} else {
+		w.Hide()
+	}
+}
+
+// hides the window completely
+func (w *repoMergeWindow) Show() {
+	w.win.Show()
+	w.Update()
+}
+
+func (w *repoMergeWindow) Hide() {
+	w.win.Hide()
+}
+
+// should be the first box/widget in the window
+// greys out the window to the user
+func (w *repoMergeWindow) Disable() {
+	w.stack.Disable()
+}
+
+func (w *repoMergeWindow) Enable() {
+	w.stack.Enable()
+}
+
+func (w *repoMergeWindow) Update() {
+	w.lasttag.SetText(w.repo.GetLastTag())
+	w.mainBranchVersion.SetText(w.repo.GetMasterVersion())
+	w.develBranchVersion.SetText(w.repo.GetDevelVersion())
+	w.userBranchVersion.SetText(w.repo.GetUserVersion())
+
+	w.currentBranch.SetText(w.repo.GetCurrentBranchName())
+	w.currentVersion.SetText(w.repo.GetCurrentVersion())
+
+	if w.repo.GetCurrentBranchName() == w.repo.GetDevelBranchName() {
+		w.mergeD.Enable()
+	} else {
+		w.mergeD.Disable()
+	}
+
+	if w.repo.GetCurrentBranchName() == w.repo.GetMasterBranchName() {
+		w.mergeM.Enable()
+	} else {
+		w.mergeM.Disable()
+	}
+}
+
+func (rs *RepoStatus) MakeRepoMergeWindow(repo *gitpb.Repo) *repoMergeWindow {
+	w := new(repoMergeWindow)
+	w.repo = repo
+
+	// sync.Once()
+	w.win = gadgets.RawBasicWindow("Merge controls for " + repo.GetGoPath())
+	w.win.Make()
+
+	w.stack = w.win.Box().NewBox("bw vbox", false)
+	// me.reposwin.Draw()
+	w.win.Custom = func() {
+		log.Info("Got close. setting win.Hide()")
+		// sets the hidden flag to false so Toggle() works
+		w.win.Hide()
+	}
+
+	grid := w.stack.NewGrid("", 0, 0)
+
+	grid.NewGroup("Merge Options")
+	grid.NextRow()
+
+	grid.NewButton("checkout user", func() {
+		w.Disable()
+		defer w.Enable()
+		if err := repo.CheckoutUser(); err != nil {
+			log.Info(repo.GetFullPath(), err)
+		}
+		w.repo.Reload()
+		w.Update()
+	})
+	grid.NextRow()
+	grid.NewButton("checkout devel", func() {
+		w.Disable()
+		defer w.Enable()
+		repo.CheckoutDevel()
+		w.repo.Reload()
+		w.Update()
+	})
+	w.mergeD = grid.NewButton("merge to devel", func() {
+		w.Disable()
+		defer w.Enable()
+		log.Info("repo:", repo.GetGoPath())
+		if result, err := repo.MergeToDevel(); err == nil {
+			log.Warn("THINGS SEEM OK", repo.GetFullPath())
+			for _, line := range result.Stdout {
+				log.Warn("stdout:", line)
+			}
+			for _, line := range result.Stderr {
+				log.Warn("stderr:", line)
+			}
+		} else {
+			log.Warn("THINGS FAILED ", repo.GetFullPath())
+			log.Warn("err", err)
+			for _, line := range result.Stdout {
+				log.Warn("stdout:", line)
+			}
+			for _, line := range result.Stderr {
+				log.Warn("stderr:", line)
+			}
+		}
+		w.repo.Reload()
+		w.Update()
+	})
+	grid.NextRow()
+	grid.NewButton("checkout master", func() {
+		w.Disable()
+		defer w.Enable()
+		repo.CheckoutMaster()
+		w.repo.Reload()
+		w.Update()
+	})
+	w.mergeM = grid.NewButton("merge to master", func() {
+		w.Disable()
+		defer w.Enable()
+		log.Info("repo:", repo.GetGoPath())
+		if result, err := repo.MergeToMaster(); err == nil {
+			log.Warn("THINGS SEEM OK", repo.GetFullPath())
+			for _, line := range result.Stdout {
+				log.Warn("stdout:", line)
+			}
+			for _, line := range result.Stderr {
+				log.Warn("stderr:", line)
+			}
+		} else {
+			log.Warn("THINGS FAILED ", repo.GetFullPath())
+			log.Warn("err", err)
+			for _, line := range result.Stdout {
+				log.Warn("stdout:", line)
+			}
+			for _, line := range result.Stderr {
+				log.Warn("stderr:", line)
+			}
+		}
+		w.repo.Reload()
+		w.Update()
+	})
+	grid.NextRow()
+
+	w.lasttag = gadgets.NewOneLiner(grid, "last tag") // `progname:"LASTTAG"`
+	grid.NextRow()
+
+	w.mainBranchVersion = gadgets.NewOneLiner(grid, "master") // `progname:"MASTERBRANCH"`
+	grid.NextRow()
+	w.develBranchVersion = gadgets.NewOneLiner(grid, "devel") // `progname:"DEVELBRANCH"`
+	grid.NextRow()
+	w.userBranchVersion = gadgets.NewOneLiner(grid, "user") // `progname:"USERBRANCH"`
+	grid.NextRow()
+
+	w.currentBranch = gadgets.NewOneLiner(grid, "current branch") // `progname:"CURRENTBRANCH"`
+	grid.NextRow()
+	w.currentVersion = gadgets.NewOneLiner(grid, "current version") // `progname:"CURRENTVERSION"`
+	grid.NextRow()
+
+	w.Update()
+
+	return w
+}
+
+/*
+	rs.showBranchesButton = newgrid.NewButton("find user and devel", func() {
+		log.Info("redo this")
+	})
+	newgrid.NextRow()
+
+	rs.checkBranchesButton = newgrid.NewButton("CheckBranches()", func() {
+		log.Info("redo this")
+	})
+	newgrid.NextRow()
+
+	newgrid.NewButton("Revert master to devel", func() {
+		log.Info("redo this")
+	})
+*/

windowModify.go

@@ -15,7 +15,7 @@ func (rs *RepoStatus) drawGitCommands(box *gui.Node) {
 	})
 
 	newgrid.NewButton("CheckDirty()", func() {
-		if rs.CheckDirty() {
+		if rs.pb.CheckDirty() {
 			log.Log(WARN, "is dirty")
 		} else {
 			log.Log(WARN, "is not dirty")
@@ -23,18 +23,18 @@ func (rs *RepoStatus) drawGitCommands(box *gui.Node) {
 	})
 
 	newgrid.NewButton("show .git/config", func() {
-		if rs.gitConfig == nil {
+		if rs.pb.GitConfig == nil {
-			log.Log(WARN, "Nonexistant or damaged .git/config", rs.String())
+			log.Log(WARN, "Nonexistant or damaged .git/config", rs.Path())
 			return
 		}
 		log.Log(WARN, ".git/config:", rs.realPath.String())
 
 		// The info:
-		for name, remote := range rs.gitConfig.remotes {
+		for name, remote := range rs.pb.GitConfig.Remotes {
-			log.Log(WARN, "  ", name, "url:", remote.url)
+			log.Log(WARN, "  ", name, "url:", remote.Url)
 		}
-		for name, branch := range rs.gitConfig.branches {
+		for name, branch := range rs.pb.GitConfig.Branches {
-			log.Log(WARN, "  ", name, "remote:", branch.remote, "merge", branch.merge)
+			log.Log(WARN, "  ", name, "remote:", branch.Remote, "merge", branch.Merge)
 		}
 	})
 	newgrid.NextRow()
@@ -47,7 +47,7 @@ func (rs *RepoStatus) drawGitCommands(box *gui.Node) {
 	label := "merge " + rs.userWorkingName.String() + " to " + rs.develWorkingName.String()
 	rs.develMergeB = newgrid.NewButton(label, func() {
 		rs.Disable()
-		if result, err := rs.pb.MergeUserToDevel(); err == nil {
+		if result, err := rs.pb.MergeToDevel(); err == nil {
 			log.Warn("THINGS SEEM OK fullAutomation() returned true.")
 		} else {
 			log.Warn("THINGS FAILED fullAutomation() returned false", result.Error)
@@ -58,7 +58,7 @@ func (rs *RepoStatus) drawGitCommands(box *gui.Node) {
 	label = "merge " + rs.develWorkingName.String() + " to " + rs.mainWorkingName.String()
 	rs.mainMergeB = newgrid.NewButton(label, func() {
 		rs.Disable()
-		if result, err := rs.pb.MergeDevelToMaster(); err == nil {
+		if result, err := rs.pb.MergeToMaster(); err == nil {
 			log.Warn("THINGS SEEM OK fullAutomation() returned true.")
 		} else {
 			log.Warn("THINGS FAILED fullAutomation() returned false", result.Error)
@@ -66,30 +66,31 @@ func (rs *RepoStatus) drawGitCommands(box *gui.Node) {
 		rs.Enable()
 	})
 	newgrid.NewButton("increment version", func() {
-		rs.IncrementVersion()
+		log.Info("broken")
+		// rs.IncrementVersion()
 	})
 	newgrid.NextRow()
 
 	rs.major = gadgets.NewBasicCombobox(newgrid, "major")
 	rs.major.Custom = func() {
-		rs.setTag()
+		// rs.setTag()
-		rs.generateCmd()
+		// rs.generateCmd()
 	}
 	// rs.major.Hide()
 	newgrid.NextRow()
 
 	rs.minor = gadgets.NewBasicCombobox(newgrid, "minor")
 	rs.minor.Custom = func() {
-		rs.setTag()
+		// rs.setTag()
-		rs.generateCmd()
+		// rs.generateCmd()
 	}
 	// rs.minor.Hide()
 	newgrid.NextRow()
 
 	rs.revision = gadgets.NewBasicCombobox(newgrid, "revision")
 	rs.revision.Custom = func() {
-		rs.setTag()
+		// rs.setTag()
-		rs.generateCmd()
+		// rs.generateCmd()
 	}
 	// rs.revision.Hide()
 	newgrid.NextRow()
@@ -101,7 +102,7 @@ func (rs *RepoStatus) drawGitCommands(box *gui.Node) {
 
 	rs.versionMessage = gadgets.NewBasicEntry(newgrid, "tag message")
 	rs.versionMessage.Custom = func() {
-		rs.generateCmd()
+		// rs.generateCmd()
 	}
 	// rs.versionMessage.Hide()
 	newgrid.NextRow()
@@ -112,7 +113,7 @@ func (rs *RepoStatus) drawGitCommands(box *gui.Node) {
 
 	rs.releaseVersion = newgrid.NewButton("tag and release new version", func() {
 		rs.Disable()
-		rs.pb.MergeDevelToMaster()
+		rs.pb.MergeToMaster()
 	})
 	// rs.releaseVersion.Hide()
 	newgrid.NextRow()

windowRepo.go

@@ -0,0 +1,73 @@
+package repostatus
+
+import (
+	"go.wit.com/lib/gadgets"
+	"go.wit.com/lib/protobuf/gitpb"
+
+	"go.wit.com/gui"
+)
+
+type repoWindow struct {
+	repo  *gitpb.Repo          // the repo protobuf
+	win   *gadgets.BasicWindow // the patches window
+	stack *gui.Node            // the top box set as vertical
+	//shelf   *gui.Node            // the first box in the stack, set as horizontal
+	//grid    *gui.Node            // the list of available patches
+	//setgrid *gui.Node            // the list of each patchset
+}
+
+// todo: autogenerate these or make them standared 'gui' package functions
+// make this an go interface somehow
+
+// is the window hidden right now?
+func (w *repoWindow) Hidden() bool {
+	return w.win.Hidden()
+}
+
+// switches between the window being visable or hidden on the desktop
+func (w *repoWindow) Toggle() {
+	if w.Hidden() {
+		w.Show()
+	} else {
+		w.Hide()
+	}
+}
+
+// hides the window completely
+func (w *repoWindow) Show() {
+	w.win.Show()
+}
+
+func (w *repoWindow) Hide() {
+	w.win.Hide()
+}
+
+// should be the first box/widget in the window
+// greys out the window to the user
+func (w *repoWindow) Disable() {
+	w.stack.Disable()
+}
+
+func (w *repoWindow) Enable() {
+	w.stack.Enable()
+}
+
+// you can only have one of these
+func MakeRepoWindow(repo *gitpb.Repo) *repoWindow {
+	pw := new(repoWindow)
+
+	// sync.Once()
+	pw.win = gadgets.RawBasicWindow("Patcheset for " + repo.GetGoPath())
+	pw.win.Make()
+
+	pw.stack = pw.win.Box().NewBox("bw vbox", false)
+	// me.reposwin.Draw()
+	pw.win.Custom = func() {
+		// sets the hidden flag to false so Toggle() works
+		pw.win.Hide()
+	}
+
+	// grid := pw.stack.NewGrid("", 0, 0)
+
+	return pw
+}