D7059: rust-dirstate-status: rust-cpython bindings for `dirstate.status`

[Alphare (Raphaël Gomès)]

Alphare updated this revision to Diff 17177.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D7059?vs=17166&id=17177

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7059/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7059

AFFECTED FILES
  rust/hg-cpython/src/dirstate.rs
  rust/hg-cpython/src/dirstate/dirstate_map.rs
  rust/hg-cpython/src/dirstate/status.rs

CHANGE DETAILS

diff --git a/rust/hg-cpython/src/dirstate/status.rs b/rust/hg-cpython/src/dirstate/status.rs
new file mode 100644
--- /dev/null
+++ b/rust/hg-cpython/src/dirstate/status.rs
@@ -0,0 +1,82 @@
+// status.rs
+//
+// Copyright 2019, Raphaël Gomès <rgomes at 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::status` module provided by the
+//! `hg-core` crate. From Python, this will be seen as `rustext.dirstate.status`.
+//!
+
+use crate::dirstate::DirstateMap;
+use cpython::exc::ValueError;
+use cpython::{
+    PyBytes, PyErr, PyList, PyObject, PyResult, Python, PythonObject,
+    ToPyObject,
+};
+use hg::utils::files::get_path_from_bytes;
+
+use hg::utils::hg_path::HgPath;
+use hg::{status, utils::hg_path::HgPathBuf};
+
+/// This will be useless once trait impls for collection are added to `PyBytes`
+/// upstream.
+fn collect_pybytes_list<P: AsRef<HgPath>>(
+    py: Python,
+    collection: &[P],
+) -> PyList {
+    let list = PyList::new(py, &[]);
+
+    for (i, path) in collection.iter().enumerate() {
+        list.insert_item(
+            py,
+            i,
+            PyBytes::new(py, path.as_ref().as_bytes()).into_object(),
+        )
+    }
+
+    list
+}
+
+pub fn status_wrapper(
+    py: Python,
+    dmap: DirstateMap,
+    root_dir: PyObject,
+    files: PyList,
+    list_clean: bool,
+    last_normal_time: i64,
+    check_exec: bool,
+) -> PyResult<(PyList, PyList, PyList, PyList, PyList, PyList, PyList)> {
+    let bytes = root_dir.extract::<PyBytes>(py)?;
+    let root_dir = get_path_from_bytes(bytes.data(py));
+
+    let dmap: DirstateMap = dmap.to_py_object(py);
+    let mut dmap = dmap.get_inner_mut(py)?;
+
+    let files: PyResult<Vec<HgPathBuf>> = files
+        .iter(py)
+        .map(|f| Ok(HgPathBuf::from_bytes(f.extract::<PyBytes>(py)?.data(py))))
+        .collect();
+    let files = files?;
+
+    let (lookup, status_res) = status(
+        &mut dmap,
+        &root_dir,
+        &files,
+        list_clean,
+        last_normal_time,
+        check_exec,
+    )
+    .map_err(|e| PyErr::new::<ValueError, _>(py, e.to_string()))?;
+
+    let modified = collect_pybytes_list(py, status_res.modified.as_ref());
+    let added = collect_pybytes_list(py, status_res.added.as_ref());
+    let removed = collect_pybytes_list(py, status_res.removed.as_ref());
+    let deleted = collect_pybytes_list(py, status_res.deleted.as_ref());
+    let clean = collect_pybytes_list(py, status_res.clean.as_ref());
+    let lookup = collect_pybytes_list(py, lookup.as_ref());
+    let unknown = PyList::new(py, &[]);
+
+    Ok((lookup, modified, added, removed, deleted, unknown, clean))
+}
diff --git a/rust/hg-cpython/src/dirstate/dirstate_map.rs b/rust/hg-cpython/src/dirstate/dirstate_map.rs
--- a/rust/hg-cpython/src/dirstate/dirstate_map.rs
+++ b/rust/hg-cpython/src/dirstate/dirstate_map.rs
@@ -20,7 +20,7 @@
 use crate::{
     dirstate::copymap::{CopyMap, CopyMapItemsIterator, CopyMapKeysIterator},
     dirstate::{dirs_multiset::Dirs, make_dirstate_tuple},
-    ref_sharing::{PyLeakedRef, PySharedRefCell},
+    ref_sharing::{PyLeakedRef, PyRefMut, PySharedRefCell},
 };
 use hg::{
     utils::hg_path::{HgPath, HgPathBuf},
@@ -465,6 +465,12 @@
 });
 
 impl DirstateMap {
+    pub fn get_inner_mut<'a>(
+        &'a self,
+        py: Python<'a>,
+    ) -> PyResult<PyRefMut<'a, RustDirstateMap>> {
+        self.inner_shared(py).borrow_mut()
+    }
     fn translate_key(
         py: Python,
         res: (&HgPathBuf, &DirstateEntry),
diff --git a/rust/hg-cpython/src/dirstate.rs b/rust/hg-cpython/src/dirstate.rs
--- a/rust/hg-cpython/src/dirstate.rs
+++ b/rust/hg-cpython/src/dirstate.rs
@@ -12,10 +12,13 @@
 mod copymap;
 mod dirs_multiset;
 mod dirstate_map;
-use crate::dirstate::{dirs_multiset::Dirs, dirstate_map::DirstateMap};
+mod status;
+use crate::dirstate::{
+    dirs_multiset::Dirs, dirstate_map::DirstateMap, status::status_wrapper,
+};
 use cpython::{
-    exc, PyBytes, PyDict, PyErr, PyModule, PyObject, PyResult, PySequence,
-    Python,
+    exc, PyBytes, PyDict, PyErr, PyList, PyModule, PyObject, PyResult,
+    PySequence, Python,
 };
 use hg::{
     utils::hg_path::HgPathBuf, DirstateEntry, DirstateParseError, EntryState,
@@ -105,6 +108,21 @@
 
     m.add_class::<Dirs>(py)?;
     m.add_class::<DirstateMap>(py)?;
+    m.add(
+        py,
+        "status",
+        py_fn!(
+            py,
+            status_wrapper(
+                dmap: DirstateMap,
+                root_dir: PyObject,
+                files: PyList,
+                list_clean: bool,
+                last_normal_time: i64,
+                check_exec: bool
+            )
+        ),
+    )?;
 
     let sys = PyModule::import(py, "sys")?;
     let sys_modules: PyDict = sys.get(py, "modules")?.extract(py)?;



To: Alphare, #hg-reviewers
Cc: durin42, kevincox, mercurial-devel