diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 12:41:41 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 12:41:41 +0000 |
commit | 10ee2acdd26a7f1298c6f6d6b7af9b469fe29b87 (patch) | |
tree | bdffd5d80c26cf4a7a518281a204be1ace85b4c1 /vendor/gix/src/reference/remote.rs | |
parent | Releasing progress-linux version 1.70.0+dfsg1-9~progress7.99u1. (diff) | |
download | rustc-10ee2acdd26a7f1298c6f6d6b7af9b469fe29b87.tar.xz rustc-10ee2acdd26a7f1298c6f6d6b7af9b469fe29b87.zip |
Merging upstream version 1.70.0+dfsg2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'vendor/gix/src/reference/remote.rs')
-rw-r--r-- | vendor/gix/src/reference/remote.rs | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/vendor/gix/src/reference/remote.rs b/vendor/gix/src/reference/remote.rs new file mode 100644 index 000000000..dd96892e2 --- /dev/null +++ b/vendor/gix/src/reference/remote.rs @@ -0,0 +1,49 @@ +use crate::{config, config::tree::Branch, remote, Reference}; + +/// Remotes +impl<'repo> Reference<'repo> { + /// Find the unvalidated name of our remote for `direction` as configured in `branch.<name>.remote|pushRemote` respectively. + /// If `Some(<name>)` it can be used in [`Repository::find_remote(…)`][crate::Repository::find_remote()], or if `None` then + /// [Repository::remote_default_name()][crate::Repository::remote_default_name()] could be used in its place. + /// + /// Return `None` if no remote is configured. + /// + /// # Note + /// + /// - it's recommended to use the [`remote(…)`][Self::remote()] method as it will configure the remote with additional + /// information. + /// - `branch.<name>.pushRemote` falls back to `branch.<name>.remote`. + pub fn remote_name(&self, direction: remote::Direction) -> Option<remote::Name<'repo>> { + let name = self.name().shorten(); + let config = &self.repo.config.resolved; + (direction == remote::Direction::Push) + .then(|| { + config + .string("branch", Some(name), Branch::PUSH_REMOTE.name) + .or_else(|| config.string("remote", None, config::tree::Remote::PUSH_DEFAULT.name)) + }) + .flatten() + .or_else(|| config.string("branch", Some(name), Branch::REMOTE.name)) + .and_then(|name| name.try_into().ok()) + } + + /// Like [`remote_name(…)`][Self::remote_name()], but configures the returned `Remote` with additional information like + /// + /// - `branch.<name>.merge` to know which branch on the remote side corresponds to this one for merging when pulling. + /// + /// It also handles if the remote is a configured URL, which has no name. + pub fn remote( + &self, + direction: remote::Direction, + ) -> Option<Result<crate::Remote<'repo>, remote::find::existing::Error>> { + // TODO: use `branch.<name>.merge` + self.remote_name(direction).map(|name| match name { + remote::Name::Symbol(name) => self.repo.find_remote(name.as_ref()).map_err(Into::into), + remote::Name::Url(url) => gix_url::parse(url.as_ref()).map_err(Into::into).and_then(|url| { + self.repo + .remote_at(url) + .map_err(|err| remote::find::existing::Error::Find(remote::find::Error::Init(err))) + }), + }) + } +} |