new window for merge on a single repo

1 files changed, 27 insertions, 26 deletions

diff --git a/windowMain.go b/windowMain.go
index 3a5f9da..6b075e3 100644
--- a/windowMain.go
+++ b/windowMain.go
@@ -1,8 +1,6 @@
 package repostatus
 
 import (
-	"os"
-
 	"go.wit.com/lib/gadgets"
 	"go.wit.com/lib/protobuf/gitpb"
 	"go.wit.com/log"
@@ -55,39 +53,42 @@ func NewRepoStatusWindow(repo *gitpb.Repo) (*RepoStatus, error) {
 	// display the git branches and options
 	rs.makeBranchesBox(primarybox)
 
+	// var win *gadgets.BasicWindow
 	// show standard git commit and merge controls
 	rs.drawGitCommands(primarybox)
 
-	// save ~/go/src & the whole path strings
-	rs.path.SetValue(path)
-	rs.goSrcPath.SetValue(os.Getenv("FORGE_GOSRC"))
-	rs.realPath.SetValue(rs.pb.GetFullPath())
+	/*
+		// save ~/go/src & the whole path strings
+		rs.path.SetValue(path)
+		rs.goSrcPath.SetValue(os.Getenv("FORGE_GOSRC"))
+		rs.realPath.SetValue(rs.pb.GetFullPath())
 
-	// add all the tags
-	// rs.makeTagBox(box2)
+		// add all the tags
+		// rs.makeTagBox(box2)
 
-	// rs.readGitConfig()
+		// rs.readGitConfig()
 
-	if rs.pb.GetReadOnly() {
-		rs.readOnly.SetValue("true")
-	} else {
-		rs.readOnly.SetValue("false")
-	}
-	rs.mainWorkingName.SetText(rs.pb.GetMasterBranchName())
-	rs.mainBranchVersion.SetLabel(rs.pb.GetMasterBranchName())
+		if rs.pb.GetReadOnly() {
+			rs.readOnly.SetValue("true")
+		} else {
+			rs.readOnly.SetValue("false")
+		}
+		rs.mainWorkingName.SetText(rs.pb.GetMasterBranchName())
+		rs.mainBranchVersion.SetLabel(rs.pb.GetMasterBranchName())
 
-	rs.develWorkingName.SetText(rs.pb.GetDevelBranchName())
-	rs.develBranchVersion.SetLabel(rs.pb.GetDevelBranchName())
+		rs.develWorkingName.SetText(rs.pb.GetDevelBranchName())
+		rs.develBranchVersion.SetLabel(rs.pb.GetDevelBranchName())
 
-	rs.userWorkingName.SetText(rs.pb.GetUserBranchName())
-	rs.userBranchVersion.SetLabel(rs.pb.GetUserBranchName())
+		rs.userWorkingName.SetText(rs.pb.GetUserBranchName())
+		rs.userBranchVersion.SetLabel(rs.pb.GetUserBranchName())
 
-	if rs.pb.GetGoPath() == "" {
-		// not golang repo
-	} else {
-		rs.isGoLang.SetText("true")
-		rs.goPath.SetText(rs.pb.GetGoPath())
-	}
+		if rs.pb.GetGoPath() == "" {
+			// not golang repo
+		} else {
+			rs.isGoLang.SetText("true")
+			rs.goPath.SetText(rs.pb.GetGoPath())
+		}
+	*/
 	windowMap[path] = rs
 	return rs, nil
 }