Merging upstream version 1.74.1+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 145 insertions, 0 deletions

diff --git a/vendor/gix-filter/tests/pipeline/convert_to_git.rs b/vendor/gix-filter/tests/pipeline/convert_to_git.rs
new file mode 100644
index 000000000..3a627f28d
--- /dev/null
+++ b/vendor/gix-filter/tests/pipeline/convert_to_git.rs
@@ -0,0 +1,145 @@
+use std::{io::Read, path::Path};
+
+use bstr::{BStr, ByteSlice};
+use gix_filter::{eol, pipeline::CrlfRoundTripCheck};
+
+use crate::{driver::apply::driver_with_process, pipeline::pipeline};
+
+#[test]
+fn no_driver_but_filter_with_autocrlf() -> gix_testtools::Result {
+    let (_cache, mut pipe) = pipeline("no-filter", || {
+        (
+            vec![],
+            Vec::new(),
+            CrlfRoundTripCheck::Fail,
+            eol::Configuration {
+                auto_crlf: eol::AutoCrlf::Enabled,
+                eol: None,
+            },
+        )
+    })?;
+
+    let out = pipe.convert_to_git(
+        "hi\r\n".as_bytes(),
+        Path::new("any.txt"),
+        &mut |_path, _attrs| {},
+        &mut no_object_in_index,
+    )?;
+
+    assert_eq!(
+        out.as_bytes().expect("read converted to buffer").as_bstr(),
+        "hi\n",
+        "the read is read into memory if there is no driver"
+    );
+    Ok(())
+}
+
+#[test]
+fn all_stages_mean_streaming_is_impossible() -> gix_testtools::Result {
+    let (mut cache, mut pipe) = pipeline("all-filters", || {
+        (
+            vec![driver_with_process()],
+            Vec::new(),
+            CrlfRoundTripCheck::Fail,
+            Default::default(),
+        )
+    })?;
+
+    let mut out = pipe.convert_to_git(
+        "➡a\r\n➡b\r\n➡$Id: 2188d1cdee2b93a80084b61af431a49d21bc7cc0$".as_bytes(),
+        Path::new("any.txt"),
+        &mut |path, attrs| {
+            cache
+                .at_entry(path, Some(false), |_oid, _buf| -> Result<_, std::convert::Infallible> {
+                    unreachable!("index access disabled")
+                })
+                .expect("cannot fail")
+                .matching_attributes(attrs);
+        },
+        &mut no_object_in_index,
+    )?;
+    assert!(out.is_changed(), "filters were applied");
+    assert!(out.as_read().is_none(), "non-driver filters operate in-memory");
+    let buf = out.as_bytes().expect("in-memory operation");
+    assert_eq!(buf.as_bstr(), "a\nb\n$Id$", "filters were successfully reversed");
+    Ok(())
+}
+
+#[test]
+fn only_driver_means_streaming_is_possible() -> gix_testtools::Result {
+    let (mut cache, mut pipe) = pipeline("driver-only", || {
+        (
+            vec![driver_with_process()],
+            Vec::new(),
+            CrlfRoundTripCheck::Skip,
+            Default::default(),
+        )
+    })?;
+
+    let mut out = pipe.convert_to_git(
+        "➡a\r\n➡b\r\n➡$Id: 2188d1cdee2b93a80084b61af431a49d21bc7cc0$".as_bytes(),
+        Path::new("subdir/doesnot/matter/any.txt"),
+        &mut |path, attrs| {
+            cache
+                .at_entry(path, Some(false), |_oid, _buf| -> Result<_, std::convert::Infallible> {
+                    unreachable!("index access disabled")
+                })
+                .expect("cannot fail")
+                .matching_attributes(attrs);
+        },
+        &mut no_object_in_index,
+    )?;
+    assert!(out.is_changed(), "filters were applied");
+    assert!(out.as_read().is_some(), "filter-only can be streamed");
+    let mut buf = Vec::new();
+    out.read_to_end(&mut buf)?;
+    assert_eq!(
+        buf.as_bstr(),
+        "a\r\nb\r\n$Id: 2188d1cdee2b93a80084b61af431a49d21bc7cc0$",
+        "one filter was reversed"
+    );
+    Ok(())
+}
+
+#[test]
+fn no_filter_means_reader_is_returned_unchanged() -> gix_testtools::Result {
+    let (mut cache, mut pipe) = pipeline("no-filters", || {
+        (vec![], Vec::new(), CrlfRoundTripCheck::Fail, Default::default())
+    })?;
+
+    let input = "➡a\r\n➡b\r\n➡$Id: 2188d1cdee2b93a80084b61af431a49d21bc7cc0$";
+    let mut out = pipe.convert_to_git(
+        input.as_bytes(),
+        Path::new("other.txt"),
+        &mut |path, attrs| {
+            cache
+                .at_entry(path, Some(false), |_oid, _buf| -> Result<_, std::convert::Infallible> {
+                    unreachable!("index access disabled")
+                })
+                .expect("cannot fail")
+                .matching_attributes(attrs);
+        },
+        &mut no_call,
+    )?;
+    assert!(!out.is_changed(), "no filter was applied");
+    let actual = out
+        .as_read()
+        .expect("input is unchanged, we get the original stream back");
+    let mut buf = Vec::new();
+    actual.read_to_end(&mut buf)?;
+    assert_eq!(buf.as_bstr(), input, "input is unchanged");
+    Ok(())
+}
+
+#[allow(clippy::ptr_arg)]
+fn no_call(_path: &BStr, _buf: &mut Vec<u8>) -> Result<Option<()>, Box<dyn std::error::Error + Send + Sync>> {
+    unreachable!("index function will not be called")
+}
+
+#[allow(clippy::ptr_arg)]
+fn no_object_in_index(
+    _path: &BStr,
+    _buf: &mut Vec<u8>,
+) -> Result<Option<()>, Box<dyn std::error::Error + Send + Sync>> {
+    Ok(None)
+}