From f45b8052e1c402d3b16b877fd46394015fc6638f Mon Sep 17 00:00:00 2001
From: Martin von Zweigbergk <martinvonz@google.com>
Date: Sun, 13 Aug 2023 10:48:10 -0700
Subject: [PATCH] conflicts: check earlier for edited absent part in conflict
 markers

With the new `Merge::iter()`, we can simplify the code a bit by
combining that with `zip`.

I'll simplify the last part of `update_from_content()` next.
---
 lib/src/conflicts.rs | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/lib/src/conflicts.rs b/lib/src/conflicts.rs
index 696ba96ac..b3df27d19 100644
--- a/lib/src/conflicts.rs
+++ b/lib/src/conflicts.rs
@@ -15,6 +15,7 @@
 #![allow(missing_docs)]
 
 use std::io::Write;
+use std::iter::zip;
 
 use itertools::Itertools;
 
@@ -336,47 +337,46 @@ pub fn update_from_content(
             }
         }
     }
+    let contents = Merge::new(removed_content, added_content);
+
+    // If the user edited the empty placeholder for an absent side, we consider the
+    // conflict resolved.
+    if zip(contents.iter(), file_ids.iter())
+        .any(|(content, file_id)| file_id.is_none() && !content.is_empty())
+    {
+        let file_id = store.write_file(path, &mut &content[..])?;
+        return Ok(Merge::normal(file_id));
+    }
+
     // Now write the new files contents we found by parsing the file
     // with conflict markers. Update the Merge object with the new
     // FileIds.
     let mut new_removes = vec![];
-    for (i, buf) in removed_content.iter().enumerate() {
+    for (i, buf) in contents.removes().iter().enumerate() {
         match &file_ids.removes()[i] {
             Some(_) => {
                 let file_id = store.write_file(path, &mut buf.as_slice())?;
                 new_removes.push(Some(file_id));
             }
-            None if buf.is_empty() => {
+            None => {
                 // The missing side of a conflict is still represented by
                 // the empty string we materialized it as
                 new_removes.push(None);
             }
-            _ => {
-                // The user edited the empty placeholder for an absent side. We consider the
-                // conflict resolved.
-                let file_id = store.write_file(path, &mut &content[..])?;
-                return Ok(Merge::normal(file_id));
-            }
         }
     }
     let mut new_adds = vec![];
-    for (i, buf) in added_content.iter().enumerate() {
+    for (i, buf) in contents.adds().iter().enumerate() {
         match &file_ids.adds()[i] {
             Some(_) => {
                 let file_id = store.write_file(path, &mut buf.as_slice())?;
                 new_adds.push(Some(file_id));
             }
-            None if buf.is_empty() => {
+            None => {
                 // The missing side of a conflict is still represented by
                 // the empty string we materialized it as => nothing to do
                 new_adds.push(None);
             }
-            _ => {
-                // The user edited the empty placeholder for an absent side. We consider the
-                // conflict resolved.
-                let file_id = store.write_file(path, &mut &content[..])?;
-                return Ok(Merge::normal(file_id));
-            }
         }
     }
     Ok(Merge::new(new_removes, new_adds))