Mercurial > hg
diff rust/hg-cpython/src/dirstate/dirstate_map.rs @ 49147:10b9f11daf15
branching: merge stable into default
This also added the small fix need in Rust tests for the new
`DirstateMap::pack_v2` API change in stable.
author | Raphaël Gomès <rgomes@octobus.net> |
---|---|
date | Mon, 25 Apr 2022 11:09:33 +0200 |
parents | a1fce5003ff4 dd2503a63d33 |
children | c7fb9b74e753 1891086f6c7f |
line wrap: on
line diff
--- a/rust/hg-cpython/src/dirstate/dirstate_map.rs Tue Apr 19 12:17:23 2022 -0700 +++ b/rust/hg-cpython/src/dirstate/dirstate_map.rs Mon Apr 25 11:09:33 2022 +0200 @@ -252,7 +252,7 @@ let inner = self.inner(py).borrow(); let result = inner.pack_v2(can_append); match result { - Ok((packed, tree_metadata, append)) => { + Ok((packed, tree_metadata, append, _old_data_size)) => { let packed = PyBytes::new(py, &packed); let tree_metadata = PyBytes::new(py, tree_metadata.as_bytes()); let tuple = (packed, tree_metadata, append);