strip out some cruft

1 files changed, 2 insertions, 34 deletions

diff --git a/doClean.go b/doClean.go
index 9e65a7b..33b2298 100644
--- a/doClean.go
+++ b/doClean.go
@@ -29,19 +29,7 @@ func doResetRepo(repo *gitpb.Repo) error {
 
 	// 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.Namespace, err)
-		}
+		return err
 	}
 
 	// try to delete devel
@@ -52,17 +40,6 @@ func doResetRepo(repo *gitpb.Repo) error {
 // reverts all repos back to the original master branches
 // automatically deletes local devel and user branches
 func doClean() (string, error) {
-	if argv.Clean.Repo != "" {
-		setForgeMode(forgepb.ForgeMode_CLEAN)
-		s := log.Sprintf("only reset repo: %s", argv.Clean.Repo)
-		if found := me.forge.Repos.FindByNamespace(argv.Clean.Repo); found != nil {
-			return s, doResetRepo(found)
-		}
-		if found := me.forge.Repos.FindByFullPath(argv.Clean.Repo); found != nil {
-			return s, doResetRepo(found)
-		}
-		return "cleaned working dir", log.Errorf("repo not found: %s", argv.Clean.Repo)
-	}
 	if argv.Clean.List != nil {
 		s, err := doCleanList()
 		return s, err
@@ -74,7 +51,7 @@ func doClean() (string, error) {
 			log.Info("Run: 'forge checkout master'")
 		}
 	}
-	setForgeMode(forgepb.ForgeMode_CLEAN)
+	me.forge.SetMode(forgepb.ForgeMode_CLEAN)
 
 	// fix this to work, then delete all the other options for "forge clean'
 	if err := me.forge.DoAllCheckoutMaster(); err != nil {
@@ -150,15 +127,6 @@ func doRepoCleanDevel(repo *gitpb.Repo) error {
 	}
 	if err := justDeleteTheDevelBranchAlready(repo); err != nil {
 		log.Info("justDeleteTheDevel() err", repo.Namespace, err)
-		if argv.Clean.Fix != nil {
-			bname := repo.GetDevelBranchName()
-			checkPatchIds(repo, repo.GetDevelBranchName(), repo.GetMasterBranchName())
-			s := fmt.Sprintf("delete this odd devel (%s) branch %s?", bname, repo.FullPath)
-			if fhelp.QuestionUser(s) {
-				repo.RunVerbose([]string{"git", "branch", "-D", bname})
-				// repo.RunVerbose([]string{"git", "checkout", bname})
-			}
-		}
 		return err
 	}
 	return nil