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

annotate rust/hg-cpython/src/dirstate/dirstate_map.rs @ 50245:dbe09fb038fc stable

rhg: remember the inode of .hg/dirstate This allows us to detect changes of `.hg/dirstate`, which is either the full dirstate (in dirstate-v1) or the docket file (v2) without relying on data inside the file. It only works on UNIX systems. This fixes a race condition for dirstate-v1 (as demonstrated by the test changes) and adds a confortable layer of sanity for dirstate-v2.

author	Rapha?l Gom?s <rgomes@octobus.net>
date	Wed, 01 Mar 2023 16:48:09 +0100
parents	6cce0afc1454
children	a6b8b1ab9116

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 };
49101 dd0430434ce9 rust-dirstatemap: add Rust implementation of `reset_state` Rapha?l Gom?s <rgomes@octobus.net> parents: 49098 diff changeset	18 use hg::dirstate::{ParentFileData, TruncatedTimestamp};
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	19
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	20 use crate::{
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	21 dirstate::copymap::{CopyMap, CopyMapItemsIterator, CopyMapKeysIterator},
48392 434de12918fd dirstate: remove need_delay logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48260 diff changeset	22 dirstate::item::DirstateItem,
47954 4afd6cc447b9 rust: Make OwningDirstateMap generic and move it into hg-core Simon Sapin <simon.sapin@octobus.net> parents: 47692 diff changeset	23 pybytes_deref::PyBytesDeref,
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	24 };
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	25 use hg::{
50221 1891086f6c7f dirstate: use more than a bool to control append behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49147 diff changeset	26 dirstate::StateMapIter, dirstate_tree::dirstate_map::DirstateMapWriteMode,
1891086f6c7f dirstate: use more than a bool to control append behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49147 diff changeset	27 dirstate_tree::on_disk::DirstateV2ParseError,
49124 d9a66d62c604 rust-dirstatemap: use `&HgPath` instead of `HgPathBuf` in `copy_map_insert` Rapha?l Gom?s <rgomes@octobus.net> parents: 49122 diff changeset	28 dirstate_tree::owning::OwningDirstateMap, revlog::Node,
d9a66d62c604 rust-dirstatemap: use `&HgPath` instead of `HgPathBuf` in `copy_map_insert` Rapha?l Gom?s <rgomes@octobus.net> parents: 49122 diff changeset	29 utils::files::normalize_case, utils::hg_path::HgPath, DirstateEntry,
49135 a1fce5003ff4 rust-hg-cpython: remove use of `EntryState` Rapha?l Gom?s <rgomes@octobus.net> parents: 49124 diff changeset	30 DirstateError, DirstateParents,
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	31 };
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	32
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	33 // TODO
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	34 // 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	35 // 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	36 // 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	37 // 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	38 // every method in `CopyMap` (copymapcopy, etc.).
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	39 // 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	40 // 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	41 // `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	42 // `RustDirstateMap`, rightfully so.
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	43 // 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	44 // 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	45 py_class!(pub class DirstateMap \|py\| {
48069 3d0a9c6e614d dirstate: Remove the Rust abstraction DirstateMapMethods Simon Sapin <simon.sapin@octobus.net> parents: 48068 diff changeset	46 @shared data inner: OwningDirstateMap;
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	47
47122 9aba0cde0ed9 rust: Read dirstate from disk in DirstateMap constructor Simon Sapin <simon.sapin@octobus.net> parents: 47121 diff changeset	48 /// 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	49 @staticmethod
47674 ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	50 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	51 on_disk: PyBytes,
50245 dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50243 diff changeset	52 identity: Option<u64>,
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 ) -> PyResult<PyObject> {
48068 bf8837e3d7ce dirstate: Remove the flat Rust DirstateMap implementation Simon Sapin <simon.sapin@octobus.net> parents: 48061 diff changeset	54 let on_disk = PyBytesDeref::new(py, on_disk);
50245 dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50243 diff changeset	55 let (map, parents) = OwningDirstateMap::new_v1(on_disk, identity)
48068 bf8837e3d7ce dirstate: Remove the flat Rust DirstateMap implementation Simon Sapin <simon.sapin@octobus.net> parents: 48061 diff changeset	56 .map_err(\|e\| dirstate_error(py, e))?;
48069 3d0a9c6e614d dirstate: Remove the Rust abstraction DirstateMapMethods Simon Sapin <simon.sapin@octobus.net> parents: 48068 diff changeset	57 let map = Self::create_instance(py, map)?;
49000 dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48421 diff changeset	58 let p1 = PyBytes::new(py, parents.p1.as_bytes());
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48421 diff changeset	59 let p2 = PyBytes::new(py, parents.p2.as_bytes());
dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48421 diff changeset	60 let parents = (p1, p2);
47122 9aba0cde0ed9 rust: Read dirstate from disk in DirstateMap constructor Simon Sapin <simon.sapin@octobus.net> parents: 47121 diff changeset	61 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	62 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	63
47674 ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	64 /// Returns a DirstateMap
ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	65 @staticmethod
ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	66 def new_v2(
ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	67 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	68 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	69 tree_metadata: PyBytes,
50243 6cce0afc1454 rust-dirstate: remember the data file uuid dirstate was loaded with Rapha?l Gom?s <rgomes@octobus.net> parents: 50222 diff changeset	70 uuid: PyBytes,
50245 dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50243 diff changeset	71 identity: Option<u64>,
47674 ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	72 ) -> PyResult<PyObject> {
ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	73 let dirstate_error = \|e: DirstateError\| {
ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	74 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	75 };
47954 4afd6cc447b9 rust: Make OwningDirstateMap generic and move it into hg-core Simon Sapin <simon.sapin@octobus.net> parents: 47692 diff changeset	76 let on_disk = PyBytesDeref::new(py, on_disk);
50243 6cce0afc1454 rust-dirstate: remember the data file uuid dirstate was loaded with Rapha?l Gom?s <rgomes@octobus.net> parents: 50222 diff changeset	77 let uuid = uuid.data(py);
49000 dd6b67d5c256 rust: fix unsound `OwningDirstateMap` Rapha?l Gom?s <rgomes@octobus.net> parents: 48421 diff changeset	78 let map = OwningDirstateMap::new_v2(
50245 dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50243 diff changeset	79 on_disk,
dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50243 diff changeset	80 data_size,
dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50243 diff changeset	81 tree_metadata.data(py),
dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50243 diff changeset	82 uuid.to_owned(),
dbe09fb038fc rhg: remember the inode of .hg/dirstate Rapha?l Gom?s <rgomes@octobus.net> parents: 50243 diff changeset	83 identity,
47682 78f7f0d490ee dirstate-v2: Move fixed-size tree metadata into the docket file Simon Sapin <simon.sapin@octobus.net> parents: 47678 diff changeset	84 ).map_err(dirstate_error)?;
48069 3d0a9c6e614d dirstate: Remove the Rust abstraction DirstateMapMethods Simon Sapin <simon.sapin@octobus.net> parents: 48068 diff changeset	85 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	86 Ok(map.into_object())
ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	87 }
ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	88
50243 6cce0afc1454 rust-dirstate: remember the data file uuid dirstate was loaded with Rapha?l Gom?s <rgomes@octobus.net> parents: 50222 diff changeset	89 /// Returns an empty DirstateMap. Only used for a new dirstate.
6cce0afc1454 rust-dirstate: remember the data file uuid dirstate was loaded with Rapha?l Gom?s <rgomes@octobus.net> parents: 50222 diff changeset	90 @staticmethod
6cce0afc1454 rust-dirstate: remember the data file uuid dirstate was loaded with Rapha?l Gom?s <rgomes@octobus.net> parents: 50222 diff changeset	91 def new_empty() -> PyResult<PyObject> {
6cce0afc1454 rust-dirstate: remember the data file uuid dirstate was loaded with Rapha?l Gom?s <rgomes@octobus.net> parents: 50222 diff changeset	92 let map = OwningDirstateMap::new_empty(vec![]);
6cce0afc1454 rust-dirstate: remember the data file uuid dirstate was loaded with Rapha?l Gom?s <rgomes@octobus.net> parents: 50222 diff changeset	93 let map = Self::create_instance(py, map)?;
6cce0afc1454 rust-dirstate: remember the data file uuid dirstate was loaded with Rapha?l Gom?s <rgomes@octobus.net> parents: 50222 diff changeset	94 Ok(map.into_object())
6cce0afc1454 rust-dirstate: remember the data file uuid dirstate was loaded with Rapha?l Gom?s <rgomes@octobus.net> parents: 50222 diff changeset	95 }
6cce0afc1454 rust-dirstate: remember the data file uuid dirstate was loaded with Rapha?l Gom?s <rgomes@octobus.net> parents: 50222 diff changeset	96
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	97 def clear(&self) -> PyResult<PyObject> {
44233 281642cd1d04 rust-cpython: rename inner_shared() to inner() Yuya Nishihara <yuya@tcha.org> parents: 44203 diff changeset	98 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	99 Ok(py.None())
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	100 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	101
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	102 def get(
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	103 &self,
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	104 key: PyObject,
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	105 default: Option<PyObject> = None
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	106 ) -> PyResult<Option<PyObject>> {
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	107 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	108 match self
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	109 .inner(py)
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	110 .borrow()
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	111 .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	112 .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	113 {
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	114 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	115 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	116 },
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	117 None => Ok(default)
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	118 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	119 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	120
49098 55c158a33fa5 dirstatemap: move `set_tracked` out of common methods and plug in Rust Rapha?l Gom?s <rgomes@octobus.net> parents: 49000 diff changeset	121 def set_tracked(&self, f: PyObject) -> PyResult<PyBool> {
55c158a33fa5 dirstatemap: move `set_tracked` out of common methods and plug in Rust Rapha?l Gom?s <rgomes@octobus.net> parents: 49000 diff changeset	122 let bytes = f.extract::<PyBytes>(py)?;
55c158a33fa5 dirstatemap: move `set_tracked` out of common methods and plug in Rust Rapha?l Gom?s <rgomes@octobus.net> parents: 49000 diff changeset	123 let path = HgPath::new(bytes.data(py));
55c158a33fa5 dirstatemap: move `set_tracked` out of common methods and plug in Rust Rapha?l Gom?s <rgomes@octobus.net> parents: 49000 diff changeset	124 let res = self.inner(py).borrow_mut().set_tracked(path);
55c158a33fa5 dirstatemap: move `set_tracked` out of common methods and plug in Rust Rapha?l Gom?s <rgomes@octobus.net> parents: 49000 diff changeset	125 let was_tracked = res.or_else(\|_\| {
55c158a33fa5 dirstatemap: move `set_tracked` out of common methods and plug in Rust Rapha?l Gom?s <rgomes@octobus.net> parents: 49000 diff changeset	126 Err(PyErr::new::<exc::OSError, _>(py, "Dirstate error".to_string()))
55c158a33fa5 dirstatemap: move `set_tracked` out of common methods and plug in Rust Rapha?l Gom?s <rgomes@octobus.net> parents: 49000 diff changeset	127 })?;
55c158a33fa5 dirstatemap: move `set_tracked` out of common methods and plug in Rust Rapha?l Gom?s <rgomes@octobus.net> parents: 49000 diff changeset	128 Ok(was_tracked.to_py_object(py))
55c158a33fa5 dirstatemap: move `set_tracked` out of common methods and plug in Rust Rapha?l Gom?s <rgomes@octobus.net> parents: 49000 diff changeset	129 }
55c158a33fa5 dirstatemap: move `set_tracked` out of common methods and plug in Rust Rapha?l Gom?s <rgomes@octobus.net> parents: 49000 diff changeset	130
49108 119c7e2b4248 rust-dirstatemap: add `set_untracked` method Rapha?l Gom?s <rgomes@octobus.net> parents: 49106 diff changeset	131 def set_untracked(&self, f: PyObject) -> PyResult<PyBool> {
119c7e2b4248 rust-dirstatemap: add `set_untracked` method Rapha?l Gom?s <rgomes@octobus.net> parents: 49106 diff changeset	132 let bytes = f.extract::<PyBytes>(py)?;
119c7e2b4248 rust-dirstatemap: add `set_untracked` method Rapha?l Gom?s <rgomes@octobus.net> parents: 49106 diff changeset	133 let path = HgPath::new(bytes.data(py));
119c7e2b4248 rust-dirstatemap: add `set_untracked` method Rapha?l Gom?s <rgomes@octobus.net> parents: 49106 diff changeset	134 let res = self.inner(py).borrow_mut().set_untracked(path);
119c7e2b4248 rust-dirstatemap: add `set_untracked` method Rapha?l Gom?s <rgomes@octobus.net> parents: 49106 diff changeset	135 let was_tracked = res.or_else(\|_\| {
119c7e2b4248 rust-dirstatemap: add `set_untracked` method Rapha?l Gom?s <rgomes@octobus.net> parents: 49106 diff changeset	136 Err(PyErr::new::<exc::OSError, _>(py, "Dirstate error".to_string()))
119c7e2b4248 rust-dirstatemap: add `set_untracked` method Rapha?l Gom?s <rgomes@octobus.net> parents: 49106 diff changeset	137 })?;
119c7e2b4248 rust-dirstatemap: add `set_untracked` method Rapha?l Gom?s <rgomes@octobus.net> parents: 49106 diff changeset	138 Ok(was_tracked.to_py_object(py))
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	139 }
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	140
49104 b5c2aca84618 rust-dirstatemap: add `set_clean` method Rapha?l Gom?s <rgomes@octobus.net> parents: 49101 diff changeset	141 def set_clean(
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	142 &self,
49104 b5c2aca84618 rust-dirstatemap: add `set_clean` method Rapha?l Gom?s <rgomes@octobus.net> parents: 49101 diff changeset	143 f: PyObject,
b5c2aca84618 rust-dirstatemap: add `set_clean` method Rapha?l Gom?s <rgomes@octobus.net> parents: 49101 diff changeset	144 mode: u32,
b5c2aca84618 rust-dirstatemap: add `set_clean` method Rapha?l Gom?s <rgomes@octobus.net> parents: 49101 diff changeset	145 size: u32,
b5c2aca84618 rust-dirstatemap: add `set_clean` method Rapha?l Gom?s <rgomes@octobus.net> parents: 49101 diff changeset	146 mtime: (i64, u32, bool)
48051 98c0408324e6 dirstate: Pass the final DirstateItem to _rustmap.addfile() Simon Sapin <simon.sapin@octobus.net> parents: 48050 diff changeset	147 ) -> PyResult<PyNone> {
49104 b5c2aca84618 rust-dirstatemap: add `set_clean` method Rapha?l Gom?s <rgomes@octobus.net> parents: 49101 diff changeset	148 let (mtime_s, mtime_ns, second_ambiguous) = mtime;
b5c2aca84618 rust-dirstatemap: add `set_clean` method Rapha?l Gom?s <rgomes@octobus.net> parents: 49101 diff changeset	149 let timestamp = TruncatedTimestamp::new_truncate(
b5c2aca84618 rust-dirstatemap: add `set_clean` method Rapha?l Gom?s <rgomes@octobus.net> parents: 49101 diff changeset	150 mtime_s, mtime_ns, second_ambiguous
b5c2aca84618 rust-dirstatemap: add `set_clean` method Rapha?l Gom?s <rgomes@octobus.net> parents: 49101 diff changeset	151 );
b5c2aca84618 rust-dirstatemap: add `set_clean` method Rapha?l Gom?s <rgomes@octobus.net> parents: 49101 diff changeset	152 let bytes = f.extract::<PyBytes>(py)?;
b5c2aca84618 rust-dirstatemap: add `set_clean` method Rapha?l Gom?s <rgomes@octobus.net> parents: 49101 diff changeset	153 let path = HgPath::new(bytes.data(py));
b5c2aca84618 rust-dirstatemap: add `set_clean` method Rapha?l Gom?s <rgomes@octobus.net> parents: 49101 diff changeset	154 let res = self.inner(py).borrow_mut().set_clean(
b5c2aca84618 rust-dirstatemap: add `set_clean` method Rapha?l Gom?s <rgomes@octobus.net> parents: 49101 diff changeset	155 path, mode, size, timestamp,
b5c2aca84618 rust-dirstatemap: add `set_clean` method Rapha?l Gom?s <rgomes@octobus.net> parents: 49101 diff changeset	156 );
b5c2aca84618 rust-dirstatemap: add `set_clean` method Rapha?l Gom?s <rgomes@octobus.net> parents: 49101 diff changeset	157 res.or_else(\|_\| {
b5c2aca84618 rust-dirstatemap: add `set_clean` method Rapha?l Gom?s <rgomes@octobus.net> parents: 49101 diff changeset	158 Err(PyErr::new::<exc::OSError, _>(py, "Dirstate error".to_string()))
b5c2aca84618 rust-dirstatemap: add `set_clean` method Rapha?l Gom?s <rgomes@octobus.net> parents: 49101 diff changeset	159 })?;
48051 98c0408324e6 dirstate: Pass the final DirstateItem to _rustmap.addfile() Simon Sapin <simon.sapin@octobus.net> parents: 48050 diff changeset	160 Ok(PyNone)
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	161 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	162
49106 c1a3fdedc492 rust-dirstatemap: add `set_possibly_dirty` method Rapha?l Gom?s <rgomes@octobus.net> parents: 49104 diff changeset	163 def set_possibly_dirty(&self, f: PyObject) -> PyResult<PyNone> {
c1a3fdedc492 rust-dirstatemap: add `set_possibly_dirty` method Rapha?l Gom?s <rgomes@octobus.net> parents: 49104 diff changeset	164 let bytes = f.extract::<PyBytes>(py)?;
c1a3fdedc492 rust-dirstatemap: add `set_possibly_dirty` method Rapha?l Gom?s <rgomes@octobus.net> parents: 49104 diff changeset	165 let path = HgPath::new(bytes.data(py));
c1a3fdedc492 rust-dirstatemap: add `set_possibly_dirty` method Rapha?l Gom?s <rgomes@octobus.net> parents: 49104 diff changeset	166 let res = self.inner(py).borrow_mut().set_possibly_dirty(path);
c1a3fdedc492 rust-dirstatemap: add `set_possibly_dirty` method Rapha?l Gom?s <rgomes@octobus.net> parents: 49104 diff changeset	167 res.or_else(\|_\| {
c1a3fdedc492 rust-dirstatemap: add `set_possibly_dirty` method Rapha?l Gom?s <rgomes@octobus.net> parents: 49104 diff changeset	168 Err(PyErr::new::<exc::OSError, _>(py, "Dirstate error".to_string()))
c1a3fdedc492 rust-dirstatemap: add `set_possibly_dirty` method Rapha?l Gom?s <rgomes@octobus.net> parents: 49104 diff changeset	169 })?;
c1a3fdedc492 rust-dirstatemap: add `set_possibly_dirty` method Rapha?l Gom?s <rgomes@octobus.net> parents: 49104 diff changeset	170 Ok(PyNone)
c1a3fdedc492 rust-dirstatemap: add `set_possibly_dirty` method Rapha?l Gom?s <rgomes@octobus.net> parents: 49104 diff changeset	171 }
c1a3fdedc492 rust-dirstatemap: add `set_possibly_dirty` method Rapha?l Gom?s <rgomes@octobus.net> parents: 49104 diff changeset	172
49101 dd0430434ce9 rust-dirstatemap: add Rust implementation of `reset_state` Rapha?l Gom?s <rgomes@octobus.net> parents: 49098 diff changeset	173 def reset_state(
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	174 &self,
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	175 f: PyObject,
49101 dd0430434ce9 rust-dirstatemap: add Rust implementation of `reset_state` Rapha?l Gom?s <rgomes@octobus.net> parents: 49098 diff changeset	176 wc_tracked: bool,
dd0430434ce9 rust-dirstatemap: add Rust implementation of `reset_state` Rapha?l Gom?s <rgomes@octobus.net> parents: 49098 diff changeset	177 p1_tracked: bool,
dd0430434ce9 rust-dirstatemap: add Rust implementation of `reset_state` Rapha?l Gom?s <rgomes@octobus.net> parents: 49098 diff changeset	178 p2_info: bool,
dd0430434ce9 rust-dirstatemap: add Rust implementation of `reset_state` Rapha?l Gom?s <rgomes@octobus.net> parents: 49098 diff changeset	179 has_meaningful_mtime: bool,
dd0430434ce9 rust-dirstatemap: add Rust implementation of `reset_state` Rapha?l Gom?s <rgomes@octobus.net> parents: 49098 diff changeset	180 parentfiledata: Option<(u32, u32, Option<(i64, u32, bool)>)>,
48048 76f1c76186a1 dirstate: Remove return boolean from dirstatemap.dropfile Simon Sapin <simon.sapin@octobus.net> parents: 48047 diff changeset	181 ) -> PyResult<PyNone> {
49101 dd0430434ce9 rust-dirstatemap: add Rust implementation of `reset_state` Rapha?l Gom?s <rgomes@octobus.net> parents: 49098 diff changeset	182 let mut has_meaningful_mtime = has_meaningful_mtime;
dd0430434ce9 rust-dirstatemap: add Rust implementation of `reset_state` Rapha?l Gom?s <rgomes@octobus.net> parents: 49098 diff changeset	183 let parent_file_data = match parentfiledata {
dd0430434ce9 rust-dirstatemap: add Rust implementation of `reset_state` Rapha?l Gom?s <rgomes@octobus.net> parents: 49098 diff changeset	184 None => {
dd0430434ce9 rust-dirstatemap: add Rust implementation of `reset_state` Rapha?l Gom?s <rgomes@octobus.net> parents: 49098 diff changeset	185 has_meaningful_mtime = false;
dd0430434ce9 rust-dirstatemap: add Rust implementation of `reset_state` Rapha?l Gom?s <rgomes@octobus.net> parents: 49098 diff changeset	186 None
dd0430434ce9 rust-dirstatemap: add Rust implementation of `reset_state` Rapha?l Gom?s <rgomes@octobus.net> parents: 49098 diff changeset	187 },
dd0430434ce9 rust-dirstatemap: add Rust implementation of `reset_state` Rapha?l Gom?s <rgomes@octobus.net> parents: 49098 diff changeset	188 Some(data) => {
dd0430434ce9 rust-dirstatemap: add Rust implementation of `reset_state` Rapha?l Gom?s <rgomes@octobus.net> parents: 49098 diff changeset	189 let (mode, size, mtime_info) = data;
dd0430434ce9 rust-dirstatemap: add Rust implementation of `reset_state` Rapha?l Gom?s <rgomes@octobus.net> parents: 49098 diff changeset	190 let mtime = if let Some(mtime_info) = mtime_info {
dd0430434ce9 rust-dirstatemap: add Rust implementation of `reset_state` Rapha?l Gom?s <rgomes@octobus.net> parents: 49098 diff changeset	191 let (mtime_s, mtime_ns, second_ambiguous) = mtime_info;
dd0430434ce9 rust-dirstatemap: add Rust implementation of `reset_state` Rapha?l Gom?s <rgomes@octobus.net> parents: 49098 diff changeset	192 let timestamp = TruncatedTimestamp::new_truncate(
dd0430434ce9 rust-dirstatemap: add Rust implementation of `reset_state` Rapha?l Gom?s <rgomes@octobus.net> parents: 49098 diff changeset	193 mtime_s, mtime_ns, second_ambiguous
dd0430434ce9 rust-dirstatemap: add Rust implementation of `reset_state` Rapha?l Gom?s <rgomes@octobus.net> parents: 49098 diff changeset	194 );
dd0430434ce9 rust-dirstatemap: add Rust implementation of `reset_state` Rapha?l Gom?s <rgomes@octobus.net> parents: 49098 diff changeset	195 Some(timestamp)
dd0430434ce9 rust-dirstatemap: add Rust implementation of `reset_state` Rapha?l Gom?s <rgomes@octobus.net> parents: 49098 diff changeset	196 } else {
dd0430434ce9 rust-dirstatemap: add Rust implementation of `reset_state` Rapha?l Gom?s <rgomes@octobus.net> parents: 49098 diff changeset	197 has_meaningful_mtime = false;
dd0430434ce9 rust-dirstatemap: add Rust implementation of `reset_state` Rapha?l Gom?s <rgomes@octobus.net> parents: 49098 diff changeset	198 None
dd0430434ce9 rust-dirstatemap: add Rust implementation of `reset_state` Rapha?l Gom?s <rgomes@octobus.net> parents: 49098 diff changeset	199 };
dd0430434ce9 rust-dirstatemap: add Rust implementation of `reset_state` Rapha?l Gom?s <rgomes@octobus.net> parents: 49098 diff changeset	200 Some(ParentFileData {
dd0430434ce9 rust-dirstatemap: add Rust implementation of `reset_state` Rapha?l Gom?s <rgomes@octobus.net> parents: 49098 diff changeset	201 mode_size: Some((mode, size)),
dd0430434ce9 rust-dirstatemap: add Rust implementation of `reset_state` Rapha?l Gom?s <rgomes@octobus.net> parents: 49098 diff changeset	202 mtime,
dd0430434ce9 rust-dirstatemap: add Rust implementation of `reset_state` Rapha?l Gom?s <rgomes@octobus.net> parents: 49098 diff changeset	203 })
dd0430434ce9 rust-dirstatemap: add Rust implementation of `reset_state` Rapha?l Gom?s <rgomes@octobus.net> parents: 49098 diff changeset	204 }
dd0430434ce9 rust-dirstatemap: add Rust implementation of `reset_state` Rapha?l Gom?s <rgomes@octobus.net> parents: 49098 diff changeset	205 };
dd0430434ce9 rust-dirstatemap: add Rust implementation of `reset_state` Rapha?l Gom?s <rgomes@octobus.net> parents: 49098 diff changeset	206 let bytes = f.extract::<PyBytes>(py)?;
dd0430434ce9 rust-dirstatemap: add Rust implementation of `reset_state` Rapha?l Gom?s <rgomes@octobus.net> parents: 49098 diff changeset	207 let path = HgPath::new(bytes.data(py));
dd0430434ce9 rust-dirstatemap: add Rust implementation of `reset_state` Rapha?l Gom?s <rgomes@octobus.net> parents: 49098 diff changeset	208 let res = self.inner(py).borrow_mut().reset_state(
dd0430434ce9 rust-dirstatemap: add Rust implementation of `reset_state` Rapha?l Gom?s <rgomes@octobus.net> parents: 49098 diff changeset	209 path,
dd0430434ce9 rust-dirstatemap: add Rust implementation of `reset_state` Rapha?l Gom?s <rgomes@octobus.net> parents: 49098 diff changeset	210 wc_tracked,
dd0430434ce9 rust-dirstatemap: add Rust implementation of `reset_state` Rapha?l Gom?s <rgomes@octobus.net> parents: 49098 diff changeset	211 p1_tracked,
dd0430434ce9 rust-dirstatemap: add Rust implementation of `reset_state` Rapha?l Gom?s <rgomes@octobus.net> parents: 49098 diff changeset	212 p2_info,
dd0430434ce9 rust-dirstatemap: add Rust implementation of `reset_state` Rapha?l Gom?s <rgomes@octobus.net> parents: 49098 diff changeset	213 has_meaningful_mtime,
dd0430434ce9 rust-dirstatemap: add Rust implementation of `reset_state` Rapha?l Gom?s <rgomes@octobus.net> parents: 49098 diff changeset	214 parent_file_data,
dd0430434ce9 rust-dirstatemap: add Rust implementation of `reset_state` Rapha?l Gom?s <rgomes@octobus.net> parents: 49098 diff changeset	215 );
dd0430434ce9 rust-dirstatemap: add Rust implementation of `reset_state` Rapha?l Gom?s <rgomes@octobus.net> parents: 49098 diff changeset	216 res.or_else(\|_\| {
dd0430434ce9 rust-dirstatemap: add Rust implementation of `reset_state` Rapha?l Gom?s <rgomes@octobus.net> parents: 49098 diff changeset	217 Err(PyErr::new::<exc::OSError, _>(py, "Dirstate error".to_string()))
dd0430434ce9 rust-dirstatemap: add Rust implementation of `reset_state` Rapha?l Gom?s <rgomes@octobus.net> parents: 49098 diff changeset	218 })?;
48048 76f1c76186a1 dirstate: Remove return boolean from dirstatemap.dropfile Simon Sapin <simon.sapin@octobus.net> parents: 48047 diff changeset	219 Ok(PyNone)
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	220 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	221
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	222 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	223 let d = d.extract::<PyBytes>(py)?;
44233 281642cd1d04 rust-cpython: rename inner_shared() to inner() Yuya Nishihara <yuya@tcha.org> parents: 44203 diff changeset	224 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	225 .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	226 .map_err(\|e\| {
bc7d8f45c3b6 rust-dirs: handle forgotten `Result`s Rapha?l Gom?s <rgomes@octobus.net> parents: 43788 diff changeset	227 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	228 })?
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	229 .to_py_object(py))
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	230 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	231
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	232 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	233 let d = d.extract::<PyBytes>(py)?;
44233 281642cd1d04 rust-cpython: rename inner_shared() to inner() Yuya Nishihara <yuya@tcha.org> parents: 44203 diff changeset	234 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	235 .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	236 .map_err(\|e\| {
bc7d8f45c3b6 rust-dirs: handle forgotten `Result`s Rapha?l Gom?s <rgomes@octobus.net> parents: 43788 diff changeset	237 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	238 })?
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	239 .to_py_object(py))
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
47674 ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	242 def write_v1(
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	243 &self,
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	244 p1: PyObject,
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	245 p2: PyObject,
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	246 ) -> PyResult<PyBytes> {
48416 c1b633db67fc rust: Serializing a DirstateMap does not mutate it anymore Simon Sapin <simon.sapin@octobus.net> parents: 48392 diff changeset	247 let inner = self.inner(py).borrow();
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	248 let parents = DirstateParents {
42800 79561843729a rust-dirstate: handle invalid length of p1/p2 parameters Yuya Nishihara <yuya@tcha.org> parents: 42799 diff changeset	249 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	250 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	251 };
48392 434de12918fd dirstate: remove need_delay logic Pierre-Yves David <pierre-yves.david@octobus.net> parents: 48260 diff changeset	252 let result = inner.pack_v1(parents);
47674 ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	253 match result {
ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	254 Ok(packed) => Ok(PyBytes::new(py, &packed)),
ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	255 Err(_) => Err(PyErr::new::<exc::OSError, _>(
ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	256 py,
ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	257 "Dirstate error".to_string(),
ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	258 )),
ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	259 }
ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	260 }
ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	261
47678 065e61628980 dirstate-v2: Support appending to the same data file Simon Sapin <simon.sapin@octobus.net> parents: 47675 diff changeset	262 /// 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	263 /// 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	264 /// 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	265 def write_v2(
ff97e793ed36 dirstate-v2: Introduce a docket file Simon Sapin <simon.sapin@octobus.net> parents: 47567 diff changeset	266 &self,
50221 1891086f6c7f dirstate: use more than a bool to control append behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49147 diff changeset	267 write_mode: usize,
47678 065e61628980 dirstate-v2: Support appending to the same data file Simon Sapin <simon.sapin@octobus.net> parents: 47675 diff changeset	268 ) -> PyResult<PyObject> {
48416 c1b633db67fc rust: Serializing a DirstateMap does not mutate it anymore Simon Sapin <simon.sapin@octobus.net> parents: 48392 diff changeset	269 let inner = self.inner(py).borrow();
50221 1891086f6c7f dirstate: use more than a bool to control append behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49147 diff changeset	270 let rust_write_mode = match write_mode {
1891086f6c7f dirstate: use more than a bool to control append behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49147 diff changeset	271 0 => DirstateMapWriteMode::Auto,
1891086f6c7f dirstate: use more than a bool to control append behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49147 diff changeset	272 1 => DirstateMapWriteMode::ForceNewDataFile,
50222 ecd28d89c29e dirstate-v2: add devel config option to control write behavior Rapha?l Gom?s <rgomes@octobus.net> parents: 50221 diff changeset	273 2 => DirstateMapWriteMode::ForceAppend,
50221 1891086f6c7f dirstate: use more than a bool to control append behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49147 diff changeset	274 _ => DirstateMapWriteMode::Auto, // XXX should we error out?
1891086f6c7f dirstate: use more than a bool to control append behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49147 diff changeset	275 };
1891086f6c7f dirstate: use more than a bool to control append behavior Pierre-Yves David <pierre-yves.david@octobus.net> parents: 49147 diff changeset	276 let result = inner.pack_v2(rust_write_mode);
47280 1766130fe9ba dirstate-v2: Change the on-disk format when the requirement is enabled Simon Sapin <simon.sapin@octobus.net> parents: 47124 diff changeset	277 match result {
49145 dd2503a63d33 rust-dirstate-v2: save proper data size if no new data on append Rapha?l Gom?s <rgomes@octobus.net> parents: 49000 diff changeset	278 Ok((packed, tree_metadata, append, _old_data_size)) => {
47678 065e61628980 dirstate-v2: Support appending to the same data file Simon Sapin <simon.sapin@octobus.net> parents: 47675 diff changeset	279 let packed = PyBytes::new(py, &packed);
48421 2097f63575a5 rhg: Add Repo::write_dirstate Simon Sapin <simon.sapin@octobus.net> parents: 48416 diff changeset	280 let tree_metadata = PyBytes::new(py, tree_metadata.as_bytes());
47682 78f7f0d490ee dirstate-v2: Move fixed-size tree metadata into the docket file Simon Sapin <simon.sapin@octobus.net> parents: 47678 diff changeset	281 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	282 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	283 },
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	284 Err(_) => Err(PyErr::new::<exc::OSError, _>(
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	285 py,
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	286 "Dirstate error".to_string(),
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
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	291 def filefoldmapasdict(&self) -> PyResult<PyDict> {
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	292 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	293 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	294 let (path, entry) = item.map_err(\|e\| v2_error(py, e))?;
49135 a1fce5003ff4 rust-hg-cpython: remove use of `EntryState` Rapha?l Gom?s <rgomes@octobus.net> parents: 49124 diff changeset	295 if !entry.removed() {
47109 33e5511b571a rust: Remove DirstateMap::file_fold_map Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	296 let key = normalize_case(path);
33e5511b571a rust: Remove DirstateMap::file_fold_map Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	297 let value = path;
33e5511b571a rust: Remove DirstateMap::file_fold_map Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	298 dict.set_item(
33e5511b571a rust: Remove DirstateMap::file_fold_map Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	299 py,
33e5511b571a rust: Remove DirstateMap::file_fold_map Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	300 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	301 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	302 )?;
33e5511b571a rust: Remove DirstateMap::file_fold_map Simon Sapin <simon.sapin@octobus.net> parents: 47101 diff changeset	303 }
42754 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 Ok(dict)
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	306 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	307
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	308 def __len__(&self) -> PyResult<usize> {
44233 281642cd1d04 rust-cpython: rename inner_shared() to inner() Yuya Nishihara <yuya@tcha.org> parents: 44203 diff changeset	309 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	310 }
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 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	313 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	314 self.inner(py)
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	315 .borrow()
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	316 .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	317 .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	318 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	319
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	320 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	321 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	322 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	323 match self
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	324 .inner(py)
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	325 .borrow()
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	326 .get(key)
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	327 .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	328 {
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	329 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	330 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	331 },
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	332 None => Err(PyErr::new::<exc::KeyError, _>(
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	333 py,
42957 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42890 diff changeset	334 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	335 )),
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	336 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	337 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	338
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	339 def keys(&self) -> PyResult<DirstateMapKeysIterator> {
44233 281642cd1d04 rust-cpython: rename inner_shared() to inner() Yuya Nishihara <yuya@tcha.org> parents: 44203 diff changeset	340 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	341 DirstateMapKeysIterator::from_inner(
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	342 py,
43285 ffc1fbd7d1f5 rust-cpython: make PyLeakedRef operations relatively safe Yuya Nishihara <yuya@tcha.org> parents: 43284 diff changeset	343 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	344 )
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 items(&self) -> PyResult<DirstateMapItemsIterator> {
44233 281642cd1d04 rust-cpython: rename inner_shared() to inner() Yuya Nishihara <yuya@tcha.org> parents: 44203 diff changeset	348 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	349 DirstateMapItemsIterator::from_inner(
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	350 py,
43285 ffc1fbd7d1f5 rust-cpython: make PyLeakedRef operations relatively safe Yuya Nishihara <yuya@tcha.org> parents: 43284 diff changeset	351 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	352 )
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	353 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	354
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	355 def __iter__(&self) -> PyResult<DirstateMapKeysIterator> {
44233 281642cd1d04 rust-cpython: rename inner_shared() to inner() Yuya Nishihara <yuya@tcha.org> parents: 44203 diff changeset	356 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	357 DirstateMapKeysIterator::from_inner(
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	358 py,
43285 ffc1fbd7d1f5 rust-cpython: make PyLeakedRef operations relatively safe Yuya Nishihara <yuya@tcha.org> parents: 43284 diff changeset	359 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	360 )
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	361 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	362
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	363 // 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	364 def copymapcopy(&self) -> PyResult<PyDict> {
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	365 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	366 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	367 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	368 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	369 py,
44973 26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44441 diff changeset	370 PyBytes::new(py, key.as_bytes()),
26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44441 diff changeset	371 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	372 )?;
42754 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 Ok(dict)
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	375 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	376
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	377 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	378 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	379 match self
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	380 .inner(py)
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	381 .borrow()
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	382 .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	383 .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	384 {
44973 26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44441 diff changeset	385 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	386 None => Err(PyErr::new::<exc::KeyError, _>(
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	387 py,
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	388 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	389 )),
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 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	392 def copymap(&self) -> PyResult<CopyMap> {
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	393 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	394 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	395
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	396 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	397 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	398 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	399 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	400 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	401 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	402 .borrow()
47335 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	403 .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	404 .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	405 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	406 def copymapget(
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	407 &self,
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	408 key: PyObject,
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	409 default: Option<PyObject>
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	410 ) -> PyResult<Option<PyObject>> {
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	411 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	412 match self
44233 281642cd1d04 rust-cpython: rename inner_shared() to inner() Yuya Nishihara <yuya@tcha.org> parents: 44203 diff changeset	413 .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	414 .borrow()
47093 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: 46891 diff changeset	415 .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	416 .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	417 {
7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42890 diff changeset	418 Some(copy) => Ok(Some(
44973 26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44441 diff changeset	419 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	420 )),
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	421 None => Ok(default),
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	422 }
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 def copymapsetitem(
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	425 &self,
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	426 key: PyObject,
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	427 value: PyObject
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	428 ) -> PyResult<PyObject> {
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	429 let key = key.extract::<PyBytes>(py)?;
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	430 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	431 self.inner(py)
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	432 .borrow_mut()
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	433 .copy_map_insert(
49124 d9a66d62c604 rust-dirstatemap: use `&HgPath` instead of `HgPathBuf` in `copy_map_insert` Rapha?l Gom?s <rgomes@octobus.net> parents: 49122 diff changeset	434 HgPath::new(key.data(py)),
d9a66d62c604 rust-dirstatemap: use `&HgPath` instead of `HgPathBuf` in `copy_map_insert` Rapha?l Gom?s <rgomes@octobus.net> parents: 49122 diff changeset	435 HgPath::new(value.data(py)),
47335 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	436 )
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	437 .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	438 Ok(py.None())
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	439 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	440 def copymappop(
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	441 &self,
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	442 key: PyObject,
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	443 default: Option<PyObject>
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	444 ) -> PyResult<Option<PyObject>> {
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	445 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	446 match self
44233 281642cd1d04 rust-cpython: rename inner_shared() to inner() Yuya Nishihara <yuya@tcha.org> parents: 44203 diff changeset	447 .inner(py)
44203 2a24ead003f0 rust-cpython: add panicking version of borrow_mut() and use it Yuya Nishihara <yuya@tcha.org> parents: 43863 diff changeset	448 .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	449 .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	450 .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	451 {
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	452 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	453 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	454 )),
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	455 None => Ok(default),
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	456 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	457 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	458
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	459 def copymapiter(&self) -> PyResult<CopyMapKeysIterator> {
44233 281642cd1d04 rust-cpython: rename inner_shared() to inner() Yuya Nishihara <yuya@tcha.org> parents: 44203 diff changeset	460 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	461 CopyMapKeysIterator::from_inner(
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	462 py,
47093 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: 46891 diff changeset	463 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	464 )
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	465 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	466
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	467 def copymapitemsiter(&self) -> PyResult<CopyMapItemsIterator> {
44233 281642cd1d04 rust-cpython: rename inner_shared() to inner() Yuya Nishihara <yuya@tcha.org> parents: 44203 diff changeset	468 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	469 CopyMapItemsIterator::from_inner(
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	470 py,
47093 787ff5d21bcd dirstate-tree: Make Rust DirstateMap bindings go through a trait object Simon Sapin <simon.sapin@octobus.net> parents: 46891 diff changeset	471 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	472 )
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	473 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	474
47683 284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	475 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	476 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	477 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	478 .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	479 {
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	480 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	481 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	482 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	483 }
3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47335 diff changeset	484 Ok(dirs)
3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47335 diff changeset	485 }
3b9914b28133 dirstate-v2: Add --dirs to debugdirstate command Simon Sapin <simon.sapin@octobus.net> parents: 47335 diff changeset	486
49120 3df46f3a3d6c rust-dirstatemap: implement part of the `setparents` logic Rapha?l Gom?s <rgomes@octobus.net> parents: 49112 diff changeset	487 def setparents_fixup(&self) -> PyResult<PyDict> {
3df46f3a3d6c rust-dirstatemap: implement part of the `setparents` logic Rapha?l Gom?s <rgomes@octobus.net> parents: 49112 diff changeset	488 let dict = PyDict::new(py);
3df46f3a3d6c rust-dirstatemap: implement part of the `setparents` logic Rapha?l Gom?s <rgomes@octobus.net> parents: 49112 diff changeset	489 let copies = self.inner(py).borrow_mut().setparents_fixup();
3df46f3a3d6c rust-dirstatemap: implement part of the `setparents` logic Rapha?l Gom?s <rgomes@octobus.net> parents: 49112 diff changeset	490 for (key, value) in copies.map_err(\|e\| v2_error(py, e))? {
3df46f3a3d6c rust-dirstatemap: implement part of the `setparents` logic Rapha?l Gom?s <rgomes@octobus.net> parents: 49112 diff changeset	491 dict.set_item(
3df46f3a3d6c rust-dirstatemap: implement part of the `setparents` logic Rapha?l Gom?s <rgomes@octobus.net> parents: 49112 diff changeset	492 py,
3df46f3a3d6c rust-dirstatemap: implement part of the `setparents` logic Rapha?l Gom?s <rgomes@octobus.net> parents: 49112 diff changeset	493 PyBytes::new(py, key.as_bytes()),
3df46f3a3d6c rust-dirstatemap: implement part of the `setparents` logic Rapha?l Gom?s <rgomes@octobus.net> parents: 49112 diff changeset	494 PyBytes::new(py, value.as_bytes()),
3df46f3a3d6c rust-dirstatemap: implement part of the `setparents` logic Rapha?l Gom?s <rgomes@octobus.net> parents: 49112 diff changeset	495 )?;
3df46f3a3d6c rust-dirstatemap: implement part of the `setparents` logic Rapha?l Gom?s <rgomes@octobus.net> parents: 49112 diff changeset	496 }
3df46f3a3d6c rust-dirstatemap: implement part of the `setparents` logic Rapha?l Gom?s <rgomes@octobus.net> parents: 49112 diff changeset	497 Ok(dict)
3df46f3a3d6c rust-dirstatemap: implement part of the `setparents` logic Rapha?l Gom?s <rgomes@octobus.net> parents: 49112 diff changeset	498 }
3df46f3a3d6c rust-dirstatemap: implement part of the `setparents` logic Rapha?l Gom?s <rgomes@octobus.net> parents: 49112 diff changeset	499
48023 357307feaf61 debugstate: Always call dirstatemap.debug_iter() Simon Sapin <simon.sapin@octobus.net> parents: 48022 diff changeset	500 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	501 let dirs = PyList::new(py, &[]);
48023 357307feaf61 debugstate: Always call dirstatemap.debug_iter() Simon Sapin <simon.sapin@octobus.net> parents: 48022 diff changeset	502 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	503 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	504 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	505 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	506 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	507 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	508 }
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	509 Ok(dirs)
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	510 }
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	511 });
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	512
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	513 impl DirstateMap {
47112 d5956136d19d dirstate-tree: Give to `status()` mutable access to the `DirstateMap` Simon Sapin <simon.sapin@octobus.net> parents: 47109 diff changeset	514 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	515 &'a self,
478d0b1bf0c5 rust-dirstate-status: rust-cpython bindings for `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43208 diff changeset	516 py: Python<'a>,
48069 3d0a9c6e614d dirstate: Remove the Rust abstraction DirstateMapMethods Simon Sapin <simon.sapin@octobus.net> parents: 48068 diff changeset	517 ) -> 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	518 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	519 }
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	520 fn translate_key(
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	521 py: Python,
47335 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	522 res: Result<(&HgPath, DirstateEntry), DirstateV2ParseError>,
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	523 ) -> PyResult<Option<PyBytes>> {
47335 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	524 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	525 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	526 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	527 fn translate_key_value(
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	528 py: Python,
47335 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	529 res: Result<(&HgPath, DirstateEntry), DirstateV2ParseError>,
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	530 ) -> PyResult<Option<(PyBytes, PyObject)>> {
47335 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	531 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	532 Ok(Some((
44973 26114bd6ec60 rust: do a clippy pass Rapha?l Gom?s <rgomes@octobus.net> parents: 44441 diff changeset	533 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	534 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	535 )))
496537c9c1b4 rust: start plugging the dirstate tree behind a feature gate Rapha?l Gom?s <rgomes@octobus.net> parents: 44973 diff changeset	536 }
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	537 }
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	538
42889 ea91a126c803 rust-cpython: rename py_shared_iterator_impl to py_shared_iterator Yuya Nishihara <yuya@tcha.org> parents: 42888 diff changeset	539 py_shared_iterator!(
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	540 DirstateMapKeysIterator,
44234 bad4e7b361d2 rust-cpython: switch to upstreamed version of PySharedRefCell Yuya Nishihara <yuya@tcha.org> parents: 44233 diff changeset	541 UnsafePyLeaked<StateMapIter<'static>>,
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	542 DirstateMap::translate_key,
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	543 Option<PyBytes>
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	544 );
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	545
42889 ea91a126c803 rust-cpython: rename py_shared_iterator_impl to py_shared_iterator Yuya Nishihara <yuya@tcha.org> parents: 42888 diff changeset	546 py_shared_iterator!(
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	547 DirstateMapItemsIterator,
44234 bad4e7b361d2 rust-cpython: switch to upstreamed version of PySharedRefCell Yuya Nishihara <yuya@tcha.org> parents: 44233 diff changeset	548 UnsafePyLeaked<StateMapIter<'static>>,
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	549 DirstateMap::translate_key_value,
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	550 Option<(PyBytes, PyObject)>
4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	551 );
42800 79561843729a rust-dirstate: handle invalid length of p1/p2 parameters Yuya Nishihara <yuya@tcha.org> parents: 42799 diff changeset	552
46595 98a455a62699 rust: Make `DirstateParents`?s fields typed `Node`s Simon Sapin <simon.sapin@octobus.net> parents: 46440 diff changeset	553 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	554 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	555 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	556 Ok(s) => Ok(s),
79561843729a rust-dirstate: handle invalid length of p1/p2 parameters Yuya Nishihara <yuya@tcha.org> parents: 42799 diff changeset	557 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	558 }
79561843729a rust-dirstate: handle invalid length of p1/p2 parameters Yuya Nishihara <yuya@tcha.org> parents: 42799 diff changeset	559 }
47335 ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	560
ed1583a845d2 dirstate-v2: Make more APIs fallible, returning Result Simon Sapin <simon.sapin@octobus.net> parents: 47332 diff changeset	561 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	562 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	563 }
47683 284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	564
284a20269a97 dirstate-v2: Separate iterators for dirfoldmap and debugdirstate Simon Sapin <simon.sapin@octobus.net> parents: 47682 diff changeset	565 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	566 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	567 }

Mercurial > public > mercurial-scm > hg

annotate rust/hg-cpython/src/dirstate/dirstate_map.rs @ 50245:dbe09fb038fc stable