Skip to content

Commit bfcf5c2

Browse files
hollessehollesse
committed
Refactor uncommitted changes handling
Unified configuration handling for uncommitted changes into `HandleUncommittedChanges` and added corresponding constants. Updated tests and logic to reflect this new approach, ensuring better maintainability and clarity.
1 parent e4d1d41 commit bfcf5c2

File tree

4 files changed

+66
-62
lines changed

4 files changed

+66
-62
lines changed

‎configuration/configuration.go‎

Lines changed: 35 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@ const (
1515
SquashWip = "squash-wip"
1616
)
1717

18+
const (
19+
IncludeChanges = "include-changes"
20+
DiscardChanges = "discard-changes"
21+
FailWithError = "fail-with-error"
22+
)
23+
1824
type Configuration struct {
1925
CliName string // override with MOB_CLI_NAME
2026
RemoteName string // override with MOB_REMOTE_NAME
@@ -28,8 +34,7 @@ type Configuration struct {
2834
NotifyCommand string // override with MOB_NOTIFY_COMMAND
2935
NotifyMessage string // override with MOB_NOTIFY_MESSAGE
3036
NextStay bool // override with MOB_NEXT_STAY
31-
StartDiscardUncommittedChanges bool
32-
StartIncludeUncommittedChanges bool
37+
HandleUncommittedChanges string
3338
StartCreate bool // override with MOB_START_CREATE variable
3439
StartJoin bool
3540
StashName string // override with MOB_STASH_NAME
@@ -120,9 +125,9 @@ func ParseArgs(args []string, configuration Configuration) (command string, para
120125
arg := args[i]
121126
switch arg {
122127
case "--discard-uncommitted-changes", "-d":
123-
newConfiguration.StartDiscardUncommittedChanges = true
128+
newConfiguration.HandleUncommittedChanges = DiscardChanges
124129
case "--include-uncommitted-changes", "-i":
125-
newConfiguration.StartIncludeUncommittedChanges = true
130+
newConfiguration.HandleUncommittedChanges = IncludeChanges
126131
case "--debug":
127132
// ignore this, already parsed
128133
case "--stay", "-s":
@@ -184,33 +189,32 @@ func GetDefaultConfiguration() Configuration {
184189

185190
}
186191
return Configuration{
187-
CliName: "mob",
188-
RemoteName: "origin",
189-
WipCommitMessage: "mob next [ci-skip] [ci skip] [skip ci]",
190-
StartCommitMessage: "mob start [ci-skip] [ci skip] [skip ci]",
191-
SkipCiPushOptionEnabled: true,
192-
GitHooksEnabled: false,
193-
VoiceCommand: voiceCommand,
194-
VoiceMessage: "mob next",
195-
NotifyCommand: notifyCommand,
196-
NotifyMessage: "mob next",
197-
NextStay: true,
198-
RequireCommitMessage: false,
199-
StartDiscardUncommittedChanges: false,
200-
StartIncludeUncommittedChanges: false,
201-
StartCreate: false,
202-
WipBranchQualifier: "",
203-
WipBranchQualifierSeparator: "-",
204-
DoneSquash: Squash,
205-
OpenCommand: "",
206-
Timer: "",
207-
TimerLocal: true,
208-
TimerRoom: "",
209-
TimerUser: "",
210-
TimerUrl: "https://timer.mob.sh/",
211-
WipBranchPrefix: "mob/",
212-
StashName: "mob-stash-name",
213-
ResetDeleteRemoteWipBranch: false,
192+
CliName: "mob",
193+
RemoteName: "origin",
194+
WipCommitMessage: "mob next [ci-skip] [ci skip] [skip ci]",
195+
StartCommitMessage: "mob start [ci-skip] [ci skip] [skip ci]",
196+
SkipCiPushOptionEnabled: true,
197+
GitHooksEnabled: false,
198+
VoiceCommand: voiceCommand,
199+
VoiceMessage: "mob next",
200+
NotifyCommand: notifyCommand,
201+
NotifyMessage: "mob next",
202+
NextStay: true,
203+
RequireCommitMessage: false,
204+
HandleUncommittedChanges: FailWithError,
205+
StartCreate: false,
206+
WipBranchQualifier: "",
207+
WipBranchQualifierSeparator: "-",
208+
DoneSquash: Squash,
209+
OpenCommand: "",
210+
Timer: "",
211+
TimerLocal: true,
212+
TimerRoom: "",
213+
TimerUser: "",
214+
TimerUrl: "https://timer.mob.sh/",
215+
WipBranchPrefix: "mob/",
216+
StashName: "mob-stash-name",
217+
ResetDeleteRemoteWipBranch: false,
214218
}
215219
}
216220

‎configuration/configuration_test.go‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -103,14 +103,24 @@ func TestParseArgsStartRoom(t *testing.T) {
103103
test.Equals(t, "testroom", configuration.TimerRoom)
104104
}
105105

106+
func TestDefaultConfigurationHandleUncommitedChanges(t *testing.T) {
107+
configuration := GetDefaultConfiguration()
108+
109+
command, parameters, configuration := ParseArgs([]string{"mob", "start"}, configuration)
110+
111+
test.Equals(t, "start", command)
112+
test.Equals(t, 0, len(parameters))
113+
test.Equals(t, FailWithError, configuration.HandleUncommittedChanges)
114+
}
115+
106116
func TestParseArgsIncludeUncommitedChanges(t *testing.T) {
107117
configuration := GetDefaultConfiguration()
108118

109119
command, parameters, configuration := ParseArgs([]string{"mob", "start", "--include-uncommitted-changes"}, configuration)
110120

111121
test.Equals(t, "start", command)
112122
test.Equals(t, 0, len(parameters))
113-
test.Equals(t, true, configuration.StartIncludeUncommittedChanges)
123+
test.Equals(t, IncludeChanges, configuration.HandleUncommittedChanges)
114124
}
115125

116126
func TestParseArgsIncludeUncommitedChangesShort(t *testing.T) {
@@ -120,7 +130,7 @@ func TestParseArgsIncludeUncommitedChangesShort(t *testing.T) {
120130

121131
test.Equals(t, "start", command)
122132
test.Equals(t, 0, len(parameters))
123-
test.Equals(t, true, configuration.StartIncludeUncommittedChanges)
133+
test.Equals(t, IncludeChanges, configuration.HandleUncommittedChanges)
124134
}
125135

126136
func TestParseArgsDiscardUncommitedChanges(t *testing.T) {
@@ -130,7 +140,7 @@ func TestParseArgsDiscardUncommitedChanges(t *testing.T) {
130140

131141
test.Equals(t, "start", command)
132142
test.Equals(t, 0, len(parameters))
133-
test.Equals(t, true, configuration.StartDiscardUncommittedChanges)
143+
test.Equals(t, DiscardChanges, configuration.HandleUncommittedChanges)
134144
}
135145

136146
func TestParseArgsDiscardUncommitedChangesShort(t *testing.T) {
@@ -140,7 +150,7 @@ func TestParseArgsDiscardUncommitedChangesShort(t *testing.T) {
140150

141151
test.Equals(t, "start", command)
142152
test.Equals(t, 0, len(parameters))
143-
test.Equals(t, true, configuration.StartDiscardUncommittedChanges)
153+
test.Equals(t, DiscardChanges, configuration.HandleUncommittedChanges)
144154
}
145155

146156
func TestParseArgsTimerRoom(t *testing.T) {
@@ -228,10 +238,6 @@ func (c Configuration) GetMobDoneSquash() string {
228238
return c.DoneSquash
229239
}
230240

231-
func (c Configuration) GetMobStartIncludeUncommittedChanges() bool {
232-
return c.StartIncludeUncommittedChanges
233-
}
234-
235241
func (c Configuration) GetMobStartCreateRemoteBranch() bool {
236242
return c.StartCreate
237243
}

‎mob.go‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ func deleteRemoteWipBranch(configuration config.Configuration) {
527527

528528
func start(configuration config.Configuration) error {
529529
uncommittedChanges := hasUncommittedChanges()
530-
if uncommittedChanges && !configuration.StartIncludeUncommittedChanges && !configuration.StartDiscardUncommittedChanges {
530+
if uncommittedChanges && configuration.HandleUncommittedChanges == config.FailWithError {
531531
say.Info("cannot start; clean working tree required")
532532
sayUnstagedChangesInfo()
533533
sayUntrackedFilesInfo()
@@ -557,22 +557,16 @@ func start(configuration config.Configuration) error {
557557
return errors.New("cannot start; unpushed changes on base branch must be pushed upstream")
558558
}
559559

560-
if uncommittedChanges && configuration.StartIncludeUncommittedChanges && configuration.StartDiscardUncommittedChanges {
561-
errorMessage := "The options '--include-uncommitted-changes' (-i) and '--discard-uncommitted-changes' (-d) cannot be used together as they are mutually exclusive. Please choose either to include or discard uncommitted changes, but not both."
562-
say.Error(errorMessage)
563-
return errors.New(errorMessage)
564-
}
565-
if uncommittedChanges && configuration.StartDiscardUncommittedChanges {
560+
if uncommittedChanges && configuration.HandleUncommittedChanges == config.DiscardChanges {
566561
git("reset", "--hard")
567562
}
568563

569-
if uncommittedChanges && configuration.StartIncludeUncommittedChanges && silentgit("ls-tree", "-r", "HEAD", "--full-name", "--name-only", ".") == "" {
570-
say.Error("cannot start; current working dir is an uncommitted subdir")
571-
say.Fix("to fix this, go to the parent directory and try again", "cd ..")
572-
return errors.New("cannot start; current working dir is an uncommitted subdir")
573-
}
574-
575-
if uncommittedChanges && configuration.StartIncludeUncommittedChanges {
564+
if uncommittedChanges && configuration.HandleUncommittedChanges == config.IncludeChanges {
565+
if silentgit("ls-tree", "-r", "HEAD", "--full-name", "--name-only", ".") == "" {
566+
say.Error("cannot start; current working dir is an uncommitted subdir")
567+
say.Fix("to fix this, go to the parent directory and try again", "cd ..")
568+
return errors.New("cannot start; current working dir is an uncommitted subdir")
569+
}
576570
git("stash", "push", "--include-untracked", "--message", configuration.StashName)
577571
say.Info("uncommitted changes were stashed. If an error occurs later on, you can recover them with 'git stash pop'.")
578572
}
@@ -589,7 +583,7 @@ func start(configuration config.Configuration) error {
589583
startNewMobSession(configuration)
590584
}
591585

592-
if uncommittedChanges && configuration.StartIncludeUncommittedChanges {
586+
if uncommittedChanges && configuration.HandleUncommittedChanges == config.IncludeChanges {
593587
stashes := silentgit("stash", "list")
594588
stash := findStashByName(stashes, configuration.StashName)
595589
git("stash", "pop", stash)

‎mob_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@ func TestCleanMissingBaseBranch(t *testing.T) {
532532

533533
func TestStartUnstagedChanges(t *testing.T) {
534534
output, configuration := setup(t)
535-
configuration.StartIncludeUncommittedChanges = false
535+
configuration.HandleUncommittedChanges = config.FailWithError
536536
createFile(t, "test.txt", "contentIrrelevant")
537537

538538
start(configuration)
@@ -545,7 +545,7 @@ func TestStartUnstagedChanges(t *testing.T) {
545545

546546
func TestStartIncludeUnstagedChanges(t *testing.T) {
547547
_, configuration := setup(t)
548-
configuration.StartIncludeUncommittedChanges = true
548+
configuration.HandleUncommittedChanges = config.IncludeChanges
549549
createFile(t, "test.txt", "contentIrrelevant")
550550

551551
start(configuration)
@@ -556,7 +556,7 @@ func TestStartIncludeUnstagedChanges(t *testing.T) {
556556

557557
func TestStartDiscardUnstagedChanges(t *testing.T) {
558558
_, configuration := setup(t)
559-
configuration.StartDiscardUncommittedChanges = true
559+
configuration.HandleUncommittedChanges = config.DiscardChanges
560560
createFile(t, "test.txt", "contentIrrelevant")
561561

562562
start(configuration)
@@ -568,7 +568,7 @@ func TestStartDiscardUnstagedChanges(t *testing.T) {
568568

569569
func TestStartIncludeUnstagedChangesInNewWorkingDirectory(t *testing.T) {
570570
output, configuration := setup(t)
571-
configuration.StartIncludeUncommittedChanges = true
571+
configuration.HandleUncommittedChanges = config.IncludeChanges
572572
createDirectory(t, "subdirnew")
573573
setWorkingDir(tempDir + "/local/subdirnew")
574574
createFile(t, "test.txt", "contentIrrelevant")
@@ -600,7 +600,7 @@ func TestBranch(t *testing.T) {
600600

601601
func TestStartIncludeUntrackedFiles(t *testing.T) {
602602
_, configuration := setup(t)
603-
configuration.StartIncludeUncommittedChanges = true
603+
configuration.HandleUncommittedChanges = config.IncludeChanges
604604
createFile(t, "example.txt", "contentIrrelevant")
605605

606606
start(configuration)
@@ -610,7 +610,7 @@ func TestStartIncludeUntrackedFiles(t *testing.T) {
610610

611611
func TestStartUntrackedFiles(t *testing.T) {
612612
_, configuration := setup(t)
613-
configuration.StartIncludeUncommittedChanges = false
613+
configuration.HandleUncommittedChanges = config.FailWithError
614614
createFile(t, "example.txt", "contentIrrelevant")
615615

616616
start(configuration)
@@ -683,7 +683,7 @@ func TestStartCreateIncludeUncommitedChangesOnUnpushedFeatureBranchWithUncommite
683683
createFile(t, "file.txt", "contentIrrelevant")
684684

685685
configuration.StartCreate = true
686-
configuration.StartIncludeUncommittedChanges = true
686+
configuration.HandleUncommittedChanges = config.IncludeChanges
687687
start(configuration)
688688

689689
assertOnBranch(t, "mob/feature1")
@@ -695,7 +695,7 @@ func TestStartCreateIncludeUncommitedChangesOnUnpushedFeatureBranchWithUncommite
695695
createFile(t, "file.txt", "contentIrrelevant")
696696

697697
configuration.StartCreate = true
698-
configuration.StartIncludeUncommittedChanges = true
698+
configuration.HandleUncommittedChanges = config.IncludeChanges
699699
configuration.WipBranchQualifier = "green"
700700
start(configuration)
701701

0 commit comments

Comments
 (0)