Remove the git2 implementation of the cargo-package dirty check.

Author: Byron

src/cargo/ops/cargo_package/mod.rs

@@ -479,12 +479,7 @@ fn prepare_archive(
     let src_files = src.list_files(pkg)?;
 
     // Check (git) repository state, getting the current commit hash.
-    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)
-    }?;
-
+    let vcs_info = vcs::check_repo_state(pkg, &src_files, ws, &opts)?;
     build_ar_list(ws, pkg, src_files, vcs_info, opts.include_lockfile)
 }
 

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

@@ -1,5 +1,5 @@
+//! Helpers to gather the VCS information for `cargo package`.
 use crate::core::{Package, Workspace};
-use crate::ops::cargo_package::vcs::{GitVcsInfo, VcsInfo};
 use crate::ops::PackageOpts;
 use crate::sources::PathEntry;
 use crate::{CargoResult, GlobalContext};
@@ -10,10 +10,28 @@ use gix::dir::walk::EmissionMode;
 use gix::index::entry::Mode;
 use gix::status::tree_index::TrackRenames;
 use gix::worktree::stack::state::ignore::Source;
+use serde::Serialize;
 use std::collections::HashSet;
 use std::path::{Path, PathBuf};
 use tracing::debug;
 
+/// Represents the VCS information when packaging.
+#[derive(Serialize)]
+pub struct VcsInfo {
+    git: GitVcsInfo,
+    /// Path to the package within repo (empty string if root).
+    path_in_vcs: String,
+}
+
+/// Represents the Git VCS information when packaging.
+#[derive(Serialize)]
+pub struct GitVcsInfo {
+    sha1: String,
+    /// Indicate whether the Git worktree is dirty.
+    #[serde(skip_serializing_if = "std::ops::Not::not")]
+    dirty: bool,
+}
+
 /// Checks if the package source is in a *git* DVCS repository.
 ///
 /// If *git*, and the source is *dirty* (e.g., has uncommitted changes),
@@ -64,8 +82,6 @@ pub fn check_repo_state(
                 workdir.display()
             ))
         })?;
-        // TODO: Either remove this whole block, or have a test.
-        //       It's hard to have no Cargo.toml here?
         // No `Cargo.toml` found. This package may be irrelevant.
         // Have to assume it is clean.
         return Ok(None);