diff --git a/git.go b/git.go index b0963c7..c087f7e 100644 --- a/git.go +++ b/git.go @@ -6,6 +6,7 @@ import ( "time" "go.wit.com/lib/gui/shell" + "go.wit.com/lib/protobuf/gitpb" "go.wit.com/log" ) @@ -199,7 +200,7 @@ func (rs *RepoStatus) setLastTagVersion() { func (rs *RepoStatus) populateTags() { tmp := rs.realPath.String() + "/.git/refs/tags" log.Log(REPO, "populateTags() path =", tmp) - for _, tag := range listFiles(tmp) { + for _, tag := range gitpb.ListFiles(tmp) { if rs.tags[tag] == "" { log.Log(REPO, "populateTags() Adding new tag", tag) // rs.tagsDrop.AddText(tag) @@ -209,12 +210,13 @@ func (rs *RepoStatus) populateTags() { // rs.tagsDrop.SetText(rs.lasttagrev) } +/* func (rs *RepoStatus) getBranches() []string { var all []string var heads []string var remotes []string - heads = listFiles(rs.realPath.String() + "/.git/refs/heads") - remotes = listFiles(rs.realPath.String() + "/.git/refs/remotes") + heads = gitpb.ListFiles(rs.realPath.String() + "/.git/refs/heads") + remotes = gitpb.ListFiles(rs.realPath.String() + "/.git/refs/remotes") all = heads @@ -225,6 +227,7 @@ func (rs *RepoStatus) getBranches() []string { } return all } +*/ // returns quickly based on the last time it was checked func (rs *RepoStatus) IsDirty() bool { diff --git a/unix.go b/unix.go index dbbaed0..ffe1610 100644 --- a/unix.go +++ b/unix.go @@ -5,7 +5,6 @@ import ( "os" "os/exec" "path/filepath" - "regexp" "strings" "time" @@ -15,31 +14,6 @@ import ( ) /* -func run(path string, thing string, cmdline string) string { - parts := strings.Split(cmdline, " ") - // Create the command - cmd := exec.Command(thing, parts...) - - // Set the working directory - cmd.Dir = path - - // Execute the command - output, err := cmd.CombinedOutput() - tmp := string(output) - tmp = strings.TrimSpace(tmp) - - if err != nil { - log.Log(WARN, "run()", path, thing, cmdline, "=", tmp) - log.Error(err, "cmd error'd out", parts) - return "" - } - - // Print the output - log.Log(INFO, "run()", path, thing, cmdline, "=", tmp) - return tmp -} -*/ - // goes in one directory so it gets remote branch names func listFiles(directory string) []string { var files []string @@ -65,7 +39,9 @@ func listFiles(directory string) []string { return files } +*/ +/* func normalizeVersion(s string) string { // reg, err := regexp.Compile("[^a-zA-Z0-9]+") parts := strings.Split(s, "-") @@ -94,6 +70,7 @@ func splitVersion(version string) (a, b, c string) { return parts[0], parts[1], parts[2] } } +*/ func (rs *RepoStatus) Run(cmd []string) cmd.Status { path := rs.realPath.String()