feat(patch application test): compare against gnu patch

Author: remimimimimi

.github/workflows/rust.yml

@@ -38,12 +38,17 @@ jobs:
           toolchain: "1.86.0"
           components: clippy,rustfmt
       - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2
+      # https://github.com/actions/runner-images/issues/5459#issuecomment-1532856844
+      - name: Set up PATH on Windows
+        # Needed to use GNU patch instead of Strawberry Perl patch
+        if: ${{ contains(github.event.pull_request.labels.*.name, 'need-patch-apply-tests') && matrix.os == 'windows-latest' }}
+        run: echo "C:\Program Files\Git\usr\bin" >> $env:GITHUB_PATH
       - name: Run tests
         run: cargo test --features=tui,recipe-generation --verbose -- --nocapture
       - name: Run patch apply tests
         # https://github.com/orgs/community/discussions/26261#discussioncomment-3251039
         if: ${{ contains(github.event.pull_request.labels.*.name, 'need-patch-apply-tests') }}
-        run: cargo test --features=tui,recipe-generation --verbose -- --nocapture --ignored
+        run: cargo test --features=tui,recipe-generation --verbose --jobs 1 -- --nocapture --ignored
 
   build:
     name: Build ${{ matrix.target }}

Cargo.lock

@@ -201,6 +201,7 @@ tracing-test = "0.2.5"
 tracing-indicatif = "0.3.9"
 serial_test = "3.2.0"
 criterion = { version = "0.5.1", features = ["html_reports"] }
+pretty_assertions = "1.4.1"
 
 [[bench]]
 name = "line_breaks"

Cargo.toml

@@ -6,7 +6,7 @@ use miette::{Context, IntoDiagnostic};
 use rattler_conda_types::{Channel, MatchSpec};
 
 use crate::{
-    apply_patch_git,
+    apply_patch_custom,
     metadata::{Output, build_reindexed_channels},
     recipe::parser::TestType,
     render::solver::load_repodatas,
@@ -116,11 +116,8 @@ pub async fn run_build(
     let output = if output.recipe.cache.is_some() {
         output.build_or_fetch_cache(tool_configuration).await?
     } else {
-        let system_tools = output.system_tools.clone();
         output
-            .fetch_sources(tool_configuration, |wd, p| {
-                apply_patch_git(&system_tools, wd, p)
-            })
+            .fetch_sources(tool_configuration, apply_patch_custom)
             .await
             .into_diagnostic()?
     };

py-rattler-build/Cargo.lock

@@ -74,7 +74,7 @@ use rattler_solve::SolveStrategy;
 use rattler_virtual_packages::{VirtualPackage, VirtualPackageOverrides};
 use recipe::parser::{Dependency, TestType, find_outputs_from_src};
 use selectors::SelectorConfig;
-use source::patch::apply_patch_git;
+use source::patch::apply_patch_custom;
 use source_code::Source;
 use system_tools::SystemTools;
 use tool_configuration::{Configuration, ContinueOnFailure, SkipExisting, TestStrategy};
@@ -1064,11 +1064,8 @@ pub async fn debug_recipe(
             .directories
             .recreate_directories()
             .into_diagnostic()?;
-        let system_tools = output.system_tools.clone();
         let output = output
-            .fetch_sources(&tool_config, |wd, pf| {
-                apply_patch_git(&system_tools, wd, pf)
-            })
+            .fetch_sources(&tool_config, apply_patch_custom)
             .await
             .into_diagnostic()?;
         let output = output