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

annotate rust/hg-cpython/src/revlog.rs @ 51243:41e19e8a6133

rust-index: stop using C index We still keep its wrapper implementation in `hg-cpython::cindex`, because we might want to recreate ancestors handling objects using it for the case of REVLOGV2. Also, we still instantiate it (from Python code) and store it as attribute, for the likes of `get_cindex` and the caller that relies on it, but that is soon to be removed, too.

author	Georges Racinet <georges.racinet@octobus.net>
date	Fri, 20 Oct 2023 09:48:53 +0200
parents	0b81440e2a73
children	8dbd985733ff

rev	line source
43945 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 //
44506 26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	3 // Copyright 2019-2020 Georges Racinet <georges.racinet@octobus.net>
43945 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
44507 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 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: 44506 diff changeset	9 cindex,
51219 fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	10 conversion::{rev_pyiter_collect, rev_pyiter_collect_or_else},
44507 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	11 utils::{node_from_py_bytes, node_from_py_object},
50976 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50974 diff changeset	12 PyRevision,
44507 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	13 };
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	14 use cpython::{
44510 15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	15 buffer::{Element, PyBuffer},
44507 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	16 exc::{IndexError, ValueError},
51243 41e19e8a6133 rust-index: stop using C index Georges Racinet <georges.racinet@octobus.net> parents: 51242 diff changeset	17 ObjectProtocol, PyBytes, PyClone, PyDict, PyErr, PyInt, PyList, PyModule,
41e19e8a6133 rust-index: stop using C index Georges Racinet <georges.racinet@octobus.net> parents: 51242 diff changeset	18 PyObject, PyResult, PySet, PyString, PyTuple, Python, PythonObject,
41e19e8a6133 rust-index: stop using C index Georges Racinet <georges.racinet@octobus.net> parents: 51242 diff changeset	19 ToPyObject, UnsafePyLeaked,
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	20 };
44507 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	21 use hg::{
51209 9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	22 errors::HgError,
51226 1b23aaf5eb7b rust-index: optimize find_gca_candidates() on less than 8 revisions Georges Racinet <georges.racinet@octobus.net> parents: 51222 diff changeset	23 index::{
1b23aaf5eb7b rust-index: optimize find_gca_candidates() on less than 8 revisions Georges Racinet <georges.racinet@octobus.net> parents: 51222 diff changeset	24 IndexHeader, Phase, RevisionDataParams, SnapshotsCache,
1b23aaf5eb7b rust-index: optimize find_gca_candidates() on less than 8 revisions Georges Racinet <georges.racinet@octobus.net> parents: 51222 diff changeset	25 INDEX_ENTRY_SIZE,
1b23aaf5eb7b rust-index: optimize find_gca_candidates() on less than 8 revisions Georges Racinet <georges.racinet@octobus.net> parents: 51222 diff changeset	26 },
44509 5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44508 diff changeset	27 nodemap::{Block, NodeMapError, NodeTree},
51236 7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	28 revlog::{nodemap::NodeMap, Graph, NodePrefix, RevlogError, RevlogIndex},
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	29 BaseRevision, Node, Revision, UncheckedRevision, NULL_REVISION,
44507 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	30 };
51217 c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	31 use std::{cell::RefCell, collections::HashMap};
51236 7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	32 use vcsgraph::graph::Graph as VCSGraph;
43945 f98f0e3ddaa1 rust-index: add a function to convert PyObject index for hg-core Pierre-Yves David <pierre-yves.david@octobus.net> parents: diff changeset	33
51236 7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	34 pub struct PySharedIndex {
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	35 /// The underlying hg-core index
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	36 pub(crate) inner: &'static hg::index::Index,
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	37 }
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	38
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	39 /// Return a Struct implementing the Graph trait
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	40 pub(crate) fn py_rust_index_to_graph(
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	41 py: Python,
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	42 index: PyObject,
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	43 ) -> PyResult<UnsafePyLeaked<PySharedIndex>> {
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	44 let midx = index.extract::<MixedIndex>(py)?;
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	45 let leaked = midx.index(py).leak_immutable();
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	46 Ok(unsafe { leaked.map(py, \|idx\| PySharedIndex { inner: idx }) })
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	47 }
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	48
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	49 impl Clone for PySharedIndex {
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	50 fn clone(&self) -> Self {
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	51 Self { inner: self.inner }
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	52 }
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	53 }
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	54
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	55 impl Graph for PySharedIndex {
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	56 fn parents(&self, rev: Revision) -> Result<[Revision; 2], hg::GraphError> {
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	57 self.inner.parents(rev)
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	58 }
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	59 }
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	60
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	61 impl VCSGraph for PySharedIndex {
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	62 fn parents(
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	63 &self,
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	64 rev: BaseRevision,
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	65 ) -> Result<vcsgraph::graph::Parents, vcsgraph::graph::GraphReadError>
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	66 {
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	67 // FIXME This trait should be reworked to decide between Revision
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	68 // and UncheckedRevision, get better errors names, etc.
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	69 match Graph::parents(self, Revision(rev)) {
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	70 Ok(parents) => {
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	71 Ok(vcsgraph::graph::Parents([parents[0].0, parents[1].0]))
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	72 }
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	73 Err(hg::GraphError::ParentOutOfRange(rev)) => {
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	74 Err(vcsgraph::graph::GraphReadError::KeyedInvalidKey(rev.0))
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	75 }
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	76 }
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	77 }
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	78 }
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	79
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	80 impl RevlogIndex for PySharedIndex {
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	81 fn len(&self) -> usize {
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	82 self.inner.len()
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	83 }
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	84 fn node(&self, rev: Revision) -> Option<&Node> {
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	85 self.inner.node(rev)
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	86 }
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	87 }
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	88
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	89 py_class!(pub class MixedIndex \|py\| {
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	90 data cindex: RefCell<cindex::Index>;
51236 7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	91 @shared data index: hg::index::Index;
44507 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	92 data nt: RefCell<Option<NodeTree>>;
44509 5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44508 diff changeset	93 data docket: RefCell<Option<PyObject>>;
44510 15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	94 // Holds a reference to the mmap'ed persistent nodemap data
51183 8ade5e6cdb61 rust-mixed-index: rename variable to make the next change clearer Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	95 data nodemap_mmap: RefCell<Option<PyBuffer>>;
51187 6ec8387eb0be rust-index: pass data down to the Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51184 diff changeset	96 // 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: 51184 diff changeset	97 data index_mmap: RefCell<Option<PyBuffer>>;
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	98
51187 6ec8387eb0be rust-index: pass data down to the Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51184 diff changeset	99 def __new__(
6ec8387eb0be rust-index: pass data down to the Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51184 diff changeset	100 _cls,
6ec8387eb0be rust-index: pass data down to the Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51184 diff changeset	101 cindex: PyObject,
51188 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51187 diff changeset	102 data: PyObject,
13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51187 diff changeset	103 default_header: u32,
51187 6ec8387eb0be rust-index: pass data down to the Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51184 diff changeset	104 ) -> PyResult<MixedIndex> {
51188 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51187 diff changeset	105 Self::new(py, cindex, data, default_header)
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	106 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	107
44012 443dc1655923 rust-index: expose a method to retrieve the C index Georges Racinet <georges.racinet@octobus.net> parents: 44011 diff changeset	108 /// 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: 44011 diff changeset	109 ///
443dc1655923 rust-index: expose a method to retrieve the C index Georges Racinet <georges.racinet@octobus.net> parents: 44011 diff changeset	110 /// 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: 44011 diff changeset	111 /// 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: 44011 diff changeset	112 /// 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: 44011 diff changeset	113 /// 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: 44011 diff changeset	114 /// ready to accept `MixedIndex`.
443dc1655923 rust-index: expose a method to retrieve the C index Georges Racinet <georges.racinet@octobus.net> parents: 44011 diff changeset	115 def get_cindex(&self) -> PyResult<PyObject> {
443dc1655923 rust-index: expose a method to retrieve the C index Georges Racinet <georges.racinet@octobus.net> parents: 44011 diff changeset	116 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: 44011 diff changeset	117 }
443dc1655923 rust-index: expose a method to retrieve the C index Georges Racinet <georges.racinet@octobus.net> parents: 44011 diff changeset	118
44507 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	119 // Index API involving nodemap, as defined in mercurial/pure/parsers.py
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	120
44507 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	121 /// 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: 44506 diff changeset	122 /// in case of ambiguity, same as C version does
50976 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50974 diff changeset	123 def get_rev(&self, node: PyBytes) -> PyResult<Option<PyRevision>> {
44507 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	124 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: 44506 diff changeset	125 let nt = opt.as_ref().unwrap();
51193 f95f70cf2ee2 rust-index: check rindex and cindex return the same get_rev Rapha?l Gom?s <rgomes@octobus.net> parents: 51192 diff changeset	126 let ridx = &*self.index(py).borrow();
48269 aa88fb60ecb4 rust-nodemap: backed out mitigation for issue 6554 Georges Racinet <georges.racinet@octobus.net> parents: 47799 diff changeset	127 let node = node_from_py_bytes(py, &node)?;
51193 f95f70cf2ee2 rust-index: check rindex and cindex return the same get_rev Rapha?l Gom?s <rgomes@octobus.net> parents: 51192 diff changeset	128 let rust_rev =
f95f70cf2ee2 rust-index: check rindex and cindex return the same get_rev Rapha?l Gom?s <rgomes@octobus.net> parents: 51192 diff changeset	129 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: 51192 diff changeset	130 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: 51192 diff changeset	131
44507 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	132 }
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	133
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	134 /// 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: 44506 diff changeset	135 /// is not found.
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	136 ///
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	137 /// 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: 44506 diff changeset	138 /// will catch and rewrap with it
50976 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50974 diff changeset	139 def rev(&self, node: PyBytes) -> PyResult<PyRevision> {
44507 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	140 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: 44506 diff changeset	141 }
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	142
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	143 /// 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: 44506 diff changeset	144 def has_node(&self, node: PyBytes) -> PyResult<bool> {
51201 297fa956b6c4 rust-index: optim note for post-scaffolding removal Georges Racinet <georges.racinet@octobus.net> parents: 51200 diff changeset	145 // 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: 51200 diff changeset	146 // 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: 51200 diff changeset	147 // as `get_rev()` currently does the necessary assertions
44507 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	148 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: 44506 diff changeset	149 }
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	150
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	151 /// 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: 44506 diff changeset	152 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: 44506 diff changeset	153 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: 44506 diff changeset	154 let nt = opt.as_ref().unwrap();
51205 274abd1562a2 rust-index: use the rust index in `shortest` Rapha?l Gom?s <rgomes@octobus.net> parents: 51204 diff changeset	155 let idx = &*self.index(py).borrow();
44507 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	156 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: 44506 diff changeset	157 {
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	158 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: 44506 diff changeset	159 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: 44506 diff changeset	160 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: 44506 diff changeset	161 }
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	162 }
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	163
48269 aa88fb60ecb4 rust-nodemap: backed out mitigation for issue 6554 Georges Racinet <georges.racinet@octobus.net> parents: 47799 diff changeset	164 def partialmatch(&self, node: PyObject) -> PyResult<Option<PyBytes>> {
44507 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	165 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: 44506 diff changeset	166 let nt = opt.as_ref().unwrap();
51207 72d16685d63a rust-index: use the Rust index in `partialmatch` Rapha?l Gom?s <rgomes@octobus.net> parents: 51205 diff changeset	167 let idx = &*self.index(py).borrow();
44507 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	168
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	169 let node_as_string = if cfg!(feature = "python3-sys") {
48269 aa88fb60ecb4 rust-nodemap: backed out mitigation for issue 6554 Georges Racinet <georges.racinet@octobus.net> parents: 47799 diff changeset	170 node.cast_as::<PyString>(py)?.to_string(py)?.to_string()
44507 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	171 }
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	172 else {
48269 aa88fb60ecb4 rust-nodemap: backed out mitigation for issue 6554 Georges Racinet <georges.racinet@octobus.net> parents: 47799 diff changeset	173 let node = node.extract::<PyBytes>(py)?;
44507 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	174 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: 44506 diff changeset	175 };
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	176
49374 455fce57e89e rust: don't swallow valuable error information Rapha?l Gom?s <rgomes@octobus.net> parents: 48269 diff changeset	177 let prefix = NodePrefix::from_hex(&node_as_string)
455fce57e89e rust: don't swallow valuable error information Rapha?l Gom?s <rgomes@octobus.net> parents: 48269 diff changeset	178 .map_err(\|_\| PyErr::new::<ValueError, _>(
455fce57e89e rust: don't swallow valuable error information Rapha?l Gom?s <rgomes@octobus.net> parents: 48269 diff changeset	179 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: 48269 diff changeset	180 )?;
46432 18a261b11b20 rust: Remove hex parsing from the nodemap Simon Sapin <simon.sapin@octobus.net> parents: 46431 diff changeset	181
48269 aa88fb60ecb4 rust-nodemap: backed out mitigation for issue 6554 Georges Racinet <georges.racinet@octobus.net> parents: 47799 diff changeset	182 nt.find_bin(idx, prefix)
aa88fb60ecb4 rust-nodemap: backed out mitigation for issue 6554 Georges Racinet <georges.racinet@octobus.net> parents: 47799 diff changeset	183 // 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: 47799 diff changeset	184 .map(\|opt\| opt.map(
aa88fb60ecb4 rust-nodemap: backed out mitigation for issue 6554 Georges Racinet <georges.racinet@octobus.net> parents: 47799 diff changeset	185 \|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: 47799 diff changeset	186 .map_err(\|e\| nodemap_error(py, e))
aa88fb60ecb4 rust-nodemap: backed out mitigation for issue 6554 Georges Racinet <georges.racinet@octobus.net> parents: 47799 diff changeset	187
44507 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	188 }
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	189
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	190 /// 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: 44506 diff changeset	191 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: 44506 diff changeset	192 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: 44506 diff changeset	193 // 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: 44506 diff changeset	194 return Err(
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	195 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: 44506 diff changeset	196 }
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	197 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: 44506 diff changeset	198 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: 44506 diff changeset	199
51190 e79b0a4be3a7 rust-index: check equality between rust and cindex for `__len__` Rapha?l Gom?s <rgomes@octobus.net> parents: 51189 diff changeset	200 let rev = self.len(py)? as BaseRevision;
44507 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	201
50976 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50974 diff changeset	202 // This is ok since we will just add the revision to the index
51190 e79b0a4be3a7 rust-index: check equality between rust and cindex for `__len__` Rapha?l Gom?s <rgomes@octobus.net> parents: 51189 diff changeset	203 let rev = Revision(rev);
51189 65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	204 self.index(py)
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	205 .borrow_mut()
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	206 .append(py_tuple_to_revision_data_params(py, tup)?)
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	207 .unwrap();
51243 41e19e8a6133 rust-index: stop using C index Georges Racinet <georges.racinet@octobus.net> parents: 51242 diff changeset	208 let idx = &*self.index(py).borrow();
44507 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	209 self.get_nodetree(py)?.borrow_mut().as_mut().unwrap()
51243 41e19e8a6133 rust-index: stop using C index Georges Racinet <georges.racinet@octobus.net> parents: 51242 diff changeset	210 .insert(idx, &node, rev)
44507 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	211 .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: 44506 diff changeset	212 Ok(py.None())
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	213 }
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	214
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	215 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: 44506 diff changeset	216 // __delitem__ is both for `del idx[r]` and `del idx[r1:r2]`
51192 f6403bcd9f96 rust-index: synchronize remove to Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51191 diff changeset	217 let start = key.getattr(py, "start")?;
f6403bcd9f96 rust-index: synchronize remove to Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51191 diff changeset	218 let start = UncheckedRevision(start.extract(py)?);
f6403bcd9f96 rust-index: synchronize remove to Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51191 diff changeset	219 let start = self.index(py)
f6403bcd9f96 rust-index: synchronize remove to Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51191 diff changeset	220 .borrow()
f6403bcd9f96 rust-index: synchronize remove to Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51191 diff changeset	221 .check_revision(start)
f6403bcd9f96 rust-index: synchronize remove to Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51191 diff changeset	222 .ok_or_else(\|\| {
f6403bcd9f96 rust-index: synchronize remove to Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51191 diff changeset	223 nodemap_error(py, NodeMapError::RevisionNotInIndex(start))
f6403bcd9f96 rust-index: synchronize remove to Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51191 diff changeset	224 })?;
f6403bcd9f96 rust-index: synchronize remove to Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51191 diff changeset	225 self.index(py).borrow_mut().remove(start).unwrap();
44507 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	226 let mut opt = self.get_nodetree(py)?.borrow_mut();
49914 58074252db3c rust: run `cargo clippy` Rapha?l Gom?s <rgomes@octobus.net> parents: 49374 diff changeset	227 let nt = opt.as_mut().unwrap();
44507 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	228 nt.invalidate_all();
49914 58074252db3c rust: run `cargo clippy` Rapha?l Gom?s <rgomes@octobus.net> parents: 49374 diff changeset	229 self.fill_nodemap(py, nt)?;
44507 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	230 Ok(())
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	231 }
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	232
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	233 //
51243 41e19e8a6133 rust-index: stop using C index Georges Racinet <georges.racinet@octobus.net> parents: 51242 diff changeset	234 // Index methods previously reforwarded to C index (tp_methods)
41e19e8a6133 rust-index: stop using C index Georges Racinet <georges.racinet@octobus.net> parents: 51242 diff changeset	235 // Same ordering as in revlog.c
44507 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	236 //
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	237
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	238 /// return the gca set of the given revs
51243 41e19e8a6133 rust-index: stop using C index Georges Racinet <georges.racinet@octobus.net> parents: 51242 diff changeset	239 def ancestors(&self, args, *_kw) -> PyResult<PyObject> {
51222 89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	240 let rust_res = self.inner_ancestors(py, args)?;
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	241 Ok(rust_res)
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	242 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	243
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	244 /// return the heads of the common ancestors of the given revs
51243 41e19e8a6133 rust-index: stop using C index Georges Racinet <georges.racinet@octobus.net> parents: 51242 diff changeset	245 def commonancestorsheads(&self, args, *_kw) -> PyResult<PyObject> {
51222 89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	246 let rust_res = self.inner_commonancestorsheads(py, args)?;
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	247 Ok(rust_res)
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	248 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	249
44511 cadcc8c20860 rust-nodemap: also clear Rust data in `clearcaches` Georges Racinet <georges.racinet@octobus.net> parents: 44510 diff changeset	250 /// 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: 44510 diff changeset	251 /// It is Python's responsibility to call `update_nodemap_data` again.
51243 41e19e8a6133 rust-index: stop using C index Georges Racinet <georges.racinet@octobus.net> parents: 51242 diff changeset	252 def clearcaches(&self) -> PyResult<PyObject> {
44511 cadcc8c20860 rust-nodemap: also clear Rust data in `clearcaches` Georges Racinet <georges.racinet@octobus.net> parents: 44510 diff changeset	253 self.nt(py).borrow_mut().take();
cadcc8c20860 rust-nodemap: also clear Rust data in `clearcaches` Georges Racinet <georges.racinet@octobus.net> parents: 44510 diff changeset	254 self.docket(py).borrow_mut().take();
51183 8ade5e6cdb61 rust-mixed-index: rename variable to make the next change clearer Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	255 self.nodemap_mmap(py).borrow_mut().take();
51231 59183a19954e rust-index: use interior mutability in head revs and caches Georges Racinet on incendie.racinet.fr <georges@racinet.fr> parents: 51230 diff changeset	256 self.index(py).borrow().clear_caches();
51243 41e19e8a6133 rust-index: stop using C index Georges Racinet <georges.racinet@octobus.net> parents: 51242 diff changeset	257 Ok(py.None())
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	258 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	259
47034 0d8ff1f4ab0c revlog: add a `entry_binary` method on index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46974 diff changeset	260 /// return the raw binary string representing a revision
51243 41e19e8a6133 rust-index: stop using C index Georges Racinet <georges.racinet@octobus.net> parents: 51242 diff changeset	261 def entry_binary(&self, args, *_kw) -> PyResult<PyObject> {
51200 7434747343ab rust-index: check that the entry bytes are the same in both indexes Rapha?l Gom?s <rgomes@octobus.net> parents: 51199 diff changeset	262 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: 51199 diff changeset	263 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: 51199 diff changeset	264 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: 51199 diff changeset	265 \|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: 51199 diff changeset	266 .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: 51199 diff changeset	267 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: 51199 diff changeset	268 Ok(rust_res)
47034 0d8ff1f4ab0c revlog: add a `entry_binary` method on index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46974 diff changeset	269 }
0d8ff1f4ab0c revlog: add a `entry_binary` method on index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46974 diff changeset	270
47037 d57386e5c80e revlog: have an explicit "pack_header" method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47034 diff changeset	271 /// return a binary packed version of the header
51243 41e19e8a6133 rust-index: stop using C index Georges Racinet <georges.racinet@octobus.net> parents: 51242 diff changeset	272 def pack_header(&self, args, *_kw) -> PyResult<PyObject> {
51195 51cc12158f97 rust-index: add `pack_header` support Rapha?l Gom?s <rgomes@octobus.net> parents: 51194 diff changeset	273 let rindex = self.index(py).borrow();
51cc12158f97 rust-index: add `pack_header` support Rapha?l Gom?s <rgomes@octobus.net> parents: 51194 diff changeset	274 let packed = rindex.pack_header(args.get_item(py, 0).extract(py)?);
51199 16d477bb0078 rust-index: return variables systematic naming convention Georges Racinet <georges.racinet@octobus.net> parents: 51198 diff changeset	275 let rust_res = PyBytes::new(py, &packed).into_object();
16d477bb0078 rust-index: return variables systematic naming convention Georges Racinet <georges.racinet@octobus.net> parents: 51198 diff changeset	276 Ok(rust_res)
47037 d57386e5c80e revlog: have an explicit "pack_header" method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47034 diff changeset	277 }
d57386e5c80e revlog: have an explicit "pack_header" method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47034 diff changeset	278
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	279 /// compute phases
51243 41e19e8a6133 rust-index: stop using C index Georges Racinet <georges.racinet@octobus.net> parents: 51242 diff changeset	280 def computephasesmapsets(&self, args, *_kw) -> PyResult<PyObject> {
51217 c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	281 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: 51216 diff changeset	282 let rust_res = self.inner_computephasesmapsets(py, py_roots)?;
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	283 Ok(rust_res)
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	284 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	285
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	286 /// reachableroots
51243 41e19e8a6133 rust-index: stop using C index Georges Racinet <georges.racinet@octobus.net> parents: 51242 diff changeset	287 def reachableroots2(&self, args, *_kw) -> PyResult<PyObject> {
51219 fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	288 let rust_res = self.inner_reachableroots2(
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	289 py,
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	290 UncheckedRevision(args.get_item(py, 0).extract(py)?),
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	291 args.get_item(py, 1),
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	292 args.get_item(py, 2),
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	293 args.get_item(py, 3).extract(py)?,
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	294 )?;
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	295 Ok(rust_res)
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	296 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	297
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	298 /// get head revisions
51243 41e19e8a6133 rust-index: stop using C index Georges Racinet <georges.racinet@octobus.net> parents: 51242 diff changeset	299 def headrevs(&self) -> PyResult<PyObject> {
51212 a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51211 diff changeset	300 let rust_res = self.inner_headrevs(py)?;
a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51211 diff changeset	301 Ok(rust_res)
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	302 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	303
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	304 /// get filtered head revisions
51243 41e19e8a6133 rust-index: stop using C index Georges Racinet <georges.racinet@octobus.net> parents: 51242 diff changeset	305 def headrevsfiltered(&self, args, *_kw) -> PyResult<PyObject> {
51213 9f876765cbe2 rust-index: add support for `headrevsfiltered` Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	306 let rust_res = self.inner_headrevsfiltered(py, &args.get_item(py, 0))?;
51214 898674a4dbc7 rust-index: headrevsfiltered() returning Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51213 diff changeset	307 Ok(rust_res)
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	308 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	309
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	310 /// True if the object is a snapshot
51243 41e19e8a6133 rust-index: stop using C index Georges Racinet <georges.racinet@octobus.net> parents: 51242 diff changeset	311 def issnapshot(&self, args, *_kw) -> PyResult<bool> {
51208 b8c89957a6b7 rust-index: add `is_snapshot` method Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	312 let index = self.index(py).borrow();
b8c89957a6b7 rust-index: add `is_snapshot` method Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	313 let result = index
b8c89957a6b7 rust-index: add `is_snapshot` method Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	314 .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: 51207 diff changeset	315 .map_err(\|e\| {
b8c89957a6b7 rust-index: add `is_snapshot` method Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	316 PyErr::new::<cpython::exc::ValueError, _>(py, e.to_string())
b8c89957a6b7 rust-index: add `is_snapshot` method Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	317 })?;
b8c89957a6b7 rust-index: add `is_snapshot` method Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	318 Ok(result)
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	319 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	320
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	321 /// Gather snapshot data in a cache dict
51243 41e19e8a6133 rust-index: stop using C index Georges Racinet <georges.racinet@octobus.net> parents: 51242 diff changeset	322 def findsnapshots(&self, args, *_kw) -> PyResult<PyObject> {
51209 9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	323 let index = self.index(py).borrow();
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	324 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: 51208 diff changeset	325 // 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: 51208 diff changeset	326 // 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: 51208 diff changeset	327 // 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: 51208 diff changeset	328 // caches.
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	329 let c_cache = PyDict::new(py);
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	330 for (k, v) in cache.items(py) {
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	331 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: 51208 diff changeset	332 }
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	333
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	334 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: 51208 diff changeset	335 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: 51208 diff changeset	336 let mut cache_wrapper = PySnapshotsCache{ py, dict: cache };
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	337 index.find_snapshots(
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	338 start_rev,
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	339 end_rev,
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	340 &mut cache_wrapper,
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	341 ).map_err(\|_\| revlog_error(py))?;
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	342 Ok(py.None())
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	343 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	344
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	345 /// determine revisions with deltas to reconstruct fulltext
51243 41e19e8a6133 rust-index: stop using C index Georges Racinet <georges.racinet@octobus.net> parents: 51242 diff changeset	346 def deltachain(&self, args, *_kw) -> PyResult<PyObject> {
51210 62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51209 diff changeset	347 let index = self.index(py).borrow();
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51209 diff changeset	348 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: 51209 diff changeset	349 let stop_rev =
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51209 diff changeset	350 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: 51209 diff changeset	351 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: 51209 diff changeset	352 nodemap_error(py, NodeMapError::RevisionNotInIndex(rev))
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51209 diff changeset	353 })?;
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51209 diff changeset	354 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: 51209 diff changeset	355 let stop_rev = UncheckedRevision(stop_rev);
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51209 diff changeset	356 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: 51209 diff changeset	357 nodemap_error(py, NodeMapError::RevisionNotInIndex(stop_rev))
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51209 diff changeset	358 })?)
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51209 diff changeset	359 } else {None};
51232 456e0fe702e8 rust-index: honour incoming using_general_delta in `deltachain` Georges Racinet on incendie.racinet.fr <georges@racinet.fr> parents: 51231 diff changeset	360 let using_general_delta = args.get_item(py, 2)
456e0fe702e8 rust-index: honour incoming using_general_delta in `deltachain` Georges Racinet on incendie.racinet.fr <georges@racinet.fr> parents: 51231 diff changeset	361 .extract::<Option<u32>>(py)?
456e0fe702e8 rust-index: honour incoming using_general_delta in `deltachain` Georges Racinet on incendie.racinet.fr <georges@racinet.fr> parents: 51231 diff changeset	362 .map(\|i\| i != 0);
456e0fe702e8 rust-index: honour incoming using_general_delta in `deltachain` Georges Racinet on incendie.racinet.fr <georges@racinet.fr> parents: 51231 diff changeset	363 let (chain, stopped) = index.delta_chain(
456e0fe702e8 rust-index: honour incoming using_general_delta in `deltachain` Georges Racinet on incendie.racinet.fr <georges@racinet.fr> parents: 51231 diff changeset	364 rev, stop_rev, using_general_delta
456e0fe702e8 rust-index: honour incoming using_general_delta in `deltachain` Georges Racinet on incendie.racinet.fr <georges@racinet.fr> parents: 51231 diff changeset	365 ).map_err(\|e\| {
51210 62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51209 diff changeset	366 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: 51209 diff changeset	367 })?;
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51209 diff changeset	368
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51209 diff changeset	369 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: 51209 diff changeset	370 Ok(
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51209 diff changeset	371 PyTuple::new(
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51209 diff changeset	372 py,
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51209 diff changeset	373 &[
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51209 diff changeset	374 chain.into_py_object(py).into_object(),
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51209 diff changeset	375 stopped.into_py_object(py).into_object()
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51209 diff changeset	376 ]
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51209 diff changeset	377 ).into_object()
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51209 diff changeset	378 )
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51209 diff changeset	379
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	380 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	381
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	382 /// slice planned chunk read to reach a density threshold
51243 41e19e8a6133 rust-index: stop using C index Georges Racinet <georges.racinet@octobus.net> parents: 51242 diff changeset	383 def slicechunktodensity(&self, args, *_kw) -> PyResult<PyObject> {
51215 0112803e6c01 rust-index: add support for `_slicechunktodensity` Rapha?l Gom?s <rgomes@octobus.net> parents: 51214 diff changeset	384 let rust_res = self.inner_slicechunktodensity(
0112803e6c01 rust-index: add support for `_slicechunktodensity` Rapha?l Gom?s <rgomes@octobus.net> parents: 51214 diff changeset	385 py,
0112803e6c01 rust-index: add support for `_slicechunktodensity` Rapha?l Gom?s <rgomes@octobus.net> parents: 51214 diff changeset	386 args.get_item(py, 0),
0112803e6c01 rust-index: add support for `_slicechunktodensity` Rapha?l Gom?s <rgomes@octobus.net> parents: 51214 diff changeset	387 args.get_item(py, 1).extract(py)?,
0112803e6c01 rust-index: add support for `_slicechunktodensity` Rapha?l Gom?s <rgomes@octobus.net> parents: 51214 diff changeset	388 args.get_item(py, 2).extract(py)?
0112803e6c01 rust-index: add support for `_slicechunktodensity` Rapha?l Gom?s <rgomes@octobus.net> parents: 51214 diff changeset	389 )?;
51216 8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51215 diff changeset	390 Ok(rust_res)
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	391 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	392
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	393 // index_sequence_methods and index_mapping_methods.
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	394 //
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	395 // 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: 43945 diff changeset	396 // 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: 43945 diff changeset	397 // and index_getitem.
51202 002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	398 // gracinet 2023: this above is no longer true for the pure Rust impl
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	399
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	400 def __len__(&self) -> PyResult<usize> {
51190 e79b0a4be3a7 rust-index: check equality between rust and cindex for `__len__` Rapha?l Gom?s <rgomes@octobus.net> parents: 51189 diff changeset	401 self.len(py)
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	402 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	403
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	404 def __getitem__(&self, key: PyObject) -> PyResult<PyObject> {
51202 002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	405 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: 51201 diff changeset	406 Ok(rust_res)
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	407 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	408
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	409 def __contains__(&self, item: PyObject) -> PyResult<bool> {
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	410 // 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: 43945 diff changeset	411 // 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: 43945 diff changeset	412 // defined in revlog.c
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 49914 diff changeset	413 match item.extract::<i32>(py) {
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	414 Ok(rev) => {
51190 e79b0a4be3a7 rust-index: check equality between rust and cindex for `__len__` Rapha?l Gom?s <rgomes@octobus.net> parents: 51189 diff changeset	415 Ok(rev >= -1 && rev < self.len(py)? as BaseRevision)
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	416 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	417 Err(_) => {
51204 b67cd0d0e976 rust-index: add checks that `__contains__` is synchronized Rapha?l Gom?s <rgomes@octobus.net> parents: 51203 diff changeset	418 let item_bytes: PyBytes = item.extract(py)?;
b67cd0d0e976 rust-index: add checks that `__contains__` is synchronized Rapha?l Gom?s <rgomes@octobus.net> parents: 51203 diff changeset	419 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: 51203 diff changeset	420 Ok(rust_res)
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	421 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	422 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	423 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	424
44508 b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44507 diff changeset	425 def nodemap_data_all(&self) -> PyResult<PyBytes> {
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44507 diff changeset	426 self.inner_nodemap_data_all(py)
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44507 diff changeset	427 }
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44507 diff changeset	428
44509 5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44508 diff changeset	429 def nodemap_data_incremental(&self) -> PyResult<PyObject> {
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44508 diff changeset	430 self.inner_nodemap_data_incremental(py)
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44508 diff changeset	431 }
44510 15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	432 def update_nodemap_data(
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	433 &self,
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	434 docket: PyObject,
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	435 nm_data: PyObject
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	436 ) -> PyResult<PyObject> {
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	437 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: 44509 diff changeset	438 }
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	439
46974 3c9208702db3 revlog: replace revlog._io.size with a new revlog.index.entry_size Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46432 diff changeset	440 @property
3c9208702db3 revlog: replace revlog._io.size with a new revlog.index.entry_size Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46432 diff changeset	441 def entry_size(&self) -> PyResult<PyInt> {
51226 1b23aaf5eb7b rust-index: optimize find_gca_candidates() on less than 8 revisions Georges Racinet <georges.racinet@octobus.net> parents: 51222 diff changeset	442 let rust_res: PyInt = INDEX_ENTRY_SIZE.to_py_object(py);
1b23aaf5eb7b rust-index: optimize find_gca_candidates() on less than 8 revisions Georges Racinet <georges.racinet@octobus.net> parents: 51222 diff changeset	443 Ok(rust_res)
46974 3c9208702db3 revlog: replace revlog._io.size with a new revlog.index.entry_size Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46432 diff changeset	444 }
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	445
47268 9d1a8829f959 revlog: signal which revlog index are compatible with Rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47037 diff changeset	446 @property
9d1a8829f959 revlog: signal which revlog index are compatible with Rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47037 diff changeset	447 def rust_ext_compat(&self) -> PyResult<PyInt> {
51226 1b23aaf5eb7b rust-index: optimize find_gca_candidates() on less than 8 revisions Georges Racinet <georges.racinet@octobus.net> parents: 51222 diff changeset	448 // will be entirely removed when the Rust index yet useful to
1b23aaf5eb7b rust-index: optimize find_gca_candidates() on less than 8 revisions Georges Racinet <georges.racinet@octobus.net> parents: 51222 diff changeset	449 // implement in Rust to detangle things when removing `self.cindex`
1b23aaf5eb7b rust-index: optimize find_gca_candidates() on less than 8 revisions Georges Racinet <georges.racinet@octobus.net> parents: 51222 diff changeset	450 let rust_res: PyInt = 1.to_py_object(py);
1b23aaf5eb7b rust-index: optimize find_gca_candidates() on less than 8 revisions Georges Racinet <georges.racinet@octobus.net> parents: 51222 diff changeset	451 Ok(rust_res)
47268 9d1a8829f959 revlog: signal which revlog index are compatible with Rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47037 diff changeset	452 }
9d1a8829f959 revlog: signal which revlog index are compatible with Rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47037 diff changeset	453
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	454 });
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	455
51184 8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51183 diff changeset	456 /// 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: 51183 diff changeset	457 /// 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: 51183 diff changeset	458 /// 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: 51183 diff changeset	459 /// 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: 51183 diff changeset	460 ///
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51183 diff changeset	461 /// # Safety
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51183 diff changeset	462 ///
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51183 diff changeset	463 /// 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: 51183 diff changeset	464 /// long as the slice.
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51183 diff changeset	465 #[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: 51183 diff changeset	466 unsafe fn mmap_keeparound(
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51183 diff changeset	467 py: Python,
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51183 diff changeset	468 data: PyObject,
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51183 diff changeset	469 ) -> PyResult<(
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51183 diff changeset	470 PyBuffer,
51230 ca81cd96000a rust-index: add Sync bound to all relevant mmap-derived values Rapha?l Gom?s <rgomes@octobus.net> parents: 51229 diff changeset	471 Box<dyn std::ops::Deref<Target = [u8]> + Send + Sync + 'static>,
51184 8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51183 diff changeset	472 )> {
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51183 diff changeset	473 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: 51183 diff changeset	474 let len = buf.item_count();
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51183 diff changeset	475
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51183 diff changeset	476 // 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: 51183 diff changeset	477 let cbuf = buf.buf_ptr();
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51183 diff changeset	478 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: 51183 diff changeset	479 && buf.is_c_contiguous()
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51183 diff changeset	480 && 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: 51183 diff changeset	481 {
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51183 diff changeset	482 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: 51183 diff changeset	483 } else {
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51183 diff changeset	484 return Err(PyErr::new::<ValueError, _>(
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51183 diff changeset	485 py,
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51183 diff changeset	486 "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: 51183 diff changeset	487 .to_string(),
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51183 diff changeset	488 ));
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51183 diff changeset	489 };
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51183 diff changeset	490
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51183 diff changeset	491 Ok((buf, Box::new(bytes)))
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51183 diff changeset	492 }
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51183 diff changeset	493
51189 65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	494 fn py_tuple_to_revision_data_params(
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	495 py: Python,
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	496 tuple: PyTuple,
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	497 ) -> PyResult<RevisionDataParams> {
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	498 if tuple.len(py) < 8 {
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	499 // 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: 51188 diff changeset	500 return Err(PyErr::new::<IndexError, _>(
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	501 py,
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	502 "tuple index out of range",
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	503 ));
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	504 }
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	505 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: 51188 diff changeset	506 let node_id = tuple
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	507 .get_item(py, 7)
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	508 .extract::<PyBytes>(py)?
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	509 .data(py)
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	510 .try_into()
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	511 .unwrap();
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	512 let flags = (offset_or_flags & 0xFFFF) as u16;
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	513 let data_offset = offset_or_flags >> 16;
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	514 Ok(RevisionDataParams {
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	515 flags,
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	516 data_offset,
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	517 data_compressed_length: tuple.get_item(py, 1).extract(py)?,
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	518 data_uncompressed_length: tuple.get_item(py, 2).extract(py)?,
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	519 data_delta_base: tuple.get_item(py, 3).extract(py)?,
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	520 link_rev: tuple.get_item(py, 4).extract(py)?,
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	521 parent_rev_1: tuple.get_item(py, 5).extract(py)?,
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	522 parent_rev_2: tuple.get_item(py, 6).extract(py)?,
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	523 node_id,
51202 002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	524 ..Default::default()
51189 65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	525 })
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	526 }
51202 002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	527 fn revision_data_params_to_py_tuple(
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	528 py: Python,
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	529 params: RevisionDataParams,
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	530 ) -> PyTuple {
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	531 PyTuple::new(
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	532 py,
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	533 &[
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	534 params.data_offset.into_py_object(py).into_object(),
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	535 params
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	536 .data_compressed_length
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	537 .into_py_object(py)
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	538 .into_object(),
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	539 params
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	540 .data_uncompressed_length
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	541 .into_py_object(py)
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	542 .into_object(),
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	543 params.data_delta_base.into_py_object(py).into_object(),
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	544 params.link_rev.into_py_object(py).into_object(),
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	545 params.parent_rev_1.into_py_object(py).into_object(),
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	546 params.parent_rev_2.into_py_object(py).into_object(),
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	547 PyBytes::new(py, &params.node_id)
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	548 .into_py_object(py)
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	549 .into_object(),
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	550 params._sidedata_offset.into_py_object(py).into_object(),
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	551 params
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	552 ._sidedata_compressed_length
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	553 .into_py_object(py)
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	554 .into_object(),
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	555 params
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	556 .data_compression_mode
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	557 .into_py_object(py)
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	558 .into_object(),
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	559 params
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	560 ._sidedata_compression_mode
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	561 .into_py_object(py)
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	562 .into_object(),
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	563 params._rank.into_py_object(py).into_object(),
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	564 ],
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	565 )
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	566 }
51189 65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	567
51209 9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	568 struct PySnapshotsCache<'p> {
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	569 py: Python<'p>,
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	570 dict: PyDict,
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	571 }
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	572
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	573 impl<'p> SnapshotsCache for PySnapshotsCache<'p> {
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	574 fn insert_for(
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	575 &mut self,
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	576 rev: BaseRevision,
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	577 value: BaseRevision,
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	578 ) -> Result<(), RevlogError> {
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	579 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: 51208 diff changeset	580 match self.dict.get_item(self.py, rev) {
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	581 Some(obj) => obj
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	582 .extract::<PySet>(self.py)
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	583 .and_then(\|set\| set.add(self.py, pyvalue)),
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	584 None => PySet::new(self.py, vec![pyvalue])
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	585 .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: 51208 diff changeset	586 }
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	587 .map_err(\|_\| {
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	588 RevlogError::Other(HgError::unsupported(
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	589 "Error in Python caches handling",
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	590 ))
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	591 })
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	592 }
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	593 }
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	594
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	595 impl MixedIndex {
51187 6ec8387eb0be rust-index: pass data down to the Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51184 diff changeset	596 fn new(
6ec8387eb0be rust-index: pass data down to the Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51184 diff changeset	597 py: Python,
6ec8387eb0be rust-index: pass data down to the Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51184 diff changeset	598 cindex: PyObject,
6ec8387eb0be rust-index: pass data down to the Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51184 diff changeset	599 data: PyObject,
51188 13f58ce70299 rust-revlog: teach the revlog opening code to read the repo options Rapha?l Gom?s <rgomes@octobus.net> parents: 51187 diff changeset	600 header: u32,
51187 6ec8387eb0be rust-index: pass data down to the Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51184 diff changeset	601 ) -> PyResult<MixedIndex> {
6ec8387eb0be rust-index: pass data down to the Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51184 diff changeset	602 // 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: 51184 diff changeset	603 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: 51184 diff changeset	604
44503 887d0f921b34 rust-index: moved constructor in separate impl block Georges Racinet <georges.racinet@octobus.net> parents: 44070 diff changeset	605 Self::create_instance(
887d0f921b34 rust-index: moved constructor in separate impl block Georges Racinet <georges.racinet@octobus.net> parents: 44070 diff changeset	606 py,
887d0f921b34 rust-index: moved constructor in separate impl block Georges Racinet <georges.racinet@octobus.net> parents: 44070 diff changeset	607 RefCell::new(cindex::Index::new(py, cindex)?),
51236 7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	608 hg::index::Index::new(
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	609 bytes,
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	610 IndexHeader::parse(&header.to_be_bytes())
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	611 .expect("default header is broken")
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	612 .unwrap(),
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	613 )
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	614 .map_err(\|e\| {
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	615 revlog_error_with_msg(py, e.to_string().as_bytes())
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	616 })?,
44507 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	617 RefCell::new(None),
44509 5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44508 diff changeset	618 RefCell::new(None),
44510 15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	619 RefCell::new(None),
51187 6ec8387eb0be rust-index: pass data down to the Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51184 diff changeset	620 RefCell::new(Some(buf)),
44503 887d0f921b34 rust-index: moved constructor in separate impl block Georges Racinet <georges.racinet@octobus.net> parents: 44070 diff changeset	621 )
887d0f921b34 rust-index: moved constructor in separate impl block Georges Racinet <georges.racinet@octobus.net> parents: 44070 diff changeset	622 }
887d0f921b34 rust-index: moved constructor in separate impl block Georges Racinet <georges.racinet@octobus.net> parents: 44070 diff changeset	623
51190 e79b0a4be3a7 rust-index: check equality between rust and cindex for `__len__` Rapha?l Gom?s <rgomes@octobus.net> parents: 51189 diff changeset	624 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: 51189 diff changeset	625 let rust_index_len = self.index(py).borrow().len();
51226 1b23aaf5eb7b rust-index: optimize find_gca_candidates() on less than 8 revisions Georges Racinet <georges.racinet@octobus.net> parents: 51222 diff changeset	626 Ok(rust_index_len)
51190 e79b0a4be3a7 rust-index: check equality between rust and cindex for `__len__` Rapha?l Gom?s <rgomes@octobus.net> parents: 51189 diff changeset	627 }
e79b0a4be3a7 rust-index: check equality between rust and cindex for `__len__` Rapha?l Gom?s <rgomes@octobus.net> parents: 51189 diff changeset	628
44507 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	629 /// 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: 44506 diff changeset	630 /// 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: 44506 diff changeset	631 /// vacuum / repack operation
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	632 fn fill_nodemap(
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	633 &self,
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	634 py: Python,
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	635 nt: &mut NodeTree,
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	636 ) -> PyResult<PyObject> {
51203 952e3cd7568f rust-index: using the Rust index in nodemap updating methods Georges Racinet <georges.racinet@octobus.net> parents: 51202 diff changeset	637 let index = self.index(py).borrow();
51190 e79b0a4be3a7 rust-index: check equality between rust and cindex for `__len__` Rapha?l Gom?s <rgomes@octobus.net> parents: 51189 diff changeset	638 for r in 0..self.len(py)? {
50976 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50974 diff changeset	639 let rev = Revision(r as BaseRevision);
44507 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	640 // 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: 44506 diff changeset	641 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: 44506 diff changeset	642 .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: 44506 diff changeset	643 }
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	644 Ok(py.None())
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	645 }
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	646
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	647 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: 44506 diff changeset	648 &'a self,
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	649 py: Python<'a>,
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	650 ) -> 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: 44506 diff changeset	651 if self.nt(py).borrow().is_none() {
51117 532e74ad3ff6 rust: run a clippy pass with the latest stable version Rapha?l Gom?s <rgomes@octobus.net> parents: 50976 diff changeset	652 let readonly = Box::<Vec<_>>::default();
44507 857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	653 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: 44506 diff changeset	654 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: 44506 diff changeset	655 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: 44506 diff changeset	656 }
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	657 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: 44506 diff changeset	658 }
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	659
44010 2728fcb8127c rust-index: make it possible to clone the struct referencing the C index Georges Racinet <georges.racinet@octobus.net> parents: 43961 diff changeset	660 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: 43961 diff changeset	661 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: 43961 diff changeset	662 }
44508 b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44507 diff changeset	663
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44507 diff changeset	664 /// 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: 44507 diff changeset	665 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: 44507 diff changeset	666 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: 44507 diff changeset	667 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: 44507 diff changeset	668
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44507 diff changeset	669 // 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: 44507 diff changeset	670 // scratch
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44507 diff changeset	671 let bytes = if readonly.len() > 0 {
51117 532e74ad3ff6 rust: run a clippy pass with the latest stable version Rapha?l Gom?s <rgomes@octobus.net> parents: 50976 diff changeset	672 let mut nt = NodeTree::load_bytes(Box::<Vec<_>>::default(), 0);
44508 b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44507 diff changeset	673 self.fill_nodemap(py, &mut nt)?;
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44507 diff changeset	674
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44507 diff changeset	675 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: 44507 diff changeset	676 assert_eq!(readonly.len(), 0);
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44507 diff changeset	677
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44507 diff changeset	678 bytes
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44507 diff changeset	679 } else {
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44507 diff changeset	680 bytes
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44507 diff changeset	681 };
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44507 diff changeset	682
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44507 diff changeset	683 let bytes = PyBytes::new(py, &bytes);
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44507 diff changeset	684 Ok(bytes)
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44507 diff changeset	685 }
44509 5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44508 diff changeset	686
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44508 diff changeset	687 /// 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: 44508 diff changeset	688 /// (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: 44508 diff changeset	689 fn inner_nodemap_data_incremental(
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44508 diff changeset	690 &self,
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44508 diff changeset	691 py: Python,
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44508 diff changeset	692 ) -> PyResult<PyObject> {
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44508 diff changeset	693 let docket = self.docket(py).borrow();
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44508 diff changeset	694 let docket = match docket.as_ref() {
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44508 diff changeset	695 Some(d) => d,
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44508 diff changeset	696 None => return Ok(py.None()),
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44508 diff changeset	697 };
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44508 diff changeset	698
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44508 diff changeset	699 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: 44508 diff changeset	700 let masked_blocks = node_tree.masked_readonly_blocks();
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44508 diff changeset	701 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: 44508 diff changeset	702 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: 44508 diff changeset	703
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44508 diff changeset	704 Ok((docket, changed, PyBytes::new(py, &data))
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44508 diff changeset	705 .to_py_object(py)
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44508 diff changeset	706 .into_object())
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44508 diff changeset	707 }
44510 15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	708
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	709 /// Update the nodemap from the new (mmaped) data.
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	710 /// 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: 44509 diff changeset	711 fn inner_update_nodemap_data(
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	712 &self,
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	713 py: Python,
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	714 docket: PyObject,
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	715 nm_data: PyObject,
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	716 ) -> PyResult<PyObject> {
51184 8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51183 diff changeset	717 // 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: 51183 diff changeset	718 let (buf, bytes) = unsafe { mmap_keeparound(py, nm_data)? };
44510 15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	719 let len = buf.item_count();
51183 8ade5e6cdb61 rust-mixed-index: rename variable to make the next change clearer Rapha?l Gom?s <rgomes@octobus.net> parents: 51117 diff changeset	720 self.nodemap_mmap(py).borrow_mut().replace(buf);
44510 15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	721
51184 8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51183 diff changeset	722 let mut nt = NodeTree::load_bytes(bytes, len);
44510 15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	723
50976 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50974 diff changeset	724 let data_tip = docket
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50974 diff changeset	725 .getattr(py, "tip_rev")?
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50974 diff changeset	726 .extract::<BaseRevision>(py)?
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50974 diff changeset	727 .into();
44510 15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	728 self.docket(py).borrow_mut().replace(docket.clone_ref(py));
51203 952e3cd7568f rust-index: using the Rust index in nodemap updating methods Georges Racinet <georges.racinet@octobus.net> parents: 51202 diff changeset	729 let idx = self.index(py).borrow();
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 49914 diff changeset	730 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: 49914 diff changeset	731 nodemap_error(py, NodeMapError::RevisionNotInIndex(data_tip))
1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 49914 diff changeset	732 })?;
44510 15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	733 let current_tip = idx.len();
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	734
50976 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50974 diff changeset	735 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: 50974 diff changeset	736 let rev = Revision(r);
44510 15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	737 // 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: 44509 diff changeset	738 nt.insert(&*idx, idx.node(rev).unwrap(), rev)
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	739 .map_err(\|e\| nodemap_error(py, e))?
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	740 }
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	741
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	742 *self.nt(py).borrow_mut() = Some(nt);
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	743
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	744 Ok(py.None())
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	745 }
51202 002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	746
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	747 fn inner_getitem(&self, py: Python, key: PyObject) -> PyResult<PyObject> {
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	748 let idx = self.index(py).borrow();
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	749 Ok(match key.extract::<BaseRevision>(py) {
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	750 Ok(key_as_int) => {
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	751 let entry_params = if key_as_int == NULL_REVISION.0 {
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	752 RevisionDataParams::default()
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	753 } else {
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	754 let rev = UncheckedRevision(key_as_int);
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	755 match idx.entry_as_params(rev) {
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	756 Some(e) => e,
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	757 None => {
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	758 return Err(PyErr::new::<IndexError, _>(
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	759 py,
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	760 "revlog index out of range",
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	761 ));
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	762 }
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	763 }
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	764 };
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	765 revision_data_params_to_py_tuple(py, entry_params)
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	766 .into_object()
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	767 }
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	768 _ => 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: 51201 diff changeset	769 \|\| py.None(),
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	770 \|py_rev\| py_rev.into_py_object(py).into_object(),
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	771 ),
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	772 })
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	773 }
51212 a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51211 diff changeset	774
a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51211 diff changeset	775 fn inner_headrevs(&self, py: Python) -> PyResult<PyObject> {
51231 59183a19954e rust-index: use interior mutability in head revs and caches Georges Racinet on incendie.racinet.fr <georges@racinet.fr> parents: 51230 diff changeset	776 let index = &*self.index(py).borrow();
51212 a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51211 diff changeset	777 let as_vec: Vec<PyObject> = index
a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51211 diff changeset	778 .head_revs()
a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51211 diff changeset	779 .map_err(\|e\| graph_error(py, e))?
a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51211 diff changeset	780 .iter()
a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51211 diff changeset	781 .map(\|r\| PyRevision::from(*r).into_py_object(py).into_object())
a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51211 diff changeset	782 .collect();
a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51211 diff changeset	783 Ok(PyList::new(py, &as_vec).into_object())
a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51211 diff changeset	784 }
51213 9f876765cbe2 rust-index: add support for `headrevsfiltered` Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	785
9f876765cbe2 rust-index: add support for `headrevsfiltered` Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	786 fn inner_headrevsfiltered(
9f876765cbe2 rust-index: add support for `headrevsfiltered` Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	787 &self,
9f876765cbe2 rust-index: add support for `headrevsfiltered` Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	788 py: Python,
9f876765cbe2 rust-index: add support for `headrevsfiltered` Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	789 filtered_revs: &PyObject,
51214 898674a4dbc7 rust-index: headrevsfiltered() returning Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51213 diff changeset	790 ) -> PyResult<PyObject> {
51213 9f876765cbe2 rust-index: add support for `headrevsfiltered` Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	791 let index = &mut *self.index(py).borrow_mut();
9f876765cbe2 rust-index: add support for `headrevsfiltered` Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	792 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: 51212 diff changeset	793
51214 898674a4dbc7 rust-index: headrevsfiltered() returning Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51213 diff changeset	794 let as_vec: Vec<PyObject> = index
51213 9f876765cbe2 rust-index: add support for `headrevsfiltered` Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	795 .head_revs_filtered(&filtered_revs)
51214 898674a4dbc7 rust-index: headrevsfiltered() returning Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51213 diff changeset	796 .map_err(\|e\| graph_error(py, e))?
898674a4dbc7 rust-index: headrevsfiltered() returning Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51213 diff changeset	797 .iter()
898674a4dbc7 rust-index: headrevsfiltered() returning Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51213 diff changeset	798 .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: 51213 diff changeset	799 .collect();
898674a4dbc7 rust-index: headrevsfiltered() returning Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51213 diff changeset	800 Ok(PyList::new(py, &as_vec).into_object())
51213 9f876765cbe2 rust-index: add support for `headrevsfiltered` Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	801 }
51215 0112803e6c01 rust-index: add support for `_slicechunktodensity` Rapha?l Gom?s <rgomes@octobus.net> parents: 51214 diff changeset	802
51222 89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	803 fn inner_ancestors(
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	804 &self,
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	805 py: Python,
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	806 py_revs: &PyTuple,
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	807 ) -> PyResult<PyObject> {
51231 59183a19954e rust-index: use interior mutability in head revs and caches Georges Racinet on incendie.racinet.fr <georges@racinet.fr> parents: 51230 diff changeset	808 let index = &*self.index(py).borrow();
51222 89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	809 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: 51219 diff changeset	810 let as_vec: Vec<_> = index
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	811 .ancestors(&revs)
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	812 .map_err(\|e\| graph_error(py, e))?
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	813 .iter()
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	814 .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: 51219 diff changeset	815 .collect();
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	816 Ok(PyList::new(py, &as_vec).into_object())
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	817 }
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	818
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	819 fn inner_commonancestorsheads(
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	820 &self,
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	821 py: Python,
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	822 py_revs: &PyTuple,
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	823 ) -> PyResult<PyObject> {
51231 59183a19954e rust-index: use interior mutability in head revs and caches Georges Racinet on incendie.racinet.fr <georges@racinet.fr> parents: 51230 diff changeset	824 let index = &*self.index(py).borrow();
51222 89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	825 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: 51219 diff changeset	826 let as_vec: Vec<_> = index
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	827 .common_ancestor_heads(&revs)
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	828 .map_err(\|e\| graph_error(py, e))?
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	829 .iter()
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	830 .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: 51219 diff changeset	831 .collect();
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	832 Ok(PyList::new(py, &as_vec).into_object())
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	833 }
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	834
51217 c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	835 fn inner_computephasesmapsets(
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	836 &self,
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	837 py: Python,
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	838 py_roots: PyDict,
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	839 ) -> PyResult<PyObject> {
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	840 let index = &*self.index(py).borrow();
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	841 let opt = self.get_nodetree(py)?.borrow();
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	842 let nt = opt.as_ref().unwrap();
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	843 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: 51216 diff changeset	844 .items_list(py)
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	845 .iter(py)
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	846 .map(\|r\| {
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	847 let phase = r.get_item(py, 0)?;
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	848 let nodes = r.get_item(py, 1)?;
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	849 // 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: 51216 diff changeset	850 // have access to the nodemap
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	851 let revs: Result<_, _> = nodes
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	852 .iter(py)?
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	853 .map(\|node\| match node?.extract::<PyBytes>(py) {
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	854 Ok(py_bytes) => {
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	855 let node = node_from_py_bytes(py, &py_bytes)?;
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	856 nt.find_bin(index, node.into())
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	857 .map_err(\|e\| nodemap_error(py, e))?
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	858 .ok_or_else(\|\| revlog_error(py))
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	859 }
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	860 Err(e) => Err(e),
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	861 })
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	862 .collect();
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	863 let phase = Phase::try_from(phase.extract::<usize>(py)?)
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	864 .map_err(\|_\| revlog_error(py));
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	865 Ok((phase?, revs?))
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	866 })
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	867 .collect();
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	868 let (len, phase_maps) = index
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	869 .compute_phases_map_sets(roots?)
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	870 .map_err(\|e\| graph_error(py, e))?;
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	871
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	872 // Ugly hack, but temporary
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	873 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: 51216 diff changeset	874 let py_phase_maps = PyDict::new(py);
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	875 for (idx, roots) in phase_maps.iter().enumerate() {
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	876 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: 51216 diff changeset	877 // 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: 51216 diff changeset	878 // 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: 51216 diff changeset	879 // max(len(phase_maps)
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	880 let roots_vec: Vec<PyInt> = roots
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	881 .iter()
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	882 .map(\|r\| PyRevision::from(*r).into_py_object(py))
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	883 .collect();
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	884 py_phase_maps.set_item(
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	885 py,
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	886 phase_num,
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	887 PySet::new(py, roots_vec)?,
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	888 )?;
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	889 }
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	890 Ok(PyTuple::new(
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	891 py,
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	892 &[
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	893 len.into_py_object(py).into_object(),
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	894 py_phase_maps.into_object(),
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	895 ],
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	896 )
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	897 .into_object())
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	898 }
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	899
51215 0112803e6c01 rust-index: add support for `_slicechunktodensity` Rapha?l Gom?s <rgomes@octobus.net> parents: 51214 diff changeset	900 fn inner_slicechunktodensity(
0112803e6c01 rust-index: add support for `_slicechunktodensity` Rapha?l Gom?s <rgomes@octobus.net> parents: 51214 diff changeset	901 &self,
0112803e6c01 rust-index: add support for `_slicechunktodensity` Rapha?l Gom?s <rgomes@octobus.net> parents: 51214 diff changeset	902 py: Python,
0112803e6c01 rust-index: add support for `_slicechunktodensity` Rapha?l Gom?s <rgomes@octobus.net> parents: 51214 diff changeset	903 revs: PyObject,
0112803e6c01 rust-index: add support for `_slicechunktodensity` Rapha?l Gom?s <rgomes@octobus.net> parents: 51214 diff changeset	904 target_density: f64,
0112803e6c01 rust-index: add support for `_slicechunktodensity` Rapha?l Gom?s <rgomes@octobus.net> parents: 51214 diff changeset	905 min_gap_size: usize,
51216 8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51215 diff changeset	906 ) -> PyResult<PyObject> {
51231 59183a19954e rust-index: use interior mutability in head revs and caches Georges Racinet on incendie.racinet.fr <georges@racinet.fr> parents: 51230 diff changeset	907 let index = &*self.index(py).borrow();
51215 0112803e6c01 rust-index: add support for `_slicechunktodensity` Rapha?l Gom?s <rgomes@octobus.net> parents: 51214 diff changeset	908 let revs: Vec<_> = rev_pyiter_collect(py, &revs, index)?;
51216 8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51215 diff changeset	909 let as_nested_vec =
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51215 diff changeset	910 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: 51215 diff changeset	911 let mut res = Vec::with_capacity(as_nested_vec.len());
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51215 diff changeset	912 let mut py_chunk = Vec::new();
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51215 diff changeset	913 for chunk in as_nested_vec {
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51215 diff changeset	914 py_chunk.clear();
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51215 diff changeset	915 py_chunk.reserve_exact(chunk.len());
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51215 diff changeset	916 for rev in chunk {
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51215 diff changeset	917 py_chunk.push(
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51215 diff changeset	918 PyRevision::from(rev).into_py_object(py).into_object(),
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51215 diff changeset	919 );
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51215 diff changeset	920 }
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51215 diff changeset	921 res.push(PyList::new(py, &py_chunk).into_object());
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51215 diff changeset	922 }
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51215 diff changeset	923 // 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: 51215 diff changeset	924 if res.len() == 1 {
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51215 diff changeset	925 Ok(PyTuple::new(py, &res).into_object())
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51215 diff changeset	926 } else {
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51215 diff changeset	927 Ok(PyList::new(py, &res).into_object())
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51215 diff changeset	928 }
51215 0112803e6c01 rust-index: add support for `_slicechunktodensity` Rapha?l Gom?s <rgomes@octobus.net> parents: 51214 diff changeset	929 }
51219 fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	930
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	931 fn inner_reachableroots2(
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	932 &self,
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	933 py: Python,
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	934 min_root: UncheckedRevision,
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	935 heads: PyObject,
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	936 roots: PyObject,
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	937 include_path: bool,
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	938 ) -> PyResult<PyObject> {
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	939 let index = &*self.index(py).borrow();
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	940 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: 51217 diff changeset	941 PyErr::new::<IndexError, _>(py, "head out of range")
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	942 })?;
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	943 let roots: Result<_, _> = roots
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	944 .iter(py)?
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	945 .map(\|r\| {
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	946 r.and_then(\|o\| match o.extract::<PyRevision>(py) {
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	947 Ok(r) => Ok(UncheckedRevision(r.0)),
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	948 Err(e) => Err(e),
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	949 })
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	950 })
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	951 .collect();
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	952 let as_set = index
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	953 .reachable_roots(min_root, heads, roots?, include_path)
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	954 .map_err(\|e\| graph_error(py, e))?;
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	955 let as_vec: Vec<PyObject> = as_set
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	956 .iter()
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	957 .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: 51217 diff changeset	958 .collect();
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	959 Ok(PyList::new(py, &as_vec).into_object())
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	960 }
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	961 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	962
44506 26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	963 fn revlog_error(py: Python) -> PyErr {
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	964 match py
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	965 .import("mercurial.error")
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	966 .and_then(\|m\| m.get(py, "RevlogError"))
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	967 {
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	968 Err(e) => e,
47305 33e7508b0ae9 hg-cpython: fix new occuring TypeError Rapha?l Gom?s <rgomes@octobus.net> parents: 47268 diff changeset	969 Ok(cls) => PyErr::from_instance(
33e7508b0ae9 hg-cpython: fix new occuring TypeError Rapha?l Gom?s <rgomes@octobus.net> parents: 47268 diff changeset	970 py,
33e7508b0ae9 hg-cpython: fix new occuring TypeError Rapha?l Gom?s <rgomes@octobus.net> parents: 47268 diff changeset	971 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: 47268 diff changeset	972 ),
44506 26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	973 }
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	974 }
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	975
51228 5807e3a8865e rust-python-index: don't panic on a corrupted index when calling from Python Rapha?l Gom?s <rgomes@octobus.net> parents: 51226 diff changeset	976 fn revlog_error_with_msg(py: Python, msg: &[u8]) -> PyErr {
5807e3a8865e rust-python-index: don't panic on a corrupted index when calling from Python Rapha?l Gom?s <rgomes@octobus.net> parents: 51226 diff changeset	977 match py
5807e3a8865e rust-python-index: don't panic on a corrupted index when calling from Python Rapha?l Gom?s <rgomes@octobus.net> parents: 51226 diff changeset	978 .import("mercurial.error")
5807e3a8865e rust-python-index: don't panic on a corrupted index when calling from Python Rapha?l Gom?s <rgomes@octobus.net> parents: 51226 diff changeset	979 .and_then(\|m\| m.get(py, "RevlogError"))
5807e3a8865e rust-python-index: don't panic on a corrupted index when calling from Python Rapha?l Gom?s <rgomes@octobus.net> parents: 51226 diff changeset	980 {
5807e3a8865e rust-python-index: don't panic on a corrupted index when calling from Python Rapha?l Gom?s <rgomes@octobus.net> parents: 51226 diff changeset	981 Err(e) => e,
5807e3a8865e rust-python-index: don't panic on a corrupted index when calling from Python Rapha?l Gom?s <rgomes@octobus.net> parents: 51226 diff changeset	982 Ok(cls) => PyErr::from_instance(
5807e3a8865e rust-python-index: don't panic on a corrupted index when calling from Python Rapha?l Gom?s <rgomes@octobus.net> parents: 51226 diff changeset	983 py,
5807e3a8865e rust-python-index: don't panic on a corrupted index when calling from Python Rapha?l Gom?s <rgomes@octobus.net> parents: 51226 diff changeset	984 cls.call(py, (PyBytes::new(py, msg),), None)
5807e3a8865e rust-python-index: don't panic on a corrupted index when calling from Python Rapha?l Gom?s <rgomes@octobus.net> parents: 51226 diff changeset	985 .ok()
5807e3a8865e rust-python-index: don't panic on a corrupted index when calling from Python Rapha?l Gom?s <rgomes@octobus.net> parents: 51226 diff changeset	986 .into_py_object(py),
5807e3a8865e rust-python-index: don't panic on a corrupted index when calling from Python Rapha?l Gom?s <rgomes@octobus.net> parents: 51226 diff changeset	987 ),
5807e3a8865e rust-python-index: don't panic on a corrupted index when calling from Python Rapha?l Gom?s <rgomes@octobus.net> parents: 51226 diff changeset	988 }
5807e3a8865e rust-python-index: don't panic on a corrupted index when calling from Python Rapha?l Gom?s <rgomes@octobus.net> parents: 51226 diff changeset	989 }
5807e3a8865e rust-python-index: don't panic on a corrupted index when calling from Python Rapha?l Gom?s <rgomes@octobus.net> parents: 51226 diff changeset	990
51212 a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51211 diff changeset	991 fn graph_error(py: Python, _err: hg::GraphError) -> PyErr {
a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51211 diff changeset	992 // ParentOutOfRange is currently the only alternative
a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51211 diff changeset	993 // in `hg::GraphError`. The C index always raises this simple ValueError.
a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51211 diff changeset	994 PyErr::new::<ValueError, _>(py, "parent out of range")
a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51211 diff changeset	995 }
a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51211 diff changeset	996
51196 44fbb7dfb563 rust-index: renamed nodemap error function for rev not in index Georges Racinet <georges.racinet@octobus.net> parents: 51195 diff changeset	997 fn nodemap_rev_not_in_index(py: Python, rev: UncheckedRevision) -> PyErr {
44506 26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	998 PyErr::new::<ValueError, _>(
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	999 py,
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	1000 format!(
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	1001 "Inconsistency: Revision {} found in nodemap \
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	1002 is not in revlog index",
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	1003 rev
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	1004 ),
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	1005 )
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	1006 }
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	1007
51197 bc4d83047c6c rust-index: helper for revision not in index not involving nodemap Georges Racinet <georges.racinet@octobus.net> parents: 51196 diff changeset	1008 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: 51196 diff changeset	1009 PyErr::new::<ValueError, _>(
bc4d83047c6c rust-index: helper for revision not in index not involving nodemap Georges Racinet <georges.racinet@octobus.net> parents: 51196 diff changeset	1010 py,
bc4d83047c6c rust-index: helper for revision not in index not involving nodemap Georges Racinet <georges.racinet@octobus.net> parents: 51196 diff changeset	1011 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: 51196 diff changeset	1012 )
bc4d83047c6c rust-index: helper for revision not in index not involving nodemap Georges Racinet <georges.racinet@octobus.net> parents: 51196 diff changeset	1013 }
bc4d83047c6c rust-index: helper for revision not in index not involving nodemap Georges Racinet <georges.racinet@octobus.net> parents: 51196 diff changeset	1014
44506 26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	1015 /// Standard treatment of NodeMapError
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	1016 fn nodemap_error(py: Python, err: NodeMapError) -> PyErr {
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	1017 match err {
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	1018 NodeMapError::MultipleResults => revlog_error(py),
51196 44fbb7dfb563 rust-index: renamed nodemap error function for rev not in index Georges Racinet <georges.racinet@octobus.net> parents: 51195 diff changeset	1019 NodeMapError::RevisionNotInIndex(r) => nodemap_rev_not_in_index(py, r),
44506 26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	1020 }
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	1021 }
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	1022
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	1023 /// 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: 43945 diff changeset	1024 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: 43945 diff changeset	1025 let dotted_name = &format!("{}.revlog", package);
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	1026 let m = PyModule::new(py, dotted_name)?;
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	1027 m.add(py, "__package__", package)?;
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	1028 m.add(py, "__doc__", "RevLog - Rust implementations")?;
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	1029
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	1030 m.add_class::<MixedIndex>(py)?;
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	1031
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	1032 let sys = PyModule::import(py, "sys")?;
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	1033 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: 43945 diff changeset	1034 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: 43945 diff changeset	1035
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	1036 Ok(m)
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	1037 }

Mercurial > public > mercurial-scm > hg

annotate rust/hg-cpython/src/revlog.rs @ 51243:41e19e8a6133