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 @@ pub fn init_module(py: Python, package: m.add_class::(py)?; m.add_class::(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)?; 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 @@ -8,7 +8,7 @@ //! Bindings for the `hg::dirstate::dirstate_map` file provided by the //! `hg-core` package. -use std::cell::RefCell; +use std::cell::{Ref, RefCell}; use std::convert::TryInto; use std::time::Duration; @@ -465,6 +465,12 @@ py_class!(pub class DirstateMap |py| { }); impl DirstateMap { + pub fn get_inner<'a>( + &'a self, + py: Python<'a>, + ) -> Ref<'a, RustDirstateMap> { + self.inner_shared(py).borrow() + } fn translate_key( py: Python, res: (&HgPathBuf, &DirstateEntry), 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 +// +// 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>( + 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::(py)?; + let root_dir = get_path_from_bytes(bytes.data(py)); + + let dmap: DirstateMap = dmap.to_py_object(py); + let dmap = dmap.get_inner(py); + + let files: PyResult> = files + .iter(py) + .map(|f| Ok(HgPathBuf::from_bytes(f.extract::(py)?.data(py)))) + .collect(); + let files = files?; + + let (lookup, status_res) = status( + &dmap, + &root_dir, + &files, + list_clean, + last_normal_time, + check_exec, + ) + .map_err(|e| PyErr::new::(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)) +}