| Alphare |
| hg-reviewers |
This avoids a duplicate index lookup
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | rust/hg-core/src/revlog/revlog.rs (19 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | SimonSapin | ||
| Closed | SimonSapin | ||
| Closed | SimonSapin | ||
| Closed | SimonSapin | ||
| Closed | SimonSapin | ||
| Closed | SimonSapin | ||
| Closed | SimonSapin |
| base_rev_or_base_of_delta_chain: if index_entry | base_rev_or_base_of_delta_chain: if index_entry | ||||
| .base_revision_or_base_of_delta_chain() | .base_revision_or_base_of_delta_chain() | ||||
| == rev | == rev | ||||
| { | { | ||||
| None | None | ||||
| } else { | } else { | ||||
| Some(index_entry.base_revision_or_base_of_delta_chain()) | Some(index_entry.base_revision_or_base_of_delta_chain()) | ||||
| }, | }, | ||||
| p1: index_entry.p1(), | |||||
| p2: index_entry.p2(), | |||||
| hash: *index_entry.hash(), | |||||
| }; | }; | ||||
| Ok(entry) | Ok(entry) | ||||
| } | } | ||||
| /// when resolving internal references within revlog, any errors | /// when resolving internal references within revlog, any errors | ||||
| /// should be reported as corruption, instead of e.g. "invalid revision" | /// should be reported as corruption, instead of e.g. "invalid revision" | ||||
| fn get_entry_internal( | fn get_entry_internal( | ||||
| &self, | &self, | ||||
| rev: Revision, | rev: Revision, | ||||
| ) -> Result<RevlogEntry, HgError> { | ) -> Result<RevlogEntry, HgError> { | ||||
| return self.get_entry(rev).map_err(|_| corrupted()); | return self.get_entry(rev).map_err(|_| corrupted()); | ||||
| } | } | ||||
| } | } | ||||
| /// The revlog entry's bytes and the necessary informations to extract | /// The revlog entry's bytes and the necessary informations to extract | ||||
| /// the entry's data. | /// the entry's data. | ||||
| #[derive(Clone)] | #[derive(Clone)] | ||||
| pub struct RevlogEntry<'a> { | pub struct RevlogEntry<'a> { | ||||
| revlog: &'a Revlog, | revlog: &'a Revlog, | ||||
| rev: Revision, | rev: Revision, | ||||
| bytes: &'a [u8], | bytes: &'a [u8], | ||||
| compressed_len: u32, | compressed_len: u32, | ||||
| uncompressed_len: i32, | uncompressed_len: i32, | ||||
| base_rev_or_base_of_delta_chain: Option<Revision>, | base_rev_or_base_of_delta_chain: Option<Revision>, | ||||
| p1: Revision, | |||||
| p2: Revision, | |||||
| hash: Node, | |||||
| } | } | ||||
| impl<'a> RevlogEntry<'a> { | impl<'a> RevlogEntry<'a> { | ||||
| pub fn revision(&self) -> Revision { | pub fn revision(&self) -> Revision { | ||||
| self.rev | self.rev | ||||
| } | } | ||||
| pub fn uncompressed_len(&self) -> Option<u32> { | pub fn uncompressed_len(&self) -> Option<u32> { | ||||
| base_rev | base_rev | ||||
| } else { | } else { | ||||
| entry.rev - 1 | entry.rev - 1 | ||||
| }; | }; | ||||
| delta_chain.push(entry); | delta_chain.push(entry); | ||||
| entry = self.revlog.get_entry_internal(base_rev)?; | entry = self.revlog.get_entry_internal(base_rev)?; | ||||
| } | } | ||||
| // TODO do not look twice in the index | |||||
| let index_entry = self | |||||
| .revlog | |||||
| .index | |||||
| .get_entry(self.rev) | |||||
| .ok_or_else(corrupted)?; | |||||
| let data = if delta_chain.is_empty() { | let data = if delta_chain.is_empty() { | ||||
| entry.data_chunk()? | entry.data_chunk()? | ||||
| } else { | } else { | ||||
| Revlog::build_data_from_deltas(entry, &delta_chain)?.into() | Revlog::build_data_from_deltas(entry, &delta_chain)?.into() | ||||
| }; | }; | ||||
| if self.revlog.check_hash( | if self.revlog.check_hash( | ||||
| index_entry.p1(), | self.p1, | ||||
| index_entry.p2(), | self.p2, | ||||
| index_entry.hash().as_bytes(), | self.hash.as_bytes(), | ||||
| &data, | &data, | ||||
| ) { | ) { | ||||
| Ok(data) | Ok(data) | ||||
| } else { | } else { | ||||
| Err(corrupted()) | Err(corrupted()) | ||||
| } | } | ||||
| } | } | ||||