Merge pull request #1884 from GitoxideLabs/improvements

various improvements

Author: Byron

gitoxide-core/src/repository/archive.rs

@@ -30,7 +30,7 @@ pub fn stream(
     let (mut stream, index) = repo.worktree_stream(tree)?;
     if !add_paths.is_empty() {
         let root = gix::path::realpath(
-            repo.work_dir()
+            repo.workdir()
                 .ok_or_else(|| anyhow!("Adding files requires a worktree directory that contains them"))?,
         )?;
         for path in add_paths {

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

@@ -83,7 +83,7 @@ pub(crate) mod function {
                         gix::worktree::stack::state::attributes::Source::WorktreeThenIdMapping
                             .adjust_for_bare(repo.is_bare()),
                     )?;
-                    let workdir = repo.work_dir();
+                    let workdir = repo.workdir();
                     for pattern in pathspec.search().patterns() {
                         let path = pattern.path();
                         let entry = cache.at_entry(

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

@@ -114,7 +114,7 @@ pub(crate) mod function {
         };
         let work_dir = ignore
             .then(|| {
-                repo.work_dir()
+                repo.workdir()
                     .map(ToOwned::to_owned)
                     .ok_or_else(|| anyhow!("repository at {:?} must have a worktree checkout", repo.path()))
             })
@@ -249,7 +249,7 @@ pub(crate) mod function {
             }
             bail!(
                 "{}: Validation failed with {} mismatches out of {}",
-                gix::path::realpath(repo.work_dir().unwrap_or(repo.git_dir()))?.display(),
+                gix::path::realpath(repo.workdir().unwrap_or(repo.git_dir()))?.display(),
                 mismatches.len(),
                 progress.counter().load(Ordering::Relaxed)
             );

gitoxide-core/src/repository/clean.rs

@@ -53,7 +53,7 @@ pub(crate) mod function {
         if format != OutputFormat::Human {
             bail!("JSON output isn't implemented yet");
         }
-        let Some(workdir) = repo.work_dir() else {
+        let Some(workdir) = repo.workdir() else {
             bail!("Need a worktree to clean, this is a bare repository");
         };
 

gitoxide-core/src/repository/exclude.rs

@@ -60,7 +60,7 @@ pub fn query(
             let mut pathspec = repo.pathspec(
                 true,
                 patterns.iter(),
-                repo.work_dir().is_some(),
+                repo.workdir().is_some(),
                 &index,
                 gix::worktree::stack::state::attributes::Source::WorktreeThenIdMapping.adjust_for_bare(repo.is_bare()),
             )?;
@@ -82,12 +82,12 @@ pub fn query(
                 let pathspec = repo.pathspec(
                     true,
                     patterns.iter(),
-                    repo.work_dir().is_some(),
+                    repo.workdir().is_some(),
                     &index,
                     gix::worktree::stack::state::attributes::Source::WorktreeThenIdMapping
                         .adjust_for_bare(repo.is_bare()),
                 )?;
-                let workdir = repo.work_dir();
+                let workdir = repo.workdir();
                 for pattern in pathspec.search().patterns() {
                     let path = pattern.path();
                     let entry = cache.at_entry(

gitoxide-core/src/repository/merge/file.rs

@@ -40,7 +40,7 @@ pub fn file(
     let base_id = repo.rev_parse_single(base.as_bstr()).ok();
     let ours_id = repo.rev_parse_single(ours.as_bstr()).ok();
     let theirs_id = repo.rev_parse_single(theirs.as_bstr()).ok();
-    let roots = worktree_roots(base_id, ours_id, theirs_id, repo.work_dir())?;
+    let roots = worktree_roots(base_id, ours_id, theirs_id, repo.workdir())?;
 
     let mut cache = repo.merge_resource_cache(roots)?;
     let null = repo.object_hash().null();

gix-fs/src/snapshot.rs

@@ -1,7 +1,6 @@
 // TODO: tests
-use std::ops::Deref;
-
 use gix_features::threading::{get_mut, get_ref, MutableOnDemand, OwnShared};
+use std::ops::Deref;
 
 /// A structure holding enough information to reload a value if its on-disk representation changes as determined by its modified time.
 #[derive(Debug)]
@@ -39,6 +38,16 @@ impl<T: Clone + std::fmt::Debug> Clone for FileSnapshot<T> {
     }
 }
 
+impl<T: Clone + std::fmt::Debug> FileSnapshot<T> {
+    /// Return the contained instance if nobody else is holding it, or clone it otherwise.
+    pub fn into_owned_or_cloned(self: OwnShared<Self>) -> T {
+        match OwnShared::try_unwrap(self) {
+            Ok(this) => this.value,
+            Err(this) => this.value.clone(),
+        }
+    }
+}
+
 /// A snapshot of a resource which is up-to-date in the moment it is retrieved.
 pub type SharedFileSnapshot<T> = OwnShared<FileSnapshot<T>>;