Show More
@@ -206,11 +206,10 impl<G: Graph> MissingAncestors<G> { | |||||
206 | new_bases |
|
206 | new_bases | |
207 | .into_iter() |
|
207 | .into_iter() | |
208 | .filter(|&rev| rev != NULL_REVISION) |
|
208 | .filter(|&rev| rev != NULL_REVISION) | |
209 |
. |
|
209 | .inspect(|&r| { | |
210 | if r > max_base { |
|
210 | if r > max_base { | |
211 | max_base = r; |
|
211 | max_base = r; | |
212 | } |
|
212 | } | |
213 | r |
|
|||
214 | }), |
|
213 | }), | |
215 | ); |
|
214 | ); | |
216 | self.max_base = max_base; |
|
215 | self.max_base = max_base; |
@@ -217,7 +217,7 pub struct FilelogRevisionData(Vec<u8>); | |||||
217 | impl FilelogRevisionData { |
|
217 | impl FilelogRevisionData { | |
218 | /// Split into metadata and data |
|
218 | /// Split into metadata and data | |
219 | pub fn split(&self) -> Result<(Option<&[u8]>, &[u8]), HgError> { |
|
219 | pub fn split(&self) -> Result<(Option<&[u8]>, &[u8]), HgError> { | |
220 |
const DELIMITER: &[u8; 2] = |
|
220 | const DELIMITER: &[u8; 2] = b"\x01\n"; | |
221 |
|
221 | |||
222 | if let Some(rest) = self.0.drop_prefix(DELIMITER) { |
|
222 | if let Some(rest) = self.0.drop_prefix(DELIMITER) { | |
223 | if let Some((metadata, data)) = rest.split_2_by_slice(DELIMITER) { |
|
223 | if let Some((metadata, data)) = rest.split_2_by_slice(DELIMITER) { |
@@ -802,9 +802,8 impl InnerRevlog { | |||||
802 | return Ok(func()); |
|
802 | return Ok(func()); | |
803 | } |
|
803 | } | |
804 | self.enter_writing_context(data_end, transaction) |
|
804 | self.enter_writing_context(data_end, transaction) | |
805 |
. |
|
805 | .inspect_err(|_| { | |
806 | self.exit_writing_context(); |
|
806 | self.exit_writing_context(); | |
807 | e |
|
|||
808 | })?; |
|
807 | })?; | |
809 | let res = func(); |
|
808 | let res = func(); | |
810 | self.exit_writing_context(); |
|
809 | self.exit_writing_context(); |
General Comments 0
You need to be logged in to leave comments.
Login now