mercurial-scm/hg: rust/hg-cpython/src/dirstate/dirstate

annotate rust/hg-cpython/src/dirstate/dirstate_map.rs @ 48674:f7086f6173f8 stable

dirstate-v2: rename the configuration to enable the format The rename of the old experimental name was overlooked before the 6.0 release. We rename everything to use the new name (and keep the released name as an alias for compatibility). Differential Revision: https://phab.mercurial-scm.org/D12129

author	Pierre-Yves David <pierre-yves.david@octobus.net>
date	Tue, 01 Feb 2022 16:36:20 +0100
parents	269ff8978086
children	434de12918fd

rev	line source
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	1 // dirstate_map.rs
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	2 //
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	3 // Copyright 2019 Raphaël Gomès <rgomes@octobus.net>
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	4 //
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	5 // This software may be used and distributed according to the terms of the
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	6 // GNU General Public License version 2 or any later version.
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	7
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	8 //! Bindings for the `hg::dirstate::dirstate_map` file provided by the
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	9 //! `hg-core` package.
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	10
47112 d5956136d19d dirstate-tree: Give to `status()` mutable access to the `DirstateMap` Simon Sapin <simon.sapin@octobus.net> parents: 47109 diff changeset	11 use std::cell::{RefCell, RefMut};
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	12 use std::convert::TryInto;
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	13
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	14 use cpython::{
48056 cd13d3c2ad2e dirstate: drop the `clearambiguoustimes` method for the map Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48051 diff changeset	15 exc, PyBool, PyBytes, PyClone, PyDict, PyErr, PyList, PyNone, PyObject,
48061 060cd909439f dirstate: drop all logic around the "non-normal" sets Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48056 diff changeset	16 PyResult, Python, PythonObject, ToPyObject, UnsafePyLeaked,
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	17 };
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	18
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	19 use crate::{
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	20 dirstate::copymap::{CopyMap, CopyMapItemsIterator, CopyMapKeysIterator},
48260 269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48135 diff changeset	21 dirstate::item::{timestamp, DirstateItem},
47954 4afd6cc447b9 rust: Make OwningDirstateMap generic and move it into hg-core Simon Sapin <simon.sapin@octobus.net> parents: 47692 diff changeset	22 pybytes_deref::PyBytesDeref,
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	23 };
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	24 use hg::{
48068 bf8837e3d7ce dirstate: Remove the flat Rust DirstateMap implementation Simon Sapin <simon.sapin@octobus.net> parents: 48061 diff changeset	25 dirstate::StateMapIter,
47954 4afd6cc447b9 rust: Make OwningDirstateMap generic and move it into hg-core Simon Sapin <simon.sapin@octobus.net> parents: 47692 diff changeset	26 dirstate_tree::dirstate_map::DirstateMap as TreeDirstateMap,
47335 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	27 dirstate_tree::on_disk::DirstateV2ParseError,
47954 4afd6cc447b9 rust: Make OwningDirstateMap generic and move it into hg-core Simon Sapin <simon.sapin@octobus.net> parents: 47692 diff changeset	28 dirstate_tree::owning::OwningDirstateMap,
46595 98a455a62699 rust: Make `DirstateParents`?s fields typed `Node`s Simon Sapin <simon.sapin@octobus.net> parents: 46440 diff changeset	29 revlog::Node,
47109 33e5511b571a rust: Remove DirstateMap::file_fold_map Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	30 utils::files::normalize_case,
42957 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42890 diff changeset	31 utils::hg_path::{HgPath, HgPathBuf},
48068 bf8837e3d7ce dirstate: Remove the flat Rust DirstateMap implementation Simon Sapin <simon.sapin@octobus.net> parents: 48061 diff changeset	32 DirstateEntry, DirstateError, DirstateParents, EntryState,
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	33 };
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	34
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	35 // TODO
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	36 // This object needs to share references to multiple members of its Rust
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	37 // inner struct, namely `copy_map`, `dirs` and `all_dirs`.
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	38 // Right now `CopyMap` is done, but it needs to have an explicit reference
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	39 // to `RustDirstateMap` which itself needs to have an encapsulation for
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	40 // every method in `CopyMap` (copymapcopy, etc.).
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	41 // This is ugly and hard to maintain.
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	42 // The same logic applies to `dirs` and `all_dirs`, however the `Dirs`
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	43 // `py_class!` is already implemented and does not mention
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	44 // `RustDirstateMap`, rightfully so.
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	45 // All attributes also have to have a separate refcount data attribute for
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	46 // leaks, with all methods that go along for reference sharing.
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	47 py_class!(pub class DirstateMap \|py\| {
48069 3d0a9c6e614d dirstate: Remove the Rust abstraction DirstateMapMethods Simon Sapin <simon.sapin@octobus.net> parents: 48068 diff changeset	48 @shared data inner: OwningDirstateMap;
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	49
47122 9aba0cde0ed9 rust: Read dirstate from disk in DirstateMap constructor Simon Sapin <simon.sapin@octobus.net> parents: 47121 diff changeset	50 /// Returns a `(dirstate_map, parents)` tuple
9aba0cde0ed9 rust: Read dirstate from disk in DirstateMap constructor Simon Sapin <simon.sapin@octobus.net> parents: 47121 diff changeset	51 @staticmethod
47674 ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	52 def new_v1(
47280 1766130fe9ba dirstate-v2: Change the on-disk format when the requirement is enabled Simon Sapin <simon.sapin@octobus.net> parents: 47124 diff changeset	53 on_disk: PyBytes,
1766130fe9ba dirstate-v2: Change the on-disk format when the requirement is enabled Simon Sapin <simon.sapin@octobus.net> parents: 47124 diff changeset	54 ) -> PyResult<PyObject> {
48068 bf8837e3d7ce dirstate: Remove the flat Rust DirstateMap implementation Simon Sapin <simon.sapin@octobus.net> parents: 48061 diff changeset	55 let on_disk = PyBytesDeref::new(py, on_disk);
bf8837e3d7ce dirstate: Remove the flat Rust DirstateMap implementation Simon Sapin <simon.sapin@octobus.net> parents: 48061 diff changeset	56 let mut map = OwningDirstateMap::new_empty(on_disk);
48069 3d0a9c6e614d dirstate: Remove the Rust abstraction DirstateMapMethods Simon Sapin <simon.sapin@octobus.net> parents: 48068 diff changeset	57 let (on_disk, map_placeholder) = map.get_pair_mut();
47954 4afd6cc447b9 rust: Make OwningDirstateMap generic and move it into hg-core Simon Sapin <simon.sapin@octobus.net> parents: 47692 diff changeset	58
48068 bf8837e3d7ce dirstate: Remove the flat Rust DirstateMap implementation Simon Sapin <simon.sapin@octobus.net> parents: 48061 diff changeset	59 let (actual_map, parents) = TreeDirstateMap::new_v1(on_disk)
bf8837e3d7ce dirstate: Remove the flat Rust DirstateMap implementation Simon Sapin <simon.sapin@octobus.net> parents: 48061 diff changeset	60 .map_err(\|e\| dirstate_error(py, e))?;
bf8837e3d7ce dirstate: Remove the flat Rust DirstateMap implementation Simon Sapin <simon.sapin@octobus.net> parents: 48061 diff changeset	61 *map_placeholder = actual_map;
48069 3d0a9c6e614d dirstate: Remove the Rust abstraction DirstateMapMethods Simon Sapin <simon.sapin@octobus.net> parents: 48068 diff changeset	62 let map = Self::create_instance(py, map)?;
48020 1194394510ba rust: Remove the `rustext.parsers` module Simon Sapin <simon.sapin@octobus.net> parents: 47954 diff changeset	63 let parents = parents.map(\|p\| {
1194394510ba rust: Remove the `rustext.parsers` module Simon Sapin <simon.sapin@octobus.net> parents: 47954 diff changeset	64 let p1 = PyBytes::new(py, p.p1.as_bytes());
1194394510ba rust: Remove the `rustext.parsers` module Simon Sapin <simon.sapin@octobus.net> parents: 47954 diff changeset	65 let p2 = PyBytes::new(py, p.p2.as_bytes());
1194394510ba rust: Remove the `rustext.parsers` module Simon Sapin <simon.sapin@octobus.net> parents: 47954 diff changeset	66 (p1, p2)
1194394510ba rust: Remove the `rustext.parsers` module Simon Sapin <simon.sapin@octobus.net> parents: 47954 diff changeset	67 });
47122 9aba0cde0ed9 rust: Read dirstate from disk in DirstateMap constructor Simon Sapin <simon.sapin@octobus.net> parents: 47121 diff changeset	68 Ok((map, parents).to_py_object(py).into_object())
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	69 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	70
47674 ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	71 /// Returns a DirstateMap
ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	72 @staticmethod
ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	73 def new_v2(
ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	74 on_disk: PyBytes,
47675 48aec076b8fb dirstate-v2: Enforce data size read from the docket file Simon Sapin <simon.sapin@octobus.net> parents: 47674 diff changeset	75 data_size: usize,
47682 78f7f0d490ee dirstate-v2: Move fixed-size tree metadata into the docket file Simon Sapin <simon.sapin@octobus.net> parents: 47678 diff changeset	76 tree_metadata: PyBytes,
47674 ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	77 ) -> PyResult<PyObject> {
ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	78 let dirstate_error = \|e: DirstateError\| {
ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	79 PyErr::new::<exc::OSError, _>(py, format!("Dirstate error: {:?}", e))
ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	80 };
47954 4afd6cc447b9 rust: Make OwningDirstateMap generic and move it into hg-core Simon Sapin <simon.sapin@octobus.net> parents: 47692 diff changeset	81 let on_disk = PyBytesDeref::new(py, on_disk);
4afd6cc447b9 rust: Make OwningDirstateMap generic and move it into hg-core Simon Sapin <simon.sapin@octobus.net> parents: 47692 diff changeset	82 let mut map = OwningDirstateMap::new_empty(on_disk);
48069 3d0a9c6e614d dirstate: Remove the Rust abstraction DirstateMapMethods Simon Sapin <simon.sapin@octobus.net> parents: 48068 diff changeset	83 let (on_disk, map_placeholder) = map.get_pair_mut();
47954 4afd6cc447b9 rust: Make OwningDirstateMap generic and move it into hg-core Simon Sapin <simon.sapin@octobus.net> parents: 47692 diff changeset	84 *map_placeholder = TreeDirstateMap::new_v2(
4afd6cc447b9 rust: Make OwningDirstateMap generic and move it into hg-core Simon Sapin <simon.sapin@octobus.net> parents: 47692 diff changeset	85 on_disk, data_size, tree_metadata.data(py),
47682 78f7f0d490ee dirstate-v2: Move fixed-size tree metadata into the docket file Simon Sapin <simon.sapin@octobus.net> parents: 47678 diff changeset	86 ).map_err(dirstate_error)?;
48069 3d0a9c6e614d dirstate: Remove the Rust abstraction DirstateMapMethods Simon Sapin <simon.sapin@octobus.net> parents: 48068 diff changeset	87 let map = Self::create_instance(py, map)?;
47674 ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	88 Ok(map.into_object())
ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	89 }
ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	90
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	91 def clear(&self) -> PyResult<PyObject> {
44233 281642cd1d04 rust-cpython: rename inner_shared() to inner() Yuya Nishihara <yuya@tcha.org> parents: 44203 diff changeset	92 self.inner(py).borrow_mut().clear();
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	93 Ok(py.None())
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	94 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	95
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	96 def get(
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	97 &self,
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	98 key: PyObject,
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	99 default: Option<PyObject> = None
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	100 ) -> PyResult<Option<PyObject>> {
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	101 let key = key.extract::<PyBytes>(py)?;
47335 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	102 match self
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	103 .inner(py)
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	104 .borrow()
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	105 .get(HgPath::new(key.data(py)))
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	106 .map_err(\|e\| v2_error(py, e))?
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	107 {
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	108 Some(entry) => {
48044 d5528ac9b4f2 dirstate: Use the Rust implementation of DirstateItem when Rust is enabled Simon Sapin <simon.sapin@octobus.net> parents: 48024 diff changeset	109 Ok(Some(DirstateItem::new_as_pyobject(py, entry)?))
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	110 },
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	111 None => Ok(default)
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	112 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	113 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	114
48045 32ef647821b2 dirstate: Skip no-op conversion in Rust DirstateMap::set_v1 Simon Sapin <simon.sapin@octobus.net> parents: 48044 diff changeset	115 def set_dirstate_item(
32ef647821b2 dirstate: Skip no-op conversion in Rust DirstateMap::set_v1 Simon Sapin <simon.sapin@octobus.net> parents: 48044 diff changeset	116 &self,
32ef647821b2 dirstate: Skip no-op conversion in Rust DirstateMap::set_v1 Simon Sapin <simon.sapin@octobus.net> parents: 48044 diff changeset	117 path: PyObject,
32ef647821b2 dirstate: Skip no-op conversion in Rust DirstateMap::set_v1 Simon Sapin <simon.sapin@octobus.net> parents: 48044 diff changeset	118 item: DirstateItem
32ef647821b2 dirstate: Skip no-op conversion in Rust DirstateMap::set_v1 Simon Sapin <simon.sapin@octobus.net> parents: 48044 diff changeset	119 ) -> PyResult<PyObject> {
47692 e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47683 diff changeset	120 let f = path.extract::<PyBytes>(py)?;
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47683 diff changeset	121 let filename = HgPath::new(f.data(py));
48047 9b2a51b2c36a dirstate: Propagate dirstate-v2 parse errors from set_dirstate_item Simon Sapin <simon.sapin@octobus.net> parents: 48045 diff changeset	122 self.inner(py)
9b2a51b2c36a dirstate: Propagate dirstate-v2 parse errors from set_dirstate_item Simon Sapin <simon.sapin@octobus.net> parents: 48045 diff changeset	123 .borrow_mut()
9b2a51b2c36a dirstate: Propagate dirstate-v2 parse errors from set_dirstate_item Simon Sapin <simon.sapin@octobus.net> parents: 48045 diff changeset	124 .set_entry(filename, item.get_entry(py))
9b2a51b2c36a dirstate: Propagate dirstate-v2 parse errors from set_dirstate_item Simon Sapin <simon.sapin@octobus.net> parents: 48045 diff changeset	125 .map_err(\|e\| v2_error(py, e))?;
47692 e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47683 diff changeset	126 Ok(py.None())
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47683 diff changeset	127 }
e5fb14a07866 dirstate-map: move most of `dirstate.update_file` logic in the dsmap Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47683 diff changeset	128
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	129 def addfile(
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	130 &self,
48051 98c0408324e6 dirstate: Pass the final DirstateItem to _rustmap.addfile() Simon Sapin <simon.sapin@octobus.net> parents: 48050 diff changeset	131 f: PyBytes,
98c0408324e6 dirstate: Pass the final DirstateItem to _rustmap.addfile() Simon Sapin <simon.sapin@octobus.net> parents: 48050 diff changeset	132 item: DirstateItem,
98c0408324e6 dirstate: Pass the final DirstateItem to _rustmap.addfile() Simon Sapin <simon.sapin@octobus.net> parents: 48050 diff changeset	133 ) -> PyResult<PyNone> {
47518 f6f25ab6bfc8 rust-dirstatemap: expand the wrapping code a bit Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47511 diff changeset	134 let filename = HgPath::new(f.data(py));
48051 98c0408324e6 dirstate: Pass the final DirstateItem to _rustmap.addfile() Simon Sapin <simon.sapin@octobus.net> parents: 48050 diff changeset	135 let entry = item.get_entry(py);
98c0408324e6 dirstate: Pass the final DirstateItem to _rustmap.addfile() Simon Sapin <simon.sapin@octobus.net> parents: 48050 diff changeset	136 self.inner(py)
98c0408324e6 dirstate: Pass the final DirstateItem to _rustmap.addfile() Simon Sapin <simon.sapin@octobus.net> parents: 48050 diff changeset	137 .borrow_mut()
98c0408324e6 dirstate: Pass the final DirstateItem to _rustmap.addfile() Simon Sapin <simon.sapin@octobus.net> parents: 48050 diff changeset	138 .add_file(filename, entry)
98c0408324e6 dirstate: Pass the final DirstateItem to _rustmap.addfile() Simon Sapin <simon.sapin@octobus.net> parents: 48050 diff changeset	139 .map_err(\|e \|dirstate_error(py, e))?;
98c0408324e6 dirstate: Pass the final DirstateItem to _rustmap.addfile() Simon Sapin <simon.sapin@octobus.net> parents: 48050 diff changeset	140 Ok(PyNone)
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	141 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	142
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	143 def removefile(
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	144 &self,
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	145 f: PyObject,
47511 eaae39894312 dirstate: move most of the `remove` logic with dirstatemap `removefile` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47477 diff changeset	146 in_merge: PyObject
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	147 ) -> PyResult<PyObject> {
44233 281642cd1d04 rust-cpython: rename inner_shared() to inner() Yuya Nishihara <yuya@tcha.org> parents: 44203 diff changeset	148 self.inner(py).borrow_mut()
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	149 .remove_file(
42957 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42890 diff changeset	150 HgPath::new(f.extract::<PyBytes>(py)?.data(py)),
47511 eaae39894312 dirstate: move most of the `remove` logic with dirstatemap `removefile` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47477 diff changeset	151 in_merge.extract::<PyBool>(py)?.is_true(),
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	152 )
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	153 .or_else(\|_\| {
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	154 Err(PyErr::new::<exc::OSError, _>(
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	155 py,
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	156 "Dirstate error".to_string(),
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	157 ))
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	158 })?;
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	159 Ok(py.None())
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	160 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	161
48050 2ac0e6b23222 dirstate: Replace dropfile with drop_item_and_copy_source Simon Sapin <simon.sapin@octobus.net> parents: 48048 diff changeset	162 def drop_item_and_copy_source(
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	163 &self,
48048 76f1c76186a1 dirstate: Remove return boolean from dirstatemap.dropfile Simon Sapin <simon.sapin@octobus.net> parents: 48047 diff changeset	164 f: PyBytes,
76f1c76186a1 dirstate: Remove return boolean from dirstatemap.dropfile Simon Sapin <simon.sapin@octobus.net> parents: 48047 diff changeset	165 ) -> PyResult<PyNone> {
76f1c76186a1 dirstate: Remove return boolean from dirstatemap.dropfile Simon Sapin <simon.sapin@octobus.net> parents: 48047 diff changeset	166 self.inner(py)
76f1c76186a1 dirstate: Remove return boolean from dirstatemap.dropfile Simon Sapin <simon.sapin@octobus.net> parents: 48047 diff changeset	167 .borrow_mut()
48050 2ac0e6b23222 dirstate: Replace dropfile with drop_item_and_copy_source Simon Sapin <simon.sapin@octobus.net> parents: 48048 diff changeset	168 .drop_entry_and_copy_source(HgPath::new(f.data(py)))
48048 76f1c76186a1 dirstate: Remove return boolean from dirstatemap.dropfile Simon Sapin <simon.sapin@octobus.net> parents: 48047 diff changeset	169 .map_err(\|e \|dirstate_error(py, e))?;
76f1c76186a1 dirstate: Remove return boolean from dirstatemap.dropfile Simon Sapin <simon.sapin@octobus.net> parents: 48047 diff changeset	170 Ok(PyNone)
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	171 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	172
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	173 def hastrackeddir(&self, d: PyObject) -> PyResult<PyBool> {
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	174 let d = d.extract::<PyBytes>(py)?;
44233 281642cd1d04 rust-cpython: rename inner_shared() to inner() Yuya Nishihara <yuya@tcha.org> parents: 44203 diff changeset	175 Ok(self.inner(py).borrow_mut()
42957 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42890 diff changeset	176 .has_tracked_dir(HgPath::new(d.data(py)))
43863 bc7d8f45c3b6 rust-dirs: handle forgotten `Result`s Rapha?l Gom?s <rgomes@octobus.net> parents: 43788 diff changeset	177 .map_err(\|e\| {
bc7d8f45c3b6 rust-dirs: handle forgotten `Result`s Rapha?l Gom?s <rgomes@octobus.net> parents: 43788 diff changeset	178 PyErr::new::<exc::ValueError, _>(py, e.to_string())
bc7d8f45c3b6 rust-dirs: handle forgotten `Result`s Rapha?l Gom?s <rgomes@octobus.net> parents: 43788 diff changeset	179 })?
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	180 .to_py_object(py))
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	181 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	182
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	183 def hasdir(&self, d: PyObject) -> PyResult<PyBool> {
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	184 let d = d.extract::<PyBytes>(py)?;
44233 281642cd1d04 rust-cpython: rename inner_shared() to inner() Yuya Nishihara <yuya@tcha.org> parents: 44203 diff changeset	185 Ok(self.inner(py).borrow_mut()
42957 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42890 diff changeset	186 .has_dir(HgPath::new(d.data(py)))
43863 bc7d8f45c3b6 rust-dirs: handle forgotten `Result`s Rapha?l Gom?s <rgomes@octobus.net> parents: 43788 diff changeset	187 .map_err(\|e\| {
bc7d8f45c3b6 rust-dirs: handle forgotten `Result`s Rapha?l Gom?s <rgomes@octobus.net> parents: 43788 diff changeset	188 PyErr::new::<exc::ValueError, _>(py, e.to_string())
bc7d8f45c3b6 rust-dirs: handle forgotten `Result`s Rapha?l Gom?s <rgomes@octobus.net> parents: 43788 diff changeset	189 })?
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	190 .to_py_object(py))
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	191 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	192
47674 ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	193 def write_v1(
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	194 &self,
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	195 p1: PyObject,
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	196 p2: PyObject,
48260 269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48135 diff changeset	197 now: (u32, u32)
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	198 ) -> PyResult<PyBytes> {
48260 269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48135 diff changeset	199 let now = timestamp(py, now)?;
47674 ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	200
ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	201 let mut inner = self.inner(py).borrow_mut();
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	202 let parents = DirstateParents {
42800 79561843729a rust-dirstate: handle invalid length of p1/p2 parameters Yuya Nishihara <yuya@tcha.org> parents: 42799 diff changeset	203 p1: extract_node_id(py, &p1)?,
79561843729a rust-dirstate: handle invalid length of p1/p2 parameters Yuya Nishihara <yuya@tcha.org> parents: 42799 diff changeset	204 p2: extract_node_id(py, &p2)?,
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	205 };
47674 ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	206 let result = inner.pack_v1(parents, now);
ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	207 match result {
ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	208 Ok(packed) => Ok(PyBytes::new(py, &packed)),
ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	209 Err(_) => Err(PyErr::new::<exc::OSError, _>(
ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	210 py,
ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	211 "Dirstate error".to_string(),
ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	212 )),
ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	213 }
ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	214 }
ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	215
47678 065e61628980 dirstate-v2: Support appending to the same data file Simon Sapin <simon.sapin@octobus.net> parents: 47675 diff changeset	216 /// Returns new data together with whether that data should be appended to
065e61628980 dirstate-v2: Support appending to the same data file Simon Sapin <simon.sapin@octobus.net> parents: 47675 diff changeset	217 /// the existing data file whose content is at `self.on_disk` (True),
065e61628980 dirstate-v2: Support appending to the same data file Simon Sapin <simon.sapin@octobus.net> parents: 47675 diff changeset	218 /// instead of written to a new data file (False).
47674 ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	219 def write_v2(
ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	220 &self,
48260 269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48135 diff changeset	221 now: (u32, u32),
47678 065e61628980 dirstate-v2: Support appending to the same data file Simon Sapin <simon.sapin@octobus.net> parents: 47675 diff changeset	222 can_append: bool,
065e61628980 dirstate-v2: Support appending to the same data file Simon Sapin <simon.sapin@octobus.net> parents: 47675 diff changeset	223 ) -> PyResult<PyObject> {
48260 269ff8978086 dirstate: store mtimes with nanosecond precision in memory Simon Sapin <simon.sapin@octobus.net> parents: 48135 diff changeset	224 let now = timestamp(py, now)?;
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	225
47280 1766130fe9ba dirstate-v2: Change the on-disk format when the requirement is enabled Simon Sapin <simon.sapin@octobus.net> parents: 47124 diff changeset	226 let mut inner = self.inner(py).borrow_mut();
47678 065e61628980 dirstate-v2: Support appending to the same data file Simon Sapin <simon.sapin@octobus.net> parents: 47675 diff changeset	227 let result = inner.pack_v2(now, can_append);
47280 1766130fe9ba dirstate-v2: Change the on-disk format when the requirement is enabled Simon Sapin <simon.sapin@octobus.net> parents: 47124 diff changeset	228 match result {
47682 78f7f0d490ee dirstate-v2: Move fixed-size tree metadata into the docket file Simon Sapin <simon.sapin@octobus.net> parents: 47678 diff changeset	229 Ok((packed, tree_metadata, append)) => {
47678 065e61628980 dirstate-v2: Support appending to the same data file Simon Sapin <simon.sapin@octobus.net> parents: 47675 diff changeset	230 let packed = PyBytes::new(py, &packed);
47682 78f7f0d490ee dirstate-v2: Move fixed-size tree metadata into the docket file Simon Sapin <simon.sapin@octobus.net> parents: 47678 diff changeset	231 let tree_metadata = PyBytes::new(py, &tree_metadata);
78f7f0d490ee dirstate-v2: Move fixed-size tree metadata into the docket file Simon Sapin <simon.sapin@octobus.net> parents: 47678 diff changeset	232 let tuple = (packed, tree_metadata, append);
78f7f0d490ee dirstate-v2: Move fixed-size tree metadata into the docket file Simon Sapin <simon.sapin@octobus.net> parents: 47678 diff changeset	233 Ok(tuple.to_py_object(py).into_object())
47678 065e61628980 dirstate-v2: Support appending to the same data file Simon Sapin <simon.sapin@octobus.net> parents: 47675 diff changeset	234 },
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	235 Err(_) => Err(PyErr::new::<exc::OSError, _>(
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	236 py,
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	237 "Dirstate error".to_string(),
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	238 )),
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	239 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	240 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	241
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	242 def filefoldmapasdict(&self) -> PyResult<PyDict> {
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	243 let dict = PyDict::new(py);
47335 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	244 for item in self.inner(py).borrow_mut().iter() {
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	245 let (path, entry) = item.map_err(\|e\| v2_error(py, e))?;
48022 f2a9db29cb2d rust: Make the fields of DirstateEntry private Simon Sapin <simon.sapin@octobus.net> parents: 48020 diff changeset	246 if entry.state() != EntryState::Removed {
47109 33e5511b571a rust: Remove DirstateMap::file_fold_map Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	247 let key = normalize_case(path);
33e5511b571a rust: Remove DirstateMap::file_fold_map Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	248 let value = path;
33e5511b571a rust: Remove DirstateMap::file_fold_map Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	249 dict.set_item(
33e5511b571a rust: Remove DirstateMap::file_fold_map Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	250 py,
33e5511b571a rust: Remove DirstateMap::file_fold_map Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	251 PyBytes::new(py, key.as_bytes()).into_object(),
33e5511b571a rust: Remove DirstateMap::file_fold_map Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	252 PyBytes::new(py, value.as_bytes()).into_object(),
33e5511b571a rust: Remove DirstateMap::file_fold_map Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	253 )?;
33e5511b571a rust: Remove DirstateMap::file_fold_map Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	254 }
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	255 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	256 Ok(dict)
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	257 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	258
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	259 def __len__(&self) -> PyResult<usize> {
44233 281642cd1d04 rust-cpython: rename inner_shared() to inner() Yuya Nishihara <yuya@tcha.org> parents: 44203 diff changeset	260 Ok(self.inner(py).borrow().len())
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	261 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	262
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	263 def __contains__(&self, key: PyObject) -> PyResult<bool> {
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	264 let key = key.extract::<PyBytes>(py)?;
47335 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	265 self.inner(py)
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	266 .borrow()
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	267 .contains_key(HgPath::new(key.data(py)))
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	268 .map_err(\|e\| v2_error(py, e))
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	269 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	270
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	271 def __getitem__(&self, key: PyObject) -> PyResult<PyObject> {
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	272 let key = key.extract::<PyBytes>(py)?;
42957 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42890 diff changeset	273 let key = HgPath::new(key.data(py));
47335 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	274 match self
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	275 .inner(py)
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	276 .borrow()
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	277 .get(key)
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	278 .map_err(\|e\| v2_error(py, e))?
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	279 {
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	280 Some(entry) => {
48044 d5528ac9b4f2 dirstate: Use the Rust implementation of DirstateItem when Rust is enabled Simon Sapin <simon.sapin@octobus.net> parents: 48024 diff changeset	281 Ok(DirstateItem::new_as_pyobject(py, entry)?)
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	282 },
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	283 None => Err(PyErr::new::<exc::KeyError, _>(
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	284 py,
42957 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42890 diff changeset	285 String::from_utf8_lossy(key.as_bytes()),
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	286 )),
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	287 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	288 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	289
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	290 def keys(&self) -> PyResult<DirstateMapKeysIterator> {
44233 281642cd1d04 rust-cpython: rename inner_shared() to inner() Yuya Nishihara <yuya@tcha.org> parents: 44203 diff changeset	291 let leaked_ref = self.inner(py).leak_immutable();
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	292 DirstateMapKeysIterator::from_inner(
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	293 py,
43285 ffc1fbd7d1f5 rust-cpython: make PyLeakedRef operations relatively safe Yuya Nishihara <yuya@tcha.org> parents: 43284 diff changeset	294 unsafe { leaked_ref.map(py, \|o\| o.iter()) },
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	295 )
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	296 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	297
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	298 def items(&self) -> PyResult<DirstateMapItemsIterator> {
44233 281642cd1d04 rust-cpython: rename inner_shared() to inner() Yuya Nishihara <yuya@tcha.org> parents: 44203 diff changeset	299 let leaked_ref = self.inner(py).leak_immutable();
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	300 DirstateMapItemsIterator::from_inner(
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	301 py,
43285 ffc1fbd7d1f5 rust-cpython: make PyLeakedRef operations relatively safe Yuya Nishihara <yuya@tcha.org> parents: 43284 diff changeset	302 unsafe { leaked_ref.map(py, \|o\| o.iter()) },
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	303 )
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	304 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	305
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	306 def __iter__(&self) -> PyResult<DirstateMapKeysIterator> {
44233 281642cd1d04 rust-cpython: rename inner_shared() to inner() Yuya Nishihara <yuya@tcha.org> parents: 44203 diff changeset	307 let leaked_ref = self.inner(py).leak_immutable();
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	308 DirstateMapKeysIterator::from_inner(
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	309 py,
43285 ffc1fbd7d1f5 rust-cpython: make PyLeakedRef operations relatively safe Yuya Nishihara <yuya@tcha.org> parents: 43284 diff changeset	310 unsafe { leaked_ref.map(py, \|o\| o.iter()) },
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	311 )
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	312 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	313
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	314 // TODO all copymap* methods, see docstring above
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	315 def copymapcopy(&self) -> PyResult<PyDict> {
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	316 let dict = PyDict::new(py);
47335 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	317 for item in self.inner(py).borrow().copy_map_iter() {
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	318 let (key, value) = item.map_err(\|e\| v2_error(py, e))?;
42957 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42890 diff changeset	319 dict.set_item(
7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42890 diff changeset	320 py,
44973 26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44441 diff changeset	321 PyBytes::new(py, key.as_bytes()),
26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44441 diff changeset	322 PyBytes::new(py, value.as_bytes()),
42957 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42890 diff changeset	323 )?;
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	324 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	325 Ok(dict)
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	326 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	327
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	328 def copymapgetitem(&self, key: PyObject) -> PyResult<PyBytes> {
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	329 let key = key.extract::<PyBytes>(py)?;
47335 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	330 match self
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	331 .inner(py)
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	332 .borrow()
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	333 .copy_map_get(HgPath::new(key.data(py)))
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	334 .map_err(\|e\| v2_error(py, e))?
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	335 {
44973 26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44441 diff changeset	336 Some(copy) => Ok(PyBytes::new(py, copy.as_bytes())),
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	337 None => Err(PyErr::new::<exc::KeyError, _>(
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	338 py,
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	339 String::from_utf8_lossy(key.data(py)),
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	340 )),
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	341 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	342 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	343 def copymap(&self) -> PyResult<CopyMap> {
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	344 CopyMap::from_inner(py, self.clone_ref(py))
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	345 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	346
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	347 def copymaplen(&self) -> PyResult<usize> {
47093 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: 46891 diff changeset	348 Ok(self.inner(py).borrow().copy_map_len())
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	349 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	350 def copymapcontains(&self, key: PyObject) -> PyResult<bool> {
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	351 let key = key.extract::<PyBytes>(py)?;
47335 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	352 self.inner(py)
42957 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42890 diff changeset	353 .borrow()
47335 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	354 .copy_map_contains_key(HgPath::new(key.data(py)))
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	355 .map_err(\|e\| v2_error(py, e))
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	356 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	357 def copymapget(
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	358 &self,
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	359 key: PyObject,
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	360 default: Option<PyObject>
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	361 ) -> PyResult<Option<PyObject>> {
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	362 let key = key.extract::<PyBytes>(py)?;
42957 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42890 diff changeset	363 match self
44233 281642cd1d04 rust-cpython: rename inner_shared() to inner() Yuya Nishihara <yuya@tcha.org> parents: 44203 diff changeset	364 .inner(py)
42957 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42890 diff changeset	365 .borrow()
47093 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: 46891 diff changeset	366 .copy_map_get(HgPath::new(key.data(py)))
47335 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	367 .map_err(\|e\| v2_error(py, e))?
42957 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42890 diff changeset	368 {
7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42890 diff changeset	369 Some(copy) => Ok(Some(
44973 26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44441 diff changeset	370 PyBytes::new(py, copy.as_bytes()).into_object(),
42957 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42890 diff changeset	371 )),
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	372 None => Ok(default),
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	373 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	374 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	375 def copymapsetitem(
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	376 &self,
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	377 key: PyObject,
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	378 value: PyObject
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	379 ) -> PyResult<PyObject> {
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	380 let key = key.extract::<PyBytes>(py)?;
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	381 let value = value.extract::<PyBytes>(py)?;
47335 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	382 self.inner(py)
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	383 .borrow_mut()
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	384 .copy_map_insert(
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	385 HgPathBuf::from_bytes(key.data(py)),
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	386 HgPathBuf::from_bytes(value.data(py)),
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	387 )
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	388 .map_err(\|e\| v2_error(py, e))?;
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	389 Ok(py.None())
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	390 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	391 def copymappop(
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	392 &self,
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	393 key: PyObject,
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	394 default: Option<PyObject>
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	395 ) -> PyResult<Option<PyObject>> {
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	396 let key = key.extract::<PyBytes>(py)?;
42957 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42890 diff changeset	397 match self
44233 281642cd1d04 rust-cpython: rename inner_shared() to inner() Yuya Nishihara <yuya@tcha.org> parents: 44203 diff changeset	398 .inner(py)
44203 2a24ead003f0 rust-cpython: add panicking version of borrow_mut() and use it Yuya Nishihara <yuya@tcha.org> parents: 43863 diff changeset	399 .borrow_mut()
47093 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: 46891 diff changeset	400 .copy_map_remove(HgPath::new(key.data(py)))
47335 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	401 .map_err(\|e\| v2_error(py, e))?
42957 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42890 diff changeset	402 {
48135 bd5f7c61d69d dirstatemap: fix copymap.pop in Rust to return the value it pops Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48069 diff changeset	403 Some(copy) => Ok(Some(
bd5f7c61d69d dirstatemap: fix copymap.pop in Rust to return the value it pops Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48069 diff changeset	404 PyBytes::new(py, copy.as_bytes()).into_object(),
bd5f7c61d69d dirstatemap: fix copymap.pop in Rust to return the value it pops Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48069 diff changeset	405 )),
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	406 None => Ok(default),
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	407 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	408 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	409
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	410 def copymapiter(&self) -> PyResult<CopyMapKeysIterator> {
44233 281642cd1d04 rust-cpython: rename inner_shared() to inner() Yuya Nishihara <yuya@tcha.org> parents: 44203 diff changeset	411 let leaked_ref = self.inner(py).leak_immutable();
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	412 CopyMapKeysIterator::from_inner(
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	413 py,
47093 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: 46891 diff changeset	414 unsafe { leaked_ref.map(py, \|o\| o.copy_map_iter()) },
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	415 )
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	416 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	417
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	418 def copymapitemsiter(&self) -> PyResult<CopyMapItemsIterator> {
44233 281642cd1d04 rust-cpython: rename inner_shared() to inner() Yuya Nishihara <yuya@tcha.org> parents: 44203 diff changeset	419 let leaked_ref = self.inner(py).leak_immutable();
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	420 CopyMapItemsIterator::from_inner(
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	421 py,
47093 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: 46891 diff changeset	422 unsafe { leaked_ref.map(py, \|o\| o.copy_map_iter()) },
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	423 )
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	424 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	425
47683 284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	426 def tracked_dirs(&self) -> PyResult<PyList> {
47351 3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47335 diff changeset	427 let dirs = PyList::new(py, &[]);
47683 284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	428 for path in self.inner(py).borrow_mut().iter_tracked_dirs()
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	429 .map_err(\|e \|dirstate_error(py, e))?
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	430 {
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	431 let path = path.map_err(\|e\| v2_error(py, e))?;
47351 3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47335 diff changeset	432 let path = PyBytes::new(py, path.as_bytes());
47683 284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	433 dirs.append(py, path.into_object())
47351 3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47335 diff changeset	434 }
3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47335 diff changeset	435 Ok(dirs)
3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47335 diff changeset	436 }
3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47335 diff changeset	437
48023 357307feaf61 debugstate: Always call dirstatemap.debug_iter() Simon Sapin <simon.sapin@octobus.net> parents: 48022 diff changeset	438 def debug_iter(&self, all: bool) -> PyResult<PyList> {
47683 284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	439 let dirs = PyList::new(py, &[]);
48023 357307feaf61 debugstate: Always call dirstatemap.debug_iter() Simon Sapin <simon.sapin@octobus.net> parents: 48022 diff changeset	440 for item in self.inner(py).borrow().debug_iter(all) {
47683 284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	441 let (path, (state, mode, size, mtime)) =
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	442 item.map_err(\|e\| v2_error(py, e))?;
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	443 let path = PyBytes::new(py, path.as_bytes());
48024 cedfe2606adf debugsate: Change debug_iter() to yield tuples instead of DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48023 diff changeset	444 let item = (path, state, mode, size, mtime);
cedfe2606adf debugsate: Change debug_iter() to yield tuples instead of DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48023 diff changeset	445 dirs.append(py, item.to_py_object(py).into_object())
47683 284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	446 }
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	447 Ok(dirs)
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	448 }
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	449 });
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	450
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	451 impl DirstateMap {
47112 d5956136d19d dirstate-tree: Give to `status()` mutable access to the `DirstateMap` Simon Sapin <simon.sapin@octobus.net> parents: 47109 diff changeset	452 pub fn get_inner_mut<'a>(
43273 478d0b1bf0c5 rust-dirstate-status: rust-cpython bindings for `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43208 diff changeset	453 &'a self,
478d0b1bf0c5 rust-dirstate-status: rust-cpython bindings for `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43208 diff changeset	454 py: Python<'a>,
48069 3d0a9c6e614d dirstate: Remove the Rust abstraction DirstateMapMethods Simon Sapin <simon.sapin@octobus.net> parents: 48068 diff changeset	455 ) -> RefMut<'a, OwningDirstateMap> {
47112 d5956136d19d dirstate-tree: Give to `status()` mutable access to the `DirstateMap` Simon Sapin <simon.sapin@octobus.net> parents: 47109 diff changeset	456 self.inner(py).borrow_mut()
43273 478d0b1bf0c5 rust-dirstate-status: rust-cpython bindings for `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43208 diff changeset	457 }
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	458 fn translate_key(
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	459 py: Python,
47335 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	460 res: Result<(&HgPath, DirstateEntry), DirstateV2ParseError>,
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	461 ) -> PyResult<Option<PyBytes>> {
47335 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	462 let (f, _entry) = res.map_err(\|e\| v2_error(py, e))?;
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	463 Ok(Some(PyBytes::new(py, f.as_bytes())))
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	464 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	465 fn translate_key_value(
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	466 py: Python,
47335 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	467 res: Result<(&HgPath, DirstateEntry), DirstateV2ParseError>,
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	468 ) -> PyResult<Option<(PyBytes, PyObject)>> {
47335 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	469 let (f, entry) = res.map_err(\|e\| v2_error(py, e))?;
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	470 Ok(Some((
44973 26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44441 diff changeset	471 PyBytes::new(py, f.as_bytes()),
48044 d5528ac9b4f2 dirstate: Use the Rust implementation of DirstateItem when Rust is enabled Simon Sapin <simon.sapin@octobus.net> parents: 48024 diff changeset	472 DirstateItem::new_as_pyobject(py, entry)?,
45610 496537c9c1b4 rust: start plugging the dirstate tree behind a feature gate Rapha?l Gom?s <rgomes@octobus.net> parents: 44973 diff changeset	473 )))
496537c9c1b4 rust: start plugging the dirstate tree behind a feature gate Rapha?l Gom?s <rgomes@octobus.net> parents: 44973 diff changeset	474 }
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	475 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	476
42889 ea91a126c803 rust-cpython: rename py_shared_iterator_impl to py_shared_iterator Yuya Nishihara <yuya@tcha.org> parents: 42888 diff changeset	477 py_shared_iterator!(
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	478 DirstateMapKeysIterator,
44234 bad4e7b361d2 rust-cpython: switch to upstreamed version of PySharedRefCell Yuya Nishihara <yuya@tcha.org> parents: 44233 diff changeset	479 UnsafePyLeaked<StateMapIter<'static>>,
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	480 DirstateMap::translate_key,
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	481 Option<PyBytes>
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	482 );
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	483
42889 ea91a126c803 rust-cpython: rename py_shared_iterator_impl to py_shared_iterator Yuya Nishihara <yuya@tcha.org> parents: 42888 diff changeset	484 py_shared_iterator!(
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	485 DirstateMapItemsIterator,
44234 bad4e7b361d2 rust-cpython: switch to upstreamed version of PySharedRefCell Yuya Nishihara <yuya@tcha.org> parents: 44233 diff changeset	486 UnsafePyLeaked<StateMapIter<'static>>,
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	487 DirstateMap::translate_key_value,
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	488 Option<(PyBytes, PyObject)>
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	489 );
42800 79561843729a rust-dirstate: handle invalid length of p1/p2 parameters Yuya Nishihara <yuya@tcha.org> parents: 42799 diff changeset	490
46595 98a455a62699 rust: Make `DirstateParents`?s fields typed `Node`s Simon Sapin <simon.sapin@octobus.net> parents: 46440 diff changeset	491 fn extract_node_id(py: Python, obj: &PyObject) -> PyResult<Node> {
42800 79561843729a rust-dirstate: handle invalid length of p1/p2 parameters Yuya Nishihara <yuya@tcha.org> parents: 42799 diff changeset	492 let bytes = obj.extract::<PyBytes>(py)?;
79561843729a rust-dirstate: handle invalid length of p1/p2 parameters Yuya Nishihara <yuya@tcha.org> parents: 42799 diff changeset	493 match bytes.data(py).try_into() {
79561843729a rust-dirstate: handle invalid length of p1/p2 parameters Yuya Nishihara <yuya@tcha.org> parents: 42799 diff changeset	494 Ok(s) => Ok(s),
79561843729a rust-dirstate: handle invalid length of p1/p2 parameters Yuya Nishihara <yuya@tcha.org> parents: 42799 diff changeset	495 Err(e) => Err(PyErr::new::<exc::ValueError, _>(py, e.to_string())),
79561843729a rust-dirstate: handle invalid length of p1/p2 parameters Yuya Nishihara <yuya@tcha.org> parents: 42799 diff changeset	496 }
79561843729a rust-dirstate: handle invalid length of p1/p2 parameters Yuya Nishihara <yuya@tcha.org> parents: 42799 diff changeset	497 }
47335 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	498
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	499 pub(super) fn v2_error(py: Python<'_>, _: DirstateV2ParseError) -> PyErr {
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	500 PyErr::new::<exc::ValueError, _>(py, "corrupted dirstate-v2")
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	501 }
47683 284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	502
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	503 fn dirstate_error(py: Python<'_>, e: DirstateError) -> PyErr {
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	504 PyErr::new::<exc::OSError, _>(py, format!("Dirstate error: {:?}", e))
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	505 }

Mercurial > public > mercurial-scm > hg

annotate rust/hg-cpython/src/dirstate/dirstate_map.rs @ 48674:f7086f6173f8 stable