Mercurial > public > mercurial-scm > hg
diff rust/hg-core/src/dirstate_tree/owning.rs @ 50252:a6b8b1ab9116
branching: merge stable into default
The clippy god had to be appeased on some aspect.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Thu, 02 Mar 2023 19:02:52 +0100 |
parents | e98fd81bb151 dbe09fb038fc |
children | 2cc5de261d76 |
line wrap: on
line diff
--- a/rust/hg-core/src/dirstate_tree/owning.rs Thu Mar 02 04:16:47 2023 +0100 +++ b/rust/hg-core/src/dirstate_tree/owning.rs Thu Mar 02 19:02:52 2023 +0100 @@ -31,6 +31,7 @@ pub fn new_v1<OnDisk>( on_disk: OnDisk, + identity: Option<u64>, ) -> Result<(Self, DirstateParents), DirstateError> where OnDisk: Deref<Target = [u8]> + Send + 'static, @@ -42,7 +43,7 @@ OwningDirstateMapTryBuilder { on_disk, map_builder: |bytes| { - DirstateMap::new_v1(bytes).map(|(dmap, p)| { + DirstateMap::new_v1(bytes, identity).map(|(dmap, p)| { parents = p.unwrap_or(DirstateParents::NULL); dmap }) @@ -57,6 +58,8 @@ on_disk: OnDisk, data_size: usize, metadata: &[u8], + uuid: Vec<u8>, + identity: Option<u64>, ) -> Result<Self, DirstateError> where OnDisk: Deref<Target = [u8]> + Send + 'static, @@ -66,7 +69,7 @@ OwningDirstateMapTryBuilder { on_disk, map_builder: |bytes| { - DirstateMap::new_v2(bytes, data_size, metadata) + DirstateMap::new_v2(bytes, data_size, metadata, uuid, identity) }, } .try_build() @@ -86,4 +89,16 @@ pub fn on_disk(&self) -> &[u8] { self.borrow_on_disk() } + + pub fn old_uuid(&self) -> Option<&[u8]> { + self.get_map().old_uuid.as_deref() + } + + pub fn old_identity(&self) -> Option<u64> { + self.get_map().identity + } + + pub fn old_data_size(&self) -> usize { + self.get_map().old_data_size + } }