change!: Change accessors named `hash_kind()` to `object_hash()` for consistency (#279)

Sebastian Thiel committed 4 years ago

Commit 2ef9a841 parent 1b7554124 files · +75 −58Browse files

Showing the changes to git-commitgraph/src (5 of 24 files). Show all

Unified · Split

5 files

git-commitgraph/src/file/access.rs +2 −2
git-commitgraph/src/file/init.rs +12 −11
git-commitgraph/src/file/mod.rs +1 −0
git-commitgraph/src/file/verify.rs +2 −2
git-commitgraph/src/graph/init.rs +3 −3

@@ -27,8 +27,8 @@ impl File { · 26 unmodified lines
27	/// The kind of hash used in this File.	27	/// The kind of hash used in this File.
28	///	28	///
29	/// Note that it is always conforming to the hash used in the owning repository.	29	/// Note that it is always conforming to the hash used in the owning repository.
30	pub fn hash_kind(&self) -> git_hash::Kind {	30	pub fn object_hash(&self) -> git_hash::Kind {
31	git_hash::Kind::from_len_in_bytes(self.hash_len)	31	self.object_hash
32	}	32	}
33		33
34	/// Returns an object id at the given index in our list of (sorted) hashes.	34	/// Returns an object id at the given index in our list of (sorted) hashes.

git-commitgraph/src/file/init.rs+12−11

         };
         ofs += 1;
-        let hash_kind = match data[ofs] {
+        let object_hash = match data[ofs] {
             1 => git_hash::Kind::Sha1,
             x => {
                 return Err(Error::UnsupportedHashVersion(x));
         let base_graphs_list_offset = chunks
             .validated_usize_offset_by_id(BASE_GRAPHS_LIST_CHUNK_ID, |chunk_range| {
                 let chunk_size = chunk_range.len();
-                if chunk_size % hash_kind.len_in_bytes() != 0 {
+                if chunk_size % object_hash.len_in_bytes() != 0 {
                     return Err(Error::InvalidChunkSize {
                         id: BASE_GRAPHS_LIST_CHUNK_ID,
                         msg: format!(
                             "chunk size {} is not a multiple of {}",
                             chunk_size,
-                            hash_kind.len_in_bytes()
+                            object_hash.len_in_bytes()
                         ),
                     });
                 }
-                let chunk_base_graph_count: u32 = (chunk_size / hash_kind.len_in_bytes())
+                let chunk_base_graph_count: u32 = (chunk_size / object_hash.len_in_bytes())
                     .try_into()
                     .expect("base graph count to fit in 32-bits");
                 if chunk_base_graph_count != u32::from(base_graph_count) {
             chunks.validated_usize_offset_by_id(COMMIT_DATA_CHUNK_ID, |chunk_range| {
                 let chunk_size = chunk_range.len();
-                let entry_size = hash_kind.len_in_bytes() + COMMIT_DATA_ENTRY_SIZE_SANS_HASH;
+                let entry_size = object_hash.len_in_bytes() + COMMIT_DATA_ENTRY_SIZE_SANS_HASH;
                 if chunk_size % entry_size != 0 {
                     return Err(Error::InvalidChunkSize {
                         id: COMMIT_DATA_CHUNK_ID,
             chunks.validated_usize_offset_by_id(OID_LOOKUP_CHUNK_ID, |chunk_range| {
                 let chunk_size = chunk_range.len();
-                if chunk_size % hash_kind.len_in_bytes() != 0 {
+                if chunk_size % object_hash.len_in_bytes() != 0 {
                     return Err(Error::InvalidChunkSize {
                         id: OID_LOOKUP_CHUNK_ID,
                         msg: format!(
                             "chunk size {} is not a multiple of {}",
                             chunk_size,
-                            hash_kind.len_in_bytes()
+                            object_hash.len_in_bytes()
                         ),
                     });
                 }
                 Ok((
                     chunk_range.start,
-                    (chunk_size / hash_kind.len_in_bytes())
+                    (chunk_size / object_hash.len_in_bytes())
                         .try_into()
                         .expect("number of commits in OIDL chunk to fit in 32 bits"),
                 ))
         let extra_edges_list_range = chunks.usize_offset_by_id(EXTENDED_EDGES_LIST_CHUNK_ID).ok();
         let trailer = &data[chunks.highest_offset() as usize..];
-        if trailer.len() != hash_kind.len_in_bytes() {
+        if trailer.len() != object_hash.len_in_bytes() {
             return Err(Error::Trailer(format!(
                 "Expected commit-graph trailer to contain {} bytes, got {}",
-                hash_kind.len_in_bytes(),
+                object_hash.len_in_bytes(),
                 trailer.len()
             )));
         }
             fan,
             oid_lookup_offset,
             path: path.to_owned(),
-            hash_len: hash_kind.len_in_bytes(),
+            hash_len: object_hash.len_in_bytes(),
+            object_hash,
         })
     }
 }

git-commitgraph/src/file/mod.rs+1−0

@@ -48,6 +48,7 @@ pub struct File { · 47 unmodified lines
48	oid_lookup_offset: usize,	48	oid_lookup_offset: usize,
49	path: PathBuf,	49	path: PathBuf,
50	hash_len: usize,	50	hash_len: usize,
		51	object_hash: git_hash::Kind,
51	}	52	}
52		53
53	/// The position of a given commit within a graph file, starting at 0.	54	/// The position of a given commit within a graph file, starting at 0.

git-commitgraph/src/file/verify.rs+2−2

@@ -81,7 +81,7 @@ impl File { · 80 unmodified lines
81	.map_err(\|(actual, expected)\| Error::Mismatch { actual, expected })?;	81	.map_err(\|(actual, expected)\| Error::Mismatch { actual, expected })?;
82	verify_split_chain_filename_hash(&self.path, self.checksum()).map_err(Error::Filename)?;	82	verify_split_chain_filename_hash(&self.path, self.checksum()).map_err(Error::Filename)?;
83		83
84	let null_id = self.hash_kind().null_ref();	84	let null_id = self.object_hash().null_ref();
85		85
86	let mut stats = Outcome {	86	let mut stats = Outcome {
87	max_generation: 0,	87	max_generation: 0,
@@ -149,7 +149,7 @@ impl File { · 61 unmodified lines
149	// as these files are usually small enough to process them in less than a second, even for the large ones.	149	// as these files are usually small enough to process them in less than a second, even for the large ones.
150	// But it's possible, once a progress instance is passed.	150	// But it's possible, once a progress instance is passed.
151	let data_len_without_trailer = self.data.len() - self.hash_len;	151	let data_len_without_trailer = self.data.len() - self.hash_len;
152	let mut hasher = git_features::hash::hasher(self.hash_kind());	152	let mut hasher = git_features::hash::hasher(self.object_hash());
153	hasher.update(&self.data[..data_len_without_trailer]);	153	hasher.update(&self.data[..data_len_without_trailer]);
154	let actual = git_hash::ObjectId::from(hasher.digest().as_ref());	154	let actual = git_hash::ObjectId::from(hasher.digest().as_ref());
155		155

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

@@ -98,12 +98,12 @@ impl Graph { · 97 unmodified lines
98	for window in files.windows(2) {	98	for window in files.windows(2) {
99	let f1 = &window[0];	99	let f1 = &window[0];
100	let f2 = &window[1];	100	let f2 = &window[1];
101	if f1.hash_kind() != f2.hash_kind() {	101	if f1.object_hash() != f2.object_hash() {
102	return Err(Error::HashVersionMismatch {	102	return Err(Error::HashVersionMismatch {
103	path1: f1.path().to_owned(),	103	path1: f1.path().to_owned(),
104	hash1: f1.hash_kind(),	104	hash1: f1.object_hash(),
105	path2: f2.path().to_owned(),	105	path2: f2.path().to_owned(),
106	hash2: f2.hash_kind(),	106	hash2: f2.object_hash(),
107	});	107	});
108	}	108	}
109	}	109	}

change!: Change accessors named `hash_kind()` to `object_hash()` for consistency (#279)

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code