From 90cf617a4f6cda2b4d7e0343c34e0979a49e47ff Mon Sep 17 00:00:00 2001
From: Mattias Granlund <mtsgrd@gmail.com>
Date: Wed, 24 Apr 2024 00:09:51 +0200
Subject: [PATCH] Add test for locking hunk to two different commits

---
 .../suite/virtual_branches/create_commit.rs   | 65 +++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/crates/gitbutler-core/tests/suite/virtual_branches/create_commit.rs b/crates/gitbutler-core/tests/suite/virtual_branches/create_commit.rs
index 60a59e78d..84b4276eb 100644
--- a/crates/gitbutler-core/tests/suite/virtual_branches/create_commit.rs
+++ b/crates/gitbutler-core/tests/suite/virtual_branches/create_commit.rs
@@ -196,3 +196,68 @@ async fn should_not_lock_disjointed_hunks() {
         fs::write(repository.path().join("file.txt"), lines.clone().join("\n")).unwrap();
     }
 }
+
+#[tokio::test]
+async fn should_double_lock() {
+    let Test {
+        project_id,
+        controller,
+        repository,
+        ..
+    } = &Test::default();
+
+    let mut lines: Vec<_> = (0_i32..7_i32).map(|i| format!("line {}", i)).collect();
+    fs::write(repository.path().join("file.txt"), lines.clone().join("\n")).unwrap();
+    repository.commit_all("initial commit");
+    repository.push();
+
+    controller
+        .set_base_branch(project_id, &"refs/remotes/origin/master".parse().unwrap())
+        .await
+        .unwrap();
+
+    let branch_id = controller
+        .create_virtual_branch(project_id, &branch::BranchCreateRequest::default())
+        .await
+        .unwrap();
+
+    {
+        lines[0] = "change 1".to_string();
+        fs::write(repository.path().join("file.txt"), lines.clone().join("\n")).unwrap();
+    }
+
+    let commit_1 = controller
+        .create_commit(project_id, &branch_id, "commit 1", None, false)
+        .await
+        .unwrap();
+
+    {
+        lines[6] = "change 2".to_string();
+        fs::write(repository.path().join("file.txt"), lines.clone().join("\n")).unwrap();
+    }
+
+    let commit_2 = controller
+        .create_commit(project_id, &branch_id, "commit 2", None, false)
+        .await
+        .unwrap();
+
+    {
+        lines[3] = "change3".to_string();
+        fs::write(repository.path().join("file.txt"), lines.join("\n")).unwrap();
+        let branch = controller
+            .list_virtual_branches(project_id)
+            .await
+            .unwrap()
+            .0
+            .into_iter()
+            .find(|b| b.id == branch_id)
+            .unwrap();
+
+        let locks = &branch.files[0].hunks[0].locked_to.clone().unwrap();
+        assert_eq!(locks.len(), 2);
+        assert_eq!(locks[0], commit_1);
+        assert_eq!(locks[1], commit_2);
+        // cleanup
+        fs::write(repository.path().join("file.txt"), lines.clone().join("\n")).unwrap();
+    }
+}