From f795417dfbddf77c452042f8e243871c669c7180 Mon Sep 17 00:00:00 2001
From: Martin von Zweigbergk <martinvonz@google.com>
Date: Sat, 29 Oct 2022 15:28:37 -0700
Subject: [PATCH] tests: add test for export of conflicted branches

To fix #463, I think we want to skip conflicted branches when we
export instead of erroring out. It seems we didn't have test case for
the current behavior, so let's add one.
---
 lib/tests/test_git.rs | 43 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

diff --git a/lib/tests/test_git.rs b/lib/tests/test_git.rs
index 1eb68646fcc..f07f4fdea9f 100644
--- a/lib/tests/test_git.rs
+++ b/lib/tests/test_git.rs
@@ -19,7 +19,7 @@ use git2::Oid;
 use jujutsu_lib::backend::CommitId;
 use jujutsu_lib::commit::Commit;
 use jujutsu_lib::git;
-use jujutsu_lib::git::{GitFetchError, GitPushError, GitRefUpdate};
+use jujutsu_lib::git::{GitExportError, GitFetchError, GitPushError, GitRefUpdate};
 use jujutsu_lib::git_backend::GitBackend;
 use jujutsu_lib::op_store::{BranchTarget, RefTarget};
 use jujutsu_lib::repo::ReadonlyRepo;
@@ -619,6 +619,47 @@ fn test_export_import_sequence() {
     );
 }
 
+#[test]
+fn test_export_conflicts() {
+    // We skip export of conflicted branches
+    let mut test_data = GitRepoData::create();
+    let git_repo = test_data.git_repo;
+    let mut tx = test_data.repo.start_transaction("test");
+    let commit_a =
+        create_random_commit(&test_data.settings, &test_data.repo).write_to_repo(tx.mut_repo());
+    let commit_b =
+        create_random_commit(&test_data.settings, &test_data.repo).write_to_repo(tx.mut_repo());
+    let commit_c =
+        create_random_commit(&test_data.settings, &test_data.repo).write_to_repo(tx.mut_repo());
+    tx.mut_repo()
+        .set_local_branch("main".to_string(), RefTarget::Normal(commit_a.id().clone()));
+    tx.mut_repo().set_local_branch(
+        "feature".to_string(),
+        RefTarget::Normal(commit_a.id().clone()),
+    );
+    test_data.repo = tx.commit();
+    assert_eq!(git::export_refs(&test_data.repo, &git_repo), Ok(()));
+
+    // Create a conflict and export. It should not be exported, but other changes
+    // should be.
+    let mut tx = test_data.repo.start_transaction("test");
+    tx.mut_repo()
+        .set_local_branch("main".to_string(), RefTarget::Normal(commit_b.id().clone()));
+    tx.mut_repo().set_local_branch(
+        "feature".to_string(),
+        RefTarget::Conflict {
+            removes: vec![commit_a.id().clone()],
+            adds: vec![commit_b.id().clone(), commit_c.id().clone()],
+        },
+    );
+    test_data.repo = tx.commit();
+    // TODO: Make it succeed instead, just skipping the conflicted branch
+    assert_eq!(
+        git::export_refs(&test_data.repo, &git_repo),
+        Err(GitExportError::ConflictedBranch("feature".to_string()))
+    );
+}
+
 #[test]
 fn test_init() {
     let settings = testutils::user_settings();