Merge pull request #8905 from Byron/head-info

ref-info: normal workflow

Author: Byron

crates/but-workspace/src/ref_info.rs

@@ -942,7 +942,6 @@ pub(crate) mod function {
                     })
                     .collect();
 
-            // TODO: get `hide()` for `gix`.
             for (segment_index, remote_ref_tip_and_base) in segments_with_remote_ref_tips_and_base {
                 boundary.clear();
                 boundary.extend(stack.base);

crates/but-workspace/tests/fixtures/scenario/with-remotes-and-workspace.sh

@@ -383,3 +383,26 @@ git init multiple-dependent-branches-per-stack-without-commit
 
   create_workspace_commit_once lane lane-2
 )
+
+git init two-dependent-branches-with-interesting-remote-setup
+(cd two-dependent-branches-with-interesting-remote-setup
+  git commit -m "init" --allow-empty
+  setup_target_to_match_main
+
+  git checkout -b integrated
+  git commit -m "integrated in target" --allow-empty
+  git commit -m "other integrated" --allow-empty
+
+  git checkout -b soon-A-remote
+  git commit -m "shared by name" --allow-empty
+  setup_remote_tracking soon-A-remote A "move"
+
+  git checkout -b soon-main-remote integrated
+  git commit -m "another unrelated" --allow-empty
+
+  git checkout -b A
+  git commit -m "shared by name" --allow-empty
+
+  setup_remote_tracking soon-main-remote main "move"
+  create_workspace_commit_once A
+)

crates/but-workspace/tests/workspace/ref_info/with_workspace_commit/mod.rs

@@ -1474,6 +1474,92 @@ fn two_branches_stracked_with_remotes() -> anyhow::Result<()> {
     Ok(())
 }
 
+#[test]
+fn two_branches_stacked_with_interesting_remote_setup() -> anyhow::Result<()> {
+    let (repo, mut meta) =
+        read_only_in_memory_scenario("two-dependent-branches-with-interesting-remote-setup")?;
+    insta::assert_snapshot!(visualize_commit_graph_all(&repo)?, @r"
+    * a221221 (HEAD -> gitbutler/workspace) GitButler Workspace Commit
+    * aadad9d (A) shared by name
+    * 96a2408 (origin/main) another unrelated
+    | * 2b1808c (origin/A) shared by name
+    |/  
+    * f15ca75 (integrated) other integrated
+    * 9456d79 integrated in target
+    * fafd9d0 (main) init
+    ");
+
+    // Just a single explicit reference we want to know of.
+    add_stack(
+        &mut meta,
+        StackId::from_number_for_testing(1),
+        "A",
+        StackState::InWorkspace,
+    );
+
+    let opts = standard_options();
+    let info = ref_info(repo.find_reference("A")?, &*meta, opts).unwrap();
+
+    // TODO: A should just have 1 commit, remote should only have one commit.
+    //       'integrated' shouldn't be listed.
+    insta::assert_debug_snapshot!(info, @r#"
+    RefInfo {
+        workspace_ref_name: Some(
+            FullName(
+                "refs/heads/gitbutler/workspace",
+            ),
+        ),
+        stacks: [
+            Stack {
+                base: Some(
+                    Sha1(fafd9d08a839d99db60b222cd58e2e0bfaf1f7b2),
+                ),
+                segments: [
+                    StackSegment {
+                        ref_name: "refs/heads/A",
+                        remote_tracking_ref_name: "refs/remotes/origin/A",
+                        ref_location: "ReachableFromWorkspaceCommit",
+                        commits_unique_from_tip: [
+                            LocalCommit(aadad9d, "shared by name\n", local/remote(similarity)),
+                            LocalCommit(96a2408, "another unrelated\n", local),
+                        ],
+                        commits_unique_in_remote_tracking_branch: [
+                            RemoteCommit(f15ca75, "other integrated\n",
+                            RemoteCommit(9456d79, "integrated in target\n",
+                        ],
+                        metadata: Some(
+                            Branch {
+                                ref_info: RefInfo { created_at: None, updated_at: "1970-01-01 00:00:00 +0000" },
+                                description: None,
+                                review: Review { pull_request: None, review_id: None },
+                            },
+                        ),
+                    },
+                    StackSegment {
+                        ref_name: "refs/heads/integrated",
+                        remote_tracking_ref_name: "None",
+                        ref_location: "ReachableFromWorkspaceCommit",
+                        commits_unique_from_tip: [
+                            LocalCommit(f15ca75, "other integrated\n", integrated),
+                            LocalCommit(9456d79, "integrated in target\n", integrated),
+                        ],
+                        commits_unique_in_remote_tracking_branch: [],
+                        metadata: None,
+                    },
+                ],
+                stash_status: None,
+            },
+        ],
+        target_ref: Some(
+            FullName(
+                "refs/remotes/origin/main",
+            ),
+        ),
+    }
+    "#);
+    Ok(())
+}
+
 #[test]
 fn single_commit_but_two_branches_stack_on_top_of_ws_commit() -> anyhow::Result<()> {
     let (repo, mut meta) =

crates/gitbutler-branch-actions/src/upstream_integration.rs

@@ -890,8 +890,6 @@ fn forced_integrated(
         });
 
         if let Some(commit_ref) = &commit_ref {
-            dbg!(commit_ref);
-            dbg!(&ref_name);
             &commit_ref.to_string() == ref_name
         } else {
             false