This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8519

rust-hg-cpython: update status bridge with the new `traversedir` support
ClosedPublic

Authored by Alphare on May 12 2020, 7:50 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG01afda7e7d6c: rust-hg-cpython: update status bridge with the new `traversedir` support

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Alphare created this revision.May 12 2020, 7:50 AM
Alphare added a commit: rHG01afda7e7d6c: rust-hg-cpython: update status bridge with the new `traversedir` support.May 14 2020, 4:31 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG01afda7e7d6c: rust-hg-cpython: update status bridge with the new `traversedir` support (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 21381

rust/hg-cpython/src/dirstate.rs

dmap: DirstateMap, dmap: DirstateMap,
root_dir: PyObject, root_dir: PyObject,
matcher: PyObject, matcher: PyObject,
ignorefiles: PyList, ignorefiles: PyList,
check_exec: bool, check_exec: bool,
last_normal_time: i64, last_normal_time: i64,
list_clean: bool, list_clean: bool,
list_ignored: bool, list_ignored: bool,
list_unknown: bool list_unknown: bool,
collect_traversed_dirs: bool
) )
), ),
)?; )?;
let sys = PyModule::import(py, "sys")?; let sys = PyModule::import(py, "sys")?;
let sys_modules: PyDict = sys.get(py, "modules")?.extract(py)?; let sys_modules: PyDict = sys.get(py, "modules")?.extract(py)?;
sys_modules.set_item(py, dotted_name, &m)?; sys_modules.set_item(py, dotted_name, &m)?;
Ok(m) Ok(m)
} }

rust/hg-cpython/src/dirstate/status.rs

matcher: PyObject, matcher: PyObject,
root_dir: PyObject, root_dir: PyObject,
ignore_files: PyList, ignore_files: PyList,
check_exec: bool, check_exec: bool,
last_normal_time: i64, last_normal_time: i64,
list_clean: bool, list_clean: bool,
list_ignored: bool, list_ignored: bool,
list_unknown: bool, list_unknown: bool,
collect_traversed_dirs: bool,
) -> PyResult<PyTuple> { ) -> PyResult<PyTuple> {
let bytes = root_dir.extract::<PyBytes>(py)?; let bytes = root_dir.extract::<PyBytes>(py)?;
let root_dir = get_path_from_bytes(bytes.data(py)); let root_dir = get_path_from_bytes(bytes.data(py));
let dmap: DirstateMap = dmap.to_py_object(py); let dmap: DirstateMap = dmap.to_py_object(py);
let dmap = dmap.get_inner(py); let dmap = dmap.get_inner(py);
let ignore_files: PyResult<Vec<_>> = ignore_files let ignore_files: PyResult<Vec<_>> = ignore_files
&root_dir, &root_dir,
ignore_files, ignore_files,
StatusOptions { StatusOptions {
check_exec, check_exec,
last_normal_time, last_normal_time,
list_clean, list_clean,
list_ignored, list_ignored,
list_unknown, list_unknown,
collect_traversed_dirs,
}, },
) )
.map_err(|e| handle_fallback(py, e))?; .map_err(|e| handle_fallback(py, e))?;
build_response(py, lookup, status_res, warnings) build_response(py, lookup, status_res, warnings)
} }
"exactmatcher" => { "exactmatcher" => {
let files = matcher.call_method( let files = matcher.call_method(
py, py,
&root_dir, &root_dir,
ignore_files, ignore_files,
StatusOptions { StatusOptions {
check_exec, check_exec,
last_normal_time, last_normal_time,
list_clean, list_clean,
list_ignored, list_ignored,
list_unknown, list_unknown,
collect_traversed_dirs,
}, },
) )
.map_err(|e| handle_fallback(py, e))?; .map_err(|e| handle_fallback(py, e))?;
build_response(py, lookup, status_res, warnings) build_response(py, lookup, status_res, warnings)
} }
"includematcher" => { "includematcher" => {
// Get the patterns from Python even though most of them are // Get the patterns from Python even though most of them are
// redundant with those we will parse later on, as they include // redundant with those we will parse later on, as they include
&root_dir, &root_dir,
ignore_files, ignore_files,
StatusOptions { StatusOptions {
check_exec, check_exec,
last_normal_time, last_normal_time,
list_clean, list_clean,
list_ignored, list_ignored,
list_unknown, list_unknown,
collect_traversed_dirs,
}, },
) )
.map_err(|e| handle_fallback(py, e))?; .map_err(|e| handle_fallback(py, e))?;
all_warnings.extend(warnings); all_warnings.extend(warnings);
build_response(py, lookup, status_res, all_warnings) build_response(py, lookup, status_res, all_warnings)
} }
let added = collect_pybytes_list(py, status_res.added.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 removed = collect_pybytes_list(py, status_res.removed.as_ref());
let deleted = collect_pybytes_list(py, status_res.deleted.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 clean = collect_pybytes_list(py, status_res.clean.as_ref());
let ignored = collect_pybytes_list(py, status_res.ignored.as_ref()); let ignored = collect_pybytes_list(py, status_res.ignored.as_ref());
let unknown = collect_pybytes_list(py, status_res.unknown.as_ref()); let unknown = collect_pybytes_list(py, status_res.unknown.as_ref());
let lookup = collect_pybytes_list(py, lookup.as_ref()); let lookup = collect_pybytes_list(py, lookup.as_ref());
let bad = collect_bad_matches(py, status_res.bad.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, &[]); let py_warnings = PyList::new(py, &[]);
for warning in warnings.iter() { for warning in warnings.iter() {
// We use duck-typing on the Python side for dispatch, good enough for // We use duck-typing on the Python side for dispatch, good enough for
// now. // now.
match warning { match warning {
PatternFileWarning::InvalidSyntax(file, syn) => { PatternFileWarning::InvalidSyntax(file, syn) => {
py_warnings.append( py_warnings.append(
py, py,
added.into_object(), added.into_object(),
removed.into_object(), removed.into_object(),
deleted.into_object(), deleted.into_object(),
clean.into_object(), clean.into_object(),
ignored.into_object(), ignored.into_object(),
unknown.into_object(), unknown.into_object(),
py_warnings.into_object(), py_warnings.into_object(),
bad.into_object(), bad.into_object(),
traversed.into_object(),
][..], ][..],
)) ))
} }