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

annotate rust/hg-cpython/src/revlog.rs @ 51967:69bfd6b242ed

head-revs: merge the two inner_headrevs? variants Now that there is only one method, it does not make sense to have two different "inner" method. This is especially true as we are about to add another parameter to the method. So we clean up before that.

author	Pierre-Yves David <pierre-yves.david@octobus.net>
date	Fri, 27 Sep 2024 00:55:54 +0200
parents	e5dcaf6d4ac0
children	609700e5d8df

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::{
51219 fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	9 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	10 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	11 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	12 };
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	13 use cpython::{
44510 15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	14 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	15 exc::{IndexError, ValueError},
51245 8b243e2a3bc4 rust-index: a property to identify the Rust index as such Georges Racinet <georges.racinet@octobus.net> parents: 51244 diff changeset	16 ObjectProtocol, PyBool, PyBytes, PyClone, PyDict, PyErr, PyInt, PyList,
8b243e2a3bc4 rust-index: a property to identify the Rust index as such Georges Racinet <georges.racinet@octobus.net> parents: 51244 diff changeset	17 PyModule, PyObject, PyResult, PySet, PyString, PyTuple, Python,
8b243e2a3bc4 rust-index: a property to identify the Rust index as such Georges Racinet <georges.racinet@octobus.net> parents: 51244 diff changeset	18 PythonObject, ToPyObject, UnsafePyLeaked,
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	19 };
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	20 use hg::{
51209 9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	21 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	22 index::{
1b23aaf5eb7b rust-index: optimize find_gca_candidates() on less than 8 revisions Georges Racinet <georges.racinet@octobus.net> parents: 51222 diff changeset	23 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	24 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	25 },
51244 8dbd985733ff rust-cpython-revlog: renamed NodeTree import as CoreNodeTree Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	26 nodemap::{Block, NodeMapError, NodeTree as CoreNodeTree},
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	27 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	28 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	29 };
51217 c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	30 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	31 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	32
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	33 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	34 /// 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	35 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	36 }
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 /// 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	39 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	40 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	41 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	42 ) -> PyResult<UnsafePyLeaked<PySharedIndex>> {
51251 f94c10334bcb rust-index: renamed `MixedIndex` as `Index` Georges Racinet on incendie.racinet.fr <georges@racinet.fr> parents: 51250 diff changeset	43 let midx = index.extract::<Index>(py)?;
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	44 let leaked = midx.index(py).leak_immutable();
51252 24d3298189d7 rust-index: document safety invariants being upheld for every `unsafe` block Rapha?l Gom?s <rgomes@octobus.net> parents: 51251 diff changeset	45 // Safety: we don't leak the "faked" reference out of the `UnsafePyLeaked`
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	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 {
51255 8b89f7cc953a rust-index: allow inlining VCSGraph parents across crates Rapha?l Gom?s <rgomes@octobus.net> parents: 51252 diff changeset	56 #[inline(always)]
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	57 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	58 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	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
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 impl VCSGraph for PySharedIndex {
51255 8b89f7cc953a rust-index: allow inlining VCSGraph parents across crates Rapha?l Gom?s <rgomes@octobus.net> parents: 51252 diff changeset	63 #[inline(always)]
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	64 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	65 &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	66 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	67 ) -> 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	68 {
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 // 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	70 // 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	71 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	72 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	73 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	74 }
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 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	76 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	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 }
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
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 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	83 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	84 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	85 }
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 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	87 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	88 }
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	89 }
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	90
51251 f94c10334bcb rust-index: renamed `MixedIndex` as `Index` Georges Racinet on incendie.racinet.fr <georges@racinet.fr> parents: 51250 diff changeset	91 py_class!(pub class Index \|py\| {
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	92 @shared data index: hg::index::Index;
51244 8dbd985733ff rust-cpython-revlog: renamed NodeTree import as CoreNodeTree Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	93 data nt: RefCell<Option<CoreNodeTree>>;
44509 5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44508 diff changeset	94 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	95 // 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	96 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	97 // 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	98 data index_mmap: RefCell<Option<PyBuffer>>;
51258 9088c6d65ef6 rust-index-cpython: cache the heads' PyList representation Rapha?l Gom?s <rgomes@octobus.net> parents: 51255 diff changeset	99 data head_revs_py_list: RefCell<Option<PyList>>;
51260 5b4995b40db0 rust-index: cache the head nodeids python list Rapha?l Gom?s <rgomes@octobus.net> parents: 51259 diff changeset	100 data head_node_ids_py_list: RefCell<Option<PyList>>;
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	101
51187 6ec8387eb0be rust-index: pass data down to the Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51184 diff changeset	102 def __new__(
6ec8387eb0be rust-index: pass data down to the Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51184 diff changeset	103 _cls,
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	104 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	105 default_header: u32,
51251 f94c10334bcb rust-index: renamed `MixedIndex` as `Index` Georges Racinet on incendie.racinet.fr <georges@racinet.fr> parents: 51250 diff changeset	106 ) -> PyResult<Self> {
51250 96e05f1a99bd rust-index: stop instantiating a C Index Georges Racinet <georges.racinet@octobus.net> parents: 51248 diff changeset	107 Self::new(py, data, default_header)
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	108 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	109
44012 443dc1655923 rust-index: expose a method to retrieve the C index Georges Racinet <georges.racinet@octobus.net> parents: 44011 diff changeset	110 /// 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	111 ///
443dc1655923 rust-index: expose a method to retrieve the C index Georges Racinet <georges.racinet@octobus.net> parents: 44011 diff changeset	112 /// 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	113 /// 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	114 /// 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	115 /// this, by exposing our own standalone nodemap class,
51250 96e05f1a99bd rust-index: stop instantiating a C Index Georges Racinet <georges.racinet@octobus.net> parents: 51248 diff changeset	116 /// ready to accept `Index`.
96e05f1a99bd rust-index: stop instantiating a C Index Georges Racinet <georges.racinet@octobus.net> parents: 51248 diff changeset	117 /* def get_cindex(&self) -> PyResult<PyObject> {
44012 443dc1655923 rust-index: expose a method to retrieve the C index Georges Racinet <georges.racinet@octobus.net> parents: 44011 diff changeset	118 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	119 }
51250 96e05f1a99bd rust-index: stop instantiating a C Index Georges Racinet <georges.racinet@octobus.net> parents: 51248 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 // 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	122
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	123 /// 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	124 /// 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	125 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	126 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	127 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	128 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	129 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	130 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	131 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	132 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	133
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	134 }
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
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 /// 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	137 /// 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	138 ///
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	139 /// 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	140 /// will catch and rewrap with it
50976 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50974 diff changeset	141 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	142 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	143 }
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
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	145 /// 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	146 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	147 // 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	148 // 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	149 // 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	150 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	151 }
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
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 /// 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	154 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	155 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	156 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	157 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	158 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	159 {
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 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	161 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	162 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	163 }
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	164 }
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
48269 aa88fb60ecb4 rust-nodemap: backed out mitigation for issue 6554 Georges Racinet <georges.racinet@octobus.net> parents: 47799 diff changeset	166 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	167 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	168 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	169 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	170
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 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	172 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	173 }
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 else {
48269 aa88fb60ecb4 rust-nodemap: backed out mitigation for issue 6554 Georges Racinet <georges.racinet@octobus.net> parents: 47799 diff changeset	175 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	176 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	177 };
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	178
49374 455fce57e89e rust: don't swallow valuable error information Rapha?l Gom?s <rgomes@octobus.net> parents: 48269 diff changeset	179 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	180 .map_err(\|_\| PyErr::new::<ValueError, _>(
455fce57e89e rust: don't swallow valuable error information Rapha?l Gom?s <rgomes@octobus.net> parents: 48269 diff changeset	181 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	182 )?;
46432 18a261b11b20 rust: Remove hex parsing from the nodemap Simon Sapin <simon.sapin@octobus.net> parents: 46431 diff changeset	183
48269 aa88fb60ecb4 rust-nodemap: backed out mitigation for issue 6554 Georges Racinet <georges.racinet@octobus.net> parents: 47799 diff changeset	184 nt.find_bin(idx, prefix)
aa88fb60ecb4 rust-nodemap: backed out mitigation for issue 6554 Georges Racinet <georges.racinet@octobus.net> parents: 47799 diff changeset	185 // 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	186 .map(\|opt\| opt.map(
aa88fb60ecb4 rust-nodemap: backed out mitigation for issue 6554 Georges Racinet <georges.racinet@octobus.net> parents: 47799 diff changeset	187 \|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	188 .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	189
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	190 }
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
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 /// 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	193 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	194 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	195 // 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	196 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	197 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	198 }
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 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	200 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	201
51190 e79b0a4be3a7 rust-index: check equality between rust and cindex for `__len__` Rapha?l Gom?s <rgomes@octobus.net> parents: 51189 diff changeset	202 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	203
50976 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50974 diff changeset	204 // 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	205 let rev = Revision(rev);
51189 65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	206 self.index(py)
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	207 .borrow_mut()
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	208 .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	209 .unwrap();
51243 41e19e8a6133 rust-index: stop using C index Georges Racinet <georges.racinet@octobus.net> parents: 51242 diff changeset	210 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	211 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	212 .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	213 .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	214 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	215 }
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
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	217 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	218 // __delitem__ is both for `del idx[r]` and `del idx[r1:r2]`
51247 a8ca22119385 rust-index: add support for `del index[r]` Rapha?l Gom?s <rgomes@octobus.net> parents: 51246 diff changeset	219 let start = if let Ok(rev) = key.extract(py) {
a8ca22119385 rust-index: add support for `del index[r]` Rapha?l Gom?s <rgomes@octobus.net> parents: 51246 diff changeset	220 UncheckedRevision(rev)
a8ca22119385 rust-index: add support for `del index[r]` Rapha?l Gom?s <rgomes@octobus.net> parents: 51246 diff changeset	221 } else {
a8ca22119385 rust-index: add support for `del index[r]` Rapha?l Gom?s <rgomes@octobus.net> parents: 51246 diff changeset	222 let start = key.getattr(py, "start")?;
a8ca22119385 rust-index: add support for `del index[r]` Rapha?l Gom?s <rgomes@octobus.net> parents: 51246 diff changeset	223 UncheckedRevision(start.extract(py)?)
a8ca22119385 rust-index: add support for `del index[r]` Rapha?l Gom?s <rgomes@octobus.net> parents: 51246 diff changeset	224 };
51192 f6403bcd9f96 rust-index: synchronize remove to Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51191 diff changeset	225 let start = self.index(py)
f6403bcd9f96 rust-index: synchronize remove to Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51191 diff changeset	226 .borrow()
f6403bcd9f96 rust-index: synchronize remove to Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51191 diff changeset	227 .check_revision(start)
f6403bcd9f96 rust-index: synchronize remove to Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51191 diff changeset	228 .ok_or_else(\|\| {
f6403bcd9f96 rust-index: synchronize remove to Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51191 diff changeset	229 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	230 })?;
f6403bcd9f96 rust-index: synchronize remove to Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51191 diff changeset	231 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	232 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	233 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	234 nt.invalidate_all();
49914 58074252db3c rust: run `cargo clippy` Rapha?l Gom?s <rgomes@octobus.net> parents: 49374 diff changeset	235 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	236 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	237 }
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	238
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	239 //
51243 41e19e8a6133 rust-index: stop using C index Georges Racinet <georges.racinet@octobus.net> parents: 51242 diff changeset	240 // 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	241 // 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	242 //
43961 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 gca set of the given revs
51243 41e19e8a6133 rust-index: stop using C index Georges Racinet <georges.racinet@octobus.net> parents: 51242 diff changeset	245 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	246 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	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
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	250 /// 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	251 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	252 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	253 Ok(rust_res)
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	254 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	255
44511 cadcc8c20860 rust-nodemap: also clear Rust data in `clearcaches` Georges Racinet <georges.racinet@octobus.net> parents: 44510 diff changeset	256 /// 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	257 /// 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	258 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	259 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	260 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	261 self.nodemap_mmap(py).borrow_mut().take();
51258 9088c6d65ef6 rust-index-cpython: cache the heads' PyList representation Rapha?l Gom?s <rgomes@octobus.net> parents: 51255 diff changeset	262 self.head_revs_py_list(py).borrow_mut().take();
51260 5b4995b40db0 rust-index: cache the head nodeids python list Rapha?l Gom?s <rgomes@octobus.net> parents: 51259 diff changeset	263 self.head_node_ids_py_list(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	264 self.index(py).borrow().clear_caches();
51243 41e19e8a6133 rust-index: stop using C index Georges Racinet <georges.racinet@octobus.net> parents: 51242 diff changeset	265 Ok(py.None())
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	266 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	267
47034 0d8ff1f4ab0c revlog: add a `entry_binary` method on index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46974 diff changeset	268 /// 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	269 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	270 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	271 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	272 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	273 \|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	274 .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	275 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	276 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	277 }
0d8ff1f4ab0c revlog: add a `entry_binary` method on index Pierre-Yves David <pierre-yves.david@octobus.net> parents: 46974 diff changeset	278
47037 d57386e5c80e revlog: have an explicit "pack_header" method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47034 diff changeset	279 /// 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	280 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	281 let rindex = self.index(py).borrow();
51cc12158f97 rust-index: add `pack_header` support Rapha?l Gom?s <rgomes@octobus.net> parents: 51194 diff changeset	282 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	283 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	284 Ok(rust_res)
47037 d57386e5c80e revlog: have an explicit "pack_header" method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47034 diff changeset	285 }
d57386e5c80e revlog: have an explicit "pack_header" method Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47034 diff changeset	286
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	287 /// compute phases
51243 41e19e8a6133 rust-index: stop using C index Georges Racinet <georges.racinet@octobus.net> parents: 51242 diff changeset	288 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	289 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	290 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	291 Ok(rust_res)
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	292 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	293
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	294 /// reachableroots
51243 41e19e8a6133 rust-index: stop using C index Georges Racinet <georges.racinet@octobus.net> parents: 51242 diff changeset	295 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	296 let rust_res = self.inner_reachableroots2(
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	297 py,
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	298 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	299 args.get_item(py, 1),
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	300 args.get_item(py, 2),
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	301 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	302 )?;
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	303 Ok(rust_res)
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	304 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	305
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	306 /// get head revisions
51962 fb4d49c52c06 rust-cpython: also accept the `filteredrevs` argument in index.headrevs Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51464 diff changeset	307 def headrevs(&self, args, *_kw) -> PyResult<PyObject> {
fb4d49c52c06 rust-cpython: also accept the `filteredrevs` argument in index.headrevs Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51464 diff changeset	308 let filtered_revs = match &args.len(py) {
fb4d49c52c06 rust-cpython: also accept the `filteredrevs` argument in index.headrevs Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51464 diff changeset	309 0 => Ok(py.None()),
fb4d49c52c06 rust-cpython: also accept the `filteredrevs` argument in index.headrevs Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51464 diff changeset	310 1 => Ok(args.get_item(py, 0)),
fb4d49c52c06 rust-cpython: also accept the `filteredrevs` argument in index.headrevs Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51464 diff changeset	311 _ => Err(PyErr::new::<cpython::exc::TypeError, _>(py, "too many arguments")),
fb4d49c52c06 rust-cpython: also accept the `filteredrevs` argument in index.headrevs Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51464 diff changeset	312 }?;
51967 69bfd6b242ed head-revs: merge the two inner_headrevs? variants Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51966 diff changeset	313 self.inner_headrevs(py, &filtered_revs)
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	314 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	315
51259 f20c4b307a5a rust-index: add fast-path for getting a list of all heads as nodes Rapha?l Gom?s <rgomes@octobus.net> parents: 51258 diff changeset	316 /// get head nodeids
f20c4b307a5a rust-index: add fast-path for getting a list of all heads as nodes Rapha?l Gom?s <rgomes@octobus.net> parents: 51258 diff changeset	317 def head_node_ids(&self) -> PyResult<PyObject> {
f20c4b307a5a rust-index: add fast-path for getting a list of all heads as nodes Rapha?l Gom?s <rgomes@octobus.net> parents: 51258 diff changeset	318 let rust_res = self.inner_head_node_ids(py)?;
f20c4b307a5a rust-index: add fast-path for getting a list of all heads as nodes Rapha?l Gom?s <rgomes@octobus.net> parents: 51258 diff changeset	319 Ok(rust_res)
f20c4b307a5a rust-index: add fast-path for getting a list of all heads as nodes Rapha?l Gom?s <rgomes@octobus.net> parents: 51258 diff changeset	320 }
f20c4b307a5a rust-index: add fast-path for getting a list of all heads as nodes Rapha?l Gom?s <rgomes@octobus.net> parents: 51258 diff changeset	321
51394 b01e7d97e167 revlog: add a Rust implementation of `headrevsdiff` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51260 diff changeset	322 /// get diff in head revisions
b01e7d97e167 revlog: add a Rust implementation of `headrevsdiff` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51260 diff changeset	323 def headrevsdiff(&self, args, *_kw) -> PyResult<PyObject> {
b01e7d97e167 revlog: add a Rust implementation of `headrevsdiff` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51260 diff changeset	324 let rust_res = self.inner_headrevsdiff(
b01e7d97e167 revlog: add a Rust implementation of `headrevsdiff` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51260 diff changeset	325 py,
b01e7d97e167 revlog: add a Rust implementation of `headrevsdiff` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51260 diff changeset	326 &args.get_item(py, 0),
b01e7d97e167 revlog: add a Rust implementation of `headrevsdiff` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51260 diff changeset	327 &args.get_item(py, 1))?;
b01e7d97e167 revlog: add a Rust implementation of `headrevsdiff` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51260 diff changeset	328 Ok(rust_res)
b01e7d97e167 revlog: add a Rust implementation of `headrevsdiff` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51260 diff changeset	329 }
b01e7d97e167 revlog: add a Rust implementation of `headrevsdiff` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51260 diff changeset	330
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	331 /// 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	332 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	333 let index = self.index(py).borrow();
b8c89957a6b7 rust-index: add `is_snapshot` method Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	334 let result = index
b8c89957a6b7 rust-index: add `is_snapshot` method Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	335 .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	336 .map_err(\|e\| {
b8c89957a6b7 rust-index: add `is_snapshot` method Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	337 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	338 })?;
b8c89957a6b7 rust-index: add `is_snapshot` method Rapha?l Gom?s <rgomes@octobus.net> parents: 51207 diff changeset	339 Ok(result)
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	340 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	341
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	342 /// 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	343 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	344 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	345 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	346 // 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	347 // 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	348 // 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	349 // caches.
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	350 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	351 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	352 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	353 }
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	354
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	355 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	356 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	357 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	358 index.find_snapshots(
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	359 start_rev,
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	360 end_rev,
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	361 &mut cache_wrapper,
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	362 ).map_err(\|_\| revlog_error(py))?;
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	363 Ok(py.None())
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	364 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	365
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	366 /// 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	367 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	368 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	369 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	370 let stop_rev =
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51209 diff changeset	371 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	372 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	373 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	374 })?;
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51209 diff changeset	375 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	376 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	377 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	378 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	379 })?)
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51209 diff changeset	380 } 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	381 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	382 .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	383 .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	384 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	385 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	386 ).map_err(\|e\| {
51210 62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51209 diff changeset	387 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	388 })?;
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51209 diff changeset	389
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51209 diff changeset	390 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	391 Ok(
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51209 diff changeset	392 PyTuple::new(
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51209 diff changeset	393 py,
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51209 diff changeset	394 &[
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51209 diff changeset	395 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	396 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	397 ]
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51209 diff changeset	398 ).into_object()
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51209 diff changeset	399 )
62e39bef36ca rust-index: add support for delta-chain computation Rapha?l Gom?s <rgomes@octobus.net> parents: 51209 diff changeset	400
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	401 }
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 /// 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	404 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	405 let rust_res = self.inner_slicechunktodensity(
0112803e6c01 rust-index: add support for `_slicechunktodensity` Rapha?l Gom?s <rgomes@octobus.net> parents: 51214 diff changeset	406 py,
0112803e6c01 rust-index: add support for `_slicechunktodensity` Rapha?l Gom?s <rgomes@octobus.net> parents: 51214 diff changeset	407 args.get_item(py, 0),
0112803e6c01 rust-index: add support for `_slicechunktodensity` Rapha?l Gom?s <rgomes@octobus.net> parents: 51214 diff changeset	408 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	409 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	410 )?;
51216 8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51215 diff changeset	411 Ok(rust_res)
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	412 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	413
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	414 // 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	415 //
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	416 // 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	417 // 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	418 // and index_getitem.
51202 002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	419 // 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	420
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	421 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	422 self.len(py)
43961 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
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	425 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	426 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	427 Ok(rust_res)
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	428 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	429
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	430 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	431 // 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	432 // 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	433 // defined in revlog.c
50974 1928b770e3e7 rust: use the new `UncheckedRevision` everywhere applicable Rapha?l Gom?s <rgomes@octobus.net> parents: 49914 diff changeset	434 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	435 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	436 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	437 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	438 Err(_) => {
51204 b67cd0d0e976 rust-index: add checks that `__contains__` is synchronized Rapha?l Gom?s <rgomes@octobus.net> parents: 51203 diff changeset	439 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	440 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	441 Ok(rust_res)
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	442 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	443 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	444 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	445
44508 b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44507 diff changeset	446 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	447 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	448 }
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44507 diff changeset	449
44509 5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44508 diff changeset	450 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	451 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	452 }
44510 15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	453 def update_nodemap_data(
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	454 &self,
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	455 docket: PyObject,
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	456 nm_data: PyObject
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	457 ) -> PyResult<PyObject> {
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	458 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	459 }
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	460
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	461 @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	462 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	463 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	464 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	465 }
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	466
47268 9d1a8829f959 revlog: signal which revlog index are compatible with Rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47037 diff changeset	467 @property
9d1a8829f959 revlog: signal which revlog index are compatible with Rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47037 diff changeset	468 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	469 // 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	470 // 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	471 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	472 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	473 }
9d1a8829f959 revlog: signal which revlog index are compatible with Rust Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47037 diff changeset	474
51245 8b243e2a3bc4 rust-index: a property to identify the Rust index as such Georges Racinet <georges.racinet@octobus.net> parents: 51244 diff changeset	475 @property
8b243e2a3bc4 rust-index: a property to identify the Rust index as such Georges Racinet <georges.racinet@octobus.net> parents: 51244 diff changeset	476 def is_rust(&self) -> PyResult<PyBool> {
8b243e2a3bc4 rust-index: a property to identify the Rust index as such Georges Racinet <georges.racinet@octobus.net> parents: 51244 diff changeset	477 Ok(false.to_py_object(py))
8b243e2a3bc4 rust-index: a property to identify the Rust index as such Georges Racinet <georges.racinet@octobus.net> parents: 51244 diff changeset	478 }
8b243e2a3bc4 rust-index: a property to identify the Rust index as such Georges Racinet <georges.racinet@octobus.net> parents: 51244 diff changeset	479
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	480 });
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	481
51184 8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51183 diff changeset	482 /// 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	483 /// 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	484 /// 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	485 /// 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	486 ///
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51183 diff changeset	487 /// # Safety
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 /// 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	490 /// 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	491 #[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	492 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	493 py: Python,
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51183 diff changeset	494 data: PyObject,
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51183 diff changeset	495 ) -> PyResult<(
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51183 diff changeset	496 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	497 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	498 )> {
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51183 diff changeset	499 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	500 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	501
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51183 diff changeset	502 // 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	503 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	504 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	505 && 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	506 && 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	507 {
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51183 diff changeset	508 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	509 } else {
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51183 diff changeset	510 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	511 py,
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51183 diff changeset	512 "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	513 .to_string(),
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51183 diff changeset	514 ));
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51183 diff changeset	515 };
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51183 diff changeset	516
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51183 diff changeset	517 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	518 }
8c4e8d06432e rust-mixed-index: move the mmap keepalive into a function Rapha?l Gom?s <rgomes@octobus.net> parents: 51183 diff changeset	519
51189 65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	520 fn py_tuple_to_revision_data_params(
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	521 py: Python,
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	522 tuple: PyTuple,
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	523 ) -> PyResult<RevisionDataParams> {
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	524 if tuple.len(py) < 8 {
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	525 // 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	526 return Err(PyErr::new::<IndexError, _>(
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	527 py,
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	528 "tuple index out of range",
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	529 ));
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	530 }
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	531 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	532 let node_id = tuple
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	533 .get_item(py, 7)
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	534 .extract::<PyBytes>(py)?
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	535 .data(py)
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	536 .try_into()
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	537 .unwrap();
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	538 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	539 let data_offset = offset_or_flags >> 16;
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	540 Ok(RevisionDataParams {
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	541 flags,
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	542 data_offset,
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	543 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	544 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	545 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	546 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	547 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	548 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	549 node_id,
51202 002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	550 ..Default::default()
51189 65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	551 })
65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	552 }
51202 002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	553 fn revision_data_params_to_py_tuple(
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	554 py: Python,
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	555 params: RevisionDataParams,
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	556 ) -> PyTuple {
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	557 PyTuple::new(
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	558 py,
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	559 &[
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	560 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	561 params
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	562 .data_compressed_length
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	563 .into_py_object(py)
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	564 .into_object(),
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	565 params
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	566 .data_uncompressed_length
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	567 .into_py_object(py)
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	568 .into_object(),
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	569 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	570 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	571 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	572 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	573 PyBytes::new(py, &params.node_id)
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	574 .into_py_object(py)
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	575 .into_object(),
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	576 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	577 params
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	578 ._sidedata_compressed_length
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	579 .into_py_object(py)
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	580 .into_object(),
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	581 params
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	582 .data_compression_mode
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	583 .into_py_object(py)
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	584 .into_object(),
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	585 params
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	586 ._sidedata_compression_mode
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	587 .into_py_object(py)
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	588 .into_object(),
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	589 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	590 ],
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	591 )
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	592 }
51189 65c9032e2e5a rust-index: synchronize append method Rapha?l Gom?s <rgomes@octobus.net> parents: 51188 diff changeset	593
51209 9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	594 struct PySnapshotsCache<'p> {
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	595 py: Python<'p>,
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	596 dict: PyDict,
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	597 }
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	598
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	599 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	600 fn insert_for(
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	601 &mut self,
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	602 rev: BaseRevision,
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	603 value: BaseRevision,
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	604 ) -> Result<(), RevlogError> {
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	605 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	606 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	607 Some(obj) => obj
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	608 .extract::<PySet>(self.py)
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	609 .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	610 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	611 .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	612 }
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	613 .map_err(\|_\| {
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	614 RevlogError::Other(HgError::unsupported(
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	615 "Error in Python caches handling",
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	616 ))
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	617 })
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	618 }
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	619 }
9b06e7f32bc5 rust-index: add support for `find_snapshots` Rapha?l Gom?s <rgomes@octobus.net> parents: 51208 diff changeset	620
51251 f94c10334bcb rust-index: renamed `MixedIndex` as `Index` Georges Racinet on incendie.racinet.fr <georges@racinet.fr> parents: 51250 diff changeset	621 impl Index {
f94c10334bcb rust-index: renamed `MixedIndex` as `Index` Georges Racinet on incendie.racinet.fr <georges@racinet.fr> parents: 51250 diff changeset	622 fn new(py: Python, data: PyObject, header: u32) -> PyResult<Self> {
51187 6ec8387eb0be rust-index: pass data down to the Rust index Rapha?l Gom?s <rgomes@octobus.net> parents: 51184 diff changeset	623 // 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	624 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	625
44503 887d0f921b34 rust-index: moved constructor in separate impl block Georges Racinet <georges.racinet@octobus.net> parents: 44070 diff changeset	626 Self::create_instance(
887d0f921b34 rust-index: moved constructor in separate impl block Georges Racinet <georges.racinet@octobus.net> parents: 44070 diff changeset	627 py,
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	628 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	629 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	630 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	631 .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	632 .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	633 )
7eea2e4109ae rust-index: using the `hg::index::Index` in ancestors iterator and lazy set Georges Racinet <georges.racinet@octobus.net> parents: 51232 diff changeset	634 .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	635 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	636 })?,
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	637 RefCell::new(None),
44509 5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44508 diff changeset	638 RefCell::new(None),
44510 15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	639 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	640 RefCell::new(Some(buf)),
51258 9088c6d65ef6 rust-index-cpython: cache the heads' PyList representation Rapha?l Gom?s <rgomes@octobus.net> parents: 51255 diff changeset	641 RefCell::new(None),
51260 5b4995b40db0 rust-index: cache the head nodeids python list Rapha?l Gom?s <rgomes@octobus.net> parents: 51259 diff changeset	642 RefCell::new(None),
44503 887d0f921b34 rust-index: moved constructor in separate impl block Georges Racinet <georges.racinet@octobus.net> parents: 44070 diff changeset	643 )
887d0f921b34 rust-index: moved constructor in separate impl block Georges Racinet <georges.racinet@octobus.net> parents: 44070 diff changeset	644 }
887d0f921b34 rust-index: moved constructor in separate impl block Georges Racinet <georges.racinet@octobus.net> parents: 44070 diff changeset	645
51190 e79b0a4be3a7 rust-index: check equality between rust and cindex for `__len__` Rapha?l Gom?s <rgomes@octobus.net> parents: 51189 diff changeset	646 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	647 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	648 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	649 }
e79b0a4be3a7 rust-index: check equality between rust and cindex for `__len__` Rapha?l Gom?s <rgomes@octobus.net> parents: 51189 diff changeset	650
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	651 /// 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	652 /// 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	653 /// 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	654 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	655 &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	656 py: Python,
51244 8dbd985733ff rust-cpython-revlog: renamed NodeTree import as CoreNodeTree Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	657 nt: &mut CoreNodeTree,
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	658 ) -> PyResult<PyObject> {
51203 952e3cd7568f rust-index: using the Rust index in nodemap updating methods Georges Racinet <georges.racinet@octobus.net> parents: 51202 diff changeset	659 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	660 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	661 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	662 // 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	663 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	664 .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	665 }
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	666 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	667 }
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	668
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	669 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	670 &'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	671 py: Python<'a>,
51244 8dbd985733ff rust-cpython-revlog: renamed NodeTree import as CoreNodeTree Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	672 ) -> PyResult<&'a RefCell<Option<CoreNodeTree>>> {
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	673 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	674 let readonly = Box::<Vec<_>>::default();
51244 8dbd985733ff rust-cpython-revlog: renamed NodeTree import as CoreNodeTree Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	675 let mut nt = CoreNodeTree::load_bytes(readonly, 0);
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	676 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	677 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	678 }
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	679 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	680 }
857cc79247ac rust-nodemap: use proper Index API instead of using the C API Rapha?l Gom?s <rgomes@octobus.net> parents: 44506 diff changeset	681
44508 b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44507 diff changeset	682 /// 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	683 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	684 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	685 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	686
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44507 diff changeset	687 // 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	688 // scratch
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44507 diff changeset	689 let bytes = if readonly.len() > 0 {
51244 8dbd985733ff rust-cpython-revlog: renamed NodeTree import as CoreNodeTree Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	690 let mut nt = CoreNodeTree::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	691 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	692
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44507 diff changeset	693 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	694 assert_eq!(readonly.len(), 0);
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44507 diff changeset	695
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44507 diff changeset	696 bytes
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44507 diff changeset	697 } else {
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44507 diff changeset	698 bytes
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44507 diff changeset	699 };
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44507 diff changeset	700
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44507 diff changeset	701 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	702 Ok(bytes)
b581231ae9d1 rust-nodemap: add binding for `nodemap_data_all` Georges Racinet <georges.racinet@octobus.net> parents: 44507 diff changeset	703 }
44509 5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44508 diff changeset	704
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44508 diff changeset	705 /// 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	706 /// (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	707 fn inner_nodemap_data_incremental(
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44508 diff changeset	708 &self,
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44508 diff changeset	709 py: Python,
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44508 diff changeset	710 ) -> PyResult<PyObject> {
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44508 diff changeset	711 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	712 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	713 Some(d) => d,
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44508 diff changeset	714 None => return Ok(py.None()),
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44508 diff changeset	715 };
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44508 diff changeset	716
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44508 diff changeset	717 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	718 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	719 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	720 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	721
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44508 diff changeset	722 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	723 .to_py_object(py)
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44508 diff changeset	724 .into_object())
5bbf887275b0 rust-nodemap: add binding for `nodemap_data_incremental` Georges Racinet <georges.racinet@octobus.net> parents: 44508 diff changeset	725 }
44510 15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	726
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	727 /// 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	728 /// 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	729 fn inner_update_nodemap_data(
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	730 &self,
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	731 py: Python,
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	732 docket: PyObject,
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	733 nm_data: PyObject,
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	734 ) -> 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	735 // 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	736 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	737 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	738 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	739
51244 8dbd985733ff rust-cpython-revlog: renamed NodeTree import as CoreNodeTree Georges Racinet <georges.racinet@octobus.net> parents: 51243 diff changeset	740 let mut nt = CoreNodeTree::load_bytes(bytes, len);
44510 15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	741
50976 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50974 diff changeset	742 let data_tip = docket
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50974 diff changeset	743 .getattr(py, "tip_rev")?
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50974 diff changeset	744 .extract::<BaseRevision>(py)?
4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50974 diff changeset	745 .into();
44510 15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	746 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	747 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	748 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	749 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	750 })?;
44510 15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	751 let current_tip = idx.len();
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	752
50976 4c5f6e95df84 rust: make `Revision` a newtype Rapha?l Gom?s <rgomes@octobus.net> parents: 50974 diff changeset	753 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	754 let rev = Revision(r);
44510 15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	755 // 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	756 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	757 .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	758 }
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	759
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	760 *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	761
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	762 Ok(py.None())
15febf99a9c6 rust-nodemap: add binding to `nodemap_update_data` Georges Racinet <georges.racinet@octobus.net> parents: 44509 diff changeset	763 }
51202 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 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	766 let idx = self.index(py).borrow();
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	767 Ok(match key.extract::<BaseRevision>(py) {
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	768 Ok(key_as_int) => {
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	769 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	770 RevisionDataParams::default()
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	771 } else {
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	772 let rev = UncheckedRevision(key_as_int);
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	773 match idx.entry_as_params(rev) {
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	774 Some(e) => e,
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	775 None => {
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	776 return Err(PyErr::new::<IndexError, _>(
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	777 py,
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	778 "revlog index out of range",
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	779 ));
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	780 }
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	781 }
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	782 };
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	783 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	784 .into_object()
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	785 }
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	786 _ => 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	787 \|\| py.None(),
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	788 \|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	789 ),
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	790 })
002b49905aac rust-index: implementation of __getitem__ Rapha?l Gom?s <rgomes@octobus.net> parents: 51201 diff changeset	791 }
51212 a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51211 diff changeset	792
51259 f20c4b307a5a rust-index: add fast-path for getting a list of all heads as nodes Rapha?l Gom?s <rgomes@octobus.net> parents: 51258 diff changeset	793 fn inner_head_node_ids(&self, py: Python) -> PyResult<PyObject> {
f20c4b307a5a rust-index: add fast-path for getting a list of all heads as nodes Rapha?l Gom?s <rgomes@octobus.net> parents: 51258 diff changeset	794 let index = &*self.index(py).borrow();
f20c4b307a5a rust-index: add fast-path for getting a list of all heads as nodes Rapha?l Gom?s <rgomes@octobus.net> parents: 51258 diff changeset	795
f20c4b307a5a rust-index: add fast-path for getting a list of all heads as nodes Rapha?l Gom?s <rgomes@octobus.net> parents: 51258 diff changeset	796 // We don't use the shortcut here, as it's actually slower to loop
f20c4b307a5a rust-index: add fast-path for getting a list of all heads as nodes Rapha?l Gom?s <rgomes@octobus.net> parents: 51258 diff changeset	797 // through the cached `PyList` than to re-do the whole computation for
f20c4b307a5a rust-index: add fast-path for getting a list of all heads as nodes Rapha?l Gom?s <rgomes@octobus.net> parents: 51258 diff changeset	798 // large lists, which are the performance sensitive ones anyway.
f20c4b307a5a rust-index: add fast-path for getting a list of all heads as nodes Rapha?l Gom?s <rgomes@octobus.net> parents: 51258 diff changeset	799 let head_revs = index.head_revs().map_err(\|e\| graph_error(py, e))?;
f20c4b307a5a rust-index: add fast-path for getting a list of all heads as nodes Rapha?l Gom?s <rgomes@octobus.net> parents: 51258 diff changeset	800 let res: Vec<_> = head_revs
f20c4b307a5a rust-index: add fast-path for getting a list of all heads as nodes Rapha?l Gom?s <rgomes@octobus.net> parents: 51258 diff changeset	801 .iter()
f20c4b307a5a rust-index: add fast-path for getting a list of all heads as nodes Rapha?l Gom?s <rgomes@octobus.net> parents: 51258 diff changeset	802 .map(\|r\| {
f20c4b307a5a rust-index: add fast-path for getting a list of all heads as nodes Rapha?l Gom?s <rgomes@octobus.net> parents: 51258 diff changeset	803 PyBytes::new(
f20c4b307a5a rust-index: add fast-path for getting a list of all heads as nodes Rapha?l Gom?s <rgomes@octobus.net> parents: 51258 diff changeset	804 py,
f20c4b307a5a rust-index: add fast-path for getting a list of all heads as nodes Rapha?l Gom?s <rgomes@octobus.net> parents: 51258 diff changeset	805 index
f20c4b307a5a rust-index: add fast-path for getting a list of all heads as nodes Rapha?l Gom?s <rgomes@octobus.net> parents: 51258 diff changeset	806 .node(*r)
f20c4b307a5a rust-index: add fast-path for getting a list of all heads as nodes Rapha?l Gom?s <rgomes@octobus.net> parents: 51258 diff changeset	807 .expect("rev should have been in the index")
f20c4b307a5a rust-index: add fast-path for getting a list of all heads as nodes Rapha?l Gom?s <rgomes@octobus.net> parents: 51258 diff changeset	808 .as_bytes(),
f20c4b307a5a rust-index: add fast-path for getting a list of all heads as nodes Rapha?l Gom?s <rgomes@octobus.net> parents: 51258 diff changeset	809 )
f20c4b307a5a rust-index: add fast-path for getting a list of all heads as nodes Rapha?l Gom?s <rgomes@octobus.net> parents: 51258 diff changeset	810 .into_object()
f20c4b307a5a rust-index: add fast-path for getting a list of all heads as nodes Rapha?l Gom?s <rgomes@octobus.net> parents: 51258 diff changeset	811 })
f20c4b307a5a rust-index: add fast-path for getting a list of all heads as nodes Rapha?l Gom?s <rgomes@octobus.net> parents: 51258 diff changeset	812 .collect();
f20c4b307a5a rust-index: add fast-path for getting a list of all heads as nodes Rapha?l Gom?s <rgomes@octobus.net> parents: 51258 diff changeset	813
51260 5b4995b40db0 rust-index: cache the head nodeids python list Rapha?l Gom?s <rgomes@octobus.net> parents: 51259 diff changeset	814 self.cache_new_heads_py_list(&head_revs, py);
5b4995b40db0 rust-index: cache the head nodeids python list Rapha?l Gom?s <rgomes@octobus.net> parents: 51259 diff changeset	815 self.cache_new_heads_node_ids_py_list(&head_revs, py);
51259 f20c4b307a5a rust-index: add fast-path for getting a list of all heads as nodes Rapha?l Gom?s <rgomes@octobus.net> parents: 51258 diff changeset	816
f20c4b307a5a rust-index: add fast-path for getting a list of all heads as nodes Rapha?l Gom?s <rgomes@octobus.net> parents: 51258 diff changeset	817 Ok(PyList::new(py, &res).into_object())
f20c4b307a5a rust-index: add fast-path for getting a list of all heads as nodes Rapha?l Gom?s <rgomes@octobus.net> parents: 51258 diff changeset	818 }
f20c4b307a5a rust-index: add fast-path for getting a list of all heads as nodes Rapha?l Gom?s <rgomes@octobus.net> parents: 51258 diff changeset	819
51967 69bfd6b242ed head-revs: merge the two inner_headrevs? variants Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51966 diff changeset	820 fn inner_headrevs(
51966 e5dcaf6d4ac0 head-revs: move hg-cpython's inner_headrevsfiltered closer to inner_headrevs Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51964 diff changeset	821 &self,
e5dcaf6d4ac0 head-revs: move hg-cpython's inner_headrevsfiltered closer to inner_headrevs Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51964 diff changeset	822 py: Python,
e5dcaf6d4ac0 head-revs: move hg-cpython's inner_headrevsfiltered closer to inner_headrevs Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51964 diff changeset	823 filtered_revs: &PyObject,
e5dcaf6d4ac0 head-revs: move hg-cpython's inner_headrevsfiltered closer to inner_headrevs Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51964 diff changeset	824 ) -> PyResult<PyObject> {
e5dcaf6d4ac0 head-revs: move hg-cpython's inner_headrevsfiltered closer to inner_headrevs Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51964 diff changeset	825 let index = &*self.index(py).borrow();
e5dcaf6d4ac0 head-revs: move hg-cpython's inner_headrevsfiltered closer to inner_headrevs Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51964 diff changeset	826
51967 69bfd6b242ed head-revs: merge the two inner_headrevs? variants Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51966 diff changeset	827 let from_core = match filtered_revs.is_none(py) {
69bfd6b242ed head-revs: merge the two inner_headrevs? variants Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51966 diff changeset	828 true => index.head_revs_shortcut(),
69bfd6b242ed head-revs: merge the two inner_headrevs? variants Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51966 diff changeset	829 false => {
69bfd6b242ed head-revs: merge the two inner_headrevs? variants Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51966 diff changeset	830 let filtered_revs =
69bfd6b242ed head-revs: merge the two inner_headrevs? variants Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51966 diff changeset	831 rev_pyiter_collect(py, filtered_revs, index)?;
69bfd6b242ed head-revs: merge the two inner_headrevs? variants Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51966 diff changeset	832 index.head_revs_filtered(&filtered_revs, true)
69bfd6b242ed head-revs: merge the two inner_headrevs? variants Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51966 diff changeset	833 }
69bfd6b242ed head-revs: merge the two inner_headrevs? variants Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51966 diff changeset	834 };
69bfd6b242ed head-revs: merge the two inner_headrevs? variants Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51966 diff changeset	835
69bfd6b242ed head-revs: merge the two inner_headrevs? variants Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51966 diff changeset	836 if let Some(new_heads) = from_core.map_err(\|e\| graph_error(py, e))? {
51966 e5dcaf6d4ac0 head-revs: move hg-cpython's inner_headrevsfiltered closer to inner_headrevs Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51964 diff changeset	837 self.cache_new_heads_py_list(&new_heads, py);
e5dcaf6d4ac0 head-revs: move hg-cpython's inner_headrevsfiltered closer to inner_headrevs Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51964 diff changeset	838 }
e5dcaf6d4ac0 head-revs: move hg-cpython's inner_headrevsfiltered closer to inner_headrevs Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51964 diff changeset	839
e5dcaf6d4ac0 head-revs: move hg-cpython's inner_headrevsfiltered closer to inner_headrevs Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51964 diff changeset	840 Ok(self
e5dcaf6d4ac0 head-revs: move hg-cpython's inner_headrevsfiltered closer to inner_headrevs Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51964 diff changeset	841 .head_revs_py_list(py)
e5dcaf6d4ac0 head-revs: move hg-cpython's inner_headrevsfiltered closer to inner_headrevs Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51964 diff changeset	842 .borrow()
e5dcaf6d4ac0 head-revs: move hg-cpython's inner_headrevsfiltered closer to inner_headrevs Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51964 diff changeset	843 .as_ref()
e5dcaf6d4ac0 head-revs: move hg-cpython's inner_headrevsfiltered closer to inner_headrevs Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51964 diff changeset	844 .expect("head revs should be cached")
e5dcaf6d4ac0 head-revs: move hg-cpython's inner_headrevsfiltered closer to inner_headrevs Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51964 diff changeset	845 .clone_ref(py)
e5dcaf6d4ac0 head-revs: move hg-cpython's inner_headrevsfiltered closer to inner_headrevs Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51964 diff changeset	846 .into_object())
e5dcaf6d4ac0 head-revs: move hg-cpython's inner_headrevsfiltered closer to inner_headrevs Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51964 diff changeset	847 }
e5dcaf6d4ac0 head-revs: move hg-cpython's inner_headrevsfiltered closer to inner_headrevs Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51964 diff changeset	848
51394 b01e7d97e167 revlog: add a Rust implementation of `headrevsdiff` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51260 diff changeset	849 fn check_revision(
b01e7d97e167 revlog: add a Rust implementation of `headrevsdiff` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51260 diff changeset	850 index: &hg::index::Index,
b01e7d97e167 revlog: add a Rust implementation of `headrevsdiff` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51260 diff changeset	851 rev: UncheckedRevision,
b01e7d97e167 revlog: add a Rust implementation of `headrevsdiff` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51260 diff changeset	852 py: Python,
b01e7d97e167 revlog: add a Rust implementation of `headrevsdiff` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51260 diff changeset	853 ) -> PyResult<Revision> {
b01e7d97e167 revlog: add a Rust implementation of `headrevsdiff` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51260 diff changeset	854 index
b01e7d97e167 revlog: add a Rust implementation of `headrevsdiff` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51260 diff changeset	855 .check_revision(rev)
b01e7d97e167 revlog: add a Rust implementation of `headrevsdiff` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51260 diff changeset	856 .ok_or_else(\|\| rev_not_in_index(py, rev))
b01e7d97e167 revlog: add a Rust implementation of `headrevsdiff` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51260 diff changeset	857 }
b01e7d97e167 revlog: add a Rust implementation of `headrevsdiff` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51260 diff changeset	858
b01e7d97e167 revlog: add a Rust implementation of `headrevsdiff` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51260 diff changeset	859 fn inner_headrevsdiff(
b01e7d97e167 revlog: add a Rust implementation of `headrevsdiff` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51260 diff changeset	860 &self,
b01e7d97e167 revlog: add a Rust implementation of `headrevsdiff` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51260 diff changeset	861 py: Python,
b01e7d97e167 revlog: add a Rust implementation of `headrevsdiff` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51260 diff changeset	862 begin: &PyObject,
b01e7d97e167 revlog: add a Rust implementation of `headrevsdiff` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51260 diff changeset	863 end: &PyObject,
b01e7d97e167 revlog: add a Rust implementation of `headrevsdiff` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51260 diff changeset	864 ) -> PyResult<PyObject> {
b01e7d97e167 revlog: add a Rust implementation of `headrevsdiff` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51260 diff changeset	865 let begin = begin.extract::<BaseRevision>(py)?;
b01e7d97e167 revlog: add a Rust implementation of `headrevsdiff` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51260 diff changeset	866 let end = end.extract::<BaseRevision>(py)?;
51463 a43a6d4b3be6 rust-index: don't use mutable borrow for head-diff computation Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51423 diff changeset	867 let index = &*self.index(py).borrow();
51394 b01e7d97e167 revlog: add a Rust implementation of `headrevsdiff` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51260 diff changeset	868 let begin =
b01e7d97e167 revlog: add a Rust implementation of `headrevsdiff` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51260 diff changeset	869 Self::check_revision(index, UncheckedRevision(begin - 1), py)?;
b01e7d97e167 revlog: add a Rust implementation of `headrevsdiff` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51260 diff changeset	870 let end = Self::check_revision(index, UncheckedRevision(end - 1), py)?;
b01e7d97e167 revlog: add a Rust implementation of `headrevsdiff` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51260 diff changeset	871 let (removed, added) = index
b01e7d97e167 revlog: add a Rust implementation of `headrevsdiff` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51260 diff changeset	872 .head_revs_diff(begin, end)
b01e7d97e167 revlog: add a Rust implementation of `headrevsdiff` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51260 diff changeset	873 .map_err(\|e\| graph_error(py, e))?;
b01e7d97e167 revlog: add a Rust implementation of `headrevsdiff` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51260 diff changeset	874 let removed: Vec<_> =
b01e7d97e167 revlog: add a Rust implementation of `headrevsdiff` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51260 diff changeset	875 removed.into_iter().map(PyRevision::from).collect();
b01e7d97e167 revlog: add a Rust implementation of `headrevsdiff` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51260 diff changeset	876 let added: Vec<_> = added.into_iter().map(PyRevision::from).collect();
b01e7d97e167 revlog: add a Rust implementation of `headrevsdiff` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51260 diff changeset	877 let res = (removed, added).to_py_object(py).into_object();
b01e7d97e167 revlog: add a Rust implementation of `headrevsdiff` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51260 diff changeset	878 Ok(res)
b01e7d97e167 revlog: add a Rust implementation of `headrevsdiff` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51260 diff changeset	879 }
b01e7d97e167 revlog: add a Rust implementation of `headrevsdiff` Arseniy Alekseyev <aalekseyev@janestreet.com> parents: 51260 diff changeset	880
51260 5b4995b40db0 rust-index: cache the head nodeids python list Rapha?l Gom?s <rgomes@octobus.net> parents: 51259 diff changeset	881 fn cache_new_heads_node_ids_py_list(
5b4995b40db0 rust-index: cache the head nodeids python list Rapha?l Gom?s <rgomes@octobus.net> parents: 51259 diff changeset	882 &self,
5b4995b40db0 rust-index: cache the head nodeids python list Rapha?l Gom?s <rgomes@octobus.net> parents: 51259 diff changeset	883 new_heads: &[Revision],
5b4995b40db0 rust-index: cache the head nodeids python list Rapha?l Gom?s <rgomes@octobus.net> parents: 51259 diff changeset	884 py: Python<'_>,
5b4995b40db0 rust-index: cache the head nodeids python list Rapha?l Gom?s <rgomes@octobus.net> parents: 51259 diff changeset	885 ) -> PyList {
5b4995b40db0 rust-index: cache the head nodeids python list Rapha?l Gom?s <rgomes@octobus.net> parents: 51259 diff changeset	886 let index = self.index(py).borrow();
5b4995b40db0 rust-index: cache the head nodeids python list Rapha?l Gom?s <rgomes@octobus.net> parents: 51259 diff changeset	887 let as_vec: Vec<PyObject> = new_heads
5b4995b40db0 rust-index: cache the head nodeids python list Rapha?l Gom?s <rgomes@octobus.net> parents: 51259 diff changeset	888 .iter()
5b4995b40db0 rust-index: cache the head nodeids python list Rapha?l Gom?s <rgomes@octobus.net> parents: 51259 diff changeset	889 .map(\|r\| {
5b4995b40db0 rust-index: cache the head nodeids python list Rapha?l Gom?s <rgomes@octobus.net> parents: 51259 diff changeset	890 PyBytes::new(
5b4995b40db0 rust-index: cache the head nodeids python list Rapha?l Gom?s <rgomes@octobus.net> parents: 51259 diff changeset	891 py,
5b4995b40db0 rust-index: cache the head nodeids python list Rapha?l Gom?s <rgomes@octobus.net> parents: 51259 diff changeset	892 index
5b4995b40db0 rust-index: cache the head nodeids python list Rapha?l Gom?s <rgomes@octobus.net> parents: 51259 diff changeset	893 .node(*r)
5b4995b40db0 rust-index: cache the head nodeids python list Rapha?l Gom?s <rgomes@octobus.net> parents: 51259 diff changeset	894 .expect("rev should have been in the index")
5b4995b40db0 rust-index: cache the head nodeids python list Rapha?l Gom?s <rgomes@octobus.net> parents: 51259 diff changeset	895 .as_bytes(),
5b4995b40db0 rust-index: cache the head nodeids python list Rapha?l Gom?s <rgomes@octobus.net> parents: 51259 diff changeset	896 )
5b4995b40db0 rust-index: cache the head nodeids python list Rapha?l Gom?s <rgomes@octobus.net> parents: 51259 diff changeset	897 .into_object()
5b4995b40db0 rust-index: cache the head nodeids python list Rapha?l Gom?s <rgomes@octobus.net> parents: 51259 diff changeset	898 })
5b4995b40db0 rust-index: cache the head nodeids python list Rapha?l Gom?s <rgomes@octobus.net> parents: 51259 diff changeset	899 .collect();
5b4995b40db0 rust-index: cache the head nodeids python list Rapha?l Gom?s <rgomes@octobus.net> parents: 51259 diff changeset	900 let new_heads_py_list = PyList::new(py, &as_vec);
5b4995b40db0 rust-index: cache the head nodeids python list Rapha?l Gom?s <rgomes@octobus.net> parents: 51259 diff changeset	901 *self.head_node_ids_py_list(py).borrow_mut() =
5b4995b40db0 rust-index: cache the head nodeids python list Rapha?l Gom?s <rgomes@octobus.net> parents: 51259 diff changeset	902 Some(new_heads_py_list.clone_ref(py));
5b4995b40db0 rust-index: cache the head nodeids python list Rapha?l Gom?s <rgomes@octobus.net> parents: 51259 diff changeset	903 new_heads_py_list
5b4995b40db0 rust-index: cache the head nodeids python list Rapha?l Gom?s <rgomes@octobus.net> parents: 51259 diff changeset	904 }
5b4995b40db0 rust-index: cache the head nodeids python list Rapha?l Gom?s <rgomes@octobus.net> parents: 51259 diff changeset	905
51258 9088c6d65ef6 rust-index-cpython: cache the heads' PyList representation Rapha?l Gom?s <rgomes@octobus.net> parents: 51255 diff changeset	906 fn cache_new_heads_py_list(
9088c6d65ef6 rust-index-cpython: cache the heads' PyList representation Rapha?l Gom?s <rgomes@octobus.net> parents: 51255 diff changeset	907 &self,
51260 5b4995b40db0 rust-index: cache the head nodeids python list Rapha?l Gom?s <rgomes@octobus.net> parents: 51259 diff changeset	908 new_heads: &[Revision],
51258 9088c6d65ef6 rust-index-cpython: cache the heads' PyList representation Rapha?l Gom?s <rgomes@octobus.net> parents: 51255 diff changeset	909 py: Python<'_>,
9088c6d65ef6 rust-index-cpython: cache the heads' PyList representation Rapha?l Gom?s <rgomes@octobus.net> parents: 51255 diff changeset	910 ) -> PyList {
9088c6d65ef6 rust-index-cpython: cache the heads' PyList representation Rapha?l Gom?s <rgomes@octobus.net> parents: 51255 diff changeset	911 let as_vec: Vec<PyObject> = new_heads
51214 898674a4dbc7 rust-index: headrevsfiltered() returning Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51213 diff changeset	912 .iter()
898674a4dbc7 rust-index: headrevsfiltered() returning Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51213 diff changeset	913 .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	914 .collect();
51258 9088c6d65ef6 rust-index-cpython: cache the heads' PyList representation Rapha?l Gom?s <rgomes@octobus.net> parents: 51255 diff changeset	915 let new_heads_py_list = PyList::new(py, &as_vec);
9088c6d65ef6 rust-index-cpython: cache the heads' PyList representation Rapha?l Gom?s <rgomes@octobus.net> parents: 51255 diff changeset	916 *self.head_revs_py_list(py).borrow_mut() =
9088c6d65ef6 rust-index-cpython: cache the heads' PyList representation Rapha?l Gom?s <rgomes@octobus.net> parents: 51255 diff changeset	917 Some(new_heads_py_list.clone_ref(py));
9088c6d65ef6 rust-index-cpython: cache the heads' PyList representation Rapha?l Gom?s <rgomes@octobus.net> parents: 51255 diff changeset	918 new_heads_py_list
51213 9f876765cbe2 rust-index: add support for `headrevsfiltered` Rapha?l Gom?s <rgomes@octobus.net> parents: 51212 diff changeset	919 }
51215 0112803e6c01 rust-index: add support for `_slicechunktodensity` Rapha?l Gom?s <rgomes@octobus.net> parents: 51214 diff changeset	920
51222 89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	921 fn inner_ancestors(
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	922 &self,
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	923 py: Python,
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	924 py_revs: &PyTuple,
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	925 ) -> 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	926 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	927 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	928 let as_vec: Vec<_> = index
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	929 .ancestors(&revs)
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	930 .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	931 .iter()
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	932 .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	933 .collect();
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	934 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	935 }
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	936
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	937 fn inner_commonancestorsheads(
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	938 &self,
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	939 py: Python,
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	940 py_revs: &PyTuple,
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	941 ) -> 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	942 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	943 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	944 let as_vec: Vec<_> = index
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	945 .common_ancestor_heads(&revs)
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	946 .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	947 .iter()
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	948 .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	949 .collect();
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	950 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	951 }
89ce6a49bfeb rust-index: implement common_ancestors_heads() and ancestors() Georges Racinet <georges.racinet@octobus.net> parents: 51219 diff changeset	952
51217 c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	953 fn inner_computephasesmapsets(
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	954 &self,
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	955 py: Python,
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	956 py_roots: PyDict,
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	957 ) -> PyResult<PyObject> {
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	958 let index = &*self.index(py).borrow();
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	959 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	960 .items_list(py)
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	961 .iter(py)
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	962 .map(\|r\| {
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	963 let phase = r.get_item(py, 0)?;
51403 f8bf1a8e9181 phases: keep internal state as rev-num instead of node-id Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51394 diff changeset	964 let revs: Vec<_> =
f8bf1a8e9181 phases: keep internal state as rev-num instead of node-id Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51394 diff changeset	965 rev_pyiter_collect(py, &r.get_item(py, 1)?, index)?;
51217 c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	966 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	967 .map_err(\|_\| revlog_error(py));
51403 f8bf1a8e9181 phases: keep internal state as rev-num instead of node-id Pierre-Yves David <pierre-yves.david@octobus.net> parents: 51394 diff changeset	968 Ok((phase?, revs))
51217 c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	969 })
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	970 .collect();
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	971 let (len, phase_maps) = index
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	972 .compute_phases_map_sets(roots?)
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	973 .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	974
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	975 // Ugly hack, but temporary
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	976 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	977 let py_phase_maps = PyDict::new(py);
51423 3099f1c68afd rust-index: remove one collect when converting back Rapha?l Gom?s <rgomes@octobus.net> parents: 51403 diff changeset	978 for (idx, roots) in phase_maps.into_iter().enumerate() {
51217 c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	979 let phase_num = IDX_TO_PHASE_NUM[idx].into_py_object(py);
51423 3099f1c68afd rust-index: remove one collect when converting back Rapha?l Gom?s <rgomes@octobus.net> parents: 51403 diff changeset	980 // This is a bit faster than collecting into a `Vec` and passing
3099f1c68afd rust-index: remove one collect when converting back Rapha?l Gom?s <rgomes@octobus.net> parents: 51403 diff changeset	981 // it to `PySet::new`.
3099f1c68afd rust-index: remove one collect when converting back Rapha?l Gom?s <rgomes@octobus.net> parents: 51403 diff changeset	982 let set = PySet::empty(py)?;
3099f1c68afd rust-index: remove one collect when converting back Rapha?l Gom?s <rgomes@octobus.net> parents: 51403 diff changeset	983 for rev in roots {
3099f1c68afd rust-index: remove one collect when converting back Rapha?l Gom?s <rgomes@octobus.net> parents: 51403 diff changeset	984 set.add(py, PyRevision::from(rev).into_py_object(py))?;
3099f1c68afd rust-index: remove one collect when converting back Rapha?l Gom?s <rgomes@octobus.net> parents: 51403 diff changeset	985 }
3099f1c68afd rust-index: remove one collect when converting back Rapha?l Gom?s <rgomes@octobus.net> parents: 51403 diff changeset	986 py_phase_maps.set_item(py, phase_num, set)?;
51217 c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	987 }
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	988 Ok(PyTuple::new(
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	989 py,
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	990 &[
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	991 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	992 py_phase_maps.into_object(),
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	993 ],
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	994 )
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	995 .into_object())
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	996 }
c817d9f626d3 rust-index: add support for `computephasesmapsets` Rapha?l Gom?s <rgomes@octobus.net> parents: 51216 diff changeset	997
51215 0112803e6c01 rust-index: add support for `_slicechunktodensity` Rapha?l Gom?s <rgomes@octobus.net> parents: 51214 diff changeset	998 fn inner_slicechunktodensity(
0112803e6c01 rust-index: add support for `_slicechunktodensity` Rapha?l Gom?s <rgomes@octobus.net> parents: 51214 diff changeset	999 &self,
0112803e6c01 rust-index: add support for `_slicechunktodensity` Rapha?l Gom?s <rgomes@octobus.net> parents: 51214 diff changeset	1000 py: Python,
0112803e6c01 rust-index: add support for `_slicechunktodensity` Rapha?l Gom?s <rgomes@octobus.net> parents: 51214 diff changeset	1001 revs: PyObject,
0112803e6c01 rust-index: add support for `_slicechunktodensity` Rapha?l Gom?s <rgomes@octobus.net> parents: 51214 diff changeset	1002 target_density: f64,
0112803e6c01 rust-index: add support for `_slicechunktodensity` Rapha?l Gom?s <rgomes@octobus.net> parents: 51214 diff changeset	1003 min_gap_size: usize,
51216 8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51215 diff changeset	1004 ) -> 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	1005 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	1006 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	1007 let as_nested_vec =
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51215 diff changeset	1008 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	1009 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	1010 let mut py_chunk = Vec::new();
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51215 diff changeset	1011 for chunk in as_nested_vec {
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51215 diff changeset	1012 py_chunk.clear();
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51215 diff changeset	1013 py_chunk.reserve_exact(chunk.len());
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51215 diff changeset	1014 for rev in chunk {
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51215 diff changeset	1015 py_chunk.push(
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51215 diff changeset	1016 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	1017 );
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51215 diff changeset	1018 }
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51215 diff changeset	1019 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	1020 }
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51215 diff changeset	1021 // 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	1022 if res.len() == 1 {
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51215 diff changeset	1023 Ok(PyTuple::new(py, &res).into_object())
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51215 diff changeset	1024 } else {
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51215 diff changeset	1025 Ok(PyList::new(py, &res).into_object())
8cb31833b486 rust-index: slicechunktodensity returns Rust result Georges Racinet <georges.racinet@octobus.net> parents: 51215 diff changeset	1026 }
51215 0112803e6c01 rust-index: add support for `_slicechunktodensity` Rapha?l Gom?s <rgomes@octobus.net> parents: 51214 diff changeset	1027 }
51219 fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	1028
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	1029 fn inner_reachableroots2(
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	1030 &self,
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	1031 py: Python,
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	1032 min_root: UncheckedRevision,
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	1033 heads: PyObject,
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	1034 roots: PyObject,
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	1035 include_path: bool,
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	1036 ) -> PyResult<PyObject> {
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	1037 let index = &*self.index(py).borrow();
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	1038 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	1039 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	1040 })?;
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	1041 let roots: Result<_, _> = roots
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	1042 .iter(py)?
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	1043 .map(\|r\| {
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	1044 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	1045 Ok(r) => Ok(UncheckedRevision(r.0)),
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	1046 Err(e) => Err(e),
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	1047 })
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	1048 })
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	1049 .collect();
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	1050 let as_set = index
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	1051 .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	1052 .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	1053 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	1054 .iter()
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	1055 .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	1056 .collect();
fc05dd74e907 rust-index: add support for `reachableroots2` Rapha?l Gom?s <rgomes@octobus.net> parents: 51217 diff changeset	1057 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	1058 }
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	1059 }
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	1060
51246 2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1061 py_class!(pub class NodeTree \|py\| {
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1062 data nt: RefCell<CoreNodeTree>;
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1063 data index: RefCell<UnsafePyLeaked<PySharedIndex>>;
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1064
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1065 def __new__(_cls, index: PyObject) -> PyResult<NodeTree> {
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1066 let index = py_rust_index_to_graph(py, index)?;
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1067 let nt = CoreNodeTree::default(); // in-RAM, fully mutable
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1068 Self::create_instance(py, RefCell::new(nt), RefCell::new(index))
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1069 }
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1070
51248 0409bd6ba663 rust-revlog: add invalidation detection to `NodeTree` class Georges Racinet <georges.racinet@octobus.net> parents: 51247 diff changeset	1071 /// Tell whether the NodeTree is still valid
0409bd6ba663 rust-revlog: add invalidation detection to `NodeTree` class Georges Racinet <georges.racinet@octobus.net> parents: 51247 diff changeset	1072 ///
0409bd6ba663 rust-revlog: add invalidation detection to `NodeTree` class Georges Racinet <georges.racinet@octobus.net> parents: 51247 diff changeset	1073 /// In case of mutation of the index, the given results are not
0409bd6ba663 rust-revlog: add invalidation detection to `NodeTree` class Georges Racinet <georges.racinet@octobus.net> parents: 51247 diff changeset	1074 /// guaranteed to be correct, and in fact, the methods borrowing
0409bd6ba663 rust-revlog: add invalidation detection to `NodeTree` class Georges Racinet <georges.racinet@octobus.net> parents: 51247 diff changeset	1075 /// the inner index would fail because of `PySharedRef` poisoning
0409bd6ba663 rust-revlog: add invalidation detection to `NodeTree` class Georges Racinet <georges.racinet@octobus.net> parents: 51247 diff changeset	1076 /// (generation-based guard), same as iterating on a `dict` that has
0409bd6ba663 rust-revlog: add invalidation detection to `NodeTree` class Georges Racinet <georges.racinet@octobus.net> parents: 51247 diff changeset	1077 /// been meanwhile mutated.
0409bd6ba663 rust-revlog: add invalidation detection to `NodeTree` class Georges Racinet <georges.racinet@octobus.net> parents: 51247 diff changeset	1078 def is_invalidated(&self) -> PyResult<bool> {
0409bd6ba663 rust-revlog: add invalidation detection to `NodeTree` class Georges Racinet <georges.racinet@octobus.net> parents: 51247 diff changeset	1079 let leaked = self.index(py).borrow();
51252 24d3298189d7 rust-index: document safety invariants being upheld for every `unsafe` block Rapha?l Gom?s <rgomes@octobus.net> parents: 51251 diff changeset	1080 // Safety: we don't leak the "faked" reference out of `UnsafePyLeaked`
51248 0409bd6ba663 rust-revlog: add invalidation detection to `NodeTree` class Georges Racinet <georges.racinet@octobus.net> parents: 51247 diff changeset	1081 let result = unsafe { leaked.try_borrow(py) };
0409bd6ba663 rust-revlog: add invalidation detection to `NodeTree` class Georges Racinet <georges.racinet@octobus.net> parents: 51247 diff changeset	1082 // two cases for result to be an error:
0409bd6ba663 rust-revlog: add invalidation detection to `NodeTree` class Georges Racinet <georges.racinet@octobus.net> parents: 51247 diff changeset	1083 // - the index has previously been mutably borrowed
0409bd6ba663 rust-revlog: add invalidation detection to `NodeTree` class Georges Racinet <georges.racinet@octobus.net> parents: 51247 diff changeset	1084 // - there is currently a mutable borrow
0409bd6ba663 rust-revlog: add invalidation detection to `NodeTree` class Georges Racinet <georges.racinet@octobus.net> parents: 51247 diff changeset	1085 // in both cases this amounts for previous results related to
0409bd6ba663 rust-revlog: add invalidation detection to `NodeTree` class Georges Racinet <georges.racinet@octobus.net> parents: 51247 diff changeset	1086 // the index to still be valid.
0409bd6ba663 rust-revlog: add invalidation detection to `NodeTree` class Georges Racinet <georges.racinet@octobus.net> parents: 51247 diff changeset	1087 Ok(result.is_err())
0409bd6ba663 rust-revlog: add invalidation detection to `NodeTree` class Georges Racinet <georges.racinet@octobus.net> parents: 51247 diff changeset	1088 }
0409bd6ba663 rust-revlog: add invalidation detection to `NodeTree` class Georges Racinet <georges.racinet@octobus.net> parents: 51247 diff changeset	1089
51246 2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1090 def insert(&self, rev: PyRevision) -> PyResult<PyObject> {
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1091 let leaked = self.index(py).borrow();
51252 24d3298189d7 rust-index: document safety invariants being upheld for every `unsafe` block Rapha?l Gom?s <rgomes@octobus.net> parents: 51251 diff changeset	1092 // Safety: we don't leak the "faked" reference out of `UnsafePyLeaked`
51246 2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1093 let index = &*unsafe { leaked.try_borrow(py)? };
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1094
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1095 let rev = UncheckedRevision(rev.0);
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1096 let rev = index
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1097 .check_revision(rev)
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1098 .ok_or_else(\|\| rev_not_in_index(py, rev))?;
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1099 if rev == NULL_REVISION {
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1100 return Err(rev_not_in_index(py, rev.into()))
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1101 }
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1102
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1103 let entry = index.inner.get_entry(rev).unwrap();
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1104 let mut nt = self.nt(py).borrow_mut();
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1105 nt.insert(index, entry.hash(), rev).map_err(\|e\| nodemap_error(py, e))?;
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1106
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1107 Ok(py.None())
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1108 }
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1109
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1110 /// Lookup by node hex prefix in the NodeTree, returning revision number.
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1111 ///
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1112 /// This is not part of the classical NodeTree API, but is good enough
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1113 /// for unit testing, as in `test-rust-revlog.py`.
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1114 def prefix_rev_lookup(
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1115 &self,
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1116 node_prefix: PyBytes
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1117 ) -> PyResult<Option<PyRevision>> {
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1118 let prefix = NodePrefix::from_hex(node_prefix.data(py))
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1119 .map_err(\|_\| PyErr::new::<ValueError, _>(
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1120 py,
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1121 format!("Invalid node or prefix {:?}",
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1122 node_prefix.as_object()))
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1123 )?;
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1124
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1125 let nt = self.nt(py).borrow();
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1126 let leaked = self.index(py).borrow();
51252 24d3298189d7 rust-index: document safety invariants being upheld for every `unsafe` block Rapha?l Gom?s <rgomes@octobus.net> parents: 51251 diff changeset	1127 // Safety: we don't leak the "faked" reference out of `UnsafePyLeaked`
51246 2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1128 let index = &*unsafe { leaked.try_borrow(py)? };
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1129
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1130 Ok(nt.find_bin(index, prefix)
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1131 .map_err(\|e\| nodemap_error(py, e))?
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1132 .map(\|r\| r.into())
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1133 )
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1134 }
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1135
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1136 def shortest(&self, node: PyBytes) -> PyResult<usize> {
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1137 let nt = self.nt(py).borrow();
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1138 let leaked = self.index(py).borrow();
51252 24d3298189d7 rust-index: document safety invariants being upheld for every `unsafe` block Rapha?l Gom?s <rgomes@octobus.net> parents: 51251 diff changeset	1139 // Safety: we don't leak the "faked" reference out of `UnsafePyLeaked`
51246 2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1140 let idx = &*unsafe { leaked.try_borrow(py)? };
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1141 match nt.unique_prefix_len_node(idx, &node_from_py_bytes(py, &node)?)
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1142 {
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1143 Ok(Some(l)) => Ok(l),
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1144 Ok(None) => Err(revlog_error(py)),
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1145 Err(e) => Err(nodemap_error(py, e)),
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1146 }
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1147 }
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1148 });
2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1149
44506 26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	1150 fn revlog_error(py: Python) -> PyErr {
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	1151 match py
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	1152 .import("mercurial.error")
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	1153 .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	1154 {
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	1155 Err(e) => e,
47305 33e7508b0ae9 hg-cpython: fix new occuring TypeError Rapha?l Gom?s <rgomes@octobus.net> parents: 47268 diff changeset	1156 Ok(cls) => PyErr::from_instance(
33e7508b0ae9 hg-cpython: fix new occuring TypeError Rapha?l Gom?s <rgomes@octobus.net> parents: 47268 diff changeset	1157 py,
33e7508b0ae9 hg-cpython: fix new occuring TypeError Rapha?l Gom?s <rgomes@octobus.net> parents: 47268 diff changeset	1158 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	1159 ),
44506 26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	1160 }
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	1161 }
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	1162
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	1163 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	1164 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	1165 .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	1166 .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	1167 {
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	1168 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	1169 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	1170 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	1171 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	1172 .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	1173 .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	1174 ),
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	1175 }
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	1176 }
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	1177
51212 a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51211 diff changeset	1178 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	1179 // ParentOutOfRange is currently the only alternative
a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51211 diff changeset	1180 // 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	1181 PyErr::new::<ValueError, _>(py, "parent out of range")
a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51211 diff changeset	1182 }
a7bba7df9189 rust-index: implement headrevs Rapha?l Gom?s <rgomes@octobus.net> parents: 51211 diff changeset	1183
51196 44fbb7dfb563 rust-index: renamed nodemap error function for rev not in index Georges Racinet <georges.racinet@octobus.net> parents: 51195 diff changeset	1184 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	1185 PyErr::new::<ValueError, _>(
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	1186 py,
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	1187 format!(
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	1188 "Inconsistency: Revision {} found in nodemap \
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	1189 is not in revlog index",
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	1190 rev
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	1191 ),
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	1192 )
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	1193 }
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	1194
51197 bc4d83047c6c rust-index: helper for revision not in index not involving nodemap Georges Racinet <georges.racinet@octobus.net> parents: 51196 diff changeset	1195 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	1196 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	1197 py,
bc4d83047c6c rust-index: helper for revision not in index not involving nodemap Georges Racinet <georges.racinet@octobus.net> parents: 51196 diff changeset	1198 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	1199 )
bc4d83047c6c rust-index: helper for revision not in index not involving nodemap Georges Racinet <georges.racinet@octobus.net> parents: 51196 diff changeset	1200 }
bc4d83047c6c rust-index: helper for revision not in index not involving nodemap Georges Racinet <georges.racinet@octobus.net> parents: 51196 diff changeset	1201
44506 26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	1202 /// Standard treatment of NodeMapError
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	1203 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	1204 match err {
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	1205 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	1206 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	1207 }
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	1208 }
26dd35ac59b8 rust-nodemap: add utils for propagating errors Georges Racinet <georges.racinet@octobus.net> parents: 44503 diff changeset	1209
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	1210 /// 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	1211 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	1212 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	1213 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	1214 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	1215 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	1216
51251 f94c10334bcb rust-index: renamed `MixedIndex` as `Index` Georges Racinet on incendie.racinet.fr <georges@racinet.fr> parents: 51250 diff changeset	1217 m.add_class::<Index>(py)?;
51246 2966b88d4531 rust-revlog: bare minimal NodeTree exposition Georges Racinet <georges.racinet@octobus.net> parents: 51245 diff changeset	1218 m.add_class::<NodeTree>(py)?;
43961 b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	1219
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	1220 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	1221 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	1222 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	1223
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	1224 Ok(m)
b69d5f3a41d0 rust-index: add a struct wrapping the C index Georges Racinet <georges.racinet@octobus.net> parents: 43945 diff changeset	1225 }

Mercurial > public > mercurial-scm > hg

annotate rust/hg-cpython/src/revlog.rs @ 51967:69bfd6b242ed