reset a single repov0.25.42

1 files changed, 51 insertions, 32 deletions

diff --git a/doClean.go b/doClean.go
index e8da80e..93927cd 100644
--- a/doClean.go
+++ b/doClean.go
@@ -14,10 +14,59 @@ import (
 	"go.wit.com/log"
 )
 
+func doResetRepo(repo *gitpb.Repo) error {
+	if repo.GetCurrentBranchName() != repo.GetMasterBranchName() {
+		return log.Errorf("not on master branch")
+	}
+	if repo.IsDirty() {
+		return log.Errorf("repo is dirty")
+	}
+
+	// when publishing, clean out the details of that if it's still there
+	if repo.GetTargetVersion() != "" {
+		repo.SetTargetVersion("")
+	}
+
+	// try to delete user
+	if err := doRepoCleanUser(repo); err != nil {
+		if err == ErrorBranchUnique {
+			if argv.Clean.Fix != nil {
+				bname := repo.GetUserBranchName()
+				checkPatchIds(repo, repo.GetUserBranchName(), repo.GetMasterBranchName())
+				s := fmt.Sprintf("delete this odd user (%s) branch %s?", bname, repo.FullPath)
+				if fhelp.QuestionUser(s) {
+					repo.RunVerbose([]string{"git", "branch", "-D", bname})
+					// repo.RunVerbose([]string{"git", "checkout", bname})
+				}
+			}
+		} else {
+			log.Info(repo.GetGoPath(), err)
+		}
+	}
+
+	// try to delete devel
+	err := doRepoCleanDevel(repo)
+	return err
+}
+
 // reverts all repos back to the original master branches
 // automatically deletes local devel and user branches
 func doClean() error {
-	setForgeMode(forgepb.ForgeMode_CLEAN)
+	if argv.Clean.Repo != "" {
+		setForgeMode(forgepb.ForgeMode_CLEAN)
+		log.Info("only reset repo:", argv.Clean.Repo)
+		if found := me.forge.Repos.FindByNamespace(argv.Clean.Repo); found != nil {
+			return doResetRepo(found)
+		}
+		if found := me.forge.Repos.FindByFullPath(argv.Clean.Repo); found != nil {
+			return doResetRepo(found)
+		}
+		return log.Errorf("repo not found: %s", argv.Clean.Repo)
+	}
+
+	s := fmt.Sprintf("Reset all (%d) git repos to the original state (non-destructive)?", me.forge.Repos.Len())
+	if !fhelp.QuestionUser(s) {
+	}
 
 	// fix this to work, then delete all the other options for "forge clean'
 	if err := me.forge.DoAllCheckoutMaster(); err != nil {
@@ -27,37 +76,7 @@ func doClean() error {
 	all := me.forge.Repos.SortByFullPath()
 	for all.Scan() {
 		repo := all.Next()
-		if repo.GetCurrentBranchName() != repo.GetMasterBranchName() {
-			continue
-		}
-		if repo.IsDirty() {
-			continue
-		}
-
-		// when publishing, clean out the details of that if it's still there
-		if repo.GetTargetVersion() != "" {
-			repo.SetTargetVersion("")
-		}
-
-		// try to delete user
-		if err := doRepoCleanUser(repo); err != nil {
-			if err == ErrorBranchUnique {
-				if argv.Clean.Fix != nil {
-					bname := repo.GetUserBranchName()
-					checkPatchIds(repo, repo.GetUserBranchName(), repo.GetMasterBranchName())
-					s := fmt.Sprintf("delete this odd user (%s) branch %s?", bname, repo.FullPath)
-					if fhelp.QuestionUser(s) {
-						repo.RunVerbose([]string{"git", "branch", "-D", bname})
-						// repo.RunVerbose([]string{"git", "checkout", bname})
-					}
-				}
-			} else {
-				log.Info(repo.GetGoPath(), err)
-			}
-		}
-
-		// try to delete devel
-		doRepoCleanDevel(repo)
+		doResetRepo(repo)
 	}
 
 	found := gitpb.NewRepos()