1 files changed, 35 insertions, 51 deletions
diff --git a/configfile.go b/configfile.go
index c6f79ed..98543c6 100644
--- a/configfile.go
+++ b/configfile.go
@@ -108,40 +108,6 @@ func parsecfg(f string) []string {
 	return lines
 }
 
-func (rl *RepoList) ArgCheckoutUser() bool {
-	log.Log(REPOWARN, "running git checkout devel everwhere")
-	var failed int = 0
-	for _, repo := range rl.AllRepos() {
-		if repo.Status.ReadOnly() {
-			// log.Log(REPOWARN,"skipping read-only", repo.Name())
-			continue
-		}
-		if repo.Status.CheckDirty() {
-			log.Log(REPOWARN, "skipping dirty repo", repo.Name())
-			continue
-		}
-		branch := repo.Status.GetUserBranchName()
-		if branch == repo.Status.GetCurrentBranchName() {
-			// already on user branch
-			continue
-		}
-		cmd := []string{"git", "checkout", branch}
-		log.Log(REPOWARN, "Running:", cmd, "in", repo.Name())
-		err, output := repo.RunCmd(cmd)
-		if err == nil {
-			log.Log(REPOWARN, "git checkout worked", output)
-		} else {
-			failed += 1
-			log.Log(REPOWARN, "git checkout failed")
-			log.Log(REPOWARN, "Something went wrong. Got err", err)
-			log.Log(REPOWARN, "output =", output)
-			// return false
-		}
-	}
-	log.Log(REPOWARN, "Ran git checkout in all repos. failure count =", failed)
-	return true
-}
-
 func (rl *RepoList) ArgGitPull() bool {
 	var localonly int
 	var badmap int
@@ -182,29 +148,47 @@ func (rl *RepoList) ArgGitPull() bool {
 func (rl *RepoList) ArgCheckoutDevel() bool {
 	log.Log(REPOWARN, "running git checkout devel everwhere")
 	var failed int = 0
+	var count int = 0
 	for _, repo := range rl.AllRepos() {
-		if repo.Status.ReadOnly() {
-			// log.Log(REPOWARN,"skipping read-only", repo.Name())
-			continue
+		count += 1
+		if repo.Status.CheckoutDevel() {
+			// checkout ok
+		} else {
+			failed += 1
 		}
-		if repo.CheckDirty() {
-			log.Log(REPOWARN, "skipping dirty repo", repo.Name())
-			continue
+	}
+	log.Log(REPOWARN, "Ran git checkout in", count, "repos. failure count =", failed)
+	return true
+}
+
+func (rl *RepoList) ArgCheckoutMaster() bool {
+	log.Log(REPOWARN, "running git checkout master everwhere")
+	var failed int = 0
+	var count int = 0
+	for _, repo := range rl.AllRepos() {
+		count += 1
+		if repo.Status.CheckoutMaster() {
+			// checkout ok
+		} else {
+			failed += 1
 		}
-		branch := repo.Status.GetDevelBranchName()
-		cmd := []string{"git", "checkout", branch}
-		log.Log(REPOWARN, "Running:", cmd, "in", repo.Name())
-		err, output := repo.RunCmd(cmd)
-		if err == nil {
-			log.Log(REPOWARN, "git checkout worked", output)
+	}
+	log.Log(REPOWARN, "Ran git checkout in", count, "repos. failure count =", failed)
+	return true
+}
+
+func (rl *RepoList) ArgCheckoutUser() bool {
+	log.Log(REPOWARN, "running git checkout master everwhere")
+	var failed int = 0
+	var count int = 0
+	for _, repo := range rl.AllRepos() {
+		count += 1
+		if repo.Status.CheckoutUser() {
+			// checkout ok
 		} else {
 			failed += 1
-			log.Log(REPOWARN, "git checkout failed")
-			log.Log(REPOWARN, "Something went wrong. Got err", err)
-			log.Log(REPOWARN, "output =", output)
-			// return false
 		}
 	}
-	log.Log(REPOWARN, "Ran git checkout in all repos. failure count =", failed)
+	log.Log(REPOWARN, "Ran git checkout in", count, "repos. failure count =", failed)
 	return true
 }