Alway pre-process patches, as it's stable enough

Author: rsdy

Cargo.lock

@@ -120,7 +120,7 @@ sentry-tracing = "0.31.2"
 git-version = "0.3.5"
 gix = { version="0.44.1", features = ["blocking-http-transport-reqwest", "blocking-network-client", "pack-cache-lru-static"] }
 chbs = "0.1.1"
-diffy = "0.3.0"
+diffy = { git = "https://github.com/bloopai/diffy" }
 git2 = { version = "0.17.1", default-features = false, features = ["https"] }
 
 [target.'cfg(windows)'.dependencies]

server/bleep/Cargo.toml

@@ -293,22 +293,13 @@ impl<'a> Visit for CreateNewCommit<'a> {
 
             assert_eq!(obj.kind, Kind::Blob);
             let blob = changes.iter().fold(obj.data, |base, patch| {
-                println!("{}", process_patch(patch));
-
-                match diffy::Patch::from_str(patch) {
-                    Ok(ok) => diffy::apply(String::from_utf8_lossy(&base).as_ref(), &ok).unwrap(),
-                    Err(_) => {
-                        let processed = process_patch(patch);
-                        println!("{processed}");
-
-                        diffy::apply(
-                            String::from_utf8_lossy(&base).as_ref(),
-                            &diffy::Patch::from_str(&processed).unwrap(),
-                        )
-                        .unwrap()
-                    }
-                }
-                .into()
+                let processed = process_patch(patch);
+                let base = String::from_utf8_lossy(&base);
+                println!("{base}");
+
+                diffy::apply(base.as_ref(), &diffy::Patch::from_str(&processed).unwrap())
+                    .unwrap()
+                    .into()
             });
 
             let new_id = self.repo.write_blob(&blob).unwrap();
@@ -332,9 +323,8 @@ fn process_patch(patch: &str) -> String {
     static RE: OnceCell<regex::Regex> = OnceCell::new();
     let empty_line = RE.get_or_init(|| regex::Regex::new(r#"^\w*$"#).unwrap());
 
+    // remove empty lines from start and end
     let patch = {
-        // remove empty lines from start and end
-
         let rev = patch
             .split('\n')
             .rev()