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.

--- 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);