more cleanups on doClean()v0.22.127

1 files changed, 52 insertions, 5 deletions

diff --git a/doClean.go b/doClean.go
index 4b435b3..dbb2b18 100644
--- a/doClean.go
+++ b/doClean.go
@@ -44,7 +44,54 @@ func doClean() error {
 		doRepoCleanDevel(repo)
 	}
 
-	log.Info("finished attempt at cleaning devel branches")
+	found := gitpb.NewRepos()
+
+	total := 0
+	// find all repos that aren't "clean"
+	all = me.forge.Repos.SortByFullPath()
+	for all.Scan() {
+		repo := all.Next()
+		total += 1
+
+		// find repos not on master branch
+		if repo.GetCurrentBranchName() != repo.GetMasterBranchName() {
+			found.AppendByGoPath(repo)
+			continue
+		}
+
+		// find dirty repos
+		if repo.IsDirty() {
+			found.AppendByGoPath(repo)
+			continue
+		}
+
+		// find repos that still have a local user branch
+		if repo.IsLocalBranch(repo.GetUserBranchName()) {
+			found.AppendByGoPath(repo)
+			continue
+		}
+
+		// find repos that still have a local devel branch
+		if repo.IsLocalBranch(repo.GetDevelBranchName()) {
+			found.AppendByGoPath(repo)
+			continue
+		}
+	}
+
+	// display all the repos that aren't clean to the user
+	log.Printf("\n") // padding for now
+	if argv.Verbose {
+		me.forge.PrintHumanTableDirty(found)
+	} else {
+		me.forge.PrintHumanTable(found)
+	}
+	log.Printf("\n") // padding for now
+
+	if found.Len() == 0 {
+		log.Printf("%d repos are not clean\n", found.Len())
+	} else {
+		log.Info("All repos are clean", total, found.Len())
+	}
 	return nil
 }
 
@@ -100,7 +147,7 @@ func doRepoCleanUser(repo *gitpb.Repo) error {
 		if b1 == 0 {
 			// every user branch exists in devel. delete user branch
 			cmd := []string{"git", "branch", "-D", bruser}
-			log.Info("USER IS IN DEVEL", repo.GetGoPath(), cmd)
+			// log.Info("USER IS IN DEVEL", repo.GetGoPath(), cmd)
 			err := repo.RunVerbose(cmd)
 			return err
 		}
@@ -116,7 +163,7 @@ func doRepoCleanUser(repo *gitpb.Repo) error {
 		b1 := repo.CountDiffObjects(bruser, "refs/heads/"+brmaster) // should be zero
 		if b1 == 0 {
 			cmd := []string{"git", "branch", "-D", bruser}
-			log.Info("USER IS IN DEVEL", repo.GetGoPath(), cmd)
+			// log.Info("USER IS IN DEVEL", repo.GetGoPath(), cmd)
 			err := repo.RunVerbose(cmd)
 			return err
 		}
@@ -143,7 +190,7 @@ func justDeleteTheDevelBranchAlready(repo *gitpb.Repo) error {
 		b1 := repo.CountDiffObjects(branch, remote) // should be zero
 		if b1 == 0 {
 			cmd := []string{"git", "branch", "-D", repo.GetDevelBranchName()}
-			log.Info("DEVEL IS IN REMOTE", repo.GetGoPath(), cmd)
+			// log.Info("DEVEL IS IN REMOTE", repo.GetGoPath(), cmd)
 			err := repo.RunVerbose(cmd)
 			return err
 		}
@@ -158,7 +205,7 @@ func justDeleteTheDevelBranchAlready(repo *gitpb.Repo) error {
 	b1 := repo.CountDiffObjects(branch, "refs/heads/"+master) // should be zero
 	if b1 == 0 {
 		cmd := []string{"git", "branch", "-D", repo.GetDevelBranchName()}
-		log.Info("DEVEL IS IN REMOTE", repo.GetGoPath(), cmd)
+		// log.Info("DEVEL IS IN REMOTE", repo.GetGoPath(), cmd)
 		err := repo.RunVerbose(cmd)
 		return err
 	}