rescan()

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

1 files changed, 44 insertions, 5 deletions

diff --git a/git.go b/git.go
index 76d34bc..1c57f46 100644
--- a/git.go
+++ b/git.go
@@ -38,14 +38,20 @@ func (r *repo) getBranch() {
 }
 
 func (r *repo) checkDirty() bool {
+	if r.path == "" {
+		log.Warn("disable spaceholders")
+		r.cButton.Disable()
+		r.pButton.Disable()
+		return false
+	}
 	out := run(r.path, "git", "diff-index HEAD")
 	if out == "" {
 		r.dirtyLabel.SetText("")
-		r.pButton.Disable()
+		r.pButton.SetText("scan")
 		return false
 	} else {
 		r.dirtyLabel.SetText("dirty")
-		r.pButton.Enable()
+		r.pButton.SetText("scan")
 		return true
 	}
 
@@ -83,7 +89,7 @@ func (r *repo) populateTags() {
 	for _, tag := range r.tags {
 		r.tagsDrop.AddText(tag)
 	}
-	r.tagsDrop.SetText(r.lasttag)
+	// r.tagsDrop.SetText(r.lasttag)
 }
 
 func (r *repo) scan() {
@@ -91,9 +97,42 @@ func (r *repo) scan() {
 	r.getLastTagVersion()
 	r.getCurrentBranchName()
 	r.getCurrentBranchVersion()
-	r.checkDirty()
-
 	r.populateTags()
+	if r.checkDirty() {
+		return
+	}
+	r.checkoutBranch("master")
+	r.checkoutBranch("devel")
+	r.checkoutBranch("jcarr")
+
+	lasttag := r.lastLabel.GetText()
+	master := r.masterVersion.GetText()
+	devel := r.develVersion.GetText()
+	jcarr := r.jcarrVersion.GetText()
+
+	log.Warn("")
+	log.Warn("lasttag =", lasttag)
+	log.Warn("master =", master)
+	log.Warn("devel =", devel)
+	log.Warn("jcarr =", jcarr)
+
+	r.dirtyLabel.SetText("garbage")
+
+	if devel != master {
+		log.Warn("devel version != master version", devel, "vs", master)
+		r.dirtyLabel.SetText("merge")
+		return
+	}
+	if lasttag != master {
+		log.Warn("last tag rev != master version", lasttag, "vs", master)
+		r.dirtyLabel.SetText("merge")
+		return
+	}
+	if lasttag == jcarr {
+		log.Warn("last tag rev == jcarr version", lasttag, "vs", jcarr)
+		r.dirtyLabel.SetText("GOOD")
+		return
+	}
 }
 
 func checkrepos() {