Patchwork [1,of,2] rust-cpython: binding for headrevs()

login
register
mail settings
Submitter Georges Racinet
Date Jan. 16, 2019, 6:15 p.m.
Message ID <f32e7d90db76879096f2.1547662508@ishtar>
Download mbox | patch
Permalink /patch/37837/
State New
Headers show

Comments

Georges Racinet - Jan. 16, 2019, 6:15 p.m.
# HG changeset patch
# User Georges Racinet <georges.racinet@octobus.net>
# Date 1547141118 -3600
#      Thu Jan 10 18:25:18 2019 +0100
# Node ID f32e7d90db76879096f216f23ebbe75772b0201e
# Parent  1271ca42622ad0677f4f1f02ebd95b3943a7d721
# EXP-Topic revset.predicates
rust-cpython: binding for headrevs()

This uses the core `dagops::retain_heads` to give a Rust implementation
to `mercurial.dagop.headrevs`.

Testing happens for now from `test-rust-ancestors.py`
(for quick and minimal change), but it'd made more sense to put the binary
index data elsewhere and to create a new test python module
Yuya Nishihara - Jan. 17, 2019, 1:38 p.m.
On Wed, 16 Jan 2019 19:15:08 +0100, Georges Racinet wrote:
> # HG changeset patch
> # User Georges Racinet <georges.racinet@octobus.net>
> # Date 1547141118 -3600
> #      Thu Jan 10 18:25:18 2019 +0100
> # Node ID f32e7d90db76879096f216f23ebbe75772b0201e
> # Parent  1271ca42622ad0677f4f1f02ebd95b3943a7d721
> # EXP-Topic revset.predicates
> rust-cpython: binding for headrevs()

> +use crate::conversion::{py_set, rev_pyiter_collect};

Missing patch to move py_set to the conversion module.
Georges Racinet - Jan. 17, 2019, 2:52 p.m.
On 1/17/19 2:38 PM, Yuya Nishihara wrote:
> On Wed, 16 Jan 2019 19:15:08 +0100, Georges Racinet wrote:
>> # HG changeset patch
>> # User Georges Racinet <georges.racinet@octobus.net>
>> # Date 1547141118 -3600
>> #      Thu Jan 10 18:25:18 2019 +0100
>> # Node ID f32e7d90db76879096f216f23ebbe75772b0201e
>> # Parent  1271ca42622ad0677f4f1f02ebd95b3943a7d721
>> # EXP-Topic revset.predicates
>> rust-cpython: binding for headrevs()
>> +use crate::conversion::{py_set, rev_pyiter_collect};
> Missing patch to move py_set to the conversion module.

Ah yes, sorry about that ! Just sent it

Patch

diff -r 1271ca42622a -r f32e7d90db76 rust/hg-cpython/src/dagops.rs
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/rust/hg-cpython/src/dagops.rs	Thu Jan 10 18:25:18 2019 +0100
@@ -0,0 +1,53 @@ 
+// dagops.rs
+//
+// Copyright 2019 Georges Racinet <georges.racinet@octobus.net>
+//
+// This software may be used and distributed according to the terms of the
+// GNU General Public License version 2 or any later version.
+
+//! Bindings for the `hg::dagops` module provided by the
+//! `hg-core` package.
+//!
+//! From Python, this will be seen as `mercurial.rustext.dagop`
+use cindex::Index;
+use cpython::{PyDict, PyModule, PyObject, PyResult, Python};
+use crate::conversion::{py_set, rev_pyiter_collect};
+use exceptions::GraphError;
+use hg::dagops;
+use hg::Revision;
+use std::collections::HashSet;
+
+/// Using the the `index`, return heads out of any Python iterable of Revisions
+///
+/// This is the Rust counterpart for `mercurial.dagop.headrevs`
+pub fn headrevs(
+    py: Python,
+    index: PyObject,
+    revs: PyObject,
+) -> PyResult<PyObject> {
+    let mut as_set: HashSet<Revision> = rev_pyiter_collect(py, &revs)?;
+    dagops::retain_heads(&Index::new(py, index)?, &mut as_set)
+        .map_err(|e| GraphError::pynew(py, e))?;
+    py_set(py, &as_set)
+}
+
+/// Create the module, with `__package__` given from parent
+pub fn init_module(py: Python, package: &str) -> PyResult<PyModule> {
+    let dotted_name = &format!("{}.dagop", package);
+    let m = PyModule::new(py, dotted_name)?;
+    m.add(py, "__package__", package)?;
+    m.add(py, "__doc__", "DAG operations - Rust implementation")?;
+    m.add(
+        py,
+        "headrevs",
+        py_fn!(py, headrevs(index: PyObject, revs: PyObject)),
+    )?;
+
+    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)
+}
diff -r 1271ca42622a -r f32e7d90db76 rust/hg-cpython/src/lib.rs
--- a/rust/hg-cpython/src/lib.rs	Wed Jan 16 16:05:27 2019 +0100
+++ b/rust/hg-cpython/src/lib.rs	Thu Jan 10 18:25:18 2019 +0100
@@ -27,6 +27,7 @@ 
 pub mod ancestors;
 mod cindex;
 mod conversion;
+pub mod dagops;
 pub mod exceptions;
 
 py_module_initializer!(rustext, initrustext, PyInit_rustext, |py, m| {
@@ -38,6 +39,7 @@ 
 
     let dotted_name: String = m.get(py, "__name__")?.extract(py)?;
     m.add(py, "ancestor", ancestors::init_module(py, &dotted_name)?)?;
+    m.add(py, "dagop", dagops::init_module(py, &dotted_name)?)?;
     m.add(py, "GraphError", py.get_type::<exceptions::GraphError>())?;
     Ok(())
 });
diff -r 1271ca42622a -r f32e7d90db76 tests/test-rust-ancestor.py
--- a/tests/test-rust-ancestor.py	Wed Jan 16 16:05:27 2019 +0100
+++ b/tests/test-rust-ancestor.py	Thu Jan 10 18:25:18 2019 +0100
@@ -14,6 +14,7 @@ 
         LazyAncestors,
         MissingAncestors,
     )
+    from mercurial.rustext import dagop
 
 try:
     from mercurial.cext import parsers as cparsers
@@ -153,6 +154,9 @@ 
         # rust-cpython issues appropriate str instances for Python 2 and 3
         self.assertEqual(exc.args, ('ParentOutOfRange', 1))
 
+    def testheadrevs(self):
+        idx = self.parseindex()
+        self.assertEqual(dagop.headrevs(idx, [1, 2, 3]), {3})
 
 if __name__ == '__main__':
     import silenttestrunner