refactor squash me

Author: Byron

gix-merge/tests/fixtures/generated-archives/tree-baseline.tar

@@ -66,20 +66,6 @@ function baseline () (
     git -c merge.conflictStyle=$conflict_style merge-tree -z --write-tree --allow-unrelated-histories "$their_committish" "$our_committish" > "$merge_info" || :
     echo "$dir" "$conflict_style" "$their_commit_id" "$their_committish" "$our_commit_id" "$our_committish" "$merge_info" "$maybe_expected_tree" "$opt_deviation_message" >> ../baseline.cases
   fi
-
-  local index_path=.git/${conflict_style}-${our_committish}-${their_committish}.index
-  if [ ! -e $index_path ]; then
-    git checkout -f $our_committish
-    git merge -m m $their_committish || :
-    cp .git/index "$index_path"
-  fi
-
-  local index_path=.git/${conflict_style}-${their_committish}-${our_committish}.index
-  if [ ! -e $index_path ]; then
-    git checkout -f $their_committish
-    git merge -m m $our_committish || :
-    cp .git/index "$index_path"
-  fi
 )
 
 git init simple

gix-merge/tests/fixtures/tree-baseline.sh

@@ -6,7 +6,7 @@ use gix_object::FindExt;
 use std::path::{Path, PathBuf};
 
 /// An entry in the conflict
-#[derive(Debug)]
+#[derive(Debug, Eq, PartialEq)]
 pub struct Entry {
     /// The relative path in the repository
     pub location: String,
@@ -17,7 +17,7 @@ pub struct Entry {
 }
 
 /// Keep track of all the sides of a conflict. Some might not be set to indicate removal, including the ancestor.
-#[derive(Default, Debug)]
+#[derive(Default, Debug, Eq, PartialEq)]
 pub struct Conflict {
     pub ancestor: Option<Entry>,
     pub ours: Option<Entry>,
@@ -96,7 +96,6 @@ pub struct Expectation {
     pub their_side_name: String,
     pub merge_info: MergeInfo,
     pub case_name: String,
-    pub index: gix_index::File,
     pub deviation: Option<Deviation>,
 }
 
@@ -171,15 +170,6 @@ impl Iterator for Expectations<'_> {
         let our_commit_id = gix_hash::ObjectId::from_hex(our_commit_id.as_bytes()).unwrap();
         let their_commit_id = gix_hash::ObjectId::from_hex(their_commit_id.as_bytes()).unwrap();
         let merge_info = parse_merge_info(std::fs::read_to_string(subdir_path.join(merge_info_filename)).unwrap());
-        let index = gix_index::File::at(
-            subdir_path
-                .join(".git")
-                .join(format!("{conflict_style_name}-{our_side_name}-{their_side_name}.index")),
-            gix_hash::Kind::Sha1,
-            false, /* skip hash */
-            Default::default(),
-        )
-        .expect("index should be present for each combination");
         Some(Expectation {
             root: subdir_path,
             conflict_style,
@@ -189,7 +179,6 @@ impl Iterator for Expectations<'_> {
             their_commit_id,
             their_side_name: their_side_name.to_owned(),
             merge_info,
-            index,
             case_name: format!(
                 "{subdir}-{}",
                 merge_info_filename
@@ -232,6 +221,10 @@ fn parse_merge_info(content: String) -> MergeInfo {
         *field = Some(entry);
     }
 
+    if conflicts.last() != Some(&conflict) {
+        conflicts.push(conflict);
+    }
+
     while lines.peek().is_some() {
         out.information
             .push(parse_info(&mut lines).expect("if there are lines, it should be valid info"));
@@ -377,3 +370,35 @@ pub fn show_diff_and_fail(
         expected.information
     );
 }
+
+pub(crate) fn apply_git_index_entries(conflicts: Vec<Conflict>, state: &mut gix_index::State) {
+    let len = state.entries().len();
+    for Conflict { ours, theirs, ancestor } in conflicts {
+        for (entry, stage) in [
+            ancestor.map(|e| (e, gix_index::entry::Stage::Base)),
+            ours.map(|e| (e, gix_index::entry::Stage::Ours)),
+            theirs.map(|e| (e, gix_index::entry::Stage::Theirs)),
+        ]
+        .into_iter()
+        .filter_map(std::convert::identity)
+        {
+            if let Some(pos) = state.entry_index_by_path_and_stage_bounded(
+                entry.location.as_str().into(),
+                gix_index::entry::Stage::Unconflicted,
+                len,
+            ) {
+                state.entries_mut()[pos].flags.insert(gix_index::entry::Flags::REMOVE)
+            }
+
+            state.dangerously_push_entry(
+                Default::default(),
+                entry.id,
+                gix_index::entry::Flags::empty() | gix_index::entry::Flags::from_bits((stage as u32) << 12).unwrap(),
+                entry.mode.into(),
+                entry.location.as_str().into(),
+            );
+        }
+    }
+    state.sort_entries();
+    state.remove_entries(|_, _, e| e.flags.contains(gix_index::entry::Flags::REMOVE));
+}

gix-merge/tests/merge/tree/baseline.rs

@@ -32,7 +32,6 @@ fn run_baseline() -> crate::Result {
         their_side_name,
         merge_info,
         case_name,
-        index,
         deviation,
     } in baseline::Expectations::new(&root, &cases)
         .filter(|case| new_test.map_or(true, |prefix: &str| case.case_name.starts_with(prefix)))
@@ -100,10 +99,18 @@ fn run_baseline() -> crate::Result {
             }
         }
 
-        let actual_index = gix_index::State::from_tree(&actual_id, &odb, Default::default())?;
+        let mut actual_index = gix_index::State::from_tree(&actual_id, &odb, Default::default())?;
+        let expected_index = {
+            let mut index = actual_index.clone();
+            if let Some(conflicts) = merge_info.conflicts {
+                baseline::apply_git_index_entries(conflicts, &mut index)
+            }
+            index
+        };
+        actual.index_changed_after_applying_conflicts(&mut actual_index)?;
         pretty_assertions::assert_eq!(
             baseline::clear_entries(&actual_index),
-            baseline::clear_entries(&index),
+            baseline::clear_entries(&expected_index),
             "{case_name}: index mismatch"
         );
     }