use proper feature toggle to enable gitoxide for cargo package

While at it, adjust two test expectations to deal with improved detail
of status checks.

Author: Byron

src/cargo/ops/cargo_package/mod.rs

@@ -450,9 +450,7 @@ fn prepare_archive(
     let src_files = src.list_files(pkg)?;
 
     // Check (git) repository state, getting the current commit hash.
-    // TODO: where is the feature toggle?
-    let use_gix = true;
-    let vcs_info = if use_gix {
+    let vcs_info = if ws.gctx().cli_unstable().gitoxide.is_some() {
         vcs::gix::check_repo_state(pkg, &src_files, ws, &opts)
     } else {
         vcs::check_repo_state(pkg, &src_files, ws, &opts)

src/cargo/ops/cargo_package/vcs/gix.rs

@@ -6,7 +6,6 @@ use crate::{CargoResult, GlobalContext};
 use anyhow::Context;
 use cargo_util::paths;
 use gix::bstr::ByteSlice;
-use gix::diff::rewrites::tracker::Change;
 use gix::dir::walk::EmissionMode;
 use gix::index::entry::Mode;
 use gix::status::tree_index::TrackRenames;
@@ -182,13 +181,11 @@ fn git(
         relative_package_root(repo, pkg.root()).as_deref(),
         &mut dirty_files,
     )?;
-    // super::collect_statuses(git_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,
-        workdir,
         &mut dirty_files,
         &mut dirty_files_outside_of_package_root,
     )?;
@@ -199,7 +196,22 @@ fn git(
     let cwd = ws.gctx().cwd();
     let mut dirty_src_files: Vec<_> = src_files
         .iter()
-        .filter(|src_file| dirty_files.iter().any(|path| src_file.starts_with(path)))
+        .filter(|src_file| {
+            if let Some(canon_src_file) = src_file.is_symlink_or_under_symlink().then(|| {
+                gix::path::realpath_opts(
+                    &src_file,
+                    ws.gctx().cwd(),
+                    gix::path::realpath::MAX_SYMLINKS,
+                )
+                .unwrap_or_else(|_| src_file.to_path_buf())
+            }) {
+                dirty_files
+                    .iter()
+                    .any(|path| canon_src_file.starts_with(path))
+            } else {
+                dirty_files.iter().any(|path| src_file.starts_with(path))
+            }
+        })
         .map(|p| p.as_ref())
         .chain(
             dirty_files_outside_pkg_root(ws, pkg, &dirty_files_outside_of_package_root, src_files)?
@@ -248,9 +260,10 @@ fn collect_statuses(
         .status(gix::progress::Discard)?
         .dirwalk_options(|opts| {
             opts.emit_untracked(gix::dir::walk::EmissionMode::Matching)
-                // Also pick up ignored files (but not entire directories)
+                // Also pick up ignored files or whole directories
                 // to specifically catch overzealously ignored source files.
-                // Later we will match these dirs by prefix.
+                // Later we will match these dirs by prefix, which is why collapsing
+                // them is desirable here.
                 .emit_ignored(Some(EmissionMode::CollapseDirectory))
                 .emit_tracked(false)
                 .recurse_repositories(false)
@@ -295,13 +308,6 @@ fn collect_statuses(
             continue;
         }
 
-        // We completely ignore submodules
-        if matches!(
-                status,
-                gix::status::Item::TreeIndex(change) if change.entry_mode().is_commit())
-        {
-            continue;
-        }
         dirty_files.push(path);
     }
     Ok(dirty_files_outside_of_package_root)
@@ -310,7 +316,6 @@ fn collect_statuses(
 /// Helper to collect dirty statuses while recursing into submodules.
 fn status_submodules(
     repo: &gix::Repository,
-    workdir: &Path,
     dirty_files: &mut Vec<PathBuf>,
     dirty_files_outside_of_package_root: &mut Vec<PathBuf>,
 ) -> CargoResult<()> {
@@ -321,12 +326,10 @@ fn status_submodules(
         // Ignore submodules that don't open, they are probably not initialized.
         // If its files are required, then the verification step should fail.
         if let Some(sub_repo) = submodule.open()? {
-            status_submodules(
-                &sub_repo,
-                workdir,
-                dirty_files,
-                dirty_files_outside_of_package_root,
-            )?;
+            let Some(workdir) = sub_repo.workdir() else {
+                continue;
+            };
+            status_submodules(&sub_repo, dirty_files, dirty_files_outside_of_package_root)?;
             dirty_files_outside_of_package_root.extend(collect_statuses(
                 &sub_repo,
                 workdir,
@@ -391,15 +394,10 @@ fn dirty_files_outside_pkg_root(
             )
             .unwrap_or_else(|_| src_file.to_owned());
 
-            if dirty_files_outside_of_package_root
+            dirty_files_outside_of_package_root
                 .iter()
                 .any(|p| canon_src_path.starts_with(p))
-            {
-                // Use the canonicalized path as later we want to truncate it by the CWD, which is also canonicalized.
-                Some(canon_src_path)
-            } else {
-                None
-            }
+                .then_some(canon_src_path)
         })
         .collect();
     Ok(dirty_files)

tests/testsuite/git.rs

@@ -3161,7 +3161,20 @@ fn dirty_submodule() {
     git_project
         .cargo("package --no-verify")
         .with_status(101)
-        .with_stderr_data(str![[r#"
+        .with_stderr_data(if cargo_uses_gitoxide() {
+            str![[r#"
+[WARNING] manifest has no description, license, license-file, documentation, homepage or repository.
+See https://doc.rust-lang.org/cargo/reference/manifest.html#package-metadata for more info.
+[ERROR] 2 files in the working directory contain changes that were not yet committed into git:
+
+.gitmodules
+src/lib.rs
+
+to proceed despite this and include the uncommitted changes, pass the `--allow-dirty` flag
+
+"#]]
+        } else {
+            str![[r#"
 [WARNING] manifest has no description, license, license-file, documentation, homepage or repository.
 See https://doc.rust-lang.org/cargo/reference/manifest.html#package-metadata for more info.
 [ERROR] 1 files in the working directory contain changes that were not yet committed into git:
@@ -3170,7 +3183,8 @@ See https://doc.rust-lang.org/cargo/reference/manifest.html#package-metadata for
 
 to proceed despite this and include the uncommitted changes, pass the `--allow-dirty` flag
 
-"#]])
+"#]]
+        })
         .run();
 
     git::commit(&repo);
@@ -3207,7 +3221,20 @@ to proceed despite this and include the uncommitted changes, pass the `--allow-d
     git_project
         .cargo("package --no-verify")
         .with_status(101)
-        .with_stderr_data(str![[r#"
+        .with_stderr_data(if cargo_uses_gitoxide() {
+            str![[r#"
+[WARNING] manifest has no description, license, license-file, documentation, homepage or repository.
+See https://doc.rust-lang.org/cargo/reference/manifest.html#package-metadata for more info.
+[ERROR] 2 files in the working directory contain changes that were not yet committed into git:
+
+src/.gitmodules
+src/bar/mod.rs
+
+to proceed despite this and include the uncommitted changes, pass the `--allow-dirty` flag
+
+"#]]
+        } else {
+            str![[r#"
 [WARNING] manifest has no description, license, license-file, documentation, homepage or repository.
 See https://doc.rust-lang.org/cargo/reference/manifest.html#package-metadata for more info.
 [ERROR] 1 files in the working directory contain changes that were not yet committed into git:
@@ -3216,7 +3243,8 @@ src/.gitmodules
 
 to proceed despite this and include the uncommitted changes, pass the `--allow-dirty` flag
 
-"#]])
+"#]]
+        })
         .run();
 
     // Commit the submodule addition.

tests/testsuite/package.rs

@@ -3,6 +3,7 @@
 use std::fs::{self, read_to_string, File};
 use std::path::Path;
 
+use cargo_test_support::git::cargo_uses_gitoxide;
 use cargo_test_support::prelude::*;
 use cargo_test_support::publish::validate_crate_contents;
 use cargo_test_support::registry::{self, Package};
@@ -1466,13 +1467,29 @@ fn dirty_file_outside_pkg_root_inside_submodule() {
     // This dirtiness should be detected in the future.
     p.change_file("submodule/file.txt", "changed");
 
-    p.cargo("package --workspace --no-verify")
-        .with_stderr_data(str![[r#"
+    let mut execs = p.cargo("package --workspace --no-verify");
+    if cargo_uses_gitoxide() {
+        execs
+            .with_status(101)
+            .with_stderr_data(str![[r#"
+[ERROR] 1 files in the working directory contain changes that were not yet committed into git:
+
+isengard/src/file.txt
+
+to proceed despite this and include the uncommitted changes, pass the `--allow-dirty` flag
+
+"#]])
+            .run();
+    } else {
+        // In `git2` this isn't currently implemented, but it could be.
+        execs
+            .with_stderr_data(str![[r#"
 [PACKAGING] isengard v0.0.0 ([ROOT]/foo/isengard)
 [PACKAGED] 6 files, [FILE_SIZE]B ([FILE_SIZE]B compressed)
 
 "#]])
-        .run();
+            .run();
+    }
 }
 
 #[cargo_test]