[Updated] D11460: rust: Remove support for passing a dict to the Rust pathutil.dirs()
SimonSapin
phabricator at mercurial-scm.org
Wed Sep 22 08:54:56 UTC 2021
Closed by commit rHG627cd8f33db0: rust: Remove support for passing a dict to the Rust pathutil.dirs() (authored by SimonSapin).
This revision was automatically updated to reflect the committed changes.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D11460?vs=30334&id=30372
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D11460/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D11460
AFFECTED FILES
rust/hg-cpython/src/dirstate.rs
rust/hg-cpython/src/dirstate/dirs_multiset.rs
tests/test-dirs.py
CHANGE DETAILS
diff --git a/tests/test-dirs.py b/tests/test-dirs.py
--- a/tests/test-dirs.py
+++ b/tests/test-dirs.py
@@ -13,13 +13,13 @@
(b'a/a/a', [b'a', b'a/a', b'']),
(b'alpha/beta/gamma', [b'', b'alpha', b'alpha/beta']),
]:
- d = pathutil.dirs({})
+ d = pathutil.dirs([])
d.addpath(case)
self.assertEqual(sorted(d), sorted(want))
def testinvalid(self):
with self.assertRaises(ValueError):
- d = pathutil.dirs({})
+ d = pathutil.dirs([])
d.addpath(b'a//b')
diff --git a/rust/hg-cpython/src/dirstate/dirs_multiset.rs b/rust/hg-cpython/src/dirstate/dirs_multiset.rs
--- a/rust/hg-cpython/src/dirstate/dirs_multiset.rs
+++ b/rust/hg-cpython/src/dirstate/dirs_multiset.rs
@@ -11,14 +11,13 @@
use std::cell::RefCell;
use cpython::{
- exc, ObjectProtocol, PyBool, PyBytes, PyClone, PyDict, PyErr, PyObject,
- PyResult, Python, UnsafePyLeaked,
+ exc, ObjectProtocol, PyBytes, PyClone, PyDict, PyErr, PyObject, PyResult,
+ Python, UnsafePyLeaked,
};
-use crate::dirstate::extract_dirstate;
use hg::{
utils::hg_path::{HgPath, HgPathBuf},
- DirsMultiset, DirsMultisetIter, DirstateError, DirstateMapError,
+ DirsMultiset, DirsMultisetIter, DirstateMapError,
};
py_class!(pub class Dirs |py| {
@@ -29,20 +28,11 @@
def __new__(
_cls,
map: PyObject,
- only_tracked: Option<PyObject> = None
) -> PyResult<Self> {
- let only_tracked_b = if let Some(only_tracked) = only_tracked {
- only_tracked.extract::<PyBool>(py)?.is_true()
- } else {
- false
- };
- let inner = if let Ok(map) = map.cast_as::<PyDict>(py) {
- let dirstate = extract_dirstate(py, &map)?;
- let dirstate = dirstate.iter().map(|(k, v)| Ok((k, *v)));
- DirsMultiset::from_dirstate(dirstate, only_tracked_b)
- .map_err(|e: DirstateError| {
- PyErr::new::<exc::ValueError, _>(py, e.to_string())
- })?
+ let inner = if map.cast_as::<PyDict>(py).is_ok() {
+ let err = "pathutil.dirs() with a dict should only be used by the Python dirstatemap \
+ and should not be used when Rust is enabled";
+ return Err(PyErr::new::<exc::TypeError, _>(py, err.to_string()))
} else {
let map: Result<Vec<HgPathBuf>, PyErr> = map
.iter(py)?
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
@@ -21,13 +21,11 @@
exceptions,
};
use cpython::{
- exc, PyBytes, PyDict, PyErr, PyList, PyModule, PyObject, PyResult,
- PySequence, Python,
+ PyBytes, PyDict, PyErr, PyList, PyModule, PyObject, PyResult, Python,
};
use hg::dirstate_tree::on_disk::V2_FORMAT_MARKER;
-use hg::{utils::hg_path::HgPathBuf, DirstateEntry, EntryState, StateMap};
+use hg::DirstateEntry;
use libc::{c_char, c_int};
-use std::convert::TryFrom;
// C code uses a custom `dirstate_tuple` type, checks in multiple instances
// for this type, and raises a Python `Exception` if the check does not pass.
@@ -78,34 +76,6 @@
maybe_obj.ok_or_else(|| PyErr::fetch(py))
}
-pub fn extract_dirstate(py: Python, dmap: &PyDict) -> Result<StateMap, PyErr> {
- dmap.items(py)
- .iter()
- .map(|(filename, stats)| {
- let stats = stats.extract::<PySequence>(py)?;
- let state = stats.get_item(py, 0)?.extract::<PyBytes>(py)?;
- let state =
- EntryState::try_from(state.data(py)[0]).map_err(|e| {
- PyErr::new::<exc::ValueError, _>(py, e.to_string())
- })?;
- let mode = stats.get_item(py, 1)?.extract(py)?;
- let size = stats.get_item(py, 2)?.extract(py)?;
- let mtime = stats.get_item(py, 3)?.extract(py)?;
- let filename = filename.extract::<PyBytes>(py)?;
- let filename = filename.data(py);
- Ok((
- HgPathBuf::from(filename.to_owned()),
- DirstateEntry {
- state,
- mode,
- size,
- mtime,
- },
- ))
- })
- .collect()
-}
-
/// Create the module, with `__package__` given from parent
pub fn init_module(py: Python, package: &str) -> PyResult<PyModule> {
let dotted_name = &format!("{}.dirstate", package);
To: SimonSapin, #hg-reviewers, Alphare
Cc: mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20210922/038e8f88/attachment-0002.html>
More information about the Mercurial-patches
mailing list