Merge pull request remotemobprogramming#386 from remotemobprogramming/fixMissingParameterInFix

fix the logging how to fix uncommited changes

Author: gregorriegler

.github/workflows/ci.yaml

@@ -33,9 +33,9 @@ jobs:
         sudo make install install-info
     - name: Show git version
       run: git version
-    - name: Use Go 1.16.x
-      uses: actions/setup-go@v2
+    - name: Use Go 1.20.x
+      uses: actions/setup-go@v4
       with:
-        go-version: '~1.16.0'
+        go-version: '~1.20'
     - name: Test
       run: go test -test.v

.github/workflows/release.yaml

@@ -16,10 +16,10 @@ jobs:
       sha_linux: ${{ steps.shasum.outputs.sha_linux }}
     steps:
       - uses: actions/checkout@main
-      - name: Use Go 1.16.x
-        uses: actions/setup-go@v2
+      - name: Use Go 1.20.x
+        uses: actions/setup-go@v4
         with:
-          go-version: '~1.16.0'
+          go-version: '~1.20'
       - name: Test
         run: go test
         env:

.github/workflows/virustotal.yaml

@@ -11,9 +11,9 @@ jobs:
         uses: actions/checkout@v3
       -
         name: Set up Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
-          go-version: '~1.16.0'
+          go-version: '~1.20'
       -
         name: Build
         run: |

go.mod

@@ -1,3 +1,3 @@
 module github.com/remotemobprogramming/mob/v4
 
-go 1.15
+go 1.20

mob.go

@@ -33,6 +33,7 @@ const (
 
 var (
 	workingDir                 = ""
+	args                       []string
 	GitPassthroughStderrStdout = false // hack to get git hooks to print to stdout/stderr
 )
 
@@ -233,7 +234,8 @@ func main() {
 	run(os.Args)
 }
 
-func run(args []string) {
+func run(osArgs []string) {
+	args = osArgs
 	say.TurnOnDebuggingByArgs(args)
 	say.Debug(runtime.Version())
 
@@ -818,11 +820,7 @@ func start(configuration config.Configuration) error {
 		say.Info("cannot start; clean working tree required")
 		sayUnstagedChangesInfo()
 		sayUntrackedFilesInfo()
-		if configuration.StartCreate {
-			say.Fix("To start, including uncommitted changes and create the remote branch, use", configuration.Mob("start --create --include-uncommitted-changes"))
-		} else {
-			say.Fix("To start, including uncommitted changes, use", configuration.Mob("start --include-uncommitted-changes"))
-		}
+		sayFixUncommitedChanges(configuration)
 		return errors.New("cannot start; clean working tree required")
 	}
 
@@ -880,6 +878,36 @@ func start(configuration config.Configuration) error {
 	return nil // no error
 }
 
+func sayFixUncommitedChanges(configuration config.Configuration) {
+	fixCommand := configuration.CliName + " start"
+	instruction := "To start, including uncommitted changes, use"
+	if configuration.StartCreate {
+		instruction = "To start, including uncommitted changes and create the remote branch, use"
+		fixCommand += " --create"
+	}
+	if containsAny(args, "-b", "--branch") && configuration.WipBranchQualifier != "" {
+		fixCommand += " --branch " + configuration.WipBranchQualifier
+	}
+	fixCommand += " --include-uncommitted-changes"
+
+	say.Fix(instruction, fixCommand)
+}
+
+func branchParameter(configuration config.Configuration) bool {
+	return containsAny(args, "-b", "--branch") && configuration.WipBranchQualifier != ""
+}
+
+func containsAny(list []string, elements ...string) bool {
+	for _, value := range list {
+		for _, element := range elements {
+			if value == element {
+				return true
+			}
+		}
+	}
+	return false
+}
+
 func createRemoteBranch(configuration config.Configuration, currentBaseBranch Branch) {
 	if !currentBaseBranch.hasRemoteBranch(configuration) && configuration.StartCreate {
 		git("push", configuration.RemoteName, currentBaseBranch.String(), "--set-upstream")

mob_test.go

@@ -1406,6 +1406,53 @@ func TestStartNextPushManualCommits(t *testing.T) {
 	assertFileExist(t, "example.txt")
 }
 
+func TestStartBranchWithUncommitedChangesFixWithBranch(t *testing.T) {
+	output, _ := setup(t)
+
+	setWorkingDir(tempDir + "/local")
+
+	createFile(t, "uncommited.txt", "contentIrrelevant")
+	runMob(t, tempDir+"/local", "start", "-b", "green")
+
+	assertOutputContains(t, output, "mob start --branch green --include-uncommitted-changes")
+}
+
+func TestStartBranchEnvWithUncommitedChangesFixWithoutBranch(t *testing.T) {
+	output, _ := setup(t)
+
+	setWorkingDir(tempDir + "/local")
+	t.Setenv("MOB_WIP_BRANCH_QUALIFIER", "red")
+	createFile(t, "uncommited.txt", "contentIrrelevant")
+	runMob(t, tempDir+"/local", "start")
+
+	assertOutputContains(t, output, "mob start --include-uncommitted-changes")
+}
+
+func TestStartCreateBranchWithUncommitedChangesFixWithBranch(t *testing.T) {
+	output, _ := setup(t)
+
+	setWorkingDir(tempDir + "/local")
+
+	git("checkout", "-b", "unpushedBranch")
+	createFile(t, "uncommited.txt", "contentIrrelevant")
+	runMob(t, tempDir+"/local", "start", "--create", "-b", "green")
+
+	assertOutputContains(t, output, "mob start --create --branch green --include-uncommitted-changes")
+}
+
+func TestStartCreateBranchEnvWithUncommitedChangesFixWithoutBranch(t *testing.T) {
+	output, _ := setup(t)
+
+	setWorkingDir(tempDir + "/local")
+	os.Setenv("MOB_WIP_BRANCH_QUALIFIER", "red")
+	git("checkout", "-b", "unpushedBranch")
+	createFile(t, "uncommited.txt", "contentIrrelevant")
+	runMob(t, tempDir+"/local", "start", "--create")
+
+	os.Unsetenv("MOB_WIP_BRANCH_QUALIFIER")
+	assertOutputContains(t, output, "mob start --create --include-uncommitted-changes")
+}
+
 func TestStartNextPushManualCommitsFeatureBranch(t *testing.T) {
 	_, configuration := setup(t)
 
@@ -1783,46 +1830,49 @@ func TestGitVersionCompare(t *testing.T) {
 }
 
 func TestMobConfigWorksOutsideOfGitRepository(t *testing.T) {
-	output := runMob(t, t.TempDir(), "config")
+	output := captureOutput(t)
+	runMob(t, t.TempDir(), "config")
 
 	assertOutputNotContains(t, output, "ERROR")
 	assertOutputContains(t, output, "MOB_CLI_NAME=\"mob\"")
 }
 
 func TestMobHelpWorksOutsideOfGitRepository(t *testing.T) {
-	output := runMob(t, t.TempDir(), "help")
+	output := captureOutput(t)
+	runMob(t, t.TempDir(), "help")
 
 	assertOutputNotContains(t, output, "ERROR")
 	assertOutputContains(t, output, "Basic Commands:")
 }
 
 func TestMobShowsHelpIfCommandIsUnknownAndOutsideOfGitRepository(t *testing.T) {
-	output := runMob(t, t.TempDir(), "unknown")
+	output := captureOutput(t)
+	runMob(t, t.TempDir(), "unknown")
 
 	assertOutputNotContains(t, output, "ERROR")
 	assertOutputContains(t, output, "Basic Commands:")
 }
 
 func TestMobMooWorksOutsideOfGitRepository(t *testing.T) {
-	output := runMob(t, t.TempDir(), "help")
+	output := captureOutput(t)
+	runMob(t, t.TempDir(), "help")
 
 	assertOutputNotContains(t, output, "ERROR")
 	assertOutputContains(t, output, "moo")
 }
 
 func TestMobVersionWorksOutsideOfGitRepository(t *testing.T) {
-	output := runMob(t, t.TempDir(), "version")
+	output := captureOutput(t)
+	runMob(t, t.TempDir(), "version")
 
 	assertOutputNotContains(t, output, "ERROR")
 	assertOutputContains(t, output, "v"+versionNumber)
 }
 
-func runMob(t *testing.T, workingDir string, args ...string) *string {
+func runMob(t *testing.T, workingDir string, args ...string) {
 	setWorkingDir(workingDir)
-	output := captureOutput(t)
 	newArgs := append([]string{"mob"}, args...)
 	run(newArgs)
-	return output
 }
 
 func gitStatus() GitStatus {
@@ -1842,13 +1892,13 @@ func gitStatus() GitStatus {
 func setup(t *testing.T) (output *string, configuration config.Configuration) {
 	configuration = config.GetDefaultConfiguration()
 	configuration.NextStay = false
-	output = captureOutput(t)
 	createTestbed(t, configuration)
 	assertOnBranch(t, "master")
 	equals(t, []string{"master"}, gitBranches())
 	equals(t, []string{"origin/master"}, gitRemoteBranches())
 	assertNoMobSessionBranches(t, configuration, "mob-session")
 	abortRunningTimers()
+	output = captureOutput(t)
 	return output, configuration
 }