Mercurial > hg
view rust/hg-cpython/src/dirstate/dirs_multiset.rs @ 42750:849e744b925d
rust-dirstate: improve API of `DirsMultiset`
- Use opaque `Iterator` type instead of implementation-specific one from
`HashMap`
- Make `DirsMultiset` behave like a set both in Rust and from Python
Differential Revision: https://phab.mercurial-scm.org/D6690
author | Raphaël Gomès <rgomes@octobus.net> |
---|---|
date | Wed, 17 Jul 2019 11:37:43 +0200 |
parents | 7ceded4419a3 |
children | 30320c7bf79f |
line wrap: on
line source
// dirs_multiset.rs // // Copyright 2019 Raphaël Gomès <rgomes@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::dirstate::dirs_multiset` file provided by the //! `hg-core` package. use std::cell::RefCell; use cpython::{ exc, ObjectProtocol, PyBytes, PyDict, PyErr, PyObject, PyResult, PythonObject, ToPyObject, }; use crate::dirstate::extract_dirstate; use hg::{ DirsIterable, DirsMultiset, DirstateMapError, DirstateParseError, EntryState, }; use std::convert::TryInto; py_class!(pub class Dirs |py| { data dirs_map: RefCell<DirsMultiset>; // `map` is either a `dict` or a flat iterator (usually a `set`, sometimes // a `list`) def __new__( _cls, map: PyObject, skip: Option<PyObject> = None ) -> PyResult<Self> { let mut skip_state: Option<EntryState> = None; if let Some(skip) = skip { skip_state = Some( skip.extract::<PyBytes>(py)?.data(py)[0] .try_into() .map_err(|e: DirstateParseError| { PyErr::new::<exc::ValueError, _>(py, e.to_string()) })?, ); } let inner = if let Ok(map) = map.cast_as::<PyDict>(py) { let dirstate = extract_dirstate(py, &map)?; DirsMultiset::new( DirsIterable::Dirstate(&dirstate), skip_state, ) } else { let map: Result<Vec<Vec<u8>>, PyErr> = map .iter(py)? .map(|o| Ok(o?.extract::<PyBytes>(py)?.data(py).to_owned())) .collect(); DirsMultiset::new( DirsIterable::Manifest(&map?), skip_state, ) }; Self::create_instance(py, RefCell::new(inner)) } def addpath(&self, path: PyObject) -> PyResult<PyObject> { self.dirs_map(py).borrow_mut().add_path( path.extract::<PyBytes>(py)?.data(py), ); Ok(py.None()) } def delpath(&self, path: PyObject) -> PyResult<PyObject> { self.dirs_map(py).borrow_mut().delete_path( path.extract::<PyBytes>(py)?.data(py), ) .and(Ok(py.None())) .or_else(|e| { match e { DirstateMapError::PathNotFound(_p) => { Err(PyErr::new::<exc::ValueError, _>( py, "expected a value, found none".to_string(), )) } DirstateMapError::EmptyPath => { Ok(py.None()) } } }) } // This is really inefficient on top of being ugly, but it's an easy way // of having it work to continue working on the rest of the module // hopefully bypassing Python entirely pretty soon. def __iter__(&self) -> PyResult<PyObject> { let dirs = self.dirs_map(py).borrow(); let dirs: Vec<_> = dirs .iter() .map(|d| PyBytes::new(py, d)) .collect(); dirs.to_py_object(py) .into_object() .iter(py) .map(|o| o.into_object()) } def __contains__(&self, item: PyObject) -> PyResult<bool> { Ok(self .dirs_map(py) .borrow() .contains(item.extract::<PyBytes>(py)?.data(py).as_ref())) } });