Remove all public exports of git-hash types in git-object (#63)

Sebastian Thiel committed 5 years ago

Commit accf89d1 parent a3f281660 files · +262 −252Browse files

Showing the changes to git-commitgraph (7 of 60 files). Show all

Unified · Split

7 files

git-commitgraph/Cargo.toml +1 −2
git-commitgraph/src/file/access.rs +2 −3
git-commitgraph/src/file/commit.rs +4 −5
git-commitgraph/src/file/verify.rs +15 −10
git-commitgraph/src/graph/init.rs +2 −3
git-commitgraph/src/graph/verify.rs +8 −5
git-commitgraph/tests/commitgraph.rs +8 −9

 doctest = false
 [features]
-serde1 = ["serde", "git-object/serde1"]
+serde1 = ["serde", "git-hash/serde1"]
 [dependencies]
 git-features = { version = "^0.11.0", path = "../git-features" }
-git-object = { version = "^0.6.0", path = "../git-object" }
 git-hash = { version = "^0.1.0", path = "../git-hash" }
 bstr = { version = "0.2.13", default-features = false, features = ["std"] }

git-commitgraph/src/file/access.rs+2−3

 use crate::file::{self, commit::Commit, File, COMMIT_DATA_ENTRY_SIZE};
 use git_hash::SIZE_OF_SHA1_DIGEST as SHA1_SIZE;
-use git_object::HashKind;
 use std::{
     convert::{TryFrom, TryInto},
     fmt::{Debug, Formatter},
     /// The kind of hash used in this File.
     ///
     /// Note that it is always conforming to the hash used in the owning repository.
-    pub fn hash_kind(&self) -> HashKind {
+    pub fn hash_kind(&self) -> git_hash::Kind {
-        HashKind::Sha1
+        git_hash::Kind::Sha1
     }
     /// Returns 20 bytes sha1 at the given index in our list of (sorted) sha1 hashes.

git-commitgraph/src/file/commit.rs+4−5

 };
 use byteorder::{BigEndian, ByteOrder};
 use git_hash::SIZE_OF_SHA1_DIGEST as SHA1_SIZE;
-use git_object::owned;
 use std::{
     convert::{TryFrom, TryInto},
     fmt::{Debug, Formatter},
 #[allow(missing_docs)]
 pub enum Error {
     #[error("commit {0}'s extra edges overflows the commit-graph file's extra edges list")]
-    ExtraEdgesListOverflow(owned::Id),
+    ExtraEdgesListOverflow(git_hash::Id),
     #[error("commit {0}'s first parent is an extra edge index, which is invalid")]
-    FirstParentIsExtraEdgeIndex(owned::Id),
+    FirstParentIsExtraEdgeIndex(git_hash::Id),
     #[error("commit {0} has extra edges, but commit-graph file has no extra edges list")]
-    MissingExtraEdgesList(owned::Id),
+    MissingExtraEdgesList(git_hash::Id),
     #[error("commit {0} has a second parent but not a first parent")]
-    SecondParentWithoutFirstParent(owned::Id),
+    SecondParentWithoutFirstParent(git_hash::Id),
 }
 // Note that git's commit-graph-format.txt as of v2.28.0 gives an incorrect value 0x0700_0000 for

git-commitgraph/src/file/verify.rs+15−10

 };
 use bstr::ByteSlice;
 use git_hash::SIZE_OF_SHA1_DIGEST as SHA1_SIZE;
-use git_object::owned;
 use std::{
     cmp::{max, min},
     collections::HashMap,
     #[error(transparent)]
     Commit(#[from] file::commit::Error),
     #[error("commit at file position {pos} has invalid ID {id}")]
-    CommitId { id: owned::Id, pos: file::Position },
+    CommitId { id: git_hash::Id, pos: file::Position },
     #[error("commit at file position {pos} with ID {id} is out of order relative to its predecessor with ID {predecessor_id}")]
     CommitsOutOfOrder {
-        id: owned::Id,
+        id: git_hash::Id,
         pos: file::Position,
-        predecessor_id: owned::Id,
+        predecessor_id: git_hash::Id,
     },
     #[error("commit-graph filename should be {0}")]
     Filename(String),
     #[error("commit {id} has invalid generation {generation}")]
-    Generation { generation: u32, id: owned::Id },
+    Generation { generation: u32, id: git_hash::Id },
     #[error("checksum mismatch: expected {expected}, got {actual}")]
-    Mismatch { actual: owned::Id, expected: owned::Id },
+    Mismatch {
+        actual: git_hash::Id,
+        expected: git_hash::Id,
+    },
     #[error("{0}")]
     Processor(#[source] E),
     #[error("commit {id} has invalid root tree ID {root_tree_id}")]
-    RootTreeId { id: owned::Id, root_tree_id: owned::Id },
+    RootTreeId {
+        id: git_hash::Id,
+        root_tree_id: git_hash::Id,
+    },
 }
 /// The positive result of [`File::traverse()`] providing some statistical information.
     /// checksum itself.
     ///
     /// Return the actual checksum on success or `(actual checksum, expected checksum)` if there is a mismatch.
-    pub fn verify_checksum(&self) -> Result<owned::Id, (owned::Id, owned::Id)> {
+    pub fn verify_checksum(&self) -> Result<git_hash::Id, (git_hash::Id, git_hash::Id)> {
         // Even though we could use git_features::hash::bytes_of_file(…), this would require using our own
         // Error type to support io::Error and Mismatch. As we only gain progress, there probably isn't much value
         // as these files are usually small enough to process them in less than a second, even for the large ones.
         let data_len_without_trailer = self.data.len() - SHA1_SIZE;
         let mut hasher = git_features::hash::Sha1::default();
         hasher.update(&self.data[..data_len_without_trailer]);
-        let actual = owned::Id::new_sha1(hasher.digest());
+        let actual = git_hash::Id::new_sha1(hasher.digest());
         let expected = self.checksum();
         if actual.to_borrowed() == expected {
         .and_then(|filename| filename.to_str())
         .and_then(|filename| filename.strip_suffix(".graph"))
         .and_then(|stem| stem.strip_prefix("graph-"))
-        .map_or(Ok(()), |hex| match owned::Id::from_40_bytes_in_hex(hex.as_bytes()) {
+        .map_or(Ok(()), |hex| match git_hash::Id::from_40_bytes_in_hex(hex.as_bytes()) {
             Ok(actual) if actual.to_borrowed() == expected => Ok(()),
             _ => Err(format!("graph-{}.graph", expected.to_sha1_hex().as_bstr())),
         })

git-commitgraph/src/graph/init.rs+2−3

     file::{self, File},
     Graph, MAX_COMMITS,
 };
-use git_object::HashKind;
 use std::{
     convert::TryFrom,
     io::{BufRead, BufReader},
     #[error("Commit-graph files mismatch: '{}' uses hash {hash1:?}, but '{}' uses hash {hash2:?}", .path1.display(), .path2.display())]
     HashVersionMismatch {
         path1: PathBuf,
-        hash1: HashKind,
+        hash1: git_hash::Kind,
         path2: PathBuf,
-        hash2: HashKind,
+        hash2: git_hash::Kind,
     },
     #[error("Did not find any files that look like commit graphs at '{}'", .0.display())]
     InvalidPath(PathBuf),

git-commitgraph/src/graph/verify.rs+8−5

     file::{self, commit},
     graph, Graph, GENERATION_NUMBER_MAX,
 };
-use git_object::owned;
 use std::{
     cmp::{max, min},
     collections::BTreeMap,
     BaseGraphCount { actual: u8, expected: u8, path: PathBuf },
     #[error("'{}' base graph at index {index} should have ID {expected} but is {actual}", .path.display())]
     BaseGraphId {
-        actual: owned::Id,
+        actual: git_hash::Id,
-        expected: owned::Id,
+        expected: git_hash::Id,
         index: u8,
         path: PathBuf,
     },
         path: PathBuf,
     },
     #[error("Commit {id}'s generation should be {expected} but is {actual}")]
-    Generation { actual: u32, expected: u32, id: owned::Id },
+    Generation {
+        actual: u32,
+        expected: u32,
+        id: git_hash::Id,
+    },
     #[error(
         "Commit {id} has parent position {parent_pos} that is out of range (should be in range 0-{max_valid_pos})"
     )]
     ParentOutOfRange {
-        id: owned::Id,
+        id: git_hash::Id,
         max_valid_pos: graph::Position,
         parent_pos: graph::Position,
     },

git-commitgraph/tests/commitgraph.rs+8−9

 use git_commitgraph::{graph::Position as GraphPosition, Graph};
-use git_object::{borrowed, owned};
 use std::{
     collections::{HashMap, HashSet},
     convert::{TryFrom, TryInto},
     PathBuf::from("tests").join("fixtures").join(path)
 }
-pub fn hex_to_id(hex: &[u8]) -> owned::Id {
+pub fn hex_to_id(hex: &[u8]) -> git_hash::Id {
-    owned::Id::from_40_bytes_in_hex(hex).expect("40 bytes hex")
+    git_hash::Id::from_40_bytes_in_hex(hex).expect("40 bytes hex")
 }
 pub struct RefInfo {
-    id: owned::Id,
+    id: git_hash::Id,
-    parent_ids: Vec<owned::Id>,
+    parent_ids: Vec<git_hash::Id>,
     pos: GraphPosition,
-    root_tree_id: owned::Id,
+    root_tree_id: git_hash::Id,
 }
 impl RefInfo {
             let parts = x.trim_end().split(' ').collect::<Vec<_>>();
             (
                 parts[0].to_string(),
-                owned::Id::from_40_bytes_in_hex(parts[1].as_bytes()).expect("40 bytes hex"),
+                git_hash::Id::from_40_bytes_in_hex(parts[1].as_bytes()).expect("40 bytes hex"),
-                owned::Id::from_40_bytes_in_hex(parts[2].as_bytes()).expect("40 bytes hex"),
+                git_hash::Id::from_40_bytes_in_hex(parts[2].as_bytes()).expect("40 bytes hex"),
                 parts[3..]
                     .iter()
-                    .map(|x| owned::Id::from_40_bytes_in_hex(x.as_bytes()).expect("40 bytes hex"))
+                    .map(|x| git_hash::Id::from_40_bytes_in_hex(x.as_bytes()).expect("40 bytes hex"))
                     .collect(),
             )
         })

Remove all public exports of git-hash types in git-object (#63)

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code