s/GoPath/Namespace/v0.25.57

1 files changed, 18 insertions, 18 deletions

diff --git a/windowReposFix.go b/windowReposFix.go
index c9a87e1..0d3d5a1 100644
--- a/windowReposFix.go
+++ b/windowReposFix.go
@@ -51,10 +51,10 @@ func makeReposWin() *stdReposTableWin {
 				mname := repo.GetMasterBranchName()
 				dname := repo.GetDevelBranchName()
 				if dname != repo.GetCurrentBranchName() {
-					log.Info("Repo is not on the devel branch", repo.GetGoPath())
+					log.Info("Repo is not on the devel branch", repo.Namespace)
 				}
 				cmd := []string{"git", "merge", mname}
-				log.Info(repo.GetGoPath(), cmd)
+				log.Info(repo.Namespace, cmd)
 				repo.RunVerbose(cmd)
 			}
 		})
@@ -91,13 +91,13 @@ func makeReposWin() *stdReposTableWin {
 				// git push origin --delete jcarr
 				os.Setenv("GIT_TERMINAL_PROMPT", "0")
 				cmd := []string{"git", "push", "origin", "--delete", brname}
-				log.Info("You may want to run:", repo.GetGoPath(), cmd)
+				log.Info("You may want to run:", repo.Namespace, cmd)
 				repo.RunVerbose(cmd)
 				os.Unsetenv("GIT_TERMINAL_PROMPT")
 
 				// git branch --delete --remote origin/jcarr
 				cmd = []string{"git", "branch", "--delete", "--remote", "origin/" + brname}
-				log.Info(repo.GetGoPath(), cmd)
+				log.Info(repo.Namespace, cmd)
 				repo.RunVerbose(cmd)
 				repo.ReloadCheck()
 			}
@@ -138,10 +138,10 @@ func makeDevelBehindMaster(pb *gitpb.Repos) *gitpb.ReposTable {
 	t := pb.NewTable("testDirty")
 	t.NewUuid()
 	sf := t.AddStringFunc("repo", func(r *gitpb.Repo) string {
-		return r.GetGoPath()
+		return r.Namespace
 	})
 	sf.Custom = func(r *gitpb.Repo) {
-		log.Info("merge master into devel here", r.GetGoPath())
+		log.Info("merge master into devel here", r.Namespace)
 	}
 	t.AddTimeFunc("age", func(repo *gitpb.Repo) time.Time {
 		return repo.NewestTime()
@@ -187,26 +187,26 @@ func makeHackModeWindow(stdwin *stdReposTableWin) {
 			for all.Scan() {
 				repo := all.Next()
 				if repo.CheckDirty() {
-					log.Info("repo is dirty", repo.GetGoPath())
+					log.Info("repo is dirty", repo.Namespace)
 					continue
 				}
-				log.Info("Starting merge on", repo.GetGoPath())
+				log.Info("Starting merge on", repo.Namespace)
 				if repo.CheckoutDevel() {
-					log.Info("checkout devel failed", repo.GetGoPath())
+					log.Info("checkout devel failed", repo.Namespace)
 					return
 				}
 				if _, err := repo.MergeToDevel(); err != nil {
-					log.Info("merge from user failed", repo.GetGoPath(), err)
+					log.Info("merge from user failed", repo.Namespace, err)
 					// log.Info(strings.Join(r.Stdout, "\n"))
 					// log.Info(strings.Join(r.Stderr, "\n"))
 					return
 				}
 				if repo.CheckoutMaster() {
-					log.Info("checkout master failed", repo.GetGoPath())
+					log.Info("checkout master failed", repo.Namespace)
 					return
 				}
 				if _, err := repo.MergeToMaster(); err != nil {
-					log.Info("merge from devel failed", repo.GetGoPath(), err)
+					log.Info("merge from devel failed", repo.Namespace, err)
 					return
 				}
 
@@ -308,12 +308,12 @@ func develRemoteProblem() *gitpb.Repos {
 		repo := all.Next()
 		brname := repo.GetDevelBranchName()
 		if !repo.IsBranchRemote(brname) {
-			// log.Info("repo does not have remote devel branch", repo.GetGoPath())
+			// log.Info("repo does not have remote devel branch", repo.Namespace)
 			continue
 		}
 		lhash := repo.GetLocalHash(brname)
 		rhash := repo.GetRemoteHash(brname)
-		// log.Info(lhash, rhash, repo.GetGoPath())
+		// log.Info(lhash, rhash, repo.Namespace)
 		if lhash == "" || rhash == "" {
 			// something is wrong if either of these are blank
 			found.AppendByFullPath(repo)
@@ -335,12 +335,12 @@ func masterRemoteProblem() *gitpb.Repos {
 		repo := all.Next()
 		brname := repo.GetMasterBranchName()
 		if !repo.IsBranchRemote(brname) {
-			// log.Info("repo does not have remote devel branch", repo.GetGoPath())
+			// log.Info("repo does not have remote devel branch", repo.Namespace)
 			continue
 		}
 		lhash := repo.GetLocalHash(brname)
 		rhash := repo.GetRemoteHash(brname)
-		// log.Info(lhash, rhash, repo.GetGoPath())
+		// log.Info(lhash, rhash, repo.Namespace)
 		if lhash == "" || rhash == "" {
 			// something is wrong if either of these are blank
 			found.AppendByFullPath(repo)
@@ -375,10 +375,10 @@ func makeWritableWindow(pb *gitpb.Repos) (*gadgets.GenericWindow, *gitpb.ReposTa
 	t.SetParent(tbox)
 
 	sf := t.AddStringFunc("repo", func(r *gitpb.Repo) string {
-		return r.GetGoPath()
+		return r.Namespace
 	})
 	sf.Custom = func(r *gitpb.Repo) {
-		log.Info("do button click on", r.GetGoPath())
+		log.Info("do button click on", r.Namespace)
 	}
 	t.AddTimeFunc("age", func(repo *gitpb.Repo) time.Time {
 		return repo.NewestTime()