mercurial-scm/hg: rust/hg-cpython/src/dirstate.rs annotate

annotate rust/hg-cpython/src/dirstate.rs @ 42609:326fdce22fb2

rust: switch hg-core and hg-cpython to rust 2018 edition Many interesting changes have happened in Rust since the Oxidation Plan was introduced, like the 2018 edition and procedural macros: - Opting in to the 2018 edition is a clear benefit in terms of future proofing, new (nice to have) syntactical sugar notwithstanding. It also has a new non-lexical, non-AST based borrow checker that has fewer bugs(!) and allows us to write correct code that in some cases would have been rejected by the old one. - Procedural macros allow us to use the PyO3 crate which maintainers have expressed the clear goal of compiling on stable, which would help in code maintainability compared to rust-cpython. In this patch are the following changes: - Removing most `extern crate` uses - Updating `use` clauses (`crate` keyword, nested `use`) - Removing `mod.rs` in favor of an aptly named module file Like discussed in the mailing list ( https://www.mercurial-scm.org/pipermail/mercurial-devel/2019-July/132316.html ), until Rust integration in Mercurial is considered to be out of the experimental phase, the maximum version of Rust allowed is whatever the latest version Debian packages. Differential Revision: https://phab.mercurial-scm.org/D6597

author	Rapha?l Gom?s <rgomes@octobus.net>
date	Tue, 02 Jul 2019 17:15:03 +0200
parents	11c025c83393
children	b3518b0baa47

rev	line source
42303 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	1 // dirstate.rs
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	2 //
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	3 // Copyright 2019 Raphaël Gomès <rgomes@octobus.net>
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	4 //
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	5 // This software may be used and distributed according to the terms of the
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	6 // GNU General Public License version 2 or any later version.
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	7
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	8 //! Bindings for the `hg::dirstate` module provided by the
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	9 //! `hg-core` package.
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	10 //!
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	11 //! From Python, this will be seen as `mercurial.rustext.dirstate`
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	12
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	13 use cpython::{
42537 ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	14 exc, ObjectProtocol, PyBytes, PyDict, PyErr, PyInt, PyModule, PyObject,
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	15 PyResult, PySequence, PyTuple, Python, PythonObject, ToPyObject,
42303 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	16 };
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	17 use hg::{
42537 ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	18 pack_dirstate, parse_dirstate, CopyVecEntry, DirsIterable, DirsMultiset,
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	19 DirstateEntry, DirstateMapError, DirstatePackError, DirstateParents,
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	20 DirstateParseError, DirstateVec,
42303 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	21 };
42609 326fdce22fb2 rust: switch hg-core and hg-cpython to rust 2018 edition Rapha?l Gom?s <rgomes@octobus.net> parents: 42558 diff changeset	22 use libc::{c_char, c_int};
326fdce22fb2 rust: switch hg-core and hg-cpython to rust 2018 edition Rapha?l Gom?s <rgomes@octobus.net> parents: 42558 diff changeset	23 #[cfg(feature = "python27")]
326fdce22fb2 rust: switch hg-core and hg-cpython to rust 2018 edition Rapha?l Gom?s <rgomes@octobus.net> parents: 42558 diff changeset	24 use python27_sys::PyCapsule_Import;
326fdce22fb2 rust: switch hg-core and hg-cpython to rust 2018 edition Rapha?l Gom?s <rgomes@octobus.net> parents: 42558 diff changeset	25 #[cfg(feature = "python3")]
326fdce22fb2 rust: switch hg-core and hg-cpython to rust 2018 edition Rapha?l Gom?s <rgomes@octobus.net> parents: 42558 diff changeset	26 use python3_sys::PyCapsule_Import;
326fdce22fb2 rust: switch hg-core and hg-cpython to rust 2018 edition Rapha?l Gom?s <rgomes@octobus.net> parents: 42558 diff changeset	27 use std::cell::RefCell;
42303 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	28 use std::collections::HashMap;
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	29 use std::ffi::CStr;
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	30 use std::mem::transmute;
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	31
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	32 /// C code uses a custom `dirstate_tuple` type, checks in multiple instances
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	33 /// for this type, and raises a Python `Exception` if the check does not pass.
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	34 /// Because this type differs only in name from the regular Python tuple, it
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	35 /// would be a good idea in the near future to remove it entirely to allow
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	36 /// for a pure Python tuple of the same effective structure to be used,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	37 /// rendering this type and the capsule below useless.
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	38 type MakeDirstateTupleFn = extern "C" fn(
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	39 state: c_char,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	40 mode: c_int,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	41 size: c_int,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	42 mtime: c_int,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	43 ) -> PyObject;
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	44
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	45 /// This is largely a copy/paste from cindex.rs, pending the merge of a
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	46 /// `py_capsule_fn!` macro in the rust-cpython project:
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	47 /// https://github.com/dgrunwald/rust-cpython/pull/169
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	48 fn decapsule_make_dirstate_tuple(py: Python) -> PyResult<MakeDirstateTupleFn> {
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	49 unsafe {
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	50 let caps_name = CStr::from_bytes_with_nul_unchecked(
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	51 b"mercurial.cext.parsers.make_dirstate_tuple_CAPI\0",
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	52 );
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	53 let from_caps = PyCapsule_Import(caps_name.as_ptr(), 0);
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	54 if from_caps.is_null() {
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	55 return Err(PyErr::fetch(py));
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	56 }
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	57 Ok(transmute(from_caps))
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	58 }
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	59 }
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	60
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	61 fn parse_dirstate_wrapper(
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	62 py: Python,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	63 dmap: PyDict,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	64 copymap: PyDict,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	65 st: PyBytes,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	66 ) -> PyResult<PyTuple> {
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	67 match parse_dirstate(st.data(py)) {
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	68 Ok((parents, dirstate_vec, copies)) => {
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	69 for (filename, entry) in dirstate_vec {
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	70 dmap.set_item(
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	71 py,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	72 PyBytes::new(py, &filename[..]),
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	73 decapsule_make_dirstate_tuple(py)?(
42408 4e4fa3a95406 rust-dirstate: architecture independence fix Georges Racinet <georges.racinet@octobus.net> parents: 42356 diff changeset	74 entry.state as c_char,
42303 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	75 entry.mode,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	76 entry.size,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	77 entry.mtime,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	78 ),
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	79 )?;
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	80 }
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	81 for CopyVecEntry { path, copy_path } in copies {
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	82 copymap.set_item(
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	83 py,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	84 PyBytes::new(py, path),
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	85 PyBytes::new(py, copy_path),
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	86 )?;
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	87 }
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	88 Ok((PyBytes::new(py, parents.p1), PyBytes::new(py, parents.p2))
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	89 .to_py_object(py))
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	90 }
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	91 Err(e) => Err(PyErr::new::<exc::ValueError, _>(
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	92 py,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	93 match e {
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	94 DirstateParseError::TooLittleData => {
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	95 "too little data for parents".to_string()
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	96 }
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	97 DirstateParseError::Overflow => {
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	98 "overflow in dirstate".to_string()
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	99 }
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	100 DirstateParseError::CorruptedEntry(e) => e,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	101 },
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	102 )),
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	103 }
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	104 }
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	105
42537 ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	106 fn extract_dirstate_vec(
42303 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	107 py: Python,
42537 ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	108 dmap: &PyDict,
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	109 ) -> Result<DirstateVec, PyErr> {
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	110 dmap.items(py)
42303 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	111 .iter()
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	112 .map(\|(filename, stats)\| {
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	113 let stats = stats.extract::<PySequence>(py)?;
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	114 let state = stats.get_item(py, 0)?.extract::<PyBytes>(py)?;
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	115 let state = state.data(py)[0] as i8;
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	116 let mode = stats.get_item(py, 1)?.extract(py)?;
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	117 let size = stats.get_item(py, 2)?.extract(py)?;
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	118 let mtime = stats.get_item(py, 3)?.extract(py)?;
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	119 let filename = filename.extract::<PyBytes>(py)?;
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	120 let filename = filename.data(py);
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	121 Ok((
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	122 filename.to_owned(),
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	123 DirstateEntry {
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	124 state,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	125 mode,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	126 size,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	127 mtime,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	128 },
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	129 ))
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	130 })
42537 ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	131 .collect()
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	132 }
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	133
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	134 fn pack_dirstate_wrapper(
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	135 py: Python,
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	136 dmap: PyDict,
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	137 copymap: PyDict,
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	138 pl: PyTuple,
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	139 now: PyInt,
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	140 ) -> PyResult<PyBytes> {
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	141 let p1 = pl.get_item(py, 0).extract::<PyBytes>(py)?;
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	142 let p1: &[u8] = p1.data(py);
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	143 let p2 = pl.get_item(py, 1).extract::<PyBytes>(py)?;
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	144 let p2: &[u8] = p2.data(py);
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	145
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	146 let dirstate_vec = extract_dirstate_vec(py, &dmap)?;
42303 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	147
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	148 let copies: Result<HashMap<Vec<u8>, Vec<u8>>, PyErr> = copymap
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	149 .items(py)
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	150 .iter()
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	151 .map(\|(key, value)\| {
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	152 Ok((
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	153 key.extract::<PyBytes>(py)?.data(py).to_owned(),
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	154 value.extract::<PyBytes>(py)?.data(py).to_owned(),
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	155 ))
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	156 })
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	157 .collect();
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	158
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	159 match pack_dirstate(
42537 ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	160 &dirstate_vec,
42303 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	161 &copies?,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	162 DirstateParents { p1, p2 },
42356 48df8a06c8bb rust-python3: compatibility fix for incoming PyLong Georges Racinet <georges.racinet@octobus.net> parents: 42303 diff changeset	163 now.as_object().extract::<i32>(py)?,
42303 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	164 ) {
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	165 Ok((packed, new_dirstate_vec)) => {
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	166 for (
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	167 filename,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	168 DirstateEntry {
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	169 state,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	170 mode,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	171 size,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	172 mtime,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	173 },
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	174 ) in new_dirstate_vec
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	175 {
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	176 dmap.set_item(
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	177 py,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	178 PyBytes::new(py, &filename[..]),
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	179 decapsule_make_dirstate_tuple(py)?(
42537 ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	180 state as c_char,
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	181 mode,
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	182 size,
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	183 mtime,
42303 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	184 ),
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	185 )?;
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	186 }
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	187 Ok(PyBytes::new(py, &packed))
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	188 }
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	189 Err(error) => Err(PyErr::new::<exc::ValueError, _>(
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	190 py,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	191 match error {
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	192 DirstatePackError::CorruptedParent => {
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	193 "expected a 20-byte hash".to_string()
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	194 }
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	195 DirstatePackError::CorruptedEntry(e) => e,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	196 DirstatePackError::BadSize(expected, actual) => {
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	197 format!("bad dirstate size: {} != {}", actual, expected)
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	198 }
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	199 },
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	200 )),
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	201 }
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	202 }
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	203
42537 ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	204 py_class!(pub class Dirs \|py\| {
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	205 data dirs_map: RefCell<DirsMultiset>;
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	206
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	207 // `map` is either a `dict` or a flat iterator (usually a `set`, sometimes
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	208 // a `list`)
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	209 def __new__(
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	210 _cls,
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	211 map: PyObject,
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	212 skip: Option<PyObject> = None
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	213 ) -> PyResult<Self> {
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	214 let mut skip_state: Option<i8> = None;
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	215 if let Some(skip) = skip {
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	216 skip_state = Some(skip.extract::<PyBytes>(py)?.data(py)[0] as i8);
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	217 }
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	218 let dirs_map;
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	219
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	220 if let Ok(map) = map.cast_as::<PyDict>(py) {
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	221 let dirstate_vec = extract_dirstate_vec(py, &map)?;
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	222 dirs_map = DirsMultiset::new(
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	223 DirsIterable::Dirstate(dirstate_vec),
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	224 skip_state,
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	225 )
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	226 } else {
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	227 let map: Result<Vec<Vec<u8>>, PyErr> = map
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	228 .iter(py)?
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	229 .map(\|o\| Ok(o?.extract::<PyBytes>(py)?.data(py).to_owned()))
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	230 .collect();
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	231 dirs_map = DirsMultiset::new(
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	232 DirsIterable::Manifest(map?),
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	233 skip_state,
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	234 )
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	235 }
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	236
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	237 Self::create_instance(py, RefCell::new(dirs_map))
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	238 }
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	239
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	240 def addpath(&self, path: PyObject) -> PyResult<PyObject> {
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	241 self.dirs_map(py).borrow_mut().add_path(
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	242 path.extract::<PyBytes>(py)?.data(py),
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	243 );
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	244 Ok(py.None())
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	245 }
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	246
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	247 def delpath(&self, path: PyObject) -> PyResult<PyObject> {
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	248 self.dirs_map(py).borrow_mut().delete_path(
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	249 path.extract::<PyBytes>(py)?.data(py),
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	250 )
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	251 .and(Ok(py.None()))
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	252 .or_else(\|e\| {
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	253 match e {
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	254 DirstateMapError::PathNotFound(_p) => {
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	255 Err(PyErr::new::<exc::ValueError, _>(
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	256 py,
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	257 "expected a value, found none".to_string(),
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	258 ))
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	259 }
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	260 DirstateMapError::EmptyPath => {
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	261 Ok(py.None())
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	262 }
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	263 }
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	264 })
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	265 }
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	266
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	267 // This is really inefficient on top of being ugly, but it's an easy way
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	268 // of having it work to continue working on the rest of the module
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	269 // hopefully bypassing Python entirely pretty soon.
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	270 def __iter__(&self) -> PyResult<PyObject> {
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	271 let dict = PyDict::new(py);
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	272
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	273 for (key, value) in self.dirs_map(py).borrow().iter() {
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	274 dict.set_item(
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	275 py,
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	276 PyBytes::new(py, &key[..]),
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	277 value.to_py_object(py),
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	278 )?;
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	279 }
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	280
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	281 let locals = PyDict::new(py);
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	282 locals.set_item(py, "obj", dict)?;
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	283
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	284 py.eval("iter(obj)", None, Some(&locals))
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	285 }
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	286
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	287 def __contains__(&self, item: PyObject) -> PyResult<bool> {
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	288 Ok(self
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	289 .dirs_map(py)
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	290 .borrow()
42558 11c025c83393 rust: simplify overly complicated expression Rapha?l Gom?s <rgomes@octobus.net> parents: 42537 diff changeset	291 .contains_key(item.extract::<PyBytes>(py)?.data(py).as_ref()))
42537 ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	292 }
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	293 });
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	294
42303 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	295 /// Create the module, with `__package__` given from parent
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	296 pub fn init_module(py: Python, package: &str) -> PyResult<PyModule> {
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	297 let dotted_name = &format!("{}.dirstate", package);
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	298 let m = PyModule::new(py, dotted_name)?;
42537 ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	299
42303 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	300 m.add(py, "__package__", package)?;
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	301 m.add(py, "__doc__", "Dirstate - Rust implementation")?;
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	302 m.add(
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	303 py,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	304 "parse_dirstate",
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	305 py_fn!(
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	306 py,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	307 parse_dirstate_wrapper(dmap: PyDict, copymap: PyDict, st: PyBytes)
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	308 ),
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	309 )?;
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	310 m.add(
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	311 py,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	312 "pack_dirstate",
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	313 py_fn!(
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	314 py,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	315 pack_dirstate_wrapper(
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	316 dmap: PyDict,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	317 copymap: PyDict,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	318 pl: PyTuple,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	319 now: PyInt
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	320 )
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	321 ),
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	322 )?;
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	323
42537 ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	324 m.add_class::<Dirs>(py)?;
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	325
42303 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	326 let sys = PyModule::import(py, "sys")?;
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	327 let sys_modules: PyDict = sys.get(py, "modules")?.extract(py)?;
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	328 sys_modules.set_item(py, dotted_name, &m)?;
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	329
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	330 Ok(m)
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	331 }

Mercurial > public > mercurial-scm > hg

annotate rust/hg-cpython/src/dirstate.rs @ 42609:326fdce22fb2