standard names finally thanks to autogenpb

6 files changed, 16 insertions, 13 deletions

diff --git a/applyPatch.go b/applyPatch.go
index fc9ef76..83d4be2 100644
--- a/applyPatch.go
+++ b/applyPatch.go
@@ -23,7 +23,7 @@ func dumpPatchset(pset *forgepb.Patchset) bool {
 
 	var count int
 	var bad int
-	all := pset.SortPatchesByFilename()
+	all := pset.Patches.SortByFilename()
 	for all.Scan() {
 		p := all.Next()
 		if IsValidPatch(p) {
@@ -96,7 +96,7 @@ func applyPatchset(pset *forgepb.Patchset) error {
 	log.Info("applyPatches() COMMENT", pset.Comment)
 	log.Info("applyPatches() GIT_AUTHOR_NAME", pset.GetGitAuthorName())
 	log.Info("applyPatches() GIT_AUTHOR_EMAIL", pset.GetGitAuthorEmail())
-	all := pset.SortPatchesByFilename()
+	all := pset.Patches.SortByFilename()
 	for all.Scan() {
 		p := all.Next()
 		// log.Info("pset filename FILENAME IS REAL?", p.Filename, pset.Name, pset.Comment)
diff --git a/argvAutoshell.go b/argvAutoshell.go
index 4f8de85..3776e39 100644
--- a/argvAutoshell.go
+++ b/argvAutoshell.go
@@ -43,7 +43,7 @@ func (args) doBashAuto() {
 	default:
 		if argv.BashAuto[0] == ARGNAME {
 			// list the subcommands here
-			fmt.Println("--bash --show checkout commit config dirty delete hard-reset list patch pull rescan")
+			fmt.Println("--bash checkout commit config dirty delete hard-reset list patch pull rescan")
 		}
 	}
 	os.Exit(0)
diff --git a/doCheckout.go b/doCheckout.go
index 1ea4b67..e7f5430 100644
--- a/doCheckout.go
+++ b/doCheckout.go
@@ -43,7 +43,9 @@ func doCheckDirtyAndConfigSave() {
 		dirty := repo.IsDirty()
 		if repo.CheckDirty() {
 			count += 1
-			me.found.AppendUniqueGoPath(repo)
+			if me.found.AppendByGoPath(repo) {
+				log.Info("doCheckDirtyAndConfigSave() repo already existed", repo.GetGoPath())
+			}
 			if !dirty {
 				configSave = true
 			}
@@ -64,7 +66,8 @@ func IsEverythingOnDevel() bool {
 		repo := all.Next()
 		if repo.GetCurrentBranchName() != repo.GetDevelBranchName() {
 			// log.Info(repo.GetFullPath(), repo.GetCurrentBranchName(), repo.GetDevelBranchName())
-			me.found.AppendUniqueGoPath(repo)
+			// add this to the list of "found" repos
+			me.found.AppendByGoPath(repo)
 		}
 	}
 	if len(me.found.Repos) == 0 {
@@ -79,7 +82,7 @@ func IsEverythingOnUser() bool {
 	for all.Scan() {
 		repo := all.Next()
 		if repo.GetCurrentBranchName() != repo.GetUserBranchName() {
-			me.found.AppendUniqueGoPath(repo)
+			me.found.AppendByGoPath(repo)
 		}
 	}
 	if len(me.found.Repos) == 0 {
diff --git a/find.go b/find.go
index f90d4ee..905176b 100644
--- a/find.go
+++ b/find.go
@@ -50,7 +50,7 @@ func findPrivate() {
 	for all.Scan() {
 		repo := all.Next()
 		if me.forge.Config.IsPrivate(repo.GetGoPath()) {
-			me.found.AppendUniqueGoPath(repo)
+			me.found.AppendByGoPath(repo)
 		}
 	}
 }
@@ -62,7 +62,7 @@ func findMine() {
 	for all.Scan() {
 		repo := all.Next()
 		if me.forge.Config.IsWritable(repo.GetGoPath()) {
-			me.found.AppendUniqueGoPath(repo)
+			me.found.AppendByGoPath(repo)
 		}
 	}
 }
@@ -74,7 +74,7 @@ func findFavorites() {
 	for all.Scan() {
 		repo := all.Next()
 		if me.forge.Config.IsFavorite(repo.GetGoPath()) {
-			me.found.AppendUniqueGoPath(repo)
+			me.found.AppendByGoPath(repo)
 		}
 	}
 }
@@ -86,7 +86,7 @@ func findDirty() {
 		var repo *gitpb.Repo
 		repo = all.Next()
 		if repo.IsDirty() {
-			me.found.AppendUniqueGoPath(repo)
+			me.found.AppendByGoPath(repo)
 		}
 	}
 }
@@ -95,6 +95,6 @@ func findAll() {
 	all := me.forge.Repos.SortByFullPath()
 	for all.Scan() {
 		repo := all.Next()
-		me.found.AppendUniqueGoPath(repo)
+		me.found.AppendByGoPath(repo)
 	}
 }
diff --git a/send.go b/send.go
index d201dc7..0b3834c 100644
--- a/send.go
+++ b/send.go
@@ -142,7 +142,7 @@ func sendMasterDiff() {
 	if err != nil {
 		badExit(err)
 	}
-	all := pset.SortPatchesByFilename()
+	all := pset.Patches.SortByFilename()
 	for all.Scan() {
 		p := all.Next()
 		log.Info("read in patch:", p.Filename)
diff --git a/windowRepos.go b/windowRepos.go
index 5205162..adaa5d6 100644
--- a/windowRepos.go
+++ b/windowRepos.go
@@ -157,7 +157,7 @@ func (r *repoWindow) repoMenu() *gui.Node {
 		loop := me.forge.Repos.All()
 		for loop.Scan() {
 			repo := loop.Next()
-			me.found.AppendUniqueGoPath(repo)
+			me.found.AppendByGoPath(repo)
 		}
 		me.forge.PrintHumanTable(me.found)
 	})