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

annotate rust/hg-cpython/src/revlog.rs @ 51246:89ce6a49bfeb

rust-index: implement common_ancestors_heads() and ancestors() The only differences betwwen `common_ancestors_heads()` and `find_gca_candidates()` seems to be that: - the former accepts "overlapping" input revisions (meaning with duplicates). - limitation to 24 inputs (in the C code), that we translate to using the arbitrary size bit sets in the Rust code because we cannot bail to Python. Given that the input is expected to be small in most cases, we take the heavy handed approach of going through a HashSet and wait for perfomance assessment In case this is used via `hg-cpython`, we can anyway absorb the overhead by having `commonancestorheads` build a vector of unique values directly, and introduce a thin wrapper over `find_gca_candidates`, to take care of bit set type dispatching only. As far as `ancestors` is concerneed, this is just chaining `common_ancestors_heads()` with `find_deepest_revs`.

author	Georges Racinet <georges.racinet@octobus.net>
date	Wed, 18 Oct 2023 15:35:38 +0200
parents	fc05dd74e907
children	1b23aaf5eb7b

rev	line source
43951 f98f0e3ddaa1 rust-index: add a function to convert PyObject index for hg-core Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	1 // revlog.rs
f98f0e3ddaa1 rust-index: add a function to convert PyObject index for hg-core Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	2 //
44516 26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44513 diff changeset	3 // Copyright 2019-2020 Georges Racinet <georges.racinet@octobus.net>
43951 f98f0e3ddaa1 rust-index: add a function to convert PyObject index for hg-core Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	4 //
f98f0e3ddaa1 rust-index: add a function to convert PyObject index for hg-core Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	5 // This software may be used and distributed according to the terms of the
f98f0e3ddaa1 rust-index: add a function to convert PyObject index for hg-core Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	6 // GNU General Public License version 2 or any later version.
f98f0e3ddaa1 rust-index: add a function to convert PyObject index for hg-core Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	7
44517 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	8 use crate::{
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	9 cindex,
51243 fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	10 conversion::{rev_pyiter_collect, rev_pyiter_collect_or_else},
44517 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	11 utils::{node_from_py_bytes, node_from_py_object},
50990 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50988 diff changeset	12 PyRevision,
44517 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	13 };
43966 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	14 use cpython::{
44520 15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44519 diff changeset	15 buffer::{Element, PyBuffer},
44517 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	16 exc::{IndexError, ValueError},
51236 a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51235 diff changeset	17 ObjectProtocol, PyBool, PyBytes, PyClone, PyDict, PyErr, PyInt, PyList,
a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51235 diff changeset	18 PyModule, PyObject, PyResult, PySet, PyString, PyTuple, Python,
a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51235 diff changeset	19 PythonObject, ToPyObject,
43966 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	20 };
44517 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	21 use hg::{
51233 9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	22 errors::HgError,
51241 c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	23 index::{IndexHeader, Phase, RevisionDataParams, SnapshotsCache},
44519 5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44518 diff changeset	24 nodemap::{Block, NodeMapError, NodeTree},
51233 9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	25 revlog::{nodemap::NodeMap, NodePrefix, RevlogError, RevlogIndex},
51226 002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	26 BaseRevision, Revision, UncheckedRevision, NULL_REVISION,
44517 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	27 };
51241 c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	28 use std::{cell::RefCell, collections::HashMap};
43951 f98f0e3ddaa1 rust-index: add a function to convert PyObject index for hg-core Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	29
f98f0e3ddaa1 rust-index: add a function to convert PyObject index for hg-core Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	30 /// Return a Struct implementing the Graph trait
44070 451d22174b5f revlog: run rustfmt nightly Augie Fackler <augie@google.com> parents: 44015 diff changeset	31 pub(crate) fn pyindex_to_graph(
451d22174b5f revlog: run rustfmt nightly Augie Fackler <augie@google.com> parents: 44015 diff changeset	32 py: Python,
451d22174b5f revlog: run rustfmt nightly Augie Fackler <augie@google.com> parents: 44015 diff changeset	33 index: PyObject,
451d22174b5f revlog: run rustfmt nightly Augie Fackler <augie@google.com> parents: 44015 diff changeset	34 ) -> PyResult<cindex::Index> {
44014 c627f1b2f3c3 rust-index: handle `MixedIndex` in `pyindex_to_graph` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44013 diff changeset	35 match index.extract::<MixedIndex>(py) {
c627f1b2f3c3 rust-index: handle `MixedIndex` in `pyindex_to_graph` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44013 diff changeset	36 Ok(midx) => Ok(midx.clone_cindex(py)),
c627f1b2f3c3 rust-index: handle `MixedIndex` in `pyindex_to_graph` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44013 diff changeset	37 Err(_) => cindex::Index::new(py, index),
c627f1b2f3c3 rust-index: handle `MixedIndex` in `pyindex_to_graph` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 44013 diff changeset	38 }
43951 f98f0e3ddaa1 rust-index: add a function to convert PyObject index for hg-core Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	39 }
43966 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	40
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	41 py_class!(pub class MixedIndex \|py\| {
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	42 data cindex: RefCell<cindex::Index>;
51211 6ec8387eb0be rust-index: pass data down to the Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	43 data index: RefCell<hg::index::Index>;
44517 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	44 data nt: RefCell<Option<NodeTree>>;
44519 5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44518 diff changeset	45 data docket: RefCell<Option<PyObject>>;
44520 15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44519 diff changeset	46 // Holds a reference to the mmap'ed persistent nodemap data
51207 8ade5e6cdb61 rust-mixed-index: rename variable to make the next change clearer Rapha?l Gom?s <rgomes@octobus.net> parents: 51118 diff changeset	47 data nodemap_mmap: RefCell<Option<PyBuffer>>;
51211 6ec8387eb0be rust-index: pass data down to the Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	48 // Holds a reference to the mmap'ed persistent index data
6ec8387eb0be rust-index: pass data down to the Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	49 data index_mmap: RefCell<Option<PyBuffer>>;
43966 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	50
51211 6ec8387eb0be rust-index: pass data down to the Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	51 def __new__(
6ec8387eb0be rust-index: pass data down to the Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	52 _cls,
6ec8387eb0be rust-index: pass data down to the Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	53 cindex: PyObject,
51212 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51211 diff changeset	54 data: PyObject,
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51211 diff changeset	55 default_header: u32,
51211 6ec8387eb0be rust-index: pass data down to the Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	56 ) -> PyResult<MixedIndex> {
51212 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51211 diff changeset	57 Self::new(py, cindex, data, default_header)
43966 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	58 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	59
44015 443dc1655923 rust-index: expose a method to retrieve the C index Georges Racinet <georges.racinet@octobus.net> parents: 44014 diff changeset	60 /// Compatibility layer used for Python consumers needing access to the C index
443dc1655923 rust-index: expose a method to retrieve the C index Georges Racinet <georges.racinet@octobus.net> parents: 44014 diff changeset	61 ///
443dc1655923 rust-index: expose a method to retrieve the C index Georges Racinet <georges.racinet@octobus.net> parents: 44014 diff changeset	62 /// Only use case so far is `scmutil.shortesthexnodeidprefix`,
443dc1655923 rust-index: expose a method to retrieve the C index Georges Racinet <georges.racinet@octobus.net> parents: 44014 diff changeset	63 /// that may need to build a custom `nodetree`, based on a specified revset.
443dc1655923 rust-index: expose a method to retrieve the C index Georges Racinet <georges.racinet@octobus.net> parents: 44014 diff changeset	64 /// With a Rust implementation of the nodemap, we will be able to get rid of
443dc1655923 rust-index: expose a method to retrieve the C index Georges Racinet <georges.racinet@octobus.net> parents: 44014 diff changeset	65 /// this, by exposing our own standalone nodemap class,
443dc1655923 rust-index: expose a method to retrieve the C index Georges Racinet <georges.racinet@octobus.net> parents: 44014 diff changeset	66 /// ready to accept `MixedIndex`.
443dc1655923 rust-index: expose a method to retrieve the C index Georges Racinet <georges.racinet@octobus.net> parents: 44014 diff changeset	67 def get_cindex(&self) -> PyResult<PyObject> {
443dc1655923 rust-index: expose a method to retrieve the C index Georges Racinet <georges.racinet@octobus.net> parents: 44014 diff changeset	68 Ok(self.cindex(py).borrow().inner().clone_ref(py))
443dc1655923 rust-index: expose a method to retrieve the C index Georges Racinet <georges.racinet@octobus.net> parents: 44014 diff changeset	69 }
443dc1655923 rust-index: expose a method to retrieve the C index Georges Racinet <georges.racinet@octobus.net> parents: 44014 diff changeset	70
44517 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	71 // Index API involving nodemap, as defined in mercurial/pure/parsers.py
43966 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	72
44517 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	73 /// Return Revision if found, raises a bare `error.RevlogError`
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	74 /// in case of ambiguity, same as C version does
50990 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50988 diff changeset	75 def get_rev(&self, node: PyBytes) -> PyResult<Option<PyRevision>> {
44517 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	76 let opt = self.get_nodetree(py)?.borrow();
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	77 let nt = opt.as_ref().unwrap();
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	78 let idx = &*self.cindex(py).borrow();
51217 f95f70cf2ee2 rust-index: check rindex and cindex return the same get_rev Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	79 let ridx = &*self.index(py).borrow();
47894 aa88fb60ecb4 rust-nodemap: backed out mitigation for issue 6554 Georges Racinet <georges.racinet@octobus.net> parents: 47795 diff changeset	80 let node = node_from_py_bytes(py, &node)?;
51217 f95f70cf2ee2 rust-index: check rindex and cindex return the same get_rev Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	81 let rust_rev =
f95f70cf2ee2 rust-index: check rindex and cindex return the same get_rev Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	82 nt.find_bin(ridx, node.into()).map_err(\|e\| nodemap_error(py, e))?;
f95f70cf2ee2 rust-index: check rindex and cindex return the same get_rev Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	83 let c_rev =
f95f70cf2ee2 rust-index: check rindex and cindex return the same get_rev Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	84 nt.find_bin(idx, node.into()).map_err(\|e\| nodemap_error(py, e))?;
f95f70cf2ee2 rust-index: check rindex and cindex return the same get_rev Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	85 assert_eq!(rust_rev, c_rev);
f95f70cf2ee2 rust-index: check rindex and cindex return the same get_rev Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	86 Ok(rust_rev.map(Into::into))
f95f70cf2ee2 rust-index: check rindex and cindex return the same get_rev Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	87
44517 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	88 }
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	89
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	90 /// same as `get_rev()` but raises a bare `error.RevlogError` if node
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	91 /// is not found.
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	92 ///
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	93 /// No need to repeat `node` in the exception, `mercurial/revlog.py`
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	94 /// will catch and rewrap with it
50990 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50988 diff changeset	95 def rev(&self, node: PyBytes) -> PyResult<PyRevision> {
44517 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	96 self.get_rev(py, node)?.ok_or_else(\|\| revlog_error(py))
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	97 }
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	98
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	99 /// return True if the node exist in the index
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	100 def has_node(&self, node: PyBytes) -> PyResult<bool> {
51225 297fa956b6c4 rust-index: optim note for post-scaffolding removal Georges Racinet <georges.racinet@octobus.net> parents: 51224 diff changeset	101 // TODO OPTIM we could avoid a needless conversion here,
297fa956b6c4 rust-index: optim note for post-scaffolding removal Georges Racinet <georges.racinet@octobus.net> parents: 51224 diff changeset	102 // to do when scaffolding for pure Rust switch is removed,
297fa956b6c4 rust-index: optim note for post-scaffolding removal Georges Racinet <georges.racinet@octobus.net> parents: 51224 diff changeset	103 // as `get_rev()` currently does the necessary assertions
44517 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	104 self.get_rev(py, node).map(\|opt\| opt.is_some())
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	105 }
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	106
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	107 /// find length of shortest hex nodeid of a binary ID
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	108 def shortest(&self, node: PyBytes) -> PyResult<usize> {
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	109 let opt = self.get_nodetree(py)?.borrow();
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	110 let nt = opt.as_ref().unwrap();
51229 274abd1562a2 rust-index: use the rust index in `shortest` Rapha?l Gom?s <rgomes@octobus.net> parents: 51228 diff changeset	111 let idx = &*self.index(py).borrow();
44517 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	112 match nt.unique_prefix_len_node(idx, &node_from_py_bytes(py, &node)?)
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	113 {
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	114 Ok(Some(l)) => Ok(l),
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	115 Ok(None) => Err(revlog_error(py)),
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	116 Err(e) => Err(nodemap_error(py, e)),
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	117 }
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	118 }
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	119
47894 aa88fb60ecb4 rust-nodemap: backed out mitigation for issue 6554 Georges Racinet <georges.racinet@octobus.net> parents: 47795 diff changeset	120 def partialmatch(&self, node: PyObject) -> PyResult<Option<PyBytes>> {
44517 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	121 let opt = self.get_nodetree(py)?.borrow();
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	122 let nt = opt.as_ref().unwrap();
51231 72d16685d63a rust-index: use the Rust index in `partialmatch` Rapha?l Gom?s <rgomes@octobus.net> parents: 51229 diff changeset	123 let idx = &*self.index(py).borrow();
44517 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	124
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	125 let node_as_string = if cfg!(feature = "python3-sys") {
47894 aa88fb60ecb4 rust-nodemap: backed out mitigation for issue 6554 Georges Racinet <georges.racinet@octobus.net> parents: 47795 diff changeset	126 node.cast_as::<PyString>(py)?.to_string(py)?.to_string()
44517 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	127 }
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	128 else {
47894 aa88fb60ecb4 rust-nodemap: backed out mitigation for issue 6554 Georges Racinet <georges.racinet@octobus.net> parents: 47795 diff changeset	129 let node = node.extract::<PyBytes>(py)?;
44517 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	130 String::from_utf8_lossy(node.data(py)).to_string()
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	131 };
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	132
49373 455fce57e89e rust: don't swallow valuable error information Rapha?l Gom?s <rgomes@octobus.net> parents: 47894 diff changeset	133 let prefix = NodePrefix::from_hex(&node_as_string)
455fce57e89e rust: don't swallow valuable error information Rapha?l Gom?s <rgomes@octobus.net> parents: 47894 diff changeset	134 .map_err(\|_\| PyErr::new::<ValueError, _>(
455fce57e89e rust: don't swallow valuable error information Rapha?l Gom?s <rgomes@octobus.net> parents: 47894 diff changeset	135 py, format!("Invalid node or prefix '{}'", node_as_string))
455fce57e89e rust: don't swallow valuable error information Rapha?l Gom?s <rgomes@octobus.net> parents: 47894 diff changeset	136 )?;
46500 18a261b11b20 rust: Remove hex parsing from the nodemap Simon Sapin <simon.sapin@octobus.net> parents: 46499 diff changeset	137
47894 aa88fb60ecb4 rust-nodemap: backed out mitigation for issue 6554 Georges Racinet <georges.racinet@octobus.net> parents: 47795 diff changeset	138 nt.find_bin(idx, prefix)
aa88fb60ecb4 rust-nodemap: backed out mitigation for issue 6554 Georges Racinet <georges.racinet@octobus.net> parents: 47795 diff changeset	139 // TODO make an inner API returning the node directly
aa88fb60ecb4 rust-nodemap: backed out mitigation for issue 6554 Georges Racinet <georges.racinet@octobus.net> parents: 47795 diff changeset	140 .map(\|opt\| opt.map(
aa88fb60ecb4 rust-nodemap: backed out mitigation for issue 6554 Georges Racinet <georges.racinet@octobus.net> parents: 47795 diff changeset	141 \|rev\| PyBytes::new(py, idx.node(rev).unwrap().as_bytes())))
aa88fb60ecb4 rust-nodemap: backed out mitigation for issue 6554 Georges Racinet <georges.racinet@octobus.net> parents: 47795 diff changeset	142 .map_err(\|e\| nodemap_error(py, e))
aa88fb60ecb4 rust-nodemap: backed out mitigation for issue 6554 Georges Racinet <georges.racinet@octobus.net> parents: 47795 diff changeset	143
44517 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	144 }
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	145
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	146 /// append an index entry
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	147 def append(&self, tup: PyTuple) -> PyResult<PyObject> {
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	148 if tup.len(py) < 8 {
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	149 // this is better than the panic promised by tup.get_item()
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	150 return Err(
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	151 PyErr::new::<IndexError, _>(py, "tuple index out of range"))
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	152 }
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	153 let node_bytes = tup.get_item(py, 7).extract(py)?;
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	154 let node = node_from_py_object(py, &node_bytes)?;
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	155
51214 e79b0a4be3a7 rust-index: check equality between rust and cindex for `__len__` Rapha?l Gom?s <rgomes@octobus.net> parents: 51213 diff changeset	156 let rev = self.len(py)? as BaseRevision;
44517 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	157 let mut idx = self.cindex(py).borrow_mut();
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	158
50990 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50988 diff changeset	159 // This is ok since we will just add the revision to the index
51214 e79b0a4be3a7 rust-index: check equality between rust and cindex for `__len__` Rapha?l Gom?s <rgomes@octobus.net> parents: 51213 diff changeset	160 let rev = Revision(rev);
51213 65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	161 idx.append(py, tup.clone_ref(py))?;
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	162 self.index(py)
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	163 .borrow_mut()
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	164 .append(py_tuple_to_revision_data_params(py, tup)?)
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	165 .unwrap();
44517 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	166 self.get_nodetree(py)?.borrow_mut().as_mut().unwrap()
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	167 .insert(&*idx, &node, rev)
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	168 .map_err(\|e\| nodemap_error(py, e))?;
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	169 Ok(py.None())
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	170 }
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	171
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	172 def __delitem__(&self, key: PyObject) -> PyResult<()> {
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	173 // __delitem__ is both for `del idx[r]` and `del idx[r1:r2]`
51216 f6403bcd9f96 rust-index: synchronize remove to Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51215 diff changeset	174 self.cindex(py).borrow().inner().del_item(py, &key)?;
f6403bcd9f96 rust-index: synchronize remove to Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51215 diff changeset	175 let start = key.getattr(py, "start")?;
f6403bcd9f96 rust-index: synchronize remove to Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51215 diff changeset	176 let start = UncheckedRevision(start.extract(py)?);
f6403bcd9f96 rust-index: synchronize remove to Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51215 diff changeset	177 let start = self.index(py)
f6403bcd9f96 rust-index: synchronize remove to Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51215 diff changeset	178 .borrow()
f6403bcd9f96 rust-index: synchronize remove to Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51215 diff changeset	179 .check_revision(start)
f6403bcd9f96 rust-index: synchronize remove to Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51215 diff changeset	180 .ok_or_else(\|\| {
f6403bcd9f96 rust-index: synchronize remove to Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51215 diff changeset	181 nodemap_error(py, NodeMapError::RevisionNotInIndex(start))
f6403bcd9f96 rust-index: synchronize remove to Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51215 diff changeset	182 })?;
f6403bcd9f96 rust-index: synchronize remove to Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51215 diff changeset	183 self.index(py).borrow_mut().remove(start).unwrap();
44517 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	184 let mut opt = self.get_nodetree(py)?.borrow_mut();
49987 58074252db3c rust: run `cargo clippy` Rapha?l Gom?s <rgomes@octobus.net> parents: 49373 diff changeset	185 let nt = opt.as_mut().unwrap();
44517 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	186 nt.invalidate_all();
49987 58074252db3c rust: run `cargo clippy` Rapha?l Gom?s <rgomes@octobus.net> parents: 49373 diff changeset	187 self.fill_nodemap(py, nt)?;
44517 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	188 Ok(())
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	189 }
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	190
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	191 //
43966 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	192 // Reforwarded C index API
44517 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	193 //
43966 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	194
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	195 // index_methods (tp_methods). Same ordering as in revlog.c
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	196
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	197 /// return the gca set of the given revs
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	198 def ancestors(&self, args, *kw) -> PyResult<PyObject> {
51246 89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	199 let rust_res = self.inner_ancestors(py, args)?;
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	200
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	201 let c_res = self.call_cindex(py, "ancestors", args, kw)?;
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	202 // the algorithm should always provide the results in reverse ordering
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	203 assert_py_eq(py, "ancestors", &rust_res, &c_res)?;
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	204
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	205 Ok(rust_res)
43966 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	206 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	207
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	208 /// return the heads of the common ancestors of the given revs
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	209 def commonancestorsheads(&self, args, *kw) -> PyResult<PyObject> {
51246 89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	210 let rust_res = self.inner_commonancestorsheads(py, args)?;
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	211
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	212 let c_res = self.call_cindex(py, "commonancestorsheads", args, kw)?;
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	213 // the algorithm should always provide the results in reverse ordering
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	214 assert_py_eq(py, "commonancestorsheads", &rust_res, &c_res)?;
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	215
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	216 Ok(rust_res)
43966 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	217 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	218
44521 cadcc8c20860 rust-nodemap: also clear Rust data in `clearcaches` Georges Racinet <georges.racinet@octobus.net> parents: 44520 diff changeset	219 /// Clear the index caches and inner py_class data.
cadcc8c20860 rust-nodemap: also clear Rust data in `clearcaches` Georges Racinet <georges.racinet@octobus.net> parents: 44520 diff changeset	220 /// It is Python's responsibility to call `update_nodemap_data` again.
43966 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	221 def clearcaches(&self, args, *kw) -> PyResult<PyObject> {
44521 cadcc8c20860 rust-nodemap: also clear Rust data in `clearcaches` Georges Racinet <georges.racinet@octobus.net> parents: 44520 diff changeset	222 self.nt(py).borrow_mut().take();
cadcc8c20860 rust-nodemap: also clear Rust data in `clearcaches` Georges Racinet <georges.racinet@octobus.net> parents: 44520 diff changeset	223 self.docket(py).borrow_mut().take();
51207 8ade5e6cdb61 rust-mixed-index: rename variable to make the next change clearer Rapha?l Gom?s <rgomes@octobus.net> parents: 51118 diff changeset	224 self.nodemap_mmap(py).borrow_mut().take();
51218 4e6620b7fbbb rust-index: support cache clearing Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	225 self.index(py).borrow_mut().clear_caches();
43966 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	226 self.call_cindex(py, "clearcaches", args, kw)
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	227 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	228
47075 0d8ff1f4ab0c revlog: add a `entry_binary` method on index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46974 diff changeset	229 /// return the raw binary string representing a revision
0d8ff1f4ab0c revlog: add a `entry_binary` method on index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46974 diff changeset	230 def entry_binary(&self, args, *kw) -> PyResult<PyObject> {
51224 7434747343ab rust-index: check that the entry bytes are the same in both indexes Rapha?l Gom?s <rgomes@octobus.net> parents: 51223 diff changeset	231 let rindex = self.index(py).borrow();
7434747343ab rust-index: check that the entry bytes are the same in both indexes Rapha?l Gom?s <rgomes@octobus.net> parents: 51223 diff changeset	232 let rev = UncheckedRevision(args.get_item(py, 0).extract(py)?);
7434747343ab rust-index: check that the entry bytes are the same in both indexes Rapha?l Gom?s <rgomes@octobus.net> parents: 51223 diff changeset	233 let rust_bytes = rindex.check_revision(rev).and_then(
7434747343ab rust-index: check that the entry bytes are the same in both indexes Rapha?l Gom?s <rgomes@octobus.net> parents: 51223 diff changeset	234 \|r\| rindex.entry_binary(r))
7434747343ab rust-index: check that the entry bytes are the same in both indexes Rapha?l Gom?s <rgomes@octobus.net> parents: 51223 diff changeset	235 .ok_or_else(\|\| rev_not_in_index(py, rev))?;
7434747343ab rust-index: check that the entry bytes are the same in both indexes Rapha?l Gom?s <rgomes@octobus.net> parents: 51223 diff changeset	236 let rust_res = PyBytes::new(py, rust_bytes).into_object();
7434747343ab rust-index: check that the entry bytes are the same in both indexes Rapha?l Gom?s <rgomes@octobus.net> parents: 51223 diff changeset	237
7434747343ab rust-index: check that the entry bytes are the same in both indexes Rapha?l Gom?s <rgomes@octobus.net> parents: 51223 diff changeset	238 let c_res = self.call_cindex(py, "entry_binary", args, kw)?;
7434747343ab rust-index: check that the entry bytes are the same in both indexes Rapha?l Gom?s <rgomes@octobus.net> parents: 51223 diff changeset	239 assert_py_eq(py, "entry_binary", &rust_res, &c_res)?;
7434747343ab rust-index: check that the entry bytes are the same in both indexes Rapha?l Gom?s <rgomes@octobus.net> parents: 51223 diff changeset	240 Ok(rust_res)
47075 0d8ff1f4ab0c revlog: add a `entry_binary` method on index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46974 diff changeset	241 }
0d8ff1f4ab0c revlog: add a `entry_binary` method on index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46974 diff changeset	242
47078 d57386e5c80e revlog: have an explicit "pack_header" method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47075 diff changeset	243 /// return a binary packed version of the header
d57386e5c80e revlog: have an explicit "pack_header" method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47075 diff changeset	244 def pack_header(&self, args, *kw) -> PyResult<PyObject> {
51219 51cc12158f97 rust-index: add `pack_header` support Rapha?l Gom?s <rgomes@octobus.net> parents: 51218 diff changeset	245 let rindex = self.index(py).borrow();
51cc12158f97 rust-index: add `pack_header` support Rapha?l Gom?s <rgomes@octobus.net> parents: 51218 diff changeset	246 let packed = rindex.pack_header(args.get_item(py, 0).extract(py)?);
51223 16d477bb0078 rust-index: return variables systematic naming convention Georges Racinet <georges.racinet@octobus.net> parents: 51222 diff changeset	247 let rust_res = PyBytes::new(py, &packed).into_object();
16d477bb0078 rust-index: return variables systematic naming convention Georges Racinet <georges.racinet@octobus.net> parents: 51222 diff changeset	248
16d477bb0078 rust-index: return variables systematic naming convention Georges Racinet <georges.racinet@octobus.net> parents: 51222 diff changeset	249 let c_res = self.call_cindex(py, "pack_header", args, kw)?;
16d477bb0078 rust-index: return variables systematic naming convention Georges Racinet <georges.racinet@octobus.net> parents: 51222 diff changeset	250 assert_py_eq(py, "pack_header", &rust_res, &c_res)?;
16d477bb0078 rust-index: return variables systematic naming convention Georges Racinet <georges.racinet@octobus.net> parents: 51222 diff changeset	251 Ok(rust_res)
47078 d57386e5c80e revlog: have an explicit "pack_header" method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47075 diff changeset	252 }
d57386e5c80e revlog: have an explicit "pack_header" method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47075 diff changeset	253
43966 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	254 /// compute phases
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	255 def computephasesmapsets(&self, args, *kw) -> PyResult<PyObject> {
51241 c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	256 let py_roots = args.get_item(py, 0).extract::<PyDict>(py)?;
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	257 let rust_res = self.inner_computephasesmapsets(py, py_roots)?;
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	258
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	259 let c_res = self.call_cindex(py, "computephasesmapsets", args, kw)?;
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	260 assert_py_eq(py, "computephasesmapsets", &rust_res, &c_res)?;
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	261 Ok(rust_res)
43966 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	262 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	263
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	264 /// reachableroots
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	265 def reachableroots2(&self, args, *kw) -> PyResult<PyObject> {
51243 fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	266 let rust_res = self.inner_reachableroots2(
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	267 py,
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	268 UncheckedRevision(args.get_item(py, 0).extract(py)?),
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	269 args.get_item(py, 1),
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	270 args.get_item(py, 2),
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	271 args.get_item(py, 3).extract(py)?,
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	272 )?;
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	273
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	274 let c_res = self.call_cindex(py, "reachableroots2", args, kw)?;
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	275 // ordering of C result depends on how the computation went, and
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	276 // Rust result ordering is arbitrary. Hence we compare after
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	277 // sorting the results (in Python to avoid reconverting everything
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	278 // back to Rust structs).
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	279 assert_py_eq_normalized(py, "reachableroots2", &rust_res, &c_res,
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	280 \|v\| format!("sorted({})", v))?;
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	281
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	282 Ok(rust_res)
43966 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	283 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	284
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	285 /// get head revisions
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	286 def headrevs(&self, args, *kw) -> PyResult<PyObject> {
51236 a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51235 diff changeset	287 let rust_res = self.inner_headrevs(py)?;
a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51235 diff changeset	288
a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51235 diff changeset	289 let c_res = self.call_cindex(py, "headrevs", args, kw)?;
a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51235 diff changeset	290 assert_py_eq(py, "headrevs", &rust_res, &c_res)?;
a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51235 diff changeset	291 Ok(rust_res)
43966 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	292 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	293
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	294 /// get filtered head revisions
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	295 def headrevsfiltered(&self, args, *kw) -> PyResult<PyObject> {
51237 9f876765cbe2 rust-index: add support for `headrevsfiltered` Rapha?l Gom?s <rgomes@octobus.net> parents: 51236 diff changeset	296 let rust_res = self.inner_headrevsfiltered(py, &args.get_item(py, 0))?;
9f876765cbe2 rust-index: add support for `headrevsfiltered` Rapha?l Gom?s <rgomes@octobus.net> parents: 51236 diff changeset	297 let c_res = self.call_cindex(py, "headrevsfiltered", args, kw)?;
51238 898674a4dbc7 rust-index: headrevsfiltered() returning Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51237 diff changeset	298
898674a4dbc7 rust-index: headrevsfiltered() returning Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51237 diff changeset	299 assert_py_eq(py, "headrevsfiltered", &rust_res, &c_res)?;
898674a4dbc7 rust-index: headrevsfiltered() returning Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51237 diff changeset	300 Ok(rust_res)
43966 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	301 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	302
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	303 /// True if the object is a snapshot
51232 b8c89957a6b7 rust-index: add `is_snapshot` method Rapha?l Gom?s <rgomes@octobus.net> parents: 51231 diff changeset	304 def issnapshot(&self, args, *kw) -> PyResult<bool> {
b8c89957a6b7 rust-index: add `is_snapshot` method Rapha?l Gom?s <rgomes@octobus.net> parents: 51231 diff changeset	305 let index = self.index(py).borrow();
b8c89957a6b7 rust-index: add `is_snapshot` method Rapha?l Gom?s <rgomes@octobus.net> parents: 51231 diff changeset	306 let result = index
b8c89957a6b7 rust-index: add `is_snapshot` method Rapha?l Gom?s <rgomes@octobus.net> parents: 51231 diff changeset	307 .is_snapshot(UncheckedRevision(args.get_item(py, 0).extract(py)?))
b8c89957a6b7 rust-index: add `is_snapshot` method Rapha?l Gom?s <rgomes@octobus.net> parents: 51231 diff changeset	308 .map_err(\|e\| {
b8c89957a6b7 rust-index: add `is_snapshot` method Rapha?l Gom?s <rgomes@octobus.net> parents: 51231 diff changeset	309 PyErr::new::<cpython::exc::ValueError, _>(py, e.to_string())
b8c89957a6b7 rust-index: add `is_snapshot` method Rapha?l Gom?s <rgomes@octobus.net> parents: 51231 diff changeset	310 })?;
b8c89957a6b7 rust-index: add `is_snapshot` method Rapha?l Gom?s <rgomes@octobus.net> parents: 51231 diff changeset	311 let cresult = self.call_cindex(py, "issnapshot", args, kw)?;
b8c89957a6b7 rust-index: add `is_snapshot` method Rapha?l Gom?s <rgomes@octobus.net> parents: 51231 diff changeset	312 assert_eq!(result, cresult.extract(py)?);
b8c89957a6b7 rust-index: add `is_snapshot` method Rapha?l Gom?s <rgomes@octobus.net> parents: 51231 diff changeset	313 Ok(result)
43966 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	314 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	315
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	316 /// Gather snapshot data in a cache dict
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	317 def findsnapshots(&self, args, *kw) -> PyResult<PyObject> {
51233 9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	318 let index = self.index(py).borrow();
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	319 let cache: PyDict = args.get_item(py, 0).extract(py)?;
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	320 // this methods operates by setting new values in the cache,
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	321 // hence we will compare results by letting the C implementation
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	322 // operate over a deepcopy of the cache, and finally compare both
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	323 // caches.
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	324 let c_cache = PyDict::new(py);
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	325 for (k, v) in cache.items(py) {
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	326 c_cache.set_item(py, k, PySet::new(py, v)?)?;
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	327 }
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	328
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	329 let start_rev = UncheckedRevision(args.get_item(py, 1).extract(py)?);
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	330 let end_rev = UncheckedRevision(args.get_item(py, 2).extract(py)?);
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	331 let mut cache_wrapper = PySnapshotsCache{ py, dict: cache };
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	332 index.find_snapshots(
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	333 start_rev,
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	334 end_rev,
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	335 &mut cache_wrapper,
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	336 ).map_err(\|_\| revlog_error(py))?;
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	337
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	338 let c_args = PyTuple::new(
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	339 py,
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	340 &[
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	341 c_cache.clone_ref(py).into_object(),
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	342 args.get_item(py, 1),
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	343 args.get_item(py, 2)
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	344 ]
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	345 );
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	346 self.call_cindex(py, "findsnapshots", &c_args, kw)?;
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	347 assert_py_eq(py, "findsnapshots cache",
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	348 &cache_wrapper.into_object(),
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	349 &c_cache.into_object())?;
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	350 Ok(py.None())
43966 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	351 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	352
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	353 /// determine revisions with deltas to reconstruct fulltext
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	354 def deltachain(&self, args, *kw) -> PyResult<PyObject> {
51234 62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51233 diff changeset	355 let index = self.index(py).borrow();
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51233 diff changeset	356 let rev = args.get_item(py, 0).extract::<BaseRevision>(py)?.into();
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51233 diff changeset	357 let stop_rev =
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51233 diff changeset	358 args.get_item(py, 1).extract::<Option<BaseRevision>>(py)?;
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51233 diff changeset	359 let rev = index.check_revision(rev).ok_or_else(\|\| {
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51233 diff changeset	360 nodemap_error(py, NodeMapError::RevisionNotInIndex(rev))
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51233 diff changeset	361 })?;
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51233 diff changeset	362 let stop_rev = if let Some(stop_rev) = stop_rev {
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51233 diff changeset	363 let stop_rev = UncheckedRevision(stop_rev);
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51233 diff changeset	364 Some(index.check_revision(stop_rev).ok_or_else(\|\| {
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51233 diff changeset	365 nodemap_error(py, NodeMapError::RevisionNotInIndex(stop_rev))
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51233 diff changeset	366 })?)
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51233 diff changeset	367 } else {None};
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51233 diff changeset	368 let (chain, stopped) = index.delta_chain(rev, stop_rev).map_err(\|e\| {
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51233 diff changeset	369 PyErr::new::<cpython::exc::ValueError, _>(py, e.to_string())
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51233 diff changeset	370 })?;
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51233 diff changeset	371
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51233 diff changeset	372 let cresult = self.call_cindex(py, "deltachain", args, kw)?;
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51233 diff changeset	373 let cchain: Vec<BaseRevision> =
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51233 diff changeset	374 cresult.get_item(py, 0)?.extract::<Vec<BaseRevision>>(py)?;
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51233 diff changeset	375 let chain: Vec<_> = chain.into_iter().map(\|r\| r.0).collect();
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51233 diff changeset	376 assert_eq!(chain, cchain);
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51233 diff changeset	377 assert_eq!(stopped, cresult.get_item(py, 1)?.extract(py)?);
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51233 diff changeset	378
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51233 diff changeset	379 Ok(
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51233 diff changeset	380 PyTuple::new(
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51233 diff changeset	381 py,
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51233 diff changeset	382 &[
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51233 diff changeset	383 chain.into_py_object(py).into_object(),
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51233 diff changeset	384 stopped.into_py_object(py).into_object()
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51233 diff changeset	385 ]
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51233 diff changeset	386 ).into_object()
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51233 diff changeset	387 )
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51233 diff changeset	388
43966 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	389 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	390
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	391 /// slice planned chunk read to reach a density threshold
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	392 def slicechunktodensity(&self, args, *kw) -> PyResult<PyObject> {
51239 0112803e6c01 rust-index: add support for `_slicechunktodensity` Rapha?l Gom?s <rgomes@octobus.net> parents: 51238 diff changeset	393 let rust_res = self.inner_slicechunktodensity(
0112803e6c01 rust-index: add support for `_slicechunktodensity` Rapha?l Gom?s <rgomes@octobus.net> parents: 51238 diff changeset	394 py,
0112803e6c01 rust-index: add support for `_slicechunktodensity` Rapha?l Gom?s <rgomes@octobus.net> parents: 51238 diff changeset	395 args.get_item(py, 0),
0112803e6c01 rust-index: add support for `_slicechunktodensity` Rapha?l Gom?s <rgomes@octobus.net> parents: 51238 diff changeset	396 args.get_item(py, 1).extract(py)?,
0112803e6c01 rust-index: add support for `_slicechunktodensity` Rapha?l Gom?s <rgomes@octobus.net> parents: 51238 diff changeset	397 args.get_item(py, 2).extract(py)?
0112803e6c01 rust-index: add support for `_slicechunktodensity` Rapha?l Gom?s <rgomes@octobus.net> parents: 51238 diff changeset	398 )?;
0112803e6c01 rust-index: add support for `_slicechunktodensity` Rapha?l Gom?s <rgomes@octobus.net> parents: 51238 diff changeset	399
0112803e6c01 rust-index: add support for `_slicechunktodensity` Rapha?l Gom?s <rgomes@octobus.net> parents: 51238 diff changeset	400 let c_res = self.call_cindex(py, "slicechunktodensity", args, kw)?;
51240 8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51239 diff changeset	401 assert_py_eq(py, "slicechunktodensity", &rust_res, &c_res)?;
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51239 diff changeset	402 Ok(rust_res)
43966 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	403 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	404
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	405 /// stats for the index
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	406 def stats(&self, args, *kw) -> PyResult<PyObject> {
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	407 self.call_cindex(py, "stats", args, kw)
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	408 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	409
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	410 // index_sequence_methods and index_mapping_methods.
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	411 //
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	412 // Since we call back through the high level Python API,
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	413 // there's no point making a distinction between index_get
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	414 // and index_getitem.
51226 002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	415 // gracinet 2023: this above is no longer true for the pure Rust impl
43966 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	416
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	417 def __len__(&self) -> PyResult<usize> {
51214 e79b0a4be3a7 rust-index: check equality between rust and cindex for `__len__` Rapha?l Gom?s <rgomes@octobus.net> parents: 51213 diff changeset	418 self.len(py)
43966 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	419 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	420
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	421 def __getitem__(&self, key: PyObject) -> PyResult<PyObject> {
51226 002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	422 let rust_res = self.inner_getitem(py, key.clone_ref(py))?;
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	423
43966 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	424 // this conversion seems needless, but that's actually because
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	425 // `index_getitem` does not handle conversion from PyLong,
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	426 // which expressions such as [e for e in index] internally use.
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	427 // Note that we don't seem to have a direct way to call
44521 cadcc8c20860 rust-nodemap: also clear Rust data in `clearcaches` Georges Racinet <georges.racinet@octobus.net> parents: 44520 diff changeset	428 // PySequence_GetItem (does the job), which would possibly be better
43966 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	429 // for performance
51226 002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	430 // gracinet 2023: the above comment can be removed when we use
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	431 // the pure Rust impl only. Note also that `key` can be a binary
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	432 // node id.
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	433 let c_key = match key.extract::<BaseRevision>(py) {
43966 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	434 Ok(rev) => rev.to_py_object(py).into_object(),
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	435 Err(_) => key,
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	436 };
51226 002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	437 let c_res = self.cindex(py).borrow().inner().get_item(py, c_key)?;
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	438
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	439 assert_py_eq(py, "__getitem__", &rust_res, &c_res)?;
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	440 Ok(rust_res)
43966 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	441 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	442
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	443 def __contains__(&self, item: PyObject) -> PyResult<bool> {
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	444 // ObjectProtocol does not seem to provide contains(), so
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	445 // this is an equivalent implementation of the index_contains()
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	446 // defined in revlog.c
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	447 let cindex = self.cindex(py).borrow();
50988 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 49987 diff changeset	448 match item.extract::<i32>(py) {
43966 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	449 Ok(rev) => {
51214 e79b0a4be3a7 rust-index: check equality between rust and cindex for `__len__` Rapha?l Gom?s <rgomes@octobus.net> parents: 51213 diff changeset	450 Ok(rev >= -1 && rev < self.len(py)? as BaseRevision)
43966 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	451 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	452 Err(_) => {
51228 b67cd0d0e976 rust-index: add checks that `__contains__` is synchronized Rapha?l Gom?s <rgomes@octobus.net> parents: 51227 diff changeset	453 let item_bytes: PyBytes = item.extract(py)?;
b67cd0d0e976 rust-index: add checks that `__contains__` is synchronized Rapha?l Gom?s <rgomes@octobus.net> parents: 51227 diff changeset	454 let rust_res = self.has_node(py, item_bytes)?;
b67cd0d0e976 rust-index: add checks that `__contains__` is synchronized Rapha?l Gom?s <rgomes@octobus.net> parents: 51227 diff changeset	455
b67cd0d0e976 rust-index: add checks that `__contains__` is synchronized Rapha?l Gom?s <rgomes@octobus.net> parents: 51227 diff changeset	456 let c_res = cindex.inner().call_method(
43966 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	457 py,
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	458 "has_node",
51228 b67cd0d0e976 rust-index: add checks that `__contains__` is synchronized Rapha?l Gom?s <rgomes@octobus.net> parents: 51227 diff changeset	459 PyTuple::new(py, &[item.clone_ref(py)]),
43966 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	460 None)?
51228 b67cd0d0e976 rust-index: add checks that `__contains__` is synchronized Rapha?l Gom?s <rgomes@octobus.net> parents: 51227 diff changeset	461 .extract(py)?;
b67cd0d0e976 rust-index: add checks that `__contains__` is synchronized Rapha?l Gom?s <rgomes@octobus.net> parents: 51227 diff changeset	462
b67cd0d0e976 rust-index: add checks that `__contains__` is synchronized Rapha?l Gom?s <rgomes@octobus.net> parents: 51227 diff changeset	463 assert_eq!(rust_res, c_res);
b67cd0d0e976 rust-index: add checks that `__contains__` is synchronized Rapha?l Gom?s <rgomes@octobus.net> parents: 51227 diff changeset	464 Ok(rust_res)
43966 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	465 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	466 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	467 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	468
44518 b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44517 diff changeset	469 def nodemap_data_all(&self) -> PyResult<PyBytes> {
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44517 diff changeset	470 self.inner_nodemap_data_all(py)
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44517 diff changeset	471 }
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44517 diff changeset	472
44519 5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44518 diff changeset	473 def nodemap_data_incremental(&self) -> PyResult<PyObject> {
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44518 diff changeset	474 self.inner_nodemap_data_incremental(py)
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44518 diff changeset	475 }
44520 15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44519 diff changeset	476 def update_nodemap_data(
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44519 diff changeset	477 &self,
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44519 diff changeset	478 docket: PyObject,
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44519 diff changeset	479 nm_data: PyObject
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44519 diff changeset	480 ) -> PyResult<PyObject> {
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44519 diff changeset	481 self.inner_update_nodemap_data(py, docket, nm_data)
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44519 diff changeset	482 }
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44519 diff changeset	483
46974 3c9208702db3 revlog: replace revlog._io.size with a new revlog.index.entry_size Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46500 diff changeset	484 @property
3c9208702db3 revlog: replace revlog._io.size with a new revlog.index.entry_size Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46500 diff changeset	485 def entry_size(&self) -> PyResult<PyInt> {
3c9208702db3 revlog: replace revlog._io.size with a new revlog.index.entry_size Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46500 diff changeset	486 self.cindex(py).borrow().inner().getattr(py, "entry_size")?.extract::<PyInt>(py)
3c9208702db3 revlog: replace revlog._io.size with a new revlog.index.entry_size Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46500 diff changeset	487 }
43966 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	488
47279 9d1a8829f959 revlog: signal which revlog index are compatible with Rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47078 diff changeset	489 @property
9d1a8829f959 revlog: signal which revlog index are compatible with Rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47078 diff changeset	490 def rust_ext_compat(&self) -> PyResult<PyInt> {
9d1a8829f959 revlog: signal which revlog index are compatible with Rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47078 diff changeset	491 self.cindex(py).borrow().inner().getattr(py, "rust_ext_compat")?.extract::<PyInt>(py)
9d1a8829f959 revlog: signal which revlog index are compatible with Rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47078 diff changeset	492 }
9d1a8829f959 revlog: signal which revlog index are compatible with Rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47078 diff changeset	493
43966 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	494 });
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	495
51208 8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	496 /// Take a (potentially) mmap'ed buffer, and return the underlying Python
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	497 /// buffer along with the Rust slice into said buffer. We need to keep the
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	498 /// Python buffer around, otherwise we'd get a dangling pointer once the buffer
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	499 /// is freed from Python's side.
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	500 ///
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	501 /// # Safety
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	502 ///
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	503 /// The caller must make sure that the buffer is kept around for at least as
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	504 /// long as the slice.
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	505 #[deny(unsafe_op_in_unsafe_fn)]
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	506 unsafe fn mmap_keeparound(
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	507 py: Python,
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	508 data: PyObject,
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	509 ) -> PyResult<(
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	510 PyBuffer,
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	511 Box<dyn std::ops::Deref<Target = [u8]> + Send + 'static>,
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	512 )> {
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	513 let buf = PyBuffer::get(py, &data)?;
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	514 let len = buf.item_count();
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	515
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	516 // Build a slice from the mmap'ed buffer data
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	517 let cbuf = buf.buf_ptr();
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	518 let bytes = if std::mem::size_of::<u8>() == buf.item_size()
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	519 && buf.is_c_contiguous()
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	520 && u8::is_compatible_format(buf.format())
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	521 {
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	522 unsafe { std::slice::from_raw_parts(cbuf as *const u8, len) }
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	523 } else {
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	524 return Err(PyErr::new::<ValueError, _>(
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	525 py,
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	526 "Nodemap data buffer has an invalid memory representation"
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	527 .to_string(),
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	528 ));
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	529 };
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	530
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	531 Ok((buf, Box::new(bytes)))
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	532 }
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	533
51213 65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	534 fn py_tuple_to_revision_data_params(
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	535 py: Python,
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	536 tuple: PyTuple,
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	537 ) -> PyResult<RevisionDataParams> {
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	538 if tuple.len(py) < 8 {
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	539 // this is better than the panic promised by tup.get_item()
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	540 return Err(PyErr::new::<IndexError, _>(
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	541 py,
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	542 "tuple index out of range",
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	543 ));
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	544 }
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	545 let offset_or_flags: u64 = tuple.get_item(py, 0).extract(py)?;
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	546 let node_id = tuple
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	547 .get_item(py, 7)
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	548 .extract::<PyBytes>(py)?
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	549 .data(py)
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	550 .try_into()
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	551 .unwrap();
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	552 let flags = (offset_or_flags & 0xFFFF) as u16;
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	553 let data_offset = offset_or_flags >> 16;
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	554 Ok(RevisionDataParams {
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	555 flags,
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	556 data_offset,
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	557 data_compressed_length: tuple.get_item(py, 1).extract(py)?,
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	558 data_uncompressed_length: tuple.get_item(py, 2).extract(py)?,
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	559 data_delta_base: tuple.get_item(py, 3).extract(py)?,
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	560 link_rev: tuple.get_item(py, 4).extract(py)?,
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	561 parent_rev_1: tuple.get_item(py, 5).extract(py)?,
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	562 parent_rev_2: tuple.get_item(py, 6).extract(py)?,
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	563 node_id,
51226 002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	564 ..Default::default()
51213 65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	565 })
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	566 }
51226 002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	567 fn revision_data_params_to_py_tuple(
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	568 py: Python,
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	569 params: RevisionDataParams,
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	570 ) -> PyTuple {
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	571 PyTuple::new(
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	572 py,
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	573 &[
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	574 params.data_offset.into_py_object(py).into_object(),
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	575 params
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	576 .data_compressed_length
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	577 .into_py_object(py)
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	578 .into_object(),
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	579 params
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	580 .data_uncompressed_length
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	581 .into_py_object(py)
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	582 .into_object(),
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	583 params.data_delta_base.into_py_object(py).into_object(),
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	584 params.link_rev.into_py_object(py).into_object(),
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	585 params.parent_rev_1.into_py_object(py).into_object(),
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	586 params.parent_rev_2.into_py_object(py).into_object(),
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	587 PyBytes::new(py, &params.node_id)
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	588 .into_py_object(py)
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	589 .into_object(),
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	590 params._sidedata_offset.into_py_object(py).into_object(),
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	591 params
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	592 ._sidedata_compressed_length
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	593 .into_py_object(py)
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	594 .into_object(),
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	595 params
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	596 .data_compression_mode
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	597 .into_py_object(py)
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	598 .into_object(),
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	599 params
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	600 ._sidedata_compression_mode
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	601 .into_py_object(py)
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	602 .into_object(),
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	603 params._rank.into_py_object(py).into_object(),
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	604 ],
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	605 )
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	606 }
51213 65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	607
51233 9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	608 struct PySnapshotsCache<'p> {
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	609 py: Python<'p>,
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	610 dict: PyDict,
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	611 }
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	612
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	613 impl<'p> PySnapshotsCache<'p> {
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	614 fn into_object(self) -> PyObject {
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	615 self.dict.into_object()
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	616 }
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	617 }
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	618
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	619 impl<'p> SnapshotsCache for PySnapshotsCache<'p> {
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	620 fn insert_for(
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	621 &mut self,
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	622 rev: BaseRevision,
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	623 value: BaseRevision,
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	624 ) -> Result<(), RevlogError> {
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	625 let pyvalue = value.into_py_object(self.py).into_object();
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	626 match self.dict.get_item(self.py, rev) {
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	627 Some(obj) => obj
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	628 .extract::<PySet>(self.py)
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	629 .and_then(\|set\| set.add(self.py, pyvalue)),
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	630 None => PySet::new(self.py, vec![pyvalue])
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	631 .and_then(\|set\| self.dict.set_item(self.py, rev, set)),
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	632 }
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	633 .map_err(\|_\| {
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	634 RevlogError::Other(HgError::unsupported(
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	635 "Error in Python caches handling",
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	636 ))
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	637 })
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	638 }
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	639 }
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51232 diff changeset	640
43966 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	641 impl MixedIndex {
51211 6ec8387eb0be rust-index: pass data down to the Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	642 fn new(
6ec8387eb0be rust-index: pass data down to the Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	643 py: Python,
6ec8387eb0be rust-index: pass data down to the Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	644 cindex: PyObject,
6ec8387eb0be rust-index: pass data down to the Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	645 data: PyObject,
51212 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51211 diff changeset	646 header: u32,
51211 6ec8387eb0be rust-index: pass data down to the Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	647 ) -> PyResult<MixedIndex> {
6ec8387eb0be rust-index: pass data down to the Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	648 // Safety: we keep the buffer around inside the class as `index_mmap`
6ec8387eb0be rust-index: pass data down to the Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	649 let (buf, bytes) = unsafe { mmap_keeparound(py, data)? };
6ec8387eb0be rust-index: pass data down to the Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	650
44513 887d0f921b34 rust-index: moved constructor in separate impl block Georges Racinet <georges.racinet@octobus.net> parents: 44070 diff changeset	651 Self::create_instance(
887d0f921b34 rust-index: moved constructor in separate impl block Georges Racinet <georges.racinet@octobus.net> parents: 44070 diff changeset	652 py,
887d0f921b34 rust-index: moved constructor in separate impl block Georges Racinet <georges.racinet@octobus.net> parents: 44070 diff changeset	653 RefCell::new(cindex::Index::new(py, cindex)?),
51212 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51211 diff changeset	654 RefCell::new(
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51211 diff changeset	655 hg::index::Index::new(
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51211 diff changeset	656 bytes,
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51211 diff changeset	657 IndexHeader::parse(&header.to_be_bytes())
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51211 diff changeset	658 .expect("default header is broken")
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51211 diff changeset	659 .unwrap(),
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51211 diff changeset	660 )
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51211 diff changeset	661 .unwrap(),
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51211 diff changeset	662 ),
44517 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	663 RefCell::new(None),
44519 5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44518 diff changeset	664 RefCell::new(None),
44520 15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44519 diff changeset	665 RefCell::new(None),
51211 6ec8387eb0be rust-index: pass data down to the Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	666 RefCell::new(Some(buf)),
44513 887d0f921b34 rust-index: moved constructor in separate impl block Georges Racinet <georges.racinet@octobus.net> parents: 44070 diff changeset	667 )
887d0f921b34 rust-index: moved constructor in separate impl block Georges Racinet <georges.racinet@octobus.net> parents: 44070 diff changeset	668 }
887d0f921b34 rust-index: moved constructor in separate impl block Georges Racinet <georges.racinet@octobus.net> parents: 44070 diff changeset	669
51214 e79b0a4be3a7 rust-index: check equality between rust and cindex for `__len__` Rapha?l Gom?s <rgomes@octobus.net> parents: 51213 diff changeset	670 fn len(&self, py: Python) -> PyResult<usize> {
e79b0a4be3a7 rust-index: check equality between rust and cindex for `__len__` Rapha?l Gom?s <rgomes@octobus.net> parents: 51213 diff changeset	671 let rust_index_len = self.index(py).borrow().len();
e79b0a4be3a7 rust-index: check equality between rust and cindex for `__len__` Rapha?l Gom?s <rgomes@octobus.net> parents: 51213 diff changeset	672 let cindex_len = self.cindex(py).borrow().inner().len(py)?;
e79b0a4be3a7 rust-index: check equality between rust and cindex for `__len__` Rapha?l Gom?s <rgomes@octobus.net> parents: 51213 diff changeset	673 assert_eq!(rust_index_len, cindex_len);
e79b0a4be3a7 rust-index: check equality between rust and cindex for `__len__` Rapha?l Gom?s <rgomes@octobus.net> parents: 51213 diff changeset	674 Ok(cindex_len)
e79b0a4be3a7 rust-index: check equality between rust and cindex for `__len__` Rapha?l Gom?s <rgomes@octobus.net> parents: 51213 diff changeset	675 }
e79b0a4be3a7 rust-index: check equality between rust and cindex for `__len__` Rapha?l Gom?s <rgomes@octobus.net> parents: 51213 diff changeset	676
44517 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	677 /// This is scaffolding at this point, but it could also become
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	678 /// a way to start a persistent nodemap or perform a
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	679 /// vacuum / repack operation
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	680 fn fill_nodemap(
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	681 &self,
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	682 py: Python,
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	683 nt: &mut NodeTree,
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	684 ) -> PyResult<PyObject> {
51227 952e3cd7568f rust-index: using the Rust index in nodemap updating methods Georges Racinet <georges.racinet@octobus.net> parents: 51226 diff changeset	685 let index = self.index(py).borrow();
51214 e79b0a4be3a7 rust-index: check equality between rust and cindex for `__len__` Rapha?l Gom?s <rgomes@octobus.net> parents: 51213 diff changeset	686 for r in 0..self.len(py)? {
50990 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50988 diff changeset	687 let rev = Revision(r as BaseRevision);
44517 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	688 // in this case node() won't ever return None
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	689 nt.insert(&*index, index.node(rev).unwrap(), rev)
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	690 .map_err(\|e\| nodemap_error(py, e))?
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	691 }
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	692 Ok(py.None())
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	693 }
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	694
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	695 fn get_nodetree<'a>(
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	696 &'a self,
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	697 py: Python<'a>,
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	698 ) -> PyResult<&'a RefCell<Option<NodeTree>>> {
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	699 if self.nt(py).borrow().is_none() {
51118 532e74ad3ff6 rust: run a clippy pass with the latest stable version Rapha?l Gom?s <rgomes@octobus.net> parents: 50990 diff changeset	700 let readonly = Box::<Vec<_>>::default();
44517 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	701 let mut nt = NodeTree::load_bytes(readonly, 0);
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	702 self.fill_nodemap(py, &mut nt)?;
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	703 self.nt(py).borrow_mut().replace(nt);
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	704 }
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	705 Ok(self.nt(py))
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	706 }
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44516 diff changeset	707
43966 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	708 /// forward a method call to the underlying C index
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	709 fn call_cindex(
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	710 &self,
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	711 py: Python,
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	712 name: &str,
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	713 args: &PyTuple,
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	714 kwargs: Option<&PyDict>,
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	715 ) -> PyResult<PyObject> {
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	716 self.cindex(py)
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	717 .borrow()
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	718 .inner()
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	719 .call_method(py, name, args, kwargs)
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	720 }
44013 2728fcb8127c rust-index: make it possible to clone the struct referencing the C index Georges Racinet <georges.racinet@octobus.net> parents: 43966 diff changeset	721
2728fcb8127c rust-index: make it possible to clone the struct referencing the C index Georges Racinet <georges.racinet@octobus.net> parents: 43966 diff changeset	722 pub fn clone_cindex(&self, py: Python) -> cindex::Index {
2728fcb8127c rust-index: make it possible to clone the struct referencing the C index Georges Racinet <georges.racinet@octobus.net> parents: 43966 diff changeset	723 self.cindex(py).borrow().clone_ref(py)
2728fcb8127c rust-index: make it possible to clone the struct referencing the C index Georges Racinet <georges.racinet@octobus.net> parents: 43966 diff changeset	724 }
44518 b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44517 diff changeset	725
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44517 diff changeset	726 /// Returns the full nodemap bytes to be written as-is to disk
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44517 diff changeset	727 fn inner_nodemap_data_all(&self, py: Python) -> PyResult<PyBytes> {
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44517 diff changeset	728 let nodemap = self.get_nodetree(py)?.borrow_mut().take().unwrap();
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44517 diff changeset	729 let (readonly, bytes) = nodemap.into_readonly_and_added_bytes();
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44517 diff changeset	730
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44517 diff changeset	731 // If there's anything readonly, we need to build the data again from
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44517 diff changeset	732 // scratch
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44517 diff changeset	733 let bytes = if readonly.len() > 0 {
51118 532e74ad3ff6 rust: run a clippy pass with the latest stable version Rapha?l Gom?s <rgomes@octobus.net> parents: 50990 diff changeset	734 let mut nt = NodeTree::load_bytes(Box::<Vec<_>>::default(), 0);
44518 b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44517 diff changeset	735 self.fill_nodemap(py, &mut nt)?;
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44517 diff changeset	736
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44517 diff changeset	737 let (readonly, bytes) = nt.into_readonly_and_added_bytes();
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44517 diff changeset	738 assert_eq!(readonly.len(), 0);
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44517 diff changeset	739
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44517 diff changeset	740 bytes
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44517 diff changeset	741 } else {
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44517 diff changeset	742 bytes
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44517 diff changeset	743 };
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44517 diff changeset	744
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44517 diff changeset	745 let bytes = PyBytes::new(py, &bytes);
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44517 diff changeset	746 Ok(bytes)
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44517 diff changeset	747 }
44519 5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44518 diff changeset	748
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44518 diff changeset	749 /// Returns the last saved docket along with the size of any changed data
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44518 diff changeset	750 /// (in number of blocks), and said data as bytes.
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44518 diff changeset	751 fn inner_nodemap_data_incremental(
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44518 diff changeset	752 &self,
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44518 diff changeset	753 py: Python,
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44518 diff changeset	754 ) -> PyResult<PyObject> {
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44518 diff changeset	755 let docket = self.docket(py).borrow();
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44518 diff changeset	756 let docket = match docket.as_ref() {
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44518 diff changeset	757 Some(d) => d,
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44518 diff changeset	758 None => return Ok(py.None()),
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44518 diff changeset	759 };
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44518 diff changeset	760
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44518 diff changeset	761 let node_tree = self.get_nodetree(py)?.borrow_mut().take().unwrap();
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44518 diff changeset	762 let masked_blocks = node_tree.masked_readonly_blocks();
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44518 diff changeset	763 let (_, data) = node_tree.into_readonly_and_added_bytes();
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44518 diff changeset	764 let changed = masked_blocks * std::mem::size_of::<Block>();
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44518 diff changeset	765
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44518 diff changeset	766 Ok((docket, changed, PyBytes::new(py, &data))
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44518 diff changeset	767 .to_py_object(py)
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44518 diff changeset	768 .into_object())
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44518 diff changeset	769 }
44520 15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44519 diff changeset	770
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44519 diff changeset	771 /// Update the nodemap from the new (mmaped) data.
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44519 diff changeset	772 /// The docket is kept as a reference for later incremental calls.
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44519 diff changeset	773 fn inner_update_nodemap_data(
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44519 diff changeset	774 &self,
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44519 diff changeset	775 py: Python,
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44519 diff changeset	776 docket: PyObject,
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44519 diff changeset	777 nm_data: PyObject,
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44519 diff changeset	778 ) -> PyResult<PyObject> {
51208 8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	779 // Safety: we keep the buffer around inside the class as `nodemap_mmap`
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	780 let (buf, bytes) = unsafe { mmap_keeparound(py, nm_data)? };
44520 15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44519 diff changeset	781 let len = buf.item_count();
51207 8ade5e6cdb61 rust-mixed-index: rename variable to make the next change clearer Rapha?l Gom?s <rgomes@octobus.net> parents: 51118 diff changeset	782 self.nodemap_mmap(py).borrow_mut().replace(buf);
44520 15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44519 diff changeset	783
51208 8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	784 let mut nt = NodeTree::load_bytes(bytes, len);
44520 15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44519 diff changeset	785
50990 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50988 diff changeset	786 let data_tip = docket
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50988 diff changeset	787 .getattr(py, "tip_rev")?
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50988 diff changeset	788 .extract::<BaseRevision>(py)?
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50988 diff changeset	789 .into();
44520 15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44519 diff changeset	790 self.docket(py).borrow_mut().replace(docket.clone_ref(py));
51227 952e3cd7568f rust-index: using the Rust index in nodemap updating methods Georges Racinet <georges.racinet@octobus.net> parents: 51226 diff changeset	791 let idx = self.index(py).borrow();
50988 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 49987 diff changeset	792 let data_tip = idx.check_revision(data_tip).ok_or_else(\|\| {
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 49987 diff changeset	793 nodemap_error(py, NodeMapError::RevisionNotInIndex(data_tip))
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 49987 diff changeset	794 })?;
44520 15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44519 diff changeset	795 let current_tip = idx.len();
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44519 diff changeset	796
50990 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50988 diff changeset	797 for r in (data_tip.0 + 1)..current_tip as BaseRevision {
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50988 diff changeset	798 let rev = Revision(r);
44520 15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44519 diff changeset	799 // in this case node() won't ever return None
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44519 diff changeset	800 nt.insert(&*idx, idx.node(rev).unwrap(), rev)
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44519 diff changeset	801 .map_err(\|e\| nodemap_error(py, e))?
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44519 diff changeset	802 }
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44519 diff changeset	803
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44519 diff changeset	804 *self.nt(py).borrow_mut() = Some(nt);
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44519 diff changeset	805
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44519 diff changeset	806 Ok(py.None())
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44519 diff changeset	807 }
51226 002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	808
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	809 fn inner_getitem(&self, py: Python, key: PyObject) -> PyResult<PyObject> {
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	810 let idx = self.index(py).borrow();
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	811 Ok(match key.extract::<BaseRevision>(py) {
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	812 Ok(key_as_int) => {
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	813 let entry_params = if key_as_int == NULL_REVISION.0 {
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	814 RevisionDataParams::default()
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	815 } else {
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	816 let rev = UncheckedRevision(key_as_int);
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	817 match idx.entry_as_params(rev) {
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	818 Some(e) => e,
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	819 None => {
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	820 return Err(PyErr::new::<IndexError, _>(
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	821 py,
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	822 "revlog index out of range",
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	823 ));
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	824 }
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	825 }
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	826 };
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	827 revision_data_params_to_py_tuple(py, entry_params)
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	828 .into_object()
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	829 }
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	830 _ => self.get_rev(py, key.extract::<PyBytes>(py)?)?.map_or_else(
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	831 \|\| py.None(),
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	832 \|py_rev\| py_rev.into_py_object(py).into_object(),
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	833 ),
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	834 })
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51225 diff changeset	835 }
51236 a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51235 diff changeset	836
a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51235 diff changeset	837 fn inner_headrevs(&self, py: Python) -> PyResult<PyObject> {
a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51235 diff changeset	838 let index = &mut *self.index(py).borrow_mut();
a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51235 diff changeset	839 let as_vec: Vec<PyObject> = index
a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51235 diff changeset	840 .head_revs()
a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51235 diff changeset	841 .map_err(\|e\| graph_error(py, e))?
a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51235 diff changeset	842 .iter()
a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51235 diff changeset	843 .map(\|r\| PyRevision::from(*r).into_py_object(py).into_object())
a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51235 diff changeset	844 .collect();
a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51235 diff changeset	845 Ok(PyList::new(py, &as_vec).into_object())
a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51235 diff changeset	846 }
51237 9f876765cbe2 rust-index: add support for `headrevsfiltered` Rapha?l Gom?s <rgomes@octobus.net> parents: 51236 diff changeset	847
9f876765cbe2 rust-index: add support for `headrevsfiltered` Rapha?l Gom?s <rgomes@octobus.net> parents: 51236 diff changeset	848 fn inner_headrevsfiltered(
9f876765cbe2 rust-index: add support for `headrevsfiltered` Rapha?l Gom?s <rgomes@octobus.net> parents: 51236 diff changeset	849 &self,
9f876765cbe2 rust-index: add support for `headrevsfiltered` Rapha?l Gom?s <rgomes@octobus.net> parents: 51236 diff changeset	850 py: Python,
9f876765cbe2 rust-index: add support for `headrevsfiltered` Rapha?l Gom?s <rgomes@octobus.net> parents: 51236 diff changeset	851 filtered_revs: &PyObject,
51238 898674a4dbc7 rust-index: headrevsfiltered() returning Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51237 diff changeset	852 ) -> PyResult<PyObject> {
51237 9f876765cbe2 rust-index: add support for `headrevsfiltered` Rapha?l Gom?s <rgomes@octobus.net> parents: 51236 diff changeset	853 let index = &mut *self.index(py).borrow_mut();
9f876765cbe2 rust-index: add support for `headrevsfiltered` Rapha?l Gom?s <rgomes@octobus.net> parents: 51236 diff changeset	854 let filtered_revs = rev_pyiter_collect(py, filtered_revs, index)?;
9f876765cbe2 rust-index: add support for `headrevsfiltered` Rapha?l Gom?s <rgomes@octobus.net> parents: 51236 diff changeset	855
51238 898674a4dbc7 rust-index: headrevsfiltered() returning Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51237 diff changeset	856 let as_vec: Vec<PyObject> = index
51237 9f876765cbe2 rust-index: add support for `headrevsfiltered` Rapha?l Gom?s <rgomes@octobus.net> parents: 51236 diff changeset	857 .head_revs_filtered(&filtered_revs)
51238 898674a4dbc7 rust-index: headrevsfiltered() returning Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51237 diff changeset	858 .map_err(\|e\| graph_error(py, e))?
898674a4dbc7 rust-index: headrevsfiltered() returning Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51237 diff changeset	859 .iter()
898674a4dbc7 rust-index: headrevsfiltered() returning Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51237 diff changeset	860 .map(\|r\| PyRevision::from(*r).into_py_object(py).into_object())
898674a4dbc7 rust-index: headrevsfiltered() returning Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51237 diff changeset	861 .collect();
898674a4dbc7 rust-index: headrevsfiltered() returning Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51237 diff changeset	862 Ok(PyList::new(py, &as_vec).into_object())
51237 9f876765cbe2 rust-index: add support for `headrevsfiltered` Rapha?l Gom?s <rgomes@octobus.net> parents: 51236 diff changeset	863 }
51239 0112803e6c01 rust-index: add support for `_slicechunktodensity` Rapha?l Gom?s <rgomes@octobus.net> parents: 51238 diff changeset	864
51246 89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	865 fn inner_ancestors(
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	866 &self,
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	867 py: Python,
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	868 py_revs: &PyTuple,
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	869 ) -> PyResult<PyObject> {
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	870 let index = &mut *self.index(py).borrow_mut();
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	871 let revs: Vec<_> = rev_pyiter_collect(py, py_revs.as_object(), index)?;
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	872 let as_vec: Vec<_> = index
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	873 .ancestors(&revs)
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	874 .map_err(\|e\| graph_error(py, e))?
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	875 .iter()
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	876 .map(\|r\| PyRevision::from(*r).into_py_object(py).into_object())
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	877 .collect();
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	878 Ok(PyList::new(py, &as_vec).into_object())
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	879 }
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	880
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	881 fn inner_commonancestorsheads(
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	882 &self,
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	883 py: Python,
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	884 py_revs: &PyTuple,
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	885 ) -> PyResult<PyObject> {
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	886 let index = &mut *self.index(py).borrow_mut();
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	887 let revs: Vec<_> = rev_pyiter_collect(py, py_revs.as_object(), index)?;
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	888 let as_vec: Vec<_> = index
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	889 .common_ancestor_heads(&revs)
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	890 .map_err(\|e\| graph_error(py, e))?
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	891 .iter()
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	892 .map(\|r\| PyRevision::from(*r).into_py_object(py).into_object())
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	893 .collect();
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	894 Ok(PyList::new(py, &as_vec).into_object())
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	895 }
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	896
51241 c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	897 fn inner_computephasesmapsets(
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	898 &self,
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	899 py: Python,
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	900 py_roots: PyDict,
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	901 ) -> PyResult<PyObject> {
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	902 let index = &*self.index(py).borrow();
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	903 let opt = self.get_nodetree(py)?.borrow();
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	904 let nt = opt.as_ref().unwrap();
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	905 let roots: Result<HashMap<Phase, Vec<Revision>>, PyErr> = py_roots
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	906 .items_list(py)
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	907 .iter(py)
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	908 .map(\|r\| {
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	909 let phase = r.get_item(py, 0)?;
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	910 let nodes = r.get_item(py, 1)?;
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	911 // Transform the nodes from Python to revs here since we
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	912 // have access to the nodemap
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	913 let revs: Result<_, _> = nodes
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	914 .iter(py)?
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	915 .map(\|node\| match node?.extract::<PyBytes>(py) {
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	916 Ok(py_bytes) => {
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	917 let node = node_from_py_bytes(py, &py_bytes)?;
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	918 nt.find_bin(index, node.into())
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	919 .map_err(\|e\| nodemap_error(py, e))?
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	920 .ok_or_else(\|\| revlog_error(py))
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	921 }
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	922 Err(e) => Err(e),
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	923 })
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	924 .collect();
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	925 let phase = Phase::try_from(phase.extract::<usize>(py)?)
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	926 .map_err(\|_\| revlog_error(py));
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	927 Ok((phase?, revs?))
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	928 })
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	929 .collect();
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	930 let (len, phase_maps) = index
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	931 .compute_phases_map_sets(roots?)
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	932 .map_err(\|e\| graph_error(py, e))?;
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	933
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	934 // Ugly hack, but temporary
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	935 const IDX_TO_PHASE_NUM: [usize; 4] = [1, 2, 32, 96];
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	936 let py_phase_maps = PyDict::new(py);
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	937 for (idx, roots) in phase_maps.iter().enumerate() {
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	938 let phase_num = IDX_TO_PHASE_NUM[idx].into_py_object(py);
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	939 // OPTIM too bad we have to collect here. At least, we could
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	940 // reuse the same Vec and allocate it with capacity at
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	941 // max(len(phase_maps)
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	942 let roots_vec: Vec<PyInt> = roots
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	943 .iter()
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	944 .map(\|r\| PyRevision::from(*r).into_py_object(py))
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	945 .collect();
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	946 py_phase_maps.set_item(
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	947 py,
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	948 phase_num,
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	949 PySet::new(py, roots_vec)?,
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	950 )?;
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	951 }
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	952 Ok(PyTuple::new(
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	953 py,
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	954 &[
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	955 len.into_py_object(py).into_object(),
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	956 py_phase_maps.into_object(),
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	957 ],
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	958 )
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	959 .into_object())
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	960 }
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51240 diff changeset	961
51239 0112803e6c01 rust-index: add support for `_slicechunktodensity` Rapha?l Gom?s <rgomes@octobus.net> parents: 51238 diff changeset	962 fn inner_slicechunktodensity(
0112803e6c01 rust-index: add support for `_slicechunktodensity` Rapha?l Gom?s <rgomes@octobus.net> parents: 51238 diff changeset	963 &self,
0112803e6c01 rust-index: add support for `_slicechunktodensity` Rapha?l Gom?s <rgomes@octobus.net> parents: 51238 diff changeset	964 py: Python,
0112803e6c01 rust-index: add support for `_slicechunktodensity` Rapha?l Gom?s <rgomes@octobus.net> parents: 51238 diff changeset	965 revs: PyObject,
0112803e6c01 rust-index: add support for `_slicechunktodensity` Rapha?l Gom?s <rgomes@octobus.net> parents: 51238 diff changeset	966 target_density: f64,
0112803e6c01 rust-index: add support for `_slicechunktodensity` Rapha?l Gom?s <rgomes@octobus.net> parents: 51238 diff changeset	967 min_gap_size: usize,
51240 8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51239 diff changeset	968 ) -> PyResult<PyObject> {
51239 0112803e6c01 rust-index: add support for `_slicechunktodensity` Rapha?l Gom?s <rgomes@octobus.net> parents: 51238 diff changeset	969 let index = &mut *self.index(py).borrow_mut();
0112803e6c01 rust-index: add support for `_slicechunktodensity` Rapha?l Gom?s <rgomes@octobus.net> parents: 51238 diff changeset	970 let revs: Vec<_> = rev_pyiter_collect(py, &revs, index)?;
51240 8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51239 diff changeset	971 let as_nested_vec =
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51239 diff changeset	972 index.slice_chunk_to_density(&revs, target_density, min_gap_size);
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51239 diff changeset	973 let mut res = Vec::with_capacity(as_nested_vec.len());
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51239 diff changeset	974 let mut py_chunk = Vec::new();
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51239 diff changeset	975 for chunk in as_nested_vec {
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51239 diff changeset	976 py_chunk.clear();
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51239 diff changeset	977 py_chunk.reserve_exact(chunk.len());
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51239 diff changeset	978 for rev in chunk {
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51239 diff changeset	979 py_chunk.push(
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51239 diff changeset	980 PyRevision::from(rev).into_py_object(py).into_object(),
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51239 diff changeset	981 );
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51239 diff changeset	982 }
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51239 diff changeset	983 res.push(PyList::new(py, &py_chunk).into_object());
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51239 diff changeset	984 }
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51239 diff changeset	985 // This is just to do the same as C, not sure why it does this
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51239 diff changeset	986 if res.len() == 1 {
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51239 diff changeset	987 Ok(PyTuple::new(py, &res).into_object())
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51239 diff changeset	988 } else {
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51239 diff changeset	989 Ok(PyList::new(py, &res).into_object())
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51239 diff changeset	990 }
51239 0112803e6c01 rust-index: add support for `_slicechunktodensity` Rapha?l Gom?s <rgomes@octobus.net> parents: 51238 diff changeset	991 }
51243 fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	992
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	993 fn inner_reachableroots2(
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	994 &self,
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	995 py: Python,
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	996 min_root: UncheckedRevision,
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	997 heads: PyObject,
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	998 roots: PyObject,
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	999 include_path: bool,
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	1000 ) -> PyResult<PyObject> {
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	1001 let index = &*self.index(py).borrow();
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	1002 let heads = rev_pyiter_collect_or_else(py, &heads, index, \|_rev\| {
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	1003 PyErr::new::<IndexError, _>(py, "head out of range")
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	1004 })?;
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	1005 let roots: Result<_, _> = roots
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	1006 .iter(py)?
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	1007 .map(\|r\| {
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	1008 r.and_then(\|o\| match o.extract::<PyRevision>(py) {
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	1009 Ok(r) => Ok(UncheckedRevision(r.0)),
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	1010 Err(e) => Err(e),
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	1011 })
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	1012 })
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	1013 .collect();
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	1014 let as_set = index
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	1015 .reachable_roots(min_root, heads, roots?, include_path)
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	1016 .map_err(\|e\| graph_error(py, e))?;
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	1017 let as_vec: Vec<PyObject> = as_set
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	1018 .iter()
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	1019 .map(\|r\| PyRevision::from(*r).into_py_object(py).into_object())
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	1020 .collect();
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	1021 Ok(PyList::new(py, &as_vec).into_object())
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51241 diff changeset	1022 }
43966 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	1023 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	1024
44516 26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44513 diff changeset	1025 fn revlog_error(py: Python) -> PyErr {
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44513 diff changeset	1026 match py
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44513 diff changeset	1027 .import("mercurial.error")
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44513 diff changeset	1028 .and_then(\|m\| m.get(py, "RevlogError"))
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44513 diff changeset	1029 {
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44513 diff changeset	1030 Err(e) => e,
47316 33e7508b0ae9 hg-cpython: fix new occuring TypeError Rapha?l Gom?s <rgomes@octobus.net> parents: 47279 diff changeset	1031 Ok(cls) => PyErr::from_instance(
33e7508b0ae9 hg-cpython: fix new occuring TypeError Rapha?l Gom?s <rgomes@octobus.net> parents: 47279 diff changeset	1032 py,
33e7508b0ae9 hg-cpython: fix new occuring TypeError Rapha?l Gom?s <rgomes@octobus.net> parents: 47279 diff changeset	1033 cls.call(py, (py.None(),), None).ok().into_py_object(py),
33e7508b0ae9 hg-cpython: fix new occuring TypeError Rapha?l Gom?s <rgomes@octobus.net> parents: 47279 diff changeset	1034 ),
44516 26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44513 diff changeset	1035 }
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44513 diff changeset	1036 }
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44513 diff changeset	1037
51236 a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51235 diff changeset	1038 fn graph_error(py: Python, _err: hg::GraphError) -> PyErr {
a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51235 diff changeset	1039 // ParentOutOfRange is currently the only alternative
a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51235 diff changeset	1040 // in `hg::GraphError`. The C index always raises this simple ValueError.
a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51235 diff changeset	1041 PyErr::new::<ValueError, _>(py, "parent out of range")
a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51235 diff changeset	1042 }
a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51235 diff changeset	1043
51220 44fbb7dfb563 rust-index: renamed nodemap error function for rev not in index Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	1044 fn nodemap_rev_not_in_index(py: Python, rev: UncheckedRevision) -> PyErr {
44516 26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44513 diff changeset	1045 PyErr::new::<ValueError, _>(
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44513 diff changeset	1046 py,
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44513 diff changeset	1047 format!(
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44513 diff changeset	1048 "Inconsistency: Revision {} found in nodemap \
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44513 diff changeset	1049 is not in revlog index",
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44513 diff changeset	1050 rev
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44513 diff changeset	1051 ),
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44513 diff changeset	1052 )
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44513 diff changeset	1053 }
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44513 diff changeset	1054
51221 bc4d83047c6c rust-index: helper for revision not in index not involving nodemap Georges Racinet <georges.racinet@octobus.net> parents: 51220 diff changeset	1055 fn rev_not_in_index(py: Python, rev: UncheckedRevision) -> PyErr {
bc4d83047c6c rust-index: helper for revision not in index not involving nodemap Georges Racinet <georges.racinet@octobus.net> parents: 51220 diff changeset	1056 PyErr::new::<ValueError, _>(
bc4d83047c6c rust-index: helper for revision not in index not involving nodemap Georges Racinet <georges.racinet@octobus.net> parents: 51220 diff changeset	1057 py,
bc4d83047c6c rust-index: helper for revision not in index not involving nodemap Georges Racinet <georges.racinet@octobus.net> parents: 51220 diff changeset	1058 format!("revlog index out of range: {}", rev),
bc4d83047c6c rust-index: helper for revision not in index not involving nodemap Georges Racinet <georges.racinet@octobus.net> parents: 51220 diff changeset	1059 )
bc4d83047c6c rust-index: helper for revision not in index not involving nodemap Georges Racinet <georges.racinet@octobus.net> parents: 51220 diff changeset	1060 }
bc4d83047c6c rust-index: helper for revision not in index not involving nodemap Georges Racinet <georges.racinet@octobus.net> parents: 51220 diff changeset	1061
44516 26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44513 diff changeset	1062 /// Standard treatment of NodeMapError
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44513 diff changeset	1063 fn nodemap_error(py: Python, err: NodeMapError) -> PyErr {
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44513 diff changeset	1064 match err {
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44513 diff changeset	1065 NodeMapError::MultipleResults => revlog_error(py),
51220 44fbb7dfb563 rust-index: renamed nodemap error function for rev not in index Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	1066 NodeMapError::RevisionNotInIndex(r) => nodemap_rev_not_in_index(py, r),
44516 26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44513 diff changeset	1067 }
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44513 diff changeset	1068 }
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44513 diff changeset	1069
51235 050098d60c30 rust-index: variant of assert_py_eq with normalizer expression Georges Racinet <georges.racinet@octobus.net> parents: 51234 diff changeset	1070 /// assert two Python objects to be equal from a Python point of view
050098d60c30 rust-index: variant of assert_py_eq with normalizer expression Georges Racinet <georges.racinet@octobus.net> parents: 51234 diff changeset	1071 ///
050098d60c30 rust-index: variant of assert_py_eq with normalizer expression Georges Racinet <georges.racinet@octobus.net> parents: 51234 diff changeset	1072 /// `method` is a label for the assertion error message, intended to be the
050098d60c30 rust-index: variant of assert_py_eq with normalizer expression Georges Racinet <georges.racinet@octobus.net> parents: 51234 diff changeset	1073 /// name of the caller.
050098d60c30 rust-index: variant of assert_py_eq with normalizer expression Georges Racinet <georges.racinet@octobus.net> parents: 51234 diff changeset	1074 /// `normalizer` is a function that takes a Python variable name and returns
050098d60c30 rust-index: variant of assert_py_eq with normalizer expression Georges Racinet <georges.racinet@octobus.net> parents: 51234 diff changeset	1075 /// an expression that the conparison will actually use.
050098d60c30 rust-index: variant of assert_py_eq with normalizer expression Georges Racinet <georges.racinet@octobus.net> parents: 51234 diff changeset	1076 /// Foe example: `\|v\| format!("sorted({})", v)`
050098d60c30 rust-index: variant of assert_py_eq with normalizer expression Georges Racinet <georges.racinet@octobus.net> parents: 51234 diff changeset	1077 fn assert_py_eq_normalized(
050098d60c30 rust-index: variant of assert_py_eq with normalizer expression Georges Racinet <georges.racinet@octobus.net> parents: 51234 diff changeset	1078 py: Python,
050098d60c30 rust-index: variant of assert_py_eq with normalizer expression Georges Racinet <georges.racinet@octobus.net> parents: 51234 diff changeset	1079 method: &str,
050098d60c30 rust-index: variant of assert_py_eq with normalizer expression Georges Racinet <georges.racinet@octobus.net> parents: 51234 diff changeset	1080 rust: &PyObject,
050098d60c30 rust-index: variant of assert_py_eq with normalizer expression Georges Racinet <georges.racinet@octobus.net> parents: 51234 diff changeset	1081 c: &PyObject,
050098d60c30 rust-index: variant of assert_py_eq with normalizer expression Georges Racinet <georges.racinet@octobus.net> parents: 51234 diff changeset	1082 normalizer: impl FnOnce(&str) -> String + Copy,
050098d60c30 rust-index: variant of assert_py_eq with normalizer expression Georges Racinet <georges.racinet@octobus.net> parents: 51234 diff changeset	1083 ) -> PyResult<()> {
050098d60c30 rust-index: variant of assert_py_eq with normalizer expression Georges Racinet <georges.racinet@octobus.net> parents: 51234 diff changeset	1084 let locals = PyDict::new(py);
050098d60c30 rust-index: variant of assert_py_eq with normalizer expression Georges Racinet <georges.racinet@octobus.net> parents: 51234 diff changeset	1085 locals.set_item(py, "rust".into_py_object(py).into_object(), rust)?;
050098d60c30 rust-index: variant of assert_py_eq with normalizer expression Georges Racinet <georges.racinet@octobus.net> parents: 51234 diff changeset	1086 locals.set_item(py, "c".into_py_object(py).into_object(), c)?;
050098d60c30 rust-index: variant of assert_py_eq with normalizer expression Georges Racinet <georges.racinet@octobus.net> parents: 51234 diff changeset	1087 // let lhs = format!(normalizer_fmt, "rust");
050098d60c30 rust-index: variant of assert_py_eq with normalizer expression Georges Racinet <georges.racinet@octobus.net> parents: 51234 diff changeset	1088 // let rhs = format!(normalizer_fmt, "c");
050098d60c30 rust-index: variant of assert_py_eq with normalizer expression Georges Racinet <georges.racinet@octobus.net> parents: 51234 diff changeset	1089 let is_eq: PyBool = py
050098d60c30 rust-index: variant of assert_py_eq with normalizer expression Georges Racinet <georges.racinet@octobus.net> parents: 51234 diff changeset	1090 .eval(
050098d60c30 rust-index: variant of assert_py_eq with normalizer expression Georges Racinet <georges.racinet@octobus.net> parents: 51234 diff changeset	1091 &format!("{} == {}", &normalizer("rust"), &normalizer("c")),
050098d60c30 rust-index: variant of assert_py_eq with normalizer expression Georges Racinet <georges.racinet@octobus.net> parents: 51234 diff changeset	1092 None,
050098d60c30 rust-index: variant of assert_py_eq with normalizer expression Georges Racinet <georges.racinet@octobus.net> parents: 51234 diff changeset	1093 Some(&locals),
050098d60c30 rust-index: variant of assert_py_eq with normalizer expression Georges Racinet <georges.racinet@octobus.net> parents: 51234 diff changeset	1094 )?
050098d60c30 rust-index: variant of assert_py_eq with normalizer expression Georges Racinet <georges.racinet@octobus.net> parents: 51234 diff changeset	1095 .extract(py)?;
050098d60c30 rust-index: variant of assert_py_eq with normalizer expression Georges Racinet <georges.racinet@octobus.net> parents: 51234 diff changeset	1096 assert!(
050098d60c30 rust-index: variant of assert_py_eq with normalizer expression Georges Racinet <georges.racinet@octobus.net> parents: 51234 diff changeset	1097 is_eq.is_true(),
050098d60c30 rust-index: variant of assert_py_eq with normalizer expression Georges Racinet <georges.racinet@octobus.net> parents: 51234 diff changeset	1098 "{} results differ. Rust: {:?} C: {:?} (before any normalization)",
050098d60c30 rust-index: variant of assert_py_eq with normalizer expression Georges Racinet <georges.racinet@octobus.net> parents: 51234 diff changeset	1099 method,
050098d60c30 rust-index: variant of assert_py_eq with normalizer expression Georges Racinet <georges.racinet@octobus.net> parents: 51234 diff changeset	1100 rust,
050098d60c30 rust-index: variant of assert_py_eq with normalizer expression Georges Racinet <georges.racinet@octobus.net> parents: 51234 diff changeset	1101 c
050098d60c30 rust-index: variant of assert_py_eq with normalizer expression Georges Racinet <georges.racinet@octobus.net> parents: 51234 diff changeset	1102 );
050098d60c30 rust-index: variant of assert_py_eq with normalizer expression Georges Racinet <georges.racinet@octobus.net> parents: 51234 diff changeset	1103 Ok(())
050098d60c30 rust-index: variant of assert_py_eq with normalizer expression Georges Racinet <georges.racinet@octobus.net> parents: 51234 diff changeset	1104 }
050098d60c30 rust-index: variant of assert_py_eq with normalizer expression Georges Racinet <georges.racinet@octobus.net> parents: 51234 diff changeset	1105
51222 52bbb57a76ad rust-index: results comparison helper with details Georges Racinet <georges.racinet@octobus.net> parents: 51221 diff changeset	1106 fn assert_py_eq(
52bbb57a76ad rust-index: results comparison helper with details Georges Racinet <georges.racinet@octobus.net> parents: 51221 diff changeset	1107 py: Python,
52bbb57a76ad rust-index: results comparison helper with details Georges Racinet <georges.racinet@octobus.net> parents: 51221 diff changeset	1108 method: &str,
52bbb57a76ad rust-index: results comparison helper with details Georges Racinet <georges.racinet@octobus.net> parents: 51221 diff changeset	1109 rust: &PyObject,
52bbb57a76ad rust-index: results comparison helper with details Georges Racinet <georges.racinet@octobus.net> parents: 51221 diff changeset	1110 c: &PyObject,
52bbb57a76ad rust-index: results comparison helper with details Georges Racinet <georges.racinet@octobus.net> parents: 51221 diff changeset	1111 ) -> PyResult<()> {
51235 050098d60c30 rust-index: variant of assert_py_eq with normalizer expression Georges Racinet <georges.racinet@octobus.net> parents: 51234 diff changeset	1112 assert_py_eq_normalized(py, method, rust, c, \|v\| v.to_owned())
51222 52bbb57a76ad rust-index: results comparison helper with details Georges Racinet <georges.racinet@octobus.net> parents: 51221 diff changeset	1113 }
52bbb57a76ad rust-index: results comparison helper with details Georges Racinet <georges.racinet@octobus.net> parents: 51221 diff changeset	1114
43966 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	1115 /// Create the module, with __package__ given from parent
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	1116 pub fn init_module(py: Python, package: &str) -> PyResult<PyModule> {
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	1117 let dotted_name = &format!("{}.revlog", package);
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	1118 let m = PyModule::new(py, dotted_name)?;
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	1119 m.add(py, "__package__", package)?;
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	1120 m.add(py, "__doc__", "RevLog - Rust implementations")?;
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	1121
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	1122 m.add_class::<MixedIndex>(py)?;
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	1123
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	1124 let sys = PyModule::import(py, "sys")?;
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	1125 let sys_modules: PyDict = sys.get(py, "modules")?.extract(py)?;
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	1126 sys_modules.set_item(py, dotted_name, &m)?;
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	1127
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	1128 Ok(m)
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43951 diff changeset	1129 }

Mercurial > public > mercurial-scm > hg-stable

annotate rust/hg-cpython/src/revlog.rs @ 51246:89ce6a49bfeb