Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
49144:f45e1618cbf6 | 49147:10b9f11daf15 |
---|---|
250 can_append: bool, | 250 can_append: bool, |
251 ) -> PyResult<PyObject> { | 251 ) -> PyResult<PyObject> { |
252 let inner = self.inner(py).borrow(); | 252 let inner = self.inner(py).borrow(); |
253 let result = inner.pack_v2(can_append); | 253 let result = inner.pack_v2(can_append); |
254 match result { | 254 match result { |
255 Ok((packed, tree_metadata, append)) => { | 255 Ok((packed, tree_metadata, append, _old_data_size)) => { |
256 let packed = PyBytes::new(py, &packed); | 256 let packed = PyBytes::new(py, &packed); |
257 let tree_metadata = PyBytes::new(py, tree_metadata.as_bytes()); | 257 let tree_metadata = PyBytes::new(py, tree_metadata.as_bytes()); |
258 let tuple = (packed, tree_metadata, append); | 258 let tuple = (packed, tree_metadata, append); |
259 Ok(tuple.to_py_object(py).into_object()) | 259 Ok(tuple.to_py_object(py).into_object()) |
260 }, | 260 }, |