branch select: untracked branches are on their own (revert #590) (#597)

Putting untracked branches under main takes away knowledge
that they are untracked in the branch selection prompt.

Reverts #590

Author: abhinav

.changes/unreleased/Changed-20250222-094533.yaml

@@ -135,14 +135,9 @@ func (p *branchPrompter) Prompt(ctx context.Context, req *branchPromptRequest) (
 	bases := make(map[string]string) // branch -> base
 	for _, branch := range localBranches {
 		res, err := p.store.LookupBranch(ctx, branch.Name)
-		var base string
 		if err == nil {
-			base = res.Base
-		} else if branch.Name != trunk {
-			base = trunk
+			bases[branch.Name] = res.Base
 		}
-
-		bases[branch.Name] = base
 	}
 
 	items := make([]widget.BranchTreeItem, 0, len(localBranches))

branch.go

@@ -74,24 +74,24 @@ whatever
 "bar"
 ===
 > Select a branch to checkout: 
+> baz
 > ┏━□ bar
-> ┣━□ baz
 > ┣━□ foo
-> ┣━□ quux
-> ┣━□ qux
 > main ◀
+> quux
+> qux
 "baz"
 ===
 > Do you want to track this branch now?: [Y/n]
 true
 ===
 > Select a branch to checkout: 
+> baz
 > ┏━□ bar
-> ┣━□ baz
 > ┣━□ foo
-> ┣━□ quux
-> ┣━□ qux
 > main ◀
+> quux
+> qux
 "baz"
 ===
 > Do you want to track this branch now?: [Y/n]

testdata/script/branch_checkout_prompt.txt

@@ -73,28 +73,28 @@ whatever
 -- robot.golden --
 ===
 > Select a branch to checkout: 
+> bcd
+> ccc
+> ddd
 > ┏━□ aaa
 > ┣━□ bbb
-> ┣━□ bcd
-> ┣━□ ccc
-> ┣━□ ddd
 > main ◀
 "bbb"
 ===
 > Select a branch to checkout: 
 > ┏━□ aaa
-> ┣━□ ccc
 > ┣━□ bbb
-> ┣━□ ddd
-> ┣━□ bcd
 > main ◀
+> ccc
+> ddd
+> bcd
 "aaa"
 ===
 > Select a branch to checkout: 
-> ┏━□ bcd
-> ┣━□ ddd
-> ┣━□ bbb
-> ┣━□ ccc
+> bcd
+> ddd
+> ccc
+> ┏━□ bbb
 > ┣━□ aaa
 > main ◀
 "bbb"

testdata/script/branch_checkout_prompt_sort_order.txt

@@ -63,15 +63,15 @@ whatever
 -- robot.golden --
 ===
 > Select a branch to delete: 
-> ┏━■ aaa ◀
+> ccc ◀
+> ┏━□ aaa
 > ┣━□ bbb
-> ┣━□ ccc
 > main
 "ccc"
 ===
 > Select a branch to delete: 
 > ┏━■ bbb ◀
-> ┣━□ ccc
 > ┣━□ aaa
 > main
+> ccc
 "bbb"

testdata/script/branch_delete_prompt_sort_order.txt

@@ -26,10 +26,10 @@ cmp stderr $WORK/stderr.golden
 -- robot.golden --
 ===
 > Select a branch to delete: 
-> ┏━□ a
-> ┣━□ b
-> ┣━■ c ◀
-> ┣━□ d
+> a
+> b
+> c ◀
+> d
 > main
 true
 -- stderr.golden --