fix!: Store the raw time in Commit

Author: Pierre Chevalier

gix-object/src/commit/mod.rs

@@ -112,7 +112,7 @@ impl<'a> CommitRef<'a> {
 
     /// Returns the time at which this commit was created.
     pub fn time(&self) -> gix_date::Time {
-        self.committer.time
+        gix_date::Time::from_bytes(self.committer.time).expect("Time from Git should be valid")
     }
 }
 

gix-object/tests/object/commit/from_bytes.rs

@@ -3,7 +3,6 @@ use crate::{
     fixture_name, linus_signature, signature,
 };
 use gix_actor::SignatureRef;
-use gix_date::{time::Sign, Time};
 use gix_object::{bstr::ByteSlice, commit::message::body::TrailerRef, CommitRef};
 use smallvec::SmallVec;
 
@@ -12,11 +11,7 @@ fn invalid_timestsamp() {
     let actor = gix_actor::SignatureRef {
         name: b"Name".as_bstr(),
         email: b"[email protected]".as_bstr(),
-        time: Time {
-            seconds: 1312735823,
-            offset: 0,
-            sign: Sign::Plus,
-        },
+        time: b"1312735823 +051800".as_bstr(),
     };
     assert_eq!(
         CommitRef::from_bytes(&fixture_name("commit", "invalid-timestamp.txt"))
@@ -39,11 +34,7 @@ fn invalid_email_of_committer() {
     let actor = gix_actor::SignatureRef {
         name: b"Gregor Hartmann".as_bstr(),
         email: b"gh <Gregor Hartmann<[email protected]".as_bstr(),
-        time: Time {
-            seconds: 1282910542,
-            offset: 2 * 60 * 60,
-            sign: Sign::Plus,
-        },
+        time: b"1282910542 +0200".as_bstr(),
     };
     assert_eq!(
         CommitRef::from_bytes(&fixture_name("commit", "invalid-actor.txt"))
@@ -67,8 +58,8 @@ fn unsigned() -> crate::Result {
         CommitRef {
             tree: b"1b2dfb4ac5e42080b682fc676e9738c94ce6d54d".as_bstr(),
             parents: SmallVec::default(),
-            author: signature(1592437401),
-            committer: signature(1592437401),
+            author: signature(b"1592437401 +0800"),
+            committer: signature(b"1592437401 +0800"),
             encoding: None,
             message: b"without sig".as_bstr(),
             extra_headers: vec![]
@@ -84,8 +75,8 @@ fn whitespace() -> crate::Result {
         CommitRef {
             tree: b"9bed6275068a0575243ba8409253e61af81ab2ff".as_bstr(),
             parents: SmallVec::from(vec![b"26b4df046d1776c123ac69d918f5aec247b58cc6".as_bstr()]),
-            author: signature(1592448450),
-            committer: signature(1592448450),
+            author: signature(b"1592448450 +0800"),
+            committer: signature(b"1592448450 +0800"),
             encoding: None,
             message: b" nl".as_bstr(), // this one had a \n trailing it, but git seems to trim that
             extra_headers: vec![]
@@ -101,8 +92,8 @@ fn signed_singleline() -> crate::Result {
         CommitRef {
             tree: b"00fc39317701176e326974ce44f5bd545a32ec0b".as_bstr(),
             parents: SmallVec::from(vec![b"09d8d3a12e161a7f6afb522dbe8900a9c09bce06".as_bstr()]),
-            author: signature(1592391367),
-            committer: signature(1592391367),
+            author: signature(b"1592391367 +0800"),
+            committer: signature(b"1592391367 +0800"),
             encoding: None,
             message: b"update tasks\n".as_bstr(),
             extra_headers: vec![(b"gpgsig".as_bstr(), b"magic:signature".as_bstr().into())]
@@ -120,8 +111,8 @@ fn mergetag() -> crate::Result {
             b"44ebe016df3aad96e3be8f95ec52397728dd7701".as_bstr(),
             b"8d485da0ddee79d0e6713405694253d401e41b93".as_bstr(),
         ]),
-        author: linus_signature(1591996221),
-        committer: linus_signature(1591996221),
+        author: linus_signature(b"1591996221 -0700"),
+        committer: linus_signature(b"1591996221 -0700"),
         encoding: None,
         message: LONG_MESSAGE.as_bytes().as_bstr(),
         extra_headers: vec![(
@@ -142,8 +133,8 @@ fn signed() -> crate::Result {
         CommitRef {
             tree: b"00fc39317701176e326974ce44f5bd545a32ec0b".as_bstr(),
             parents: SmallVec::from(vec![b"09d8d3a12e161a7f6afb522dbe8900a9c09bce06".as_bstr()]),
-            author: signature(1592391367),
-            committer: signature(1592391367),
+            author: signature(b"1592391367 +0800"),
+            committer: signature(b"1592391367 +0800"),
             encoding: None,
             message: b"update tasks\n".as_bstr(),
             extra_headers: vec![(b"gpgsig".as_bstr(), b"-----BEGIN PGP SIGNATURE-----\n\niQEzBAABCAAdFiEEdjYp/sh4j8NRKLX27gKdHl60AwAFAl7p9tgACgkQ7gKdHl60\nAwBpegf+KQciv9AOIN7+yPmowecGxBnSfpKWTDzFxnyGR8dq63SpWT8WEKG5mf3a\nG6iUqpsDWaMHlzihaMKRvgRpZxFRbjnNPFBj6F4RRqfE+5R7k6DRSLUV5PqnsdSH\nuccfIDWi1imhsm7AaP5trwl1t+83U2JhHqPcPVFLMODYwWeO6NLR/JCzGSTQRa8t\nRgaVMKI19O/fge5OT5Ua8D47VKEhsJX0LfmkP5RfZQ8JJvNd40TupqKRdlv0sAzP\nya7NXkSHXCavHNR6kA+KpWxn900UoGK8/IDlwU6MeOkpPVawb3NFMqnc7KJDaC2p\nSMzpuEG8LTrCx2YSpHNLqHyzvQ1CZA==\n=5ITV\n-----END PGP SIGNATURE-----\n".as_bstr().into())]
@@ -159,8 +150,8 @@ fn signed_with_encoding() -> crate::Result {
         CommitRef {
             tree: b"1973afa74d87b2bb73fa884aaaa8752aec43ea88".as_bstr(),
             parents: SmallVec::from(vec![b"79c51cc86923e2b8ca0ee5c4eb75e48027133f9a".as_bstr()]),
-            author: signature(1592448995),
-            committer: signature(1592449083),
+            author: signature(b"1592448995 +0800"),
+            committer: signature(b"1592449083 +0800"),
             encoding: Some(b"ISO-8859-1".as_bstr()),
             message: b"encoding & sig".as_bstr(),
             extra_headers: vec![(b"gpgsig".as_bstr(), SIGNATURE.as_bstr().into())]
@@ -176,8 +167,8 @@ fn with_encoding() -> crate::Result {
         CommitRef {
             tree: b"4a1c03029e7407c0afe9fc0320b3258e188b115e".as_bstr(),
             parents: SmallVec::from(vec![b"7ca98aad461a5c302cb4c9e3acaaa6053cc67a62".as_bstr()]),
-            author: signature(1592438199),
-            committer: signature(1592438199),
+            author: signature(b"1592438199 +0800"),
+            committer: signature(b"1592438199 +0800"),
             encoding: Some("ISO-8859-1".into()),
             message: b"commit with encoding".as_bstr(),
             extra_headers: vec![]
@@ -191,11 +182,7 @@ fn pre_epoch() -> crate::Result {
     let signature = || SignatureRef {
         name: "Législateur".into(),
         email: "".into(),
-        time: Time {
-            seconds: -5263834140,
-            offset: 540,
-            sign: Sign::Plus,
-        },
+        time: b"-5263834140 +0009".as_bstr(),
     };
     assert_eq!(
         CommitRef::from_bytes(&fixture_name("commit", "pre-epoch.txt"))?,
@@ -217,11 +204,7 @@ fn double_dash_special_time_offset() -> crate::Result {
     let signature = || SignatureRef {
         name: "name".into(),
         email: "[email protected]".into(),
-        time: Time {
-            seconds: 1288373970,
-            offset: -252000,
-            sign: Sign::Minus,
-        },
+        time: "1288373970 --700".into(),
     };
     assert_eq!(
         CommitRef::from_bytes(&fixture_name("commit", "double-dash-date-offset.txt"))?,
@@ -243,11 +226,7 @@ fn with_trailer() -> crate::Result {
     let kim = SignatureRef {
         name: "Kim Altintop".into(),
         email: "[email protected]".into(),
-        time: Time {
-            seconds: 1631514803,
-            offset: 7200,
-            sign: Sign::Plus,
-        },
+        time: "1631514803 +0200".into(),
     };
     let backing = fixture_name("commit", "message-with-footer.txt");
     let commit = CommitRef::from_bytes(&backing)?;
@@ -336,8 +315,8 @@ fn merge() -> crate::Result {
                 b"6a6054db4ce3c1e4e6a37f8c4d7acb63a4d6ad71".as_bstr(),
                 b"c91d592913d47ac4e4a76daf16fd649b276e211e".as_bstr()
             ]),
-            author: signature(1592454703),
-            committer: signature(1592454738),
+            author: signature(b"1592454703 +0800"),
+            committer: signature(b"1592454738 +0800"),
             encoding: Some("ISO-8859-1".into()),
             message: b"Merge branch 'branch'".as_bstr(),
             extra_headers: vec![]

gix-object/tests/object/commit/iter.rs

@@ -33,19 +33,19 @@ fn signed_with_encoding() -> crate::Result {
                 id: hex_to_id("79c51cc86923e2b8ca0ee5c4eb75e48027133f9a")
             },
             Token::Author {
-                signature: signature(1592448995)
+                signature: signature(b"1592448995 +0800")
             },
             Token::Committer {
-                signature: signature(1592449083)
+                signature: signature(b"1592449083 +0800")
             },
             Token::Encoding(b"ISO-8859-1".as_bstr()),
             Token::ExtraHeader((b"gpgsig".as_bstr(), SIGNATURE.as_bytes().as_bstr().into())),
             Token::Message(b"encoding & sig".as_bstr()),
         ]
     );
 
-    assert_eq!(iter.author().ok(), Some(signature(1592448995)));
-    assert_eq!(iter.committer().ok(), Some(signature(1592449083)));
+    assert_eq!(iter.author().ok(), Some(signature(b"1592448995 +0800")));
+    assert_eq!(iter.committer().ok(), Some(signature(b"1592449083 +0800")));
     Ok(())
 }
 
@@ -61,10 +61,10 @@ fn whitespace() -> crate::Result {
                 id: hex_to_id("26b4df046d1776c123ac69d918f5aec247b58cc6")
             },
             Token::Author {
-                signature: signature(1592448450)
+                signature: signature(b"1592448450 +0800")
             },
             Token::Committer {
-                signature: signature(1592448450)
+                signature: signature(b"1592448450 +0800")
             },
             Token::Message(b" nl".as_bstr())
         ]
@@ -81,10 +81,10 @@ fn unsigned() -> crate::Result {
                 id: hex_to_id("1b2dfb4ac5e42080b682fc676e9738c94ce6d54d")
             },
             Token::Author {
-                signature: signature(1592437401)
+                signature: signature(b"1592437401 +0800")
             },
             Token::Committer {
-                signature: signature(1592437401)
+                signature: signature(b"1592437401 +0800")
             },
             Token::Message(b"without sig".as_bstr())
         ]
@@ -104,10 +104,10 @@ fn signed_singleline() -> crate::Result {
                 id: hex_to_id("09d8d3a12e161a7f6afb522dbe8900a9c09bce06")
             },
             Token::Author {
-                signature: signature(1592391367)
+                signature: signature(b"1592391367 +0800")
             },
             Token::Committer {
-                signature: signature(1592391367)
+                signature: signature(b"1592391367 +0800")
             },
             Token::ExtraHeader((b"gpgsig".as_bstr(), b"magic:signature".as_bstr().into())),
             Token::Message(b"update tasks\n".as_bstr()),
@@ -151,10 +151,10 @@ fn mergetag() -> crate::Result {
                 id: hex_to_id("8d485da0ddee79d0e6713405694253d401e41b93")
             },
             Token::Author {
-                signature: linus_signature(1591996221)
+                signature: linus_signature(b"1591996221 -0700")
             },
             Token::Committer {
-                signature: linus_signature(1591996221)
+                signature: linus_signature(b"1591996221 -0700")
             },
             Token::ExtraHeader((b"mergetag".as_bstr(), MERGE_TAG.as_bytes().as_bstr().into())),
             Token::Message(LONG_MESSAGE.into()),
@@ -186,7 +186,7 @@ mod method {
         );
         assert_eq!(
             iter.signatures().collect::<Vec<_>>(),
-            vec![signature(1592437401), signature(1592437401)]
+            vec![signature(b"1592437401 +0800"), signature(b"1592437401 +0800")]
         );
         assert_eq!(iter.parent_ids().count(), 0);
         Ok(())
@@ -198,11 +198,15 @@ mod method {
         let iter = CommitRefIter::from_bytes(&input);
         assert_eq!(
             iter.signatures().collect::<Vec<_>>(),
-            vec![signature(1592437401), signature(1592437401)]
+            vec![signature(b"1592437401 +0800"), signature(b"1592437401 +0800")]
+        );
+        assert_eq!(iter.author().ok(), Some(signature(b"1592437401 +0800")));
+        assert_eq!(iter.committer().ok(), Some(signature(b"1592437401 +0800")));
+        assert_eq!(
+            iter.author().ok(),
+            Some(signature(b"1592437401 +0800")),
+            "it's not consuming"
         );
-        assert_eq!(iter.author().ok(), Some(signature(1592437401)));
-        assert_eq!(iter.committer().ok(), Some(signature(1592437401)));
-        assert_eq!(iter.author().ok(), Some(signature(1592437401)), "it's not consuming");
         Ok(())
     }
 

gix-object/tests/object/commit/message.rs

@@ -224,7 +224,6 @@ mod summary {
     use std::borrow::Cow;
 
     use gix_actor::SignatureRef;
-    use gix_date::{time::Sign, Time};
     use gix_object::{
         bstr::{BStr, ByteSlice},
         commit::MessageRef,
@@ -236,11 +235,7 @@ mod summary {
         let actor = SignatureRef {
             name: "name".into(),
             email: "email".into(),
-            time: Time {
-                seconds: 0,
-                offset: 0,
-                sign: Sign::Plus,
-            },
+            time: "0 0000".into(),
         };
         assert_eq!(
             CommitRef {

gix-object/tests/object/commit/mod.rs

@@ -172,7 +172,7 @@ fn invalid() {
     assert_eq!(
         CommitRef::from_bytes(partial_commit).unwrap_err().to_string(),
         if cfg!(feature = "verbose-object-parsing-errors") {
-            "object parsing failed at `1`\nexpected `author <signature>`"
+            "object parsing failed at ``\nexpected `author <signature>`"
         } else {
             "object parsing failed"
         }

gix-object/tests/object/main.rs

@@ -81,39 +81,30 @@ fn fixture_name(kind: &str, path: &str) -> Vec<u8> {
 fn size_in_memory() {
     let actual = std::mem::size_of::<gix_object::Object>();
     assert!(
-        actual <= 264,
-        "{actual} <= 264: Prevent unexpected growth of what should be lightweight objects"
+        actual <= 272,
+        "{actual} <= 272: Prevent unexpected growth of what should be lightweight objects"
     );
 }
 
 fn hex_to_id(hex: &str) -> ObjectId {
     ObjectId::from_hex(hex.as_bytes()).expect("40 bytes hex")
 }
 
-use gix_date::{time::Sign, SecondsSinceUnixEpoch, Time};
 
-fn signature(seconds: SecondsSinceUnixEpoch) -> gix_actor::SignatureRef<'static> {
+fn signature(time: &[u8]) -> gix_actor::SignatureRef<'_> {
     use gix_object::bstr::ByteSlice;
     gix_actor::SignatureRef {
         name: b"Sebastian Thiel".as_bstr(),
         email: b"[email protected]".as_bstr(),
-        time: Time {
-            seconds,
-            offset: 28800,
-            sign: Sign::Plus,
-        },
+        time: time.as_bstr(),
     }
 }
 
-fn linus_signature(seconds: SecondsSinceUnixEpoch) -> gix_actor::SignatureRef<'static> {
+fn linus_signature(time: &[u8]) -> gix_actor::SignatureRef<'_> {
     use gix_object::bstr::ByteSlice;
     gix_actor::SignatureRef {
         name: b"Linus Torvalds".as_bstr(),
         email: b"[email protected]".as_bstr(),
-        time: Time {
-            seconds,
-            offset: -25200,
-            sign: Sign::Minus,
-        },
+        time: time.as_bstr(),
     }
 }