show devel and user versions

1 files changed, 31 insertions, 23 deletions

diff --git a/scan.go b/scan.go
index 6182ef7..f6a3b14 100644
--- a/scan.go
+++ b/scan.go
@@ -58,32 +58,40 @@ func (r *RepoRow) NewScan() int {
 		}
 	}
 
-//	r.masterVersion.SetLabel(r.pb.GetMasterVersion())
-//	r.develVersion.SetLabel(r.pb.GetDevelVersion())
-//	r.userVersion.SetLabel(r.pb.GetUserVersion())
-//	r.gitState.SetLabel(r.Status.GetState())
-//	r.currentName.SetLabel(r.Status.CurrentBranchName())
-//	r.currentVersion.SetLabel(r.Status.CurrentBranchVersion())
-
-	tags := []string{"%(objectname)", "%(creatordate)", "%(*authordate)", "%(refname)", "%(subject)"}
-	format := strings.Join(tags, "_,,,_")
-	cmd := []string{"git", "for-each-ref", "--sort=taggerdate", "--format", format}
-	// log.Info("RUNNING:", strings.Join(cmd, " "))
-	result := r.pb.RunQuiet(cmd)
-	if result.Error != nil {
-		log.Warn("git for-each-ref error:", result.Error)
+	if r.masterVersion == nil {
+		panic("what the fuck node")
 	}
-	for i, line := range result.Stdout {
-		log.Info(i, line)
+	if r.pb == nil {
+		panic("what the fuck pb")
 	}
+	r.masterVersion.SetLabel(r.pb.GitMasterVersion())
+	r.develVersion.SetLabel(r.pb.GitDevelVersion())
+	r.userVersion.SetLabel(r.pb.GitUserVersion())
+	//	r.gitState.SetLabel(r.Status.GetState())
+	//	r.currentName.SetLabel(r.Status.CurrentBranchName())
+	//	r.currentVersion.SetLabel(r.Status.CurrentBranchVersion())
 
-	if me.hideFunction == nil {
-		// application didn't register a hide function
-		// always show everything in that case
-		r.Show()
-	} else {
-		me.hideFunction(r)
-	}
+	/*
+		tags := []string{"%(objectname)", "%(creatordate)", "%(*authordate)", "%(refname)", "%(subject)"}
+		format := strings.Join(tags, "_,,,_")
+		cmd := []string{"git", "for-each-ref", "--sort=taggerdate", "--format", format}
+		// log.Info("RUNNING:", strings.Join(cmd, " "))
+		result := r.pb.RunQuiet(cmd)
+		if result.Error != nil {
+			log.Warn("git for-each-ref error:", result.Error)
+		}
+		for i, line := range result.Stdout {
+			log.Info(i, line)
+		}
+
+		if me.hideFunction == nil {
+			// application didn't register a hide function
+			// always show everything in that case
+			r.Show()
+		} else {
+			me.hideFunction(r)
+		}
+	*/
 
 	// print out whatever changes have happened
 	if c, ok := r.Status.Changed(); ok {