Skip to content

Print message when branch is tracked #405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattprecious merged 1 commit into from
Apr 1, 2026
Merged

Print message when branch is tracked #405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/commonMain/kotlin/com/mattprecious/stacker/command/branch/BranchTrack.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(".")
}
)
}
}
22 changes: 17 additions & 5 deletions src/commonTest/kotlin/com/mattprecious/stacker/test/command/BranchTrackTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}

Expand Down Expand Up @@ -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")

Expand All @@ -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()
}
Expand Down Expand Up @@ -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()
}

Expand Down