troubleshooting branch namesv0.22.4

1 files changed, 23 insertions, 7 deletions

diff --git a/list.go b/list.go
index e9f9476..4e4cca4 100644
--- a/list.go
+++ b/list.go
@@ -48,14 +48,17 @@ func verifyPrint(repo *gitpb.Repo) {
 			me.forge.Repos.ConfigSave()
 		} else {
 			log.Info("need argv --real to delete", repo.GoPath)
+			os.Exit(0)
 		}
-		os.Exit(0)
 	}
-	if me.forge.IsReadOnly(repo.GoPath) && ! argv.ReadOnly {
+	if me.forge.IsReadOnly(repo.GoPath) && !argv.ReadOnly {
 		return
 	}
-	start := fmt.Sprintf("%-40s %-8s %-10s %-10s %-10s %-10s", s["gopath"], s["rtype"], s["mver"], s["dver"], s["uver"], s["cver"])
-	end += fmt.Sprintf("(%s,%s,%s,%s) ", s["mname"], s["dname"], s["uname"], s["cname"])
+	start := fmt.Sprintf("%-40s %-8s %-20s %-20s %-20s", s["gopath"], s["rtype"], s["cver"], s["mver"], s["cver"])
+	if s["url"] != "" {
+		end += "(" + s["url"] + ") "
+	}
+	// end += fmt.Sprintf("(%s,%s,%s,%s) ", s["mname"], s["dname"], s["uname"], s["cname"])
 	log.Info(start, end)
 }
 
@@ -68,7 +71,7 @@ func verify(repo *gitpb.Repo, s map[string]string) bool {
 
 	s["mname"] = repo.GetMasterBranchName()
 	if s["mname"] == "" {
-		log.Info("verify() no master branch name")
+		log.Info("verify() no master branch name", repo.GoPath)
 		s["mver"] = repo.GetMasterVersion()
 		return false
 	}
@@ -80,20 +83,33 @@ func verify(repo *gitpb.Repo, s map[string]string) bool {
 
 	s["dname"] = repo.GetDevelBranchName()
 	if s["dname"] == "" {
-		log.Info("verify() no devel branch name")
+		log.Info("verify() no devel branch name", repo.GoPath)
 		return false
 	}
 	s["uname"] = repo.GetUserBranchName()
 	if s["uname"] == "" {
-		log.Info("verify() no user branch name")
+		log.Info("verify() no user branch name", repo.GoPath)
 		return false
 	}
 	s["cname"] = repo.GetCurrentBranchName()
 
 	s["mver"] = repo.GetMasterVersion()
+	if s["mver"] == "" {
+		log.Info("verify() no master branch name", repo.GoPath, repo.GetMasterBranchName())
+		return false
+	}
 	s["dver"] = repo.GetDevelVersion()
+	if s["dver"] == "" {
+		log.Info("verify() no devel branch name", repo.GoPath, repo.GetDevelBranchName())
+		return false
+	}
 	s["uver"] = repo.GetUserVersion()
+	if s["uver"] == "" {
+		log.Info("verify() no user branch name", repo.GoPath, repo.GetUserBranchName())
+		return false
+	}
 	s["cver"] = repo.GetCurrentBranchVersion()
+	s["url"] = repo.URL
 
 	return true
 }