From 8126da6207078bfb354c74e17d51dfdda320e6db Mon Sep 17 00:00:00 2001 From: maciej-stanuch Date: Wed, 6 Jul 2022 17:11:14 +0200 Subject: [PATCH 1/4] Allow for use of timer outside of git repository --- mob.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mob.go b/mob.go index 39f928e3..78aa6e42 100644 --- a/mob.go +++ b/mob.go @@ -951,6 +951,11 @@ func startTimer(timerInMinutes string, configuration Configuration) { } func getMobTimerRoom(configuration Configuration) string { + if !isGit() { + debugInfo("timer not in git repository, using MOB_TIMER_ROOM for room name") + return configuration.TimerRoom + } + currentWipBranchQualifier := configuration.WipBranchQualifier if currentWipBranchQualifier == "" { currentBranch := gitCurrentBranch() @@ -966,6 +971,7 @@ func getMobTimerRoom(configuration Configuration) string { sayInfo("Using wip branch qualifier for room name") return currentWipBranchQualifier } + return configuration.TimerRoom } From 934d35b3813b81ab9511fe971738c1b43a6d26be Mon Sep 17 00:00:00 2001 From: maciej-stanuch Date: Wed, 6 Jul 2022 17:31:14 +0200 Subject: [PATCH 2/4] Add changelog for timer change --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b5790fbe..083f401e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # 3.1.5 - Add a more specific error message if `git` is not installed. +- Allow for using `mob timer` outside of git repositories. - Fix: `mob done --squash-wip` now successfully auto-merges auto-mergeable diverging changes. - Print the help output whenever any kind of help argument (`help`, `--help`, `-h`) is present in the command, e.g. `mob s 10 -h`. - Various fixes in suggestion of next typist: From 38e19a7811524a6476ea2ebf59be303d622311f4 Mon Sep 17 00:00:00 2001 From: maciej-stanuch Date: Wed, 6 Jul 2022 17:31:46 +0200 Subject: [PATCH 3/4] Extract method for getting current WIP branch qualifier --- mob.go | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/mob.go b/mob.go index 78aa6e42..8b54f06f 100644 --- a/mob.go +++ b/mob.go @@ -956,23 +956,28 @@ func getMobTimerRoom(configuration Configuration) string { return configuration.TimerRoom } - currentWipBranchQualifier := configuration.WipBranchQualifier - if currentWipBranchQualifier == "" { + currentWipBranchQualifier := getCurrentWipBranchQualifier(configuration) + + if configuration.TimerRoomUseWipBranchQualifier && currentWipBranchQualifier != "" { + sayInfo("Using wip branch qualifier for room name") + return currentWipBranchQualifier + } + + return configuration.TimerRoom +} + +func getCurrentWipBranchQualifier(configuration Configuration) string { + if configuration.WipBranchQualifier == "" { currentBranch := gitCurrentBranch() currentBaseBranch, _ := determineBranches(currentBranch, gitBranches(), configuration) if currentBranch.IsWipBranch(configuration) { wipBranchWithoutWipPrefix := currentBranch.removeWipPrefix(configuration).Name - currentWipBranchQualifier = removePrefix(removePrefix(wipBranchWithoutWipPrefix, currentBaseBranch.Name), configuration.WipBranchQualifierSeparator) + return removePrefix(removePrefix(wipBranchWithoutWipPrefix, currentBaseBranch.Name), configuration.WipBranchQualifierSeparator) } } - if configuration.TimerRoomUseWipBranchQualifier && currentWipBranchQualifier != "" { - sayInfo("Using wip branch qualifier for room name") - return currentWipBranchQualifier - } - - return configuration.TimerRoom + return configuration.WipBranchQualifier } func startBreakTimer(timerInMinutes string, configuration Configuration) { From 3dc99fec3b9d52cf022fde96ed10545c9a90dd31 Mon Sep 17 00:00:00 2001 From: maciej-stanuch Date: Tue, 12 Jul 2022 22:23:51 +0200 Subject: [PATCH 4/4] Revert "Extract method for getting current WIP branch qualifier" This reverts commit 38e19a7811524a6476ea2ebf59be303d622311f4. --- mob.go | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/mob.go b/mob.go index 8b54f06f..78aa6e42 100644 --- a/mob.go +++ b/mob.go @@ -956,28 +956,23 @@ func getMobTimerRoom(configuration Configuration) string { return configuration.TimerRoom } - currentWipBranchQualifier := getCurrentWipBranchQualifier(configuration) - - if configuration.TimerRoomUseWipBranchQualifier && currentWipBranchQualifier != "" { - sayInfo("Using wip branch qualifier for room name") - return currentWipBranchQualifier - } - - return configuration.TimerRoom -} - -func getCurrentWipBranchQualifier(configuration Configuration) string { - if configuration.WipBranchQualifier == "" { + currentWipBranchQualifier := configuration.WipBranchQualifier + if currentWipBranchQualifier == "" { currentBranch := gitCurrentBranch() currentBaseBranch, _ := determineBranches(currentBranch, gitBranches(), configuration) if currentBranch.IsWipBranch(configuration) { wipBranchWithoutWipPrefix := currentBranch.removeWipPrefix(configuration).Name - return removePrefix(removePrefix(wipBranchWithoutWipPrefix, currentBaseBranch.Name), configuration.WipBranchQualifierSeparator) + currentWipBranchQualifier = removePrefix(removePrefix(wipBranchWithoutWipPrefix, currentBaseBranch.Name), configuration.WipBranchQualifierSeparator) } } - return configuration.WipBranchQualifier + if configuration.TimerRoomUseWipBranchQualifier && currentWipBranchQualifier != "" { + sayInfo("Using wip branch qualifier for room name") + return currentWipBranchQualifier + } + + return configuration.TimerRoom } func startBreakTimer(timerInMinutes string, configuration Configuration) {