continue cleaning up original version

1 files changed, 22 insertions, 3 deletions

diff --git a/new.go b/new.go
index 8d11c8d..289966e 100644
--- a/new.go
+++ b/new.go
@@ -2,6 +2,7 @@ package repostatus
 
 import (
 	"os"
+	"os/user"
 	"path/filepath"
 	"strings"
 
@@ -63,9 +64,9 @@ func NewRepoStatusWindow(path string) *RepoStatus {
 
 	_, err = os.Open(filename)
 	if err != nil {
-		log.Log(WARN, "Error reading .git/config:", filename, err)
-		log.Log(WARN, "TODO: find .git/config in parent directory")
-		// return nil
+		// log.Log(WARN, "Error reading .git/config:", filename, err)
+		// log.Log(WARN, "TODO: find .git/config in parent directory")
+		return nil
 	}
 
 	rs := &RepoStatus{
@@ -113,6 +114,24 @@ func NewRepoStatusWindow(path string) *RepoStatus {
 	if strings.HasPrefix(path, "git.wit.org") {
 		rs.readOnly.SetValue("false")
 	}
+	rs.setMainWorkingName("master")
+
+	usr, _ := user.Current()
+	uname := usr.Username
+	if rs.TagExists(uname) {
+		rs.setUserWorkingName(uname)
+	} else {
+		rs.setUserWorkingName("")
+	}
+
+	if rs.TagExists("guidevel") {
+		rs.setDevelWorkingName("guidevel")
+	} else if rs.TagExists("devel") {
+		rs.setDevelWorkingName("devel")
+	} else {
+		log.Log(WARN, "tag devel does not exist")
+		rs.setDevelWorkingName("")
+	}
 
 	windowMap[path] = rs
 	return rs