diff --git a/src/commonMain/kotlin/com/mattprecious/stacker/command/branch/BranchTrack.kt b/src/commonMain/kotlin/com/mattprecious/stacker/command/branch/BranchTrack.kt index 62f62775..0908f9b3 100644 --- a/src/commonMain/kotlin/com/mattprecious/stacker/command/branch/BranchTrack.kt +++ b/src/commonMain/kotlin/com/mattprecious/stacker/command/branch/BranchTrack.kt @@ -92,5 +92,15 @@ internal class BranchTrack( val parentSha = vc.getSha(parent) stackManager.trackBranch(branchName, parent, parentSha) + + printStatic( + buildAnnotatedString { + append("Branch ") + branch { append(branchName) } + append(" is now tracked with parent branch ") + branch { append(parent) } + append(".") + } + ) } } diff --git a/src/commonTest/kotlin/com/mattprecious/stacker/test/command/BranchTrackTest.kt b/src/commonTest/kotlin/com/mattprecious/stacker/test/command/BranchTrackTest.kt index 38f9cd24..0b384123 100644 --- a/src/commonTest/kotlin/com/mattprecious/stacker/test/command/BranchTrackTest.kt +++ b/src/commonTest/kotlin/com/mattprecious/stacker/test/command/BranchTrackTest.kt @@ -58,7 +58,7 @@ class BranchTrackTest { gitCommit("Change A") testCommand({ branchTrack(null) }) { - awaitFrame("") + awaitFrame(static = "Branch change-a is now tracked with parent branch main.", output = "") assertThat(awaitResult()).isTrue() } @@ -90,7 +90,9 @@ class BranchTrackTest { testCommand({ repoInit("main", Optional.None) }) gitCreateAndCheckoutBranch("change-a") val parentSha = gitCommit("Change A") - testCommand({ branchTrack(null) }) + testCommand({ branchTrack(null) }) { + awaitFrame(static = "Branch change-a is now tracked with parent branch main.", output = "") + } gitCreateAndCheckoutBranch("change-b") gitCommit("Change B") @@ -107,7 +109,15 @@ class BranchTrackTest { sendKeyEvent(KeyEvent("ArrowUp")) sendKeyEvent(KeyEvent("Enter")) - awaitFrame(static = "Choose a parent branch for change-b: change-a", output = "") + awaitFrame( + static = + """ + Choose a parent branch for change-b: change-a + Branch change-b is now tracked with parent branch change-a. + """ + .trimIndent(), + output = "", + ) assertThat(awaitResult()).isTrue() } @@ -147,13 +157,15 @@ class BranchTrackTest { testCommand({ repoInit("main", Optional.None) }) gitCreateAndCheckoutBranch("change-a") gitCommit("Change A") - testCommand({ branchTrack(null) }) + testCommand({ branchTrack(null) }) { + awaitFrame(static = "Branch change-a is now tracked with parent branch main.", output = "") + } gitCheckoutBranch("main") gitCreateAndCheckoutBranch("change-b") gitCommit("Change B") testCommand({ branchTrack(null) }) { - awaitFrame("") + awaitFrame(static = "Branch change-b is now tracked with parent branch main.", output = "") assertThat(awaitResult()).isTrue() }