Merge branch 'gix-clone-improvements'

Byron · Byron · commit 76c99f3005f1 · 2023-01-03T10:10:19.000+01:00
diff --git a/git-transport/src/client/blocking_io/file.rs b/git-transport/src/client/blocking_io/file.rs
@@ -138,7 +138,23 @@ fn supervise_stderr(
                 Some(err) => Err(err),
                 None => match res {
                     Ok(n) if n == wanted => Ok(n),
-                    Ok(n) => self.recv.recv().ok().map(Err).unwrap_or(Ok(n)),
+                    Ok(n) => {
+                        // TODO: fix this
+                        // When parsing refs this seems to happen legitimately
+                        // (even though we read packet lines only and should always know exactly how much to read)
+                        // Maybe this still happens in `read_exact()` as sometimes we just don't get enough bytes
+                        // despite knowing how many.
+                        // To prevent deadlock, we have to set a timeout which slows down legitimate parts of the protocol.
+                        // This code was specifically written to make the `cargo` test-suite pass, and we can reduce
+                        // the timeouts even more once there is a native ssh transport that is used by `cargo`, it will
+                        // be able to handle these properly.
+                        // Alternatively, one could implement something like `read2` to avoid blocking on stderr entirely.
+                        self.recv
+                            .recv_timeout(std::time::Duration::from_millis(5))
+                            .ok()
+                            .map(Err)
+                            .unwrap_or(Ok(n))
+                    }
                     Err(err) => Err(self.recv.recv().ok().unwrap_or(err)),
                 },
             }
@@ -153,7 +169,7 @@ fn supervise_stderr(
 
     let (send, recv) = std::sync::mpsc::sync_channel(1);
     std::thread::Builder::new()
-        .name("supervise ssh".into())
+        .name("supervise ssh stderr".into())
         .stack_size(128 * 1024)
         .spawn(move || -> std::io::Result<()> {
             let mut process_stderr = std::io::stderr();
diff --git a/gitoxide-core/src/repository/clone.rs b/gitoxide-core/src/repository/clone.rs
@@ -12,16 +12,16 @@ pub const PROGRESS_RANGE: std::ops::RangeInclusive<u8> = 1..=3;
 pub(crate) mod function {
     use std::ffi::OsStr;
 
-    use anyhow::bail;
+    use anyhow::{bail, Context};
     use git_repository as git;
     use git_repository::{bstr::BString, remote::fetch::Status, Progress};
 
     use super::Options;
     use crate::{repository::fetch::function::print_updates, OutputFormat};
 
     pub fn clone<P>(
-        remote: impl AsRef<OsStr>,
-        directory: impl AsRef<std::path::Path>,
+        url: impl AsRef<OsStr>,
+        directory: Option<impl Into<std::path::PathBuf>>,
         overrides: Vec<BString>,
         mut progress: P,
         mut out: impl std::io::Write,
@@ -41,8 +41,16 @@ pub(crate) mod function {
             bail!("JSON output isn't yet supported for fetching.");
         }
 
+        let url: git::Url = url.as_ref().try_into()?;
+        let directory = directory.map(|dir| Ok(dir.into())).unwrap_or_else(|| {
+            git::path::from_bstr(url.path.as_ref())
+                .as_ref()
+                .file_stem()
+                .map(Into::into)
+                .context("Filename extraction failed - path too short")
+        })?;
         let mut prepare = git::clone::PrepareFetch::new(
-            remote.as_ref(),
+            url,
             directory,
             bare.then(|| git::create::Kind::Bare)
                 .unwrap_or(git::create::Kind::WithWorktree),
diff --git a/src/plumbing/options/mod.rs b/src/plumbing/options/mod.rs
@@ -182,7 +182,7 @@ pub mod clone {
         pub remote: OsString,
 
         /// The directory to initialize with the new repository and to which all data should be written.
-        pub directory: PathBuf,
+        pub directory: Option<PathBuf>,
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ pub mod clone {`
`182`	`182`	`pub remote: OsString,`
`183`	`183`
`184`	`184`	`/// The directory to initialize with the new repository and to which all data should be written.`
`185`		`- pub directory: PathBuf,`
	`185`	`+ pub directory: Option<PathBuf>,`
`186`	`186`	`}`
`187`	`187`	`}`
`188`	`188`