[Request] [+ ] D8519: rust-hg-cpython: update status bridge with the new `traversedir` support
Alphare (Raphaël Gomès)
phabricator at mercurial-scm.org
Tue May 12 11:51:13 UTC 2020
Alphare created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.
REPOSITORY
rHG Mercurial
BRANCH
default
REVISION DETAIL
https://phab.mercurial-scm.org/D8519
AFFECTED FILES
rust/hg-cpython/src/dirstate.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
--- a/rust/hg-cpython/src/dirstate/status.rs
+++ b/rust/hg-cpython/src/dirstate/status.rs
@@ -104,6 +104,7 @@
list_clean: bool,
list_ignored: bool,
list_unknown: bool,
+ collect_traversed_dirs: bool,
) -> PyResult<PyTuple> {
let bytes = root_dir.extract::<PyBytes>(py)?;
let root_dir = get_path_from_bytes(bytes.data(py));
@@ -134,6 +135,7 @@
list_clean,
list_ignored,
list_unknown,
+ collect_traversed_dirs,
},
)
.map_err(|e| handle_fallback(py, e))?;
@@ -170,6 +172,7 @@
list_clean,
list_ignored,
list_unknown,
+ collect_traversed_dirs,
},
)
.map_err(|e| handle_fallback(py, e))?;
@@ -224,6 +227,7 @@
list_clean,
list_ignored,
list_unknown,
+ collect_traversed_dirs,
},
)
.map_err(|e| handle_fallback(py, e))?;
@@ -256,6 +260,7 @@
let unknown = collect_pybytes_list(py, status_res.unknown.as_ref());
let lookup = collect_pybytes_list(py, lookup.as_ref());
let bad = collect_bad_matches(py, status_res.bad.as_ref())?;
+ let traversed = collect_pybytes_list(py, status_res.traversed.as_ref());
let py_warnings = PyList::new(py, &[]);
for warning in warnings.iter() {
// We use duck-typing on the Python side for dispatch, good enough for
@@ -292,6 +297,7 @@
unknown.into_object(),
py_warnings.into_object(),
bad.into_object(),
+ traversed.into_object(),
][..],
))
}
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
@@ -133,7 +133,8 @@
last_normal_time: i64,
list_clean: bool,
list_ignored: bool,
- list_unknown: bool
+ list_unknown: bool,
+ collect_traversed_dirs: bool
)
),
)?;
To: Alphare, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mercurial-scm.org/pipermail/mercurial-patches/attachments/20200512/406722a5/attachment.html>
More information about the Mercurial-patches
mailing list