##// END OF EJS Templates
debugmergestate: make templated...
debugmergestate: make templated Our IntelliJ team wants to be able to read the merge state in order to help the user resolve merge conflicts. They had so far been reading file contents from p1() and p2() and their merge base. That is not ideal for several reasons (merge base is not necessarily the "graft base", renames are not handled, commands like `hg update -m` is not handled). It will get especially bad as of my D7827. This patch makes the output s a templated. I haven't bothered to make it complete (e.g. merge driver states are not handled), but it's probably good enough as a start. I've done a web search for "debugmergestate" and I can't find any indication that any tools currently rely on its output. If it turns out that we get bug reports for it once this is released, I won't object to backing this patch out on the stable branch (and then perhaps replace it by a separate command, or put it behind a new flag). The changes in test-backout.t are interesting, in particular this: ``` - other path: foo (node not stored in v1 format) + other path: (node foo) ``` I wonder if that means that we actually read v1 format incorrectly. That seems to be an old format that was switched away from in 2014, so it doesn't matter now anyway. Differential Revision: https://phab.mercurial-scm.org/D8120

File last commit:

r44398:f98f0e3d default
r44880:acbfa31c default
Show More
ancestors.rs
222 lines | 8.2 KiB | application/rls-services+xml | RustLexer
Georges Racinet
rust-cpython: start cpython crate bindings...
r41001 // ancestors.rs
//
// Copyright 2018 Georges Racinet <gracinet@anybox.fr>
//
// This software may be used and distributed according to the terms of the
// GNU General Public License version 2 or any later version.
Georges Racinet
rust-cpython: rustdoc improvements...
r41220 //! Bindings for the `hg::ancestors` module provided by the
Georges Racinet
rust-cpython: start cpython crate bindings...
r41001 //! `hg-core` crate. From Python, this will be seen as `rustext.ancestor`
Georges Racinet
rust-cpython: rustdoc improvements...
r41220 //! and can be used as replacement for the the pure `ancestor` Python module.
//!
//! # Classes visible from Python:
//! - [`LazyAncestors`] is the Rust implementation of
Georges Racinet
rust-cpython: set conversion for MissingAncestors.bases()...
r41279 //! `mercurial.ancestor.lazyancestors`. The only difference is that it is
//! instantiated with a C `parsers.index` instance instead of a parents
//! function.
Georges Racinet
rust-cpython: rustdoc improvements...
r41220 //!
Georges Racinet
rust-cpython: bindings for MissingAncestors...
r41224 //! - [`MissingAncestors`] is the Rust implementation of
//! `mercurial.ancestor.incrementalmissingancestors`.
//!
//! API differences:
//! + it is instantiated with a C `parsers.index`
//! instance instead of a parents function.
//! + `MissingAncestors.bases` is a method returning a tuple instead of
//! a set-valued attribute. We could return a Python set easily if our
//! [PySet PR](https://github.com/dgrunwald/rust-cpython/pull/165)
//! is accepted.
//!
Georges Racinet
rust-cpython: rustdoc improvements...
r41220 //! - [`AncestorsIterator`] is the Rust counterpart of the
Georges Racinet
rust-cpython: set conversion for MissingAncestors.bases()...
r41279 //! `ancestor._lazyancestorsiter` Python generator. From Python, instances of
//! this should be mainly obtained by calling `iter()` on a [`LazyAncestors`]
//! instance.
Georges Racinet
rust-cpython: rustdoc improvements...
r41220 //!
//! [`LazyAncestors`]: struct.LazyAncestors.html
Georges Racinet
rust-cpython: bindings for MissingAncestors...
r41224 //! [`MissingAncestors`]: struct.MissingAncestors.html
Georges Racinet
rust-cpython: rustdoc improvements...
r41220 //! [`AncestorsIterator`]: struct.AncestorsIterator.html
rust-index: add a function to convert PyObject index for hg-core...
r44398 use crate::revlog::pyindex_to_graph;
Raphaël Gomès
rust: switch hg-core and hg-cpython to rust 2018 edition...
r42828 use crate::{
Georges Racinet
rust-cpython: removed now useless py_set() conversion...
r43563 cindex::Index, conversion::rev_pyiter_collect, exceptions::GraphError,
Raphaël Gomès
rust: switch hg-core and hg-cpython to rust 2018 edition...
r42828 };
Georges Racinet
rust-cpython: binding for AncestorsIterator...
r41083 use cpython::{
Georges Racinet
rust-cpython: set conversion for MissingAncestors.bases()...
r41279 ObjectProtocol, PyClone, PyDict, PyList, PyModule, PyObject, PyResult,
Georges Racinet
rust-cpython: moved py_set() utility to conversion module...
r41842 Python, PythonObject, ToPyObject,
Georges Racinet
rust-cpython: binding for AncestorsIterator...
r41083 };
use hg::Revision;
Georges Racinet
rust-cpython: bindings for MissingAncestors...
r41224 use hg::{
AncestorsIterator as CoreIterator, LazyAncestors as CoreLazy,
MissingAncestors as CoreMissing,
};
Georges Racinet
rust-cpython: binding for AncestorsIterator...
r41083 use std::cell::RefCell;
Georges Racinet
rust-cpython: bindings for MissingAncestors...
r41224 use std::collections::HashSet;
Georges Racinet
rust-cpython: binding for AncestorsIterator...
r41083
Georges Racinet
rust-cpython: rustdoc improvements...
r41220 py_class!(pub class AncestorsIterator |py| {
Georges Racinet
rust-cpython: binding for AncestorsIterator...
r41083 data inner: RefCell<Box<CoreIterator<Index>>>;
def __next__(&self) -> PyResult<Option<Revision>> {
match self.inner(py).borrow_mut().next() {
Some(Err(e)) => Err(GraphError::pynew(py, e)),
None => Ok(None),
Some(Ok(r)) => Ok(Some(r)),
}
}
def __contains__(&self, rev: Revision) -> PyResult<bool> {
Georges Racinet
rust-cpython: style consistency leftovers...
r41222 self.inner(py).borrow_mut().contains(rev)
.map_err(|e| GraphError::pynew(py, e))
Georges Racinet
rust-cpython: binding for AncestorsIterator...
r41083 }
def __iter__(&self) -> PyResult<Self> {
Ok(self.clone_ref(py))
}
def __new__(_cls, index: PyObject, initrevs: PyObject, stoprev: Revision,
inclusive: bool) -> PyResult<AncestorsIterator> {
Georges Racinet
rust-cpython: generalised conversion function...
r41223 let initvec: Vec<Revision> = rev_pyiter_collect(py, &initrevs)?;
Georges Racinet
rust-cpython: style consistency leftovers...
r41222 let ait = CoreIterator::new(
rust-index: add a function to convert PyObject index for hg-core...
r44398 pyindex_to_graph(py, index)?,
Georges Racinet
rust-cpython: style consistency leftovers...
r41222 initvec,
stoprev,
inclusive,
)
.map_err(|e| GraphError::pynew(py, e))?;
Georges Racinet
rust-cpython: binding for AncestorsIterator...
r41083 AncestorsIterator::from_inner(py, ait)
}
});
impl AncestorsIterator {
pub fn from_inner(py: Python, ait: CoreIterator<Index>) -> PyResult<Self> {
Self::create_instance(py, RefCell::new(Box::new(ait)))
}
}
Georges Racinet
rust-cpython: start cpython crate bindings...
r41001
Georges Racinet
rust-cpython: rustdoc improvements...
r41220 py_class!(pub class LazyAncestors |py| {
Georges Racinet
rust-cpython: binding for LazyAncestors...
r41149 data inner: RefCell<Box<CoreLazy<Index>>>;
def __contains__(&self, rev: Revision) -> PyResult<bool> {
self.inner(py)
.borrow_mut()
.contains(rev)
.map_err(|e| GraphError::pynew(py, e))
}
def __iter__(&self) -> PyResult<AncestorsIterator> {
AncestorsIterator::from_inner(py, self.inner(py).borrow().iter())
}
def __bool__(&self) -> PyResult<bool> {
Ok(!self.inner(py).borrow().is_empty())
}
def __new__(_cls, index: PyObject, initrevs: PyObject, stoprev: Revision,
inclusive: bool) -> PyResult<Self> {
Georges Racinet
rust-cpython: generalised conversion function...
r41223 let initvec: Vec<Revision> = rev_pyiter_collect(py, &initrevs)?;
Georges Racinet
rust-cpython: binding for LazyAncestors...
r41149
let lazy =
rust-index: add a function to convert PyObject index for hg-core...
r44398 CoreLazy::new(pyindex_to_graph(py, index)?,
initvec, stoprev, inclusive)
Georges Racinet
rust-cpython: binding for LazyAncestors...
r41149 .map_err(|e| GraphError::pynew(py, e))?;
Self::create_instance(py, RefCell::new(Box::new(lazy)))
}
});
Georges Racinet
rust-cpython: bindings for MissingAncestors...
r41224 py_class!(pub class MissingAncestors |py| {
data inner: RefCell<Box<CoreMissing<Index>>>;
def __new__(_cls, index: PyObject, bases: PyObject) -> PyResult<MissingAncestors> {
let bases_vec: Vec<Revision> = rev_pyiter_collect(py, &bases)?;
rust-index: add a function to convert PyObject index for hg-core...
r44398 let inner = CoreMissing::new(pyindex_to_graph(py, index)?, bases_vec);
Georges Racinet
rust-cpython: bindings for MissingAncestors...
r41224 MissingAncestors::create_instance(py, RefCell::new(Box::new(inner)))
}
def hasbases(&self) -> PyResult<bool> {
Ok(self.inner(py).borrow().has_bases())
}
def addbases(&self, bases: PyObject) -> PyResult<PyObject> {
let mut inner = self.inner(py).borrow_mut();
let bases_vec: Vec<Revision> = rev_pyiter_collect(py, &bases)?;
inner.add_bases(bases_vec);
// cpython doc has examples with PyResult<()> but this gives me
// the trait `cpython::ToPyObject` is not implemented for `()`
// so let's return an explicit None
Ok(py.None())
}
Georges Racinet
rust-cpython: removed now useless py_set() conversion...
r43563 def bases(&self) -> PyResult<HashSet<Revision>> {
Ok(self.inner(py).borrow().get_bases().clone())
Georges Racinet
rust-cpython: bindings for MissingAncestors...
r41224 }
Georges Racinet
rust-cpython: removed now useless py_set() conversion...
r43563 def basesheads(&self) -> PyResult<HashSet<Revision>> {
Georges Racinet
rust: MissingAncestors.basesheads()...
r41282 let inner = self.inner(py).borrow();
Georges Racinet
rust-cpython: removed now useless py_set() conversion...
r43563 inner.bases_heads().map_err(|e| GraphError::pynew(py, e))
Georges Racinet
rust: MissingAncestors.basesheads()...
r41282 }
Georges Racinet
rust-cpython: bindings for MissingAncestors...
r41224 def removeancestorsfrom(&self, revs: PyObject) -> PyResult<PyObject> {
let mut inner = self.inner(py).borrow_mut();
// this is very lame: we convert to a Rust set, update it in place
// and then convert back to Python, only to have Python remove the
// excess (thankfully, Python is happy with a list or even an iterator)
// Leads to improve this:
// - have the CoreMissing instead do something emit revisions to
// discard
// - define a trait for sets of revisions in the core and implement
// it for a Python set rewrapped with the GIL marker
let mut revs_pyset: HashSet<Revision> = rev_pyiter_collect(py, &revs)?;
inner.remove_ancestors_from(&mut revs_pyset)
.map_err(|e| GraphError::pynew(py, e))?;
// convert as Python list
let mut remaining_pyint_vec: Vec<PyObject> = Vec::with_capacity(
revs_pyset.len());
for rev in revs_pyset {
remaining_pyint_vec.push(rev.to_py_object(py).into_object());
}
let remaining_pylist = PyList::new(py, remaining_pyint_vec.as_slice());
revs.call_method(py, "intersection_update", (remaining_pylist, ), None)
}
def missingancestors(&self, revs: PyObject) -> PyResult<PyList> {
let mut inner = self.inner(py).borrow_mut();
let revs_vec: Vec<Revision> = rev_pyiter_collect(py, &revs)?;
let missing_vec = match inner.missing_ancestors(revs_vec) {
Ok(missing) => missing,
Err(e) => {
return Err(GraphError::pynew(py, e));
}
};
// convert as Python list
let mut missing_pyint_vec: Vec<PyObject> = Vec::with_capacity(
missing_vec.len());
for rev in missing_vec {
missing_pyint_vec.push(rev.to_py_object(py).into_object());
}
Ok(PyList::new(py, missing_pyint_vec.as_slice()))
}
});
/// Create the module, with __package__ given from parent
Georges Racinet
rust-cpython: start cpython crate bindings...
r41001 pub fn init_module(py: Python, package: &str) -> PyResult<PyModule> {
let dotted_name = &format!("{}.ancestor", package);
let m = PyModule::new(py, dotted_name)?;
m.add(py, "__package__", package)?;
m.add(
py,
"__doc__",
"Generic DAG ancestor algorithms - Rust implementation",
)?;
Georges Racinet
rust-cpython: binding for AncestorsIterator...
r41083 m.add_class::<AncestorsIterator>(py)?;
Georges Racinet
rust-cpython: binding for LazyAncestors...
r41149 m.add_class::<LazyAncestors>(py)?;
Georges Racinet
rust-cpython: bindings for MissingAncestors...
r41224 m.add_class::<MissingAncestors>(py)?;
Georges Racinet
rust-cpython: start cpython crate bindings...
r41001
let sys = PyModule::import(py, "sys")?;
let sys_modules: PyDict = sys.get(py, "modules")?.extract(py)?;
sys_modules.set_item(py, dotted_name, &m)?;
// Example C code (see pyexpat.c and import.c) will "give away the
// reference", but we won't because it will be consumed once the
// Rust PyObject is dropped.
Ok(m)
}