Merge pull request #2088 from GitoxideLabs/improvements

improvements

Author: Byron

gix-ref/Cargo.toml

@@ -9,7 +9,7 @@ description = "A crate to handle git references"
 authors = ["Sebastian Thiel <[email protected]>"]
 edition = "2021"
 include = ["src/**/*", "LICENSE-*"]
-rust-version = "1.70"
+rust-version = "1.74"
 autotests = false
 
 [lib]

gix-ref/src/store/file/find.rs

@@ -280,10 +280,10 @@ impl file::Store {
                 .filter_map(|c| gix_path::try_os_str_into_bstr(c.as_os_str().into()).ok())
                 .any(|c| gix_validate::path::component_is_windows_device(c.as_ref()))
         {
-            return Err(std::io::Error::new(
-                std::io::ErrorKind::Other,
-                format!("Illegal use of reserved Windows device name in \"{}\"", name.as_bstr()),
-            ));
+            return Err(std::io::Error::other(format!(
+                "Illegal use of reserved Windows device name in \"{}\"",
+                name.as_bstr()
+            )));
         }
 
         let ref_path = base.join(relative_path);

gix-ref/src/store/file/log/iter.rs

@@ -129,8 +129,7 @@ where
 {
     let pos = log.seek(std::io::SeekFrom::End(0))?;
     if buf.is_empty() {
-        return Err(std::io::Error::new(
-            std::io::ErrorKind::Other,
+        return Err(std::io::Error::other(
             "Zero sized buffers are not allowed, use 256 bytes or more for typical logs",
         ));
     }
@@ -217,10 +216,10 @@ where
                     } else {
                         let npos = last_read_pos.saturating_sub((self.buf.len() - end) as u64);
                         if npos == last_read_pos {
-                            return Some(Err(std::io::Error::new(
-                                std::io::ErrorKind::Other,
-                                format!("buffer too small for line size, got until {:?}", self.buf.as_bstr()),
-                            )
+                            return Some(Err(std::io::Error::other(format!(
+                                "buffer too small for line size, got until {:?}",
+                                self.buf.as_bstr()
+                            ))
                             .into()));
                         }
                         let n = (last_read_pos - npos) as usize;

gix-ref/src/store/file/log/line.rs

@@ -26,7 +26,7 @@ mod write {
 
     impl From<Error> for io::Error {
         fn from(err: Error) -> Self {
-            io::Error::new(io::ErrorKind::Other, err)
+            io::Error::other(err)
         }
     }
 

gix-ref/src/store/file/overlay_iter.rs

@@ -438,7 +438,7 @@ impl file::Store {
                         Some(prefix) => packed.iter_prefixed(prefix.into_owned()),
                         None => packed.iter(),
                     }
-                    .map_err(|err| std::io::Error::new(std::io::ErrorKind::Other, err))?
+                    .map_err(std::io::Error::other)?
                     .peekable(),
                 ),
                 None => None,

gix-ref/src/store/file/transaction/commit.rs

@@ -97,7 +97,7 @@ impl Transaction<'_, '_> {
                             // TODO: when Kind::IsADirectory becomes stable, use that.
                             let err = if err.instance.resource_path().is_dir() {
                                 gix_tempfile::remove_dir::empty_depth_first(err.instance.resource_path())
-                                    .map_err(|io_err| std::io::Error::new(std::io::ErrorKind::Other, io_err))
+                                    .map_err(std::io::Error::other)
                                     .and_then(|_| err.instance.commit().map_err(|err| err.error))
                                     .err()
                             } else {

gix-ref/tests/Cargo.toml

@@ -9,7 +9,7 @@ license = "MIT OR Apache-2.0"
 description = "Test the gix-ref crate with feature toggles"
 authors = ["Sebastian Thiel <[email protected]>"]
 edition = "2021"
-rust-version = "1.70"
+rust-version = "1.74"
 
 [features]
 gix-features-parallel = ["gix-features/parallel"] # test sorted parallel loose file traversal

gix-refspec/src/instruction.rs

@@ -37,6 +37,11 @@ pub enum Push<'a> {
         /// If true, allow non-fast-forward updates of `dest`.
         allow_non_fast_forward: bool,
     },
+    /// Exclude a single ref.
+    Exclude {
+        /// A full or partial ref name to exclude, or multiple if a single `*` is used.
+        src: &'a BStr,
+    },
 }
 
 /// Any source can either be a ref name (full or partial) or a fully spelled out hex-sha for an object, on the remote side.

gix-refspec/src/parse.rs

@@ -8,8 +8,6 @@ pub enum Error {
     NegativeWithDestination,
     #[error("Negative specs must not be empty")]
     NegativeEmpty,
-    #[error("Negative specs are only supported when fetching")]
-    NegativeUnsupported,
     #[error("Negative specs must be object hashes")]
     NegativeObjectHash,
     #[error("Negative specs must be full ref names, starting with \"refs/\"")]
@@ -62,9 +60,6 @@ pub(crate) mod function {
         let mode = match spec.first() {
             Some(&b'^') => {
                 spec = &spec[1..];
-                if operation == Operation::Push {
-                    return Err(Error::NegativeUnsupported);
-                }
                 Mode::Negative
             }
             Some(&b'+') => {

gix-refspec/src/spec.rs

@@ -209,6 +209,7 @@ impl<'a> RefSpecRef<'a> {
                     dst,
                     allow_non_fast_forward: matches!(self.mode, Mode::Force),
                 }),
+                (Mode::Negative, Some(src), None) => Instruction::Push(Push::Exclude { src }),
                 (mode, src, dest) => {
                     unreachable!(
                         "BUG: push instructions with {:?} {:?} {:?} are not possible",