diff options
Diffstat (limited to 'draw.go')
| -rw-r--r-- | draw.go | 15 |
1 files changed, 4 insertions, 11 deletions
@@ -48,15 +48,8 @@ func (rs *RepoStatus) drawGitBranches() { master = "main" } } - // rs.masterDrop.Set(master) // relabel the various gadgets with the right branch name rs.masterBranchVersion.SetLabel(master) - // rs.major.SetTitle(master) - - /* - rs.develDrop.Set("devel") - rs.userDrop.Set("jcarr") - */ var count *gui.Node @@ -90,7 +83,7 @@ func (rs *RepoStatus) drawGitStatus() { rs.tagsDrop = gadgets.NewBasicDropdown(newgrid, "existing tags") rs.masterBranchVersion = gadgets.NewOneLiner(newgrid, "master") rs.develBranchVersion = gadgets.NewOneLiner(newgrid, "devel") - rs.jcarrBranchVersion = gadgets.NewOneLiner(newgrid, "jcarr") + rs.userBranchVersion = gadgets.NewOneLiner(newgrid, "user") rs.dirtyLabel = gadgets.NewOneLiner(newgrid, "dirty") @@ -249,9 +242,9 @@ func (rs *RepoStatus) recommend() { log.Warn("list the known tags") rs.DisableEverything() rs.populateTags() - log.Warn("Does devel == jcarr?", rs.develBranchVersion.Get(), rs.jcarrBranchVersion.Get()) - if rs.develBranchVersion.Get() != rs.jcarrBranchVersion.Get() { - log.Warn("devel does not equal jcarr") + log.Warn("Does devel == user?", rs.develBranchVersion.Get(), rs.userBranchVersion.Get()) + if rs.develBranchVersion.Get() != rs.userBranchVersion.Get() { + log.Warn("devel does not equal user") log.Warn("merge or squash?") rs.EnableMergeDevel() rs.setMergeUserCommands() |