feat!: remove `gix remote --url` in favor of determining the intention similar to `git fetch` (#450)

Sebastian Thiel committed 4 years ago

Commit 92bbe331 parent 8c7351c4 files · +22 −35Browse files

Unified · Split

4 files

gitoxide-core/src/repository/fetch.rs +1 −3
gitoxide-core/src/repository/remote.rs +17 −16
src/plumbing/main.rs +2 −6
src/plumbing/options/mod.rs +2 −10

gitoxide-core/src/repository/fetch.rs+1−3

     pub format: OutputFormat,
     pub dry_run: bool,
     pub remote: Option<String>,
-    pub url: Option<git::Url>,
     /// If non-empty, override all ref-specs otherwise configured in the remote
     pub ref_specs: Vec<BString>,
 }
             format,
             dry_run,
             remote,
-            url,
             ref_specs,
         }: Options,
     ) -> anyhow::Result<()> {
-        let _remote = crate::repository::remote::by_name_or_url(&repo, remote.as_deref(), url)?;
+        let _remote = crate::repository::remote::by_name_or_url(&repo, remote.as_deref())?;
         todo!()
     }
 }

gitoxide-core/src/repository/remote.rs+17−16

             Tracking { ref_specs: Vec<BString> },
         }
-        pub struct Context {
+        pub struct Options {
             pub format: OutputFormat,
-            pub name: Option<String>,
+            pub name_or_url: Option<String>,
-            pub url: Option<git_repository::Url>,
             pub handshake_info: bool,
         }
         mut progress: impl git::Progress,
         mut out: impl std::io::Write,
         err: impl std::io::Write,
-        refs::Context {
+        refs::Options {
             format,
-            name,
+            name_or_url,
-            url,
             handshake_info,
-        }: refs::Context,
+        }: refs::Options,
     ) -> anyhow::Result<()> {
         use anyhow::Context;
-        let mut remote = by_name_or_url(&repo, name.as_deref(), url)?;
+        let mut remote = by_name_or_url(&repo, name_or_url.as_deref())?;
         if let refs::Kind::Tracking { ref_specs, .. } = &kind {
             if format != OutputFormat::Human {
                 bail!("JSON output isn't yet supported for listing ref-mappings.");
 pub(crate) fn by_name_or_url<'repo>(
     repo: &'repo git::Repository,
-    name: Option<&str>,
+    name_or_url: Option<&str>,
-    url: Option<git::Url>,
 ) -> anyhow::Result<git::Remote<'repo>> {
-    use anyhow::{bail, Context};
+    use anyhow::Context;
-    Ok(match (name, url) {
+    Ok(match name_or_url {
-        (Some(name), None) => repo.find_remote(&name)?,
+        Some(name) => {
-        (None, None) => repo
+            if name.contains('/') {
+                repo.remote_at(git::url::parse(name.into())?)?
+            } else {
+                repo.find_remote(&name)?
+            }
+        }
+        None => repo
             .head()?
             .into_remote(git::remote::Direction::Fetch)
             .context("Cannot find a remote for unborn branch")??,
-        (None, Some(url)) => repo.remote_at(url)?,
-        (Some(_), Some(_)) => bail!("Must not set both the remote name and the url - they are mutually exclusive"),
     })
 }

src/plumbing/main.rs+2−6

             dry_run,
             remote,
             ref_spec,
-            url,
         }) => {
             let opts = core::repository::fetch::Options {
                 format,
                 dry_run,
                 remote,
                 ref_specs: ref_spec,
-                url,
             };
             prepare_and_run(
                 "fetch",
         #[cfg_attr(feature = "small", allow(unused_variables))]
         Subcommands::Remote(remote::Platform {
             name,
-            url,
             cmd,
             handshake_info,
         }) => match cmd {
                         core::repository::remote::refs::Kind::Tracking { ref_specs: ref_spec }
                     }
                 };
-                let context = core::repository::remote::refs::Context {
+                let context = core::repository::remote::refs::Options {
-                    name,
+                    name_or_url: name,
-                    url,
                     format,
                     handshake_info,
                 };

src/plumbing/options/mod.rs+2−10

         #[clap(long, short = 'n')]
         pub dry_run: bool,
-        /// The name of the remote to connect to.
+        /// The name of the remote to connect to, or the url of the remote to connect to directly.
         ///
         /// If unset, the current branch will determine the remote.
         #[clap(long, short = 'r')]
         pub remote: Option<String>,
-        /// Connect directly to the given URL, forgoing any configuration from the repository.
-        #[clap(long, short = 'u', conflicts_with("remote"), parse(try_from_os_str = std::convert::TryFrom::try_from))]
-        pub url: Option<git::Url>,
         /// Override the built-in and configured ref-specs with one or more of the given ones.
         #[clap(parse(try_from_os_str = git::env::os_str_to_bstring))]
         pub ref_spec: Vec<git_repository::bstr::BString>,
     #[derive(Debug, clap::Parser)]
     pub struct Platform {
-        /// The name of the remote to connect to.
+        /// The name of the remote to connect to, or the URL of the remote to connect to directly.
         ///
         /// If unset, the current branch will determine the remote.
         #[clap(long, short = 'n')]
         pub name: Option<String>,
-        /// Connect directly to the given URL, forgoing any configuration from the repository.
-        #[clap(long, short = 'u', conflicts_with("name"), parse(try_from_os_str = std::convert::TryFrom::try_from))]
-        pub url: Option<git::Url>,
         /// Output additional typically information provided by the server as part of the connection handshake.
         #[clap(long)]
         pub handshake_info: bool,