works again

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

1 files changed, 9 insertions, 8 deletions

diff --git a/draw.go b/draw.go
index 22a3275..6ab130e 100644
--- a/draw.go
+++ b/draw.go
@@ -102,9 +102,9 @@ func (rs *RepoStatus) drawGitCommands() {
 		rs.Update()
 	})
 
-	label := "merge devel to " + rs.masterDrop.String()
+	label := "merge " + rs.masterDrop.String() + " to devel"
 	rs.develMerge = newgrid.NewButton(label, func() {
-		rs.develMerge.Disable()
+		rs.Disable()
 		master := rs.masterDrop.String()
 		rs.checkoutBranch("master", master)
 		if rs.getCurrentBranchName() != master {
@@ -116,6 +116,7 @@ func (rs *RepoStatus) drawGitCommands() {
 			return
 		}
 		rs.Update()
+		rs.Enable()
 		log.Warn("THINGS SEEM OK")
 	})
 
@@ -252,7 +253,7 @@ func (rs *RepoStatus) recommend() {
 		log.Warn("merge or squash?")
 		rs.EnableMergeDevel()
 		rs.setMergeUserCommands()
-		label := "merge " + rs.GetUserName() + " into " + rs.GetDevelName()
+		label := "merge " + rs.GetUserBranchName() + " into " + rs.GetDevelBranchName()
 		rs.develMerge.SetText(label)
 		return
 	}
@@ -261,7 +262,7 @@ func (rs *RepoStatus) recommend() {
 		log.Warn("master does not equal devel. merge devel into master")
 		rs.EnableMergeDevel()
 		rs.setMergeDevelCommands()
-		label := "merge " + rs.GetDevelName() + " into " + rs.GetMasterName()
+		label := "merge " + rs.GetDevelBranchName() + " into " + rs.GetMasterBranchName()
 		rs.develMerge.SetText(label)
 		return
 	}
@@ -355,8 +356,8 @@ func (rs *RepoStatus) setMergeDevelCommands() {
 	var line1, line2, line3 []string
 	var all [][]string
 
-	master := rs.GetMasterName()
-	devel := rs.GetDevelName()
+	master := rs.GetMasterBranchName()
+	devel := rs.GetDevelBranchName()
 
 	line1 = append(line1, "git", "checkout", master)
 	all = append(all, line1)
@@ -382,8 +383,8 @@ func (rs *RepoStatus) setMergeUserCommands() {
 	var line1, line2, line3 []string
 	var all [][]string
 
-	devel := rs.GetDevelName()
-	user := rs.GetUserName()
+	devel := rs.GetDevelBranchName()
+	user := rs.GetUserBranchName()
 
 	line1 = append(line1, "git", "checkout", devel)
 	all = append(all, line1)