perf(cargo-package): match certain path prefix with pathspec

src/cargo/ops/cargo_package/vcs.rs

@@ -1,6 +1,7 @@
 //! Helpers to gather the VCS information for `cargo package`.
 
 use std::collections::HashSet;
+use std::path::Path;
 use std::path::PathBuf;
 
 use anyhow::Context as _;
@@ -173,7 +174,9 @@ fn git(
     // - ignored (in case the user has an `include` directive that
     //   conflicts with .gitignore).
     let mut dirty_files = Vec::new();
-    collect_statuses(repo, &mut dirty_files)?;
+    let pathspec = relative_pathspec(repo, pkg.root());
+    collect_statuses(repo, &[pathspec.as_str()], &mut dirty_files)?;
+
     // Include each submodule so that the error message can provide
     // specifically *which* files in a submodule are modified.
     status_submodules(repo, &mut dirty_files)?;
@@ -263,12 +266,18 @@ fn dirty_files_outside_pkg_root(
 }
 
 /// Helper to collect dirty statuses for a single repo.
-fn collect_statuses(repo: &git2::Repository, dirty_files: &mut Vec<PathBuf>) -> CargoResult<()> {
+fn collect_statuses(
+    repo: &git2::Repository,
+    pathspecs: &[&str],
+    dirty_files: &mut Vec<PathBuf>,
+) -> CargoResult<()> {
     let mut status_opts = git2::StatusOptions::new();
     // Exclude submodules, as they are being handled manually by recursing
     // into each one so that details about specific files can be
     // retrieved.
-    status_opts
+    pathspecs
+        .iter()
+        .fold(&mut status_opts, git2::StatusOptions::pathspec)
         .exclude_submodules(true)
         .include_ignored(true)
         .include_untracked(true);
@@ -300,8 +309,16 @@ fn status_submodules(repo: &git2::Repository, dirty_files: &mut Vec<PathBuf>) ->
         // If its files are required, then the verification step should fail.
         if let Ok(sub_repo) = submodule.open() {
             status_submodules(&sub_repo, dirty_files)?;
-            collect_statuses(&sub_repo, dirty_files)?;
+            collect_statuses(&sub_repo, &[], dirty_files)?;
         }
     }
     Ok(())
 }
+
+/// Use pathspec so git only matches a certain path prefix
+fn relative_pathspec(repo: &git2::Repository, pkg_root: &Path) -> String {
+    let workdir = repo.workdir().unwrap();
+    let relpath = pkg_root.strip_prefix(workdir).unwrap_or(Path::new(""));
+    // to unix separators
+    relpath.to_str().unwrap().replace('\\', "/")
+}