cleaner repo list window

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

1 files changed, 18 insertions, 12 deletions

diff --git a/scan.go b/scan.go
index 3d8ae0f..8172d5b 100644
--- a/scan.go
+++ b/scan.go
@@ -19,20 +19,26 @@ func (r *repo) newScan() bool {
 		log.Warn("repo does not exist", r.getPath())
 		return false
 	}
-	mn := r.status.GetMasterBranchName()
-	r.masterName.SetLabel(mn)
-	mv := r.status.GetMasterVersion()
-	r.masterVersion.SetLabel(mv)
+	mname := r.status.GetMasterBranchName()
+	mver := r.status.GetMasterVersion()
+	if mname != "guimaster" {
+		mver = mver + " (" + mname + ")"
+	}
+	r.masterVersion.SetLabel(mver)
 
-	dn := r.status.GetDevelBranchName()
-	r.develName.SetLabel(dn)
-	dv := r.status.GetDevelVersion()
-	r.develVersion.SetLabel(dv)
+	dname := r.status.GetDevelBranchName()
+	dver := r.status.GetDevelVersion()
+	if dname != "devel" {
+		dver = dver + " (" + dname + ")"
+	}
+	r.develVersion.SetLabel(dver)
 
-	un := r.status.GetUserBranchName()
-	r.userName.SetLabel(un)
-	uv := r.status.GetUserVersion()
-	r.userVersion.SetLabel(uv)
+	uname := r.status.GetUserBranchName()
+	uver := r.status.GetUserVersion()
+	if uname != "jcarr" {
+		uver = uver + " (" + uname + ")"
+	}
+	r.userVersion.SetLabel(uver)
 
 	cbname := r.status.GetCurrentBranchName()
 	cbversion := r.status.GetCurrentBranchVersion()