Incorporate worktree information into graph and workspace.

Author: Byron

crates/but-graph/tests/fixtures/scenarios.sh

@@ -120,6 +120,13 @@ git init multi-root
   git checkout main && git merge --allow-unrelated-histories C
 )
 
+git init ambiguous-worktrees
+(cd ambiguous-worktrees
+  commit M
+  git worktree add ../wt-outside-ambiguous-worktree
+  git worktree add wt-inside-ambiguous-worktree
+)
+
 # A single root that splits up into 4 branches and merges again
 git init four-diamond
 (cd four-diamond
@@ -205,6 +212,31 @@ git init special-branches
 
 mkdir ws
 (cd ws
+  git init ambiguous-worktrees
+  (cd ambiguous-worktrees
+    set -x
+    commit M1
+    commit M-base
+
+    git branch A
+    git worktree add -b A-inside wt-A-inside
+    git worktree add -b A-outside ../wt-A-outside
+
+    git checkout -b soon-origin-A main
+      commit A-remote
+    git checkout main
+      commit M-advanced
+      setup_target_to_match_main
+
+    git checkout -b B A
+      commit B
+    git checkout A
+    git worktree add wt-B-inside B
+
+    create_workspace_commit_once A B
+    setup_remote_tracking soon-origin-A A "move"
+  )
+
   git init remote-and-integrated-tracking-linear
   (cd remote-and-integrated-tracking-linear
      commit M1

crates/but-graph/tests/graph/init/mod.rs

@@ -723,6 +723,27 @@ fn special_branch_names_do_not_end_up_in_segment() -> anyhow::Result<()> {
     Ok(())
 }
 
+#[test]
+fn ambiguous_worktrees() -> anyhow::Result<()> {
+    let (repo, meta) = read_only_in_memory_scenario("ambiguous-worktrees")?;
+    insta::assert_snapshot!(visualize_commit_graph_all(&repo)?, @"* 85efbe4 (HEAD -> main, wt-outside-ambiguous-worktree, wt-inside-ambiguous-worktree) M");
+
+    let graph = Graph::from_head(&repo, &*meta, standard_options())?.validated()?;
+    // TODO: show worktree ids at least, make main workspace clear
+    insta::assert_snapshot!(graph_tree(&graph), @r"
+    └── 👉►:0[0]:main
+        └── ·85efbe4 (⌂|1) ►wt-inside-ambiguous-worktree, ►wt-outside-ambiguous-worktree
+    ");
+
+    insta::assert_snapshot!(graph_workspace(&graph.to_workspace()?), @r"
+    ⌂:0:main <> ✓!
+    └── ≡:0:main
+        └── :0:main
+            └── ·85efbe4 ►wt-inside-ambiguous-worktree, ►wt-outside-ambiguous-worktree
+    ");
+    Ok(())
+}
+
 mod with_workspace;
 
 mod utils;

crates/but-graph/tests/graph/init/with_workspace.rs

@@ -5462,6 +5462,57 @@ fn no_ws_commit_two_branches_no_target() -> anyhow::Result<()> {
     Ok(())
 }
 
+#[test]
+fn ambiguous_worktrees() -> anyhow::Result<()> {
+    let (repo, mut meta) = read_only_in_memory_scenario("ws/ambiguous-worktrees")?;
+    insta::assert_snapshot!(visualize_commit_graph_all(&repo)?, @r"
+    *   a5f94a2 (HEAD -> gitbutler/workspace) GitButler Workspace Commit
+    |\  
+    | * 3e01e28 (B) B
+    |/  
+    | * 8dc508f (origin/main, main) M-advanced
+    |/  
+    | * 197ddce (origin/A) A-remote
+    |/  
+    * 081bae9 (A-outside, A-inside, A) M-base
+    * 3183e43 M1
+    ");
+
+    add_stack_with_segments(&mut meta, 0, "A", StackState::InWorkspace, &[]);
+    let graph = Graph::from_head(&repo, &*meta, standard_options())?.validated()?;
+    // TODO: Show worktrees
+    insta::assert_snapshot!(graph_tree(&graph), @r"
+    ├── 👉📕►►►:0[0]:gitbutler/workspace
+    │   └── ·a5f94a2 (⌂|🏘|1)
+    │       ├── ►:5[1]:B
+    │       │   └── ·3e01e28 (⌂|🏘|1)
+    │       │       └── ►:3[2]:anon: →:6:
+    │       │           ├── ·081bae9 (⌂|🏘|✓|1111) ►A-inside, ►A-outside
+    │       │           └── ·3183e43 (⌂|🏘|✓|1111)
+    │       └── 📙►:6[1]:A <> origin/A →:4:
+    │           └── →:3:
+    ├── ►:1[0]:origin/main →:2:
+    │   └── ►:2[1]:main <> origin/main →:1:
+    │       └── ·8dc508f (⌂|✓|10)
+    │           └── →:3:
+    └── ►:4[0]:origin/A →:6:
+        └── 🟣197ddce (0x0|1000)
+            └── →:3:
+    ");
+
+    graph.open_as_svg();
+    insta::assert_snapshot!(graph_workspace(&graph.to_workspace()?), @r"
+    📕🏘️:0:gitbutler/workspace <> ✓refs/remotes/origin/main⇣1 on 081bae9
+    ├── ≡📙:6:A <> origin/A →:4:⇣1 on 081bae9 {0}
+    │   └── 📙:6:A <> origin/A →:4:⇣1
+    │       └── 🟣197ddce
+    └── ≡:5:B on 081bae9
+        └── :5:B
+            └── ·3e01e28 (🏘️)
+    ");
+    Ok(())
+}
+
 mod edit_commit {
     use but_graph::Graph;
     use but_testsupport::{graph_tree, graph_workspace, visualize_commit_graph_all};