Merge branch 'gix_rev_parse_time_format'

Author: Byron

Cargo.lock

@@ -40,8 +40,6 @@ git-repository = { version = "^0.24.0", path = "../git-repository", default-feat
 git-pack-for-configuration-only = { package = "git-pack", version = "^0.22.0", path = "../git-pack", default-features = false, features = ["pack-cache-lru-dynamic", "pack-cache-lru-static"] }
 git-transport-configuration-only = { package = "git-transport", version = "^0.20.0", path = "../git-transport", default-features = false }
 git-commitgraph = { version = "^0.8.2", path = "../git-commitgraph" }
-git-config = { version = "^0.7.1", path = "../git-config" }
-git-features = { version = "^0.22.4", path = "../git-features" }
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] }
 anyhow = "1.0.42"
 thiserror = "1.0.34"

gitoxide-core/Cargo.toml

@@ -136,7 +136,7 @@ pub fn checkout_exclusive(
                 )
             })
             .unwrap_or_default(),
-        git_features::progress::bytes()
+        git::progress::bytes()
             .unwrap()
             .display(bytes_written as usize, None, None)
     ));

gitoxide-core/src/index/checkout.rs

@@ -4,7 +4,6 @@ use std::{
 };
 
 use git::{objs::bstr::ByteSlice, progress, Progress};
-use git_config::File;
 use git_repository as git;
 
 #[derive(Copy, Clone, Eq, PartialEq)]
@@ -101,9 +100,9 @@ where
 
 fn find_origin_remote(repo: &Path) -> anyhow::Result<Option<git_url::Url>> {
     let non_bare = repo.join(".git").join("config");
-    let local = git_config::Source::Local;
-    let config = File::from_path_no_includes(non_bare.as_path(), local)
-        .or_else(|_| File::from_path_no_includes(repo.join("config").as_path(), local))?;
+    let local = git::config::Source::Local;
+    let config = git::config::File::from_path_no_includes(non_bare.as_path(), local)
+        .or_else(|_| git::config::File::from_path_no_includes(repo.join("config").as_path(), local))?;
     Ok(config
         .string("remote", Some("origin"), "url")
         .map(|url| git_url::Url::from_bytes(url.as_ref()))

gitoxide-core/src/organize.rs

@@ -1,6 +1,6 @@
 use anyhow::bail;
 use git::{
-    bstr::{BStr, BString, ByteSlice},
+    bstr::{BStr, BString},
     revision::plumbing::{
         spec,
         spec::parse::{
@@ -94,17 +94,13 @@ impl<'a> delegate::Revision for Explain<'a> {
             ReflogLookup::Entry(no) => {
                 writeln!(self.out, "Find entry {} in reflog of '{}' reference", no, ref_name).ok()
             }
-            ReflogLookup::Date(time) => {
-                let mut buf = Vec::new();
-                time.write_to(&mut buf).ok()?;
-                writeln!(
-                    self.out,
-                    "Find entry closest to time {} in reflog of '{}' reference",
-                    buf.as_bstr(),
-                    ref_name
-                )
-                .ok()
-            }
+            ReflogLookup::Date(time) => writeln!(
+                self.out,
+                "Find entry closest to time {} in reflog of '{}' reference",
+                time.format(git::date::time::format::ISO8601),
+                ref_name
+            )
+            .ok(),
         }
     }