Merge pull request #2106 from cruessler/add-open-with-environment-overrides

Add `gix::open_with_environment_overrides`

Sebastian Thiel committed 1 year ago

Commit c1491162 parents a4b0d2c fb2766b5 files · +37 −6Browse files

Unified · Split

5 files

gitoxide-core/src/repository/tag.rs +7 −1
gix/src/discover.rs +2 −0
gix/src/lib.rs +24 −3
gix/src/types.rs +3 −1
src/plumbing/main.rs +1 −1

 use gix::bstr::{BStr, BString, ByteSlice};
+use crate::OutputFormat;
 #[derive(Eq, PartialEq, PartialOrd, Ord)]
 enum VersionPart {
     String(BString),
     }
 }
-pub fn list(repo: gix::Repository, out: &mut dyn std::io::Write) -> anyhow::Result<()> {
+pub fn list(repo: gix::Repository, out: &mut dyn std::io::Write, format: OutputFormat) -> anyhow::Result<()> {
+    if format != OutputFormat::Human {
+        anyhow::bail!("JSON output isn't supported");
+    }
     let platform = repo.references()?;
     let mut tags: Vec<_> = platform

gix/src/discover.rs+2−0

     /// Try to open a git repository directly from the environment.
     /// If that fails, discover upwards from `directory` until one is found,
     /// while applying discovery options from the environment.
+    ///
+    /// For more, see [`ThreadSafeRepository::discover_with_environment_overrides_opts()`].
     pub fn discover_with_environment_overrides(directory: impl AsRef<Path>) -> Result<Self, Error> {
         Self::discover_with_environment_overrides_opts(directory, Default::default(), Default::default())
     }

gix/src/lib.rs+24−3

 //!
 //! By default, the [`Repository`] isn't `Sync` and thus can't be used in certain contexts which require the `Sync` trait.
 //!
-//! To help with this, convert it with [`.into_sync()`][Repository::into_sync()] into a [`ThreadSafeRepository`].
+//! To help with this, convert it with [`Repository::into_sync()`] into a [`ThreadSafeRepository`].
 //!
 //! ### Object-Access Performance
 //!
 //! On miss, the object is looked up and if a pack is hit, there is a small fixed-size cache for delta-base objects.
 //!
 //! In scenarios where the same objects are accessed multiple times, the object cache can be useful and is to be configured specifically
-//! using the [`object_cache_size(…)`][crate::Repository::object_cache_size()] method.
+//! using the [`Repository::object_cache_size()`] method.
 //!
 //! Use the `cache-efficiency-debug` cargo feature to learn how efficient the cache actually is - it's easy to end up with lowered
 //! performance if the cache is not hit in 50% of the time.
 #[cfg(feature = "merge")]
 pub mod merge;
-/// See [`ThreadSafeRepository::discover()`], but returns a [`Repository`] instead.
+/// Try to open a git repository in `directory` and search upwards through its parents until one is found,
+/// using default trust options which matters in case the found repository isn't owned by the current user.
+///
+/// For details, see [`ThreadSafeRepository::discover()`].
 ///
 /// # Note
 ///
     ThreadSafeRepository::discover(directory).map(Into::into)
 }
+/// Try to discover a git repository directly from the environment.
+///
+/// For details, see [`ThreadSafeRepository::discover_with_environment_overrides_opts()`].
+#[allow(clippy::result_large_err)]
+pub fn discover_with_environment_overrides(
+    directory: impl AsRef<std::path::Path>,
+) -> Result<Repository, discover::Error> {
+    ThreadSafeRepository::discover_with_environment_overrides(directory).map(Into::into)
+}
+/// Try to open a git repository directly from the environment.
+///
+/// See [`ThreadSafeRepository::open_with_environment_overrides()`].
+#[allow(clippy::result_large_err)]
+pub fn open_with_environment_overrides(directory: impl Into<std::path::PathBuf>) -> Result<Repository, open::Error> {
+    ThreadSafeRepository::open_with_environment_overrides(directory, Default::default()).map(Into::into)
+}
 /// See [`ThreadSafeRepository::init()`], but returns a [`Repository`] instead.
 #[allow(clippy::result_large_err)]
 pub fn init(directory: impl AsRef<std::path::Path>) -> Result<Repository, init::Error> {

gix/src/types.rs+3−1

@@ -145,7 +145,9 @@ pub struct Reference<'r> { · 144 unmodified lines
145		145
146	/// A thread-local handle to interact with a repository from a single thread.	146	/// A thread-local handle to interact with a repository from a single thread.
147	///	147	///
148	/// It is `Send` but not `Sync` - for the latter you can convert it `to_sync()`.	148	/// It is `Send`, but not `Sync` - for the latter you can convert it using
		149	/// [`Repository::into_sync()`].
		150	///
149	/// Note that it clones itself so that it is empty, requiring the user to configure each clone separately, specifically	151	/// Note that it clones itself so that it is empty, requiring the user to configure each clone separately, specifically
150	/// and explicitly. This is to have the fastest-possible default configuration available by default, but allow	152	/// and explicitly. This is to have the fastest-possible default configuration available by default, but allow
151	/// those who experiment with workloads to get speed boosts of 2x or more.	153	/// those who experiment with workloads to get speed boosts of 2x or more.

src/plumbing/main.rs+1−1

@@ -1312,7 +1312,7 @@ pub fn main() -> Result<()> { · 1311 unmodified lines
1312	progress,	1312	progress,
1313	progress_keep_open,	1313	progress_keep_open,
1314	None,	1314	None,
1315	move \|_progress, out, _err\| core::repository::tag::list(repository(Mode::Lenient)?, out),	1315	move \|_progress, out, _err\| core::repository::tag::list(repository(Mode::Lenient)?, out, format),
1316	),	1316	),
1317	},	1317	},
1318	Subcommands::Tree(cmd) => match cmd {	1318	Subcommands::Tree(cmd) => match cmd {