Demonstration of bug

Author: jonathantanmy2

crates/but-hunk-dependency/src/ranges/tests/workspace.rs

@@ -93,6 +93,100 @@ fn workspace_simple() -> anyhow::Result<()> {
     Ok(())
 }
 
+#[test]
+fn overlapping_commits_in_a_stack() -> anyhow::Result<()> {
+    let path = BString::from("/test.txt");
+
+    let commit1_id = id_from_hex_char('1');
+    let commit2_id = id_from_hex_char('2');
+    let stack1_id = StackId::generate();
+
+    let commit3_id = id_from_hex_char('3');
+    let stack2_id = StackId::generate();
+
+    let workspace_ranges = WorkspaceRanges::try_from_stacks(vec![
+        InputStack {
+            stack_id: stack1_id,
+            commits_from_base_to_tip: vec![
+                InputCommit {
+                    commit_id: commit1_id,
+                    files: vec![InputFile {
+                        path: path.clone(),
+                        change_type: TreeStatusKind::Modification,
+                        hunks: vec![input_hunk_from_unified_diff(
+                            "@@ -1,4 +1,9 @@
+1
++P1
++P2
++P3
++P4
++P5
+2
+3
+4
+",
+                        )?],
+                    }],
+                },
+                InputCommit {
+                    commit_id: commit2_id,
+                    files: vec![InputFile {
+                        path: path.clone(),
+                        change_type: TreeStatusKind::Modification,
+                        hunks: vec![input_hunk_from_unified_diff(
+                            "@@ -1,6 +1,7 @@
+1
+P1
+P2
++Q1
+P3
+P4
+P5
+",
+                        )?],
+                    }],
+                },
+            ],
+        },
+        InputStack {
+            stack_id: stack2_id,
+            commits_from_base_to_tip: vec![InputCommit {
+                commit_id: commit3_id,
+                files: vec![InputFile {
+                    change_type: TreeStatusKind::Modification,
+                    path: path.clone(),
+                    hunks: vec![input_hunk_from_unified_diff(
+                        "@@ -3,6 +3,7 @@
+3
+4
+5
++R1
+6
+7
+8
+",
+                    )?],
+                }],
+            }],
+        },
+    ])?;
+
+    {
+        // According to stack2, R1 is on line 6. But stack1 added 6 lines before
+        // that, so R1 should be on line 12. But the line_shift of commit1 is
+        // double-counted.
+        // DO NOT SUBMIT
+        // The bug needs to be fixed and the 17 below needs to be changed to 12
+        // before submitting
+        let dependencies = workspace_ranges.intersection(&path, 17, 1).unwrap();
+        assert_eq!(dependencies.len(), 1);
+        assert_eq!(dependencies[0].commit_id, commit3_id);
+        assert_eq!(dependencies[0].stack_id, stack2_id);
+    }
+
+    Ok(())
+}
+
 #[test]
 fn gracefully_handle_invalid_input_commits() -> anyhow::Result<()> {
     let path = BString::from("/test.txt");