Merge branch 'fix-input'

Author: Byron

.github/workflows/ci.yml

@@ -48,6 +48,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
+    - uses: dtolnay/rust-toolchain@stable
     - uses: Swatinem/rust-cache@v2
     - name: Setup dependencies
       run:

gitoxide-core/src/repository/attributes/query.rs

@@ -53,22 +53,43 @@ pub(crate) mod function {
             }
             PathsOrPatterns::Patterns(patterns) => {
                 let mut pathspec = repo.pathspec(
-                    patterns,
+                    patterns.iter(),
                     true,
                     &index,
                     gix::worktree::stack::state::attributes::Source::WorktreeThenIdMapping
                         .adjust_for_bare(repo.is_bare()),
                 )?;
+                let mut pathspec_matched_entry = false;
                 for (path, _entry) in pathspec
                     .index_entries_with_paths(&index)
                     .ok_or_else(|| anyhow!("Pathspec didn't match a single path in the index"))?
                 {
+                    pathspec_matched_entry = true;
                     let entry = cache.at_entry(path, Some(false))?;
                     if !entry.matching_attributes(&mut matches) {
                         continue;
                     }
                     print_match(&matches, path, &mut out)?;
                 }
+
+                if !pathspec_matched_entry {
+                    // TODO(borrowchk): this shouldn't be necessary at all, but `pathspec` stays borrowed mutably for some reason.
+                    //                  It's probably due to the strange lifetimes of `index_entries_with_paths()`.
+                    let pathspec = repo.pathspec(
+                        patterns.iter(),
+                        true,
+                        &index,
+                        gix::worktree::stack::state::attributes::Source::WorktreeThenIdMapping
+                            .adjust_for_bare(repo.is_bare()),
+                    )?;
+                    for pattern in pathspec.search().patterns() {
+                        let entry = cache.at_entry(pattern.path(), Some(false))?;
+                        if !entry.matching_attributes(&mut matches) {
+                            continue;
+                        }
+                        print_match(&matches, pattern.path(), &mut out)?;
+                    }
+                }
             }
         }
 

gitoxide-core/src/repository/exclude.rs

@@ -57,23 +57,44 @@ pub fn query(
             }
         }
         PathsOrPatterns::Patterns(patterns) => {
-            for (path, _entry) in repo
-                .pathspec(
-                    patterns.into_iter(),
-                    repo.work_dir().is_some(),
-                    &index,
-                    gix::worktree::stack::state::attributes::Source::WorktreeThenIdMapping
-                        .adjust_for_bare(repo.is_bare()),
-                )?
+            let mut pathspec_matched_something = false;
+            let mut pathspec = repo.pathspec(
+                patterns.iter(),
+                repo.work_dir().is_some(),
+                &index,
+                gix::worktree::stack::state::attributes::Source::WorktreeThenIdMapping.adjust_for_bare(repo.is_bare()),
+            )?;
+
+            for (path, _entry) in pathspec
                 .index_entries_with_paths(&index)
                 .ok_or_else(|| anyhow!("Pathspec didn't yield any entry"))?
             {
+                pathspec_matched_something = true;
                 let entry = cache.at_entry(path, Some(false))?;
                 let match_ = entry
                     .matching_exclude_pattern()
                     .and_then(|m| (show_ignore_patterns || !m.pattern.is_negative()).then_some(m));
                 print_match(match_, path, &mut out)?;
             }
+
+            if !pathspec_matched_something {
+                // TODO(borrowchk): this shouldn't be necessary at all, but `pathspec` stays borrowed mutably for some reason.
+                //                  It's probably due to the strange lifetimes of `index_entries_with_paths()`.
+                let pathspec = repo.pathspec(
+                    patterns.iter(),
+                    repo.work_dir().is_some(),
+                    &index,
+                    gix::worktree::stack::state::attributes::Source::WorktreeThenIdMapping
+                        .adjust_for_bare(repo.is_bare()),
+                )?;
+                for pattern in pathspec.search().patterns() {
+                    let entry = cache.at_entry(pattern.path(), None)?;
+                    let match_ = entry
+                        .matching_exclude_pattern()
+                        .and_then(|m| (show_ignore_patterns || !m.pattern.is_negative()).then_some(m));
+                    print_match(match_, pattern.path(), &mut out)?;
+                }
+            }
         }
     }
 

gix-index/tests/index/access.rs

@@ -152,6 +152,16 @@ fn prefixed_entries() {
     check_prefix(&file, "x", &["x"]);
     check_prefix(&file, "b", &["b"]);
     check_prefix(&file, "c", &["c"]);
+
+    assert_eq!(
+        file.prefixed_entries_range("".into()),
+        Some(0..11),
+        "empty prefixes match everything"
+    );
+    assert!(
+        file.prefixed_entries_range("foo".into()).is_none(),
+        "there is no match for this prefix"
+    );
 }
 
 fn check_prefix(index: &gix_index::State, prefix: &str, expected: &[&str]) {

justfile

@@ -13,7 +13,11 @@ alias nt := nextest
 test: clippy check doc unit-tests journey-tests-pure journey-tests-small journey-tests-async journey-tests
 
 # run all tests, without clippy, including journey tests, try building docs (and clear target on CI)
-ci-test: check doc unit-tests clear-target journey-tests-pure journey-tests-small journey-tests-async journey-tests
+ci-test: check doc clear-target unit-tests ci-journey-tests
+
+# run all journey tests, but assure these are running after `cargo clean` (and workaround a just-issue of deduplicating targets)
+ci-journey-tests:
+    just clear-target journey-tests-pure journey-tests-small journey-tests-async journey-tests
 
 clear-target:
     cargo clean

tests/snapshots/panic-behaviour/expected-failure

@@ -1,2 +1,3 @@
-thread 'main' panicked at 'something went very wrong', src/porcelain/main.rs:41:42
+thread 'main' panicked at src/porcelain/main.rs:41:42:
+something went very wrong
 note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

tests/snapshots/panic-behaviour/expected-failure-in-thread

@@ -1,3 +1,4 @@
-thread 'main' panicked at 'something went very wrong', src/porcelain/main.rs:41:42
+thread 'main' panicked at src/porcelain/main.rs:41:42:
+something went very wrong
 note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
 

tests/snapshots/panic-behaviour/expected-failure-in-thread-with-progress

@@ -1,3 +1,4 @@
-[?1049h[?25lthread '<unnamed>' panicked at 'something went very wrong', src/porcelain/main.rs:41:42
+[?1049h[?25lthread '<unnamed>' panicked at src/porcelain/main.rs:41:42:
+something went very wrong
 note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
 [?25h[?1049l