Merge pull request #1935 from pierrechevalier83/fix_1923

Make author and committer date roundtrip

Author: Byron

Cargo.lock

@@ -377,3 +377,7 @@ no_effect_underscore_binding = "allow"  # x1
 empty_docs = "allow"
 too_long_first_doc_paragraph = "allow"
 large_stack_arrays = "allow"
+
+# Fix one day
+result_large_err = "allow"
+large_enum_variant = "allow"

Cargo.toml

@@ -150,7 +150,7 @@ fn run(args: Args) -> anyhow::Result<()> {
                         commit_ref.author.actor().write_to(&mut buf)?;
                         buf.into()
                     },
-                    time: commit_ref.author.time.format(format::DEFAULT),
+                    time: commit_ref.author.time()?.format(format::DEFAULT),
                     message: commit_ref.message.to_owned(),
                 })
             }),

examples/log.rs

@@ -57,8 +57,9 @@ impl Engine {
         let repos = self.refresh_repos(&corpus_path, corpus_id)?;
         self.state.progress.set_name("refresh repos".into());
         self.state.progress.info(format!(
-            "Added or updated {} repositories under {corpus_path:?}",
-            repos.len()
+            "Added or updated {} repositories under '{corpus_path}'",
+            repos.len(),
+            corpus_path = corpus_path.display(),
         ));
         Ok(())
     }
@@ -316,7 +317,7 @@ impl Engine {
                                 out.push(repo);
                                 progress.inc();
                             }
-                            Err(err) => progress.fail(format!("{repo_path:?}: {err:#?}")),
+                            Err(err) => progress.fail(format!("{repo_path}: {err:#?}", repo_path = repo_path.display())),
                         }
                     }
                     statement.finalize()?;

gitoxide-core/src/corpus/engine.rs

@@ -17,7 +17,7 @@ const MINUTES_PER_HOUR: f32 = 60.0;
 pub const HOURS_PER_WORKDAY: f32 = 8.0;
 
 pub fn estimate_hours(
-    commits: &[(u32, gix::actor::SignatureRef<'static>)],
+    commits: &[(u32, super::SignatureRef<'static>)],
     stats: &[(u32, FileStats, LineStats)],
 ) -> WorkByEmail {
     assert!(!commits.is_empty());
@@ -31,7 +31,7 @@ pub fn estimate_hours(
         let mut cur = commits.next().expect("at least one commit if we are here");
 
         for next in commits {
-            let change_in_minutes = (next.time.seconds.saturating_sub(cur.time.seconds)) as f32 / MINUTES_PER_HOUR;
+            let change_in_minutes = (next.seconds().saturating_sub(cur.seconds())) as f32 / MINUTES_PER_HOUR;
             if change_in_minutes < MAX_COMMIT_DIFFERENCE_IN_MINUTES {
                 hours += change_in_minutes / MINUTES_PER_HOUR;
             } else {
@@ -166,13 +166,11 @@ pub fn spawn_tree_delta_threads<'scope>(
                                             (true, true) => {
                                                 files.modified += 1;
                                                 if let Some(cache) = cache.as_mut() {
-                                                    let mut diff = change.diff(cache).map_err(|err| {
-                                                        std::io::Error::new(std::io::ErrorKind::Other, err)
-                                                    })?;
+                                                    let mut diff = change.diff(cache).map_err(std::io::Error::other)?;
                                                     let mut nl = 0;
-                                                    if let Some(counts) = diff.line_counts().map_err(|err| {
-                                                        std::io::Error::new(std::io::ErrorKind::Other, err)
-                                                    })? {
+                                                    if let Some(counts) =
+                                                        diff.line_counts().map_err(std::io::Error::other)?
+                                                    {
                                                         nl += counts.insertions as usize + counts.removals as usize;
                                                         lines.added += counts.insertions as usize;
                                                         lines.removed += counts.removals as usize;

gitoxide-core/src/hours/core.rs

@@ -2,7 +2,6 @@ use std::{collections::BTreeSet, io, path::Path, time::Instant};
 
 use anyhow::bail;
 use gix::{
-    actor,
     bstr::{BStr, ByteSlice},
     prelude::*,
     progress, Count, NestedProgress, Progress,
@@ -27,6 +26,18 @@ pub struct Context<W> {
     pub out: W,
 }
 
+pub struct SignatureRef<'a> {
+    name: &'a BStr,
+    email: &'a BStr,
+    time: gix::date::Time,
+}
+
+impl SignatureRef<'_> {
+    fn seconds(&self) -> gix::date::SecondsSinceUnixEpoch {
+        self.time.seconds
+    }
+}
+
 /// Estimate the hours it takes to produce the content of the repository in `_working_dir_`, with `_refname_` for
 /// the start of the commit graph traversal.
 ///
@@ -85,7 +96,7 @@ where
 
                         out.push((
                             commit_idx,
-                            actor::SignatureRef {
+                            SignatureRef {
                                 name,
                                 email,
                                 time: author.time,
@@ -97,7 +108,7 @@ where
                 out.sort_by(|a, b| {
                     a.1.email
                         .cmp(b.1.email)
-                        .then(a.1.time.seconds.cmp(&b.1.time.seconds).reverse())
+                        .then(a.1.seconds().cmp(&b.1.seconds()).reverse())
                 });
                 Ok(out)
             });

gitoxide-core/src/hours/mod.rs

@@ -30,9 +30,10 @@
 #![deny(rust_2018_idioms)]
 #![forbid(unsafe_code)]
 
-use anyhow::bail;
 use std::str::FromStr;
 
+use anyhow::bail;
+
 #[derive(Debug, Eq, PartialEq, Hash, Clone, Copy)]
 pub enum OutputFormat {
     Human,

gitoxide-core/src/lib.rs

@@ -1,5 +1,5 @@
-use std::borrow::Cow;
 use std::{
+    borrow::Cow,
     ffi::OsStr,
     path::{Path, PathBuf},
 };
@@ -138,9 +138,9 @@ fn handle(
 
     if let Some(parent_repo_path) = find_parent_repo(git_workdir) {
         progress.fail(format!(
-            "Skipping repository at {:?} as it is nested within repository {:?}",
+            "Skipping repository at '{}' as it is nested within repository '{}'",
             git_workdir.display(),
-            parent_repo_path
+            parent_repo_path.display()
         ));
         return Ok(());
     }
@@ -157,7 +157,7 @@ fn handle(
     };
     if url.path.is_empty() {
         progress.info(format!(
-            "Skipping repository at {:?} whose remote does not have a path: {:?}",
+            "Skipping repository at '{}' whose remote does not have a path: {}",
             git_workdir.display(),
             url.to_bstring()
         ));

gitoxide-core/src/organize.rs

@@ -1,10 +1,10 @@
-use crate::net;
-use crate::pack::receive::protocol::fetch::negotiate;
-use crate::OutputFormat;
-use gix::config::tree::Key;
-use gix::protocol::maybe_async;
-use gix::remote::fetch::Error;
-use gix::DynNestedProgress;
+use std::{
+    io,
+    path::PathBuf,
+    sync::{atomic::AtomicBool, Arc},
+};
+
+use gix::{config::tree::Key, protocol::maybe_async, remote::fetch::Error, DynNestedProgress};
 pub use gix::{
     hash::ObjectId,
     objs::bstr::{BString, ByteSlice},
@@ -18,11 +18,8 @@ pub use gix::{
     },
     NestedProgress, Progress,
 };
-use std::{
-    io,
-    path::PathBuf,
-    sync::{atomic::AtomicBool, Arc},
-};
+
+use crate::{net, pack::receive::protocol::fetch::negotiate, OutputFormat};
 
 pub const PROGRESS_RANGE: std::ops::RangeInclusive<u8> = 1..=3;
 pub struct Context<W> {
@@ -294,7 +291,7 @@ fn receive_pack_blocking(
         None::<gix::objs::find::Never>,
         options,
     )
-    .map_err(|err| io::Error::new(io::ErrorKind::Other, err))?;
+    .map_err(io::Error::other)?;
 
     if let Some(directory) = refs_directory.take() {
         write_raw_refs(refs, directory)?;

gitoxide-core/src/pack/receive.rs

@@ -19,8 +19,12 @@ pub fn create(path: impl AsRef<std::path::Path>) -> anyhow::Result<rusqlite::Con
         }
         Some(version) if version != VERSION => match con.close() {
             Ok(()) => {
-                std::fs::remove_file(path)
-                    .with_context(|| format!("Failed to remove incompatible database file at {path:?}"))?;
+                std::fs::remove_file(path).with_context(|| {
+                    format!(
+                        "Failed to remove incompatible database file at {path}",
+                        path = path.display()
+                    )
+                })?;
                 con = rusqlite::Connection::open(path)?;
                 con.execute_batch(meta_table)?;
                 con.execute("INSERT into meta(version) values(?)", params![VERSION])?;