##// END OF EJS Templates
rust-hg-cpython: update status bridge with the new `traversedir` support...
Raphaël Gomès -
r45354:01afda7e default
parent child Browse files
Show More
@@ -133,7 +133,8 b' pub fn init_module(py: Python, package: '
133 last_normal_time: i64,
133 last_normal_time: i64,
134 list_clean: bool,
134 list_clean: bool,
135 list_ignored: bool,
135 list_ignored: bool,
136 list_unknown: bool
136 list_unknown: bool,
137 collect_traversed_dirs: bool
137 )
138 )
138 ),
139 ),
139 )?;
140 )?;
@@ -104,6 +104,7 b' pub fn status_wrapper('
104 list_clean: bool,
104 list_clean: bool,
105 list_ignored: bool,
105 list_ignored: bool,
106 list_unknown: bool,
106 list_unknown: bool,
107 collect_traversed_dirs: bool,
107 ) -> PyResult<PyTuple> {
108 ) -> PyResult<PyTuple> {
108 let bytes = root_dir.extract::<PyBytes>(py)?;
109 let bytes = root_dir.extract::<PyBytes>(py)?;
109 let root_dir = get_path_from_bytes(bytes.data(py));
110 let root_dir = get_path_from_bytes(bytes.data(py));
@@ -134,6 +135,7 b' pub fn status_wrapper('
134 list_clean,
135 list_clean,
135 list_ignored,
136 list_ignored,
136 list_unknown,
137 list_unknown,
138 collect_traversed_dirs,
137 },
139 },
138 )
140 )
139 .map_err(|e| handle_fallback(py, e))?;
141 .map_err(|e| handle_fallback(py, e))?;
@@ -170,6 +172,7 b' pub fn status_wrapper('
170 list_clean,
172 list_clean,
171 list_ignored,
173 list_ignored,
172 list_unknown,
174 list_unknown,
175 collect_traversed_dirs,
173 },
176 },
174 )
177 )
175 .map_err(|e| handle_fallback(py, e))?;
178 .map_err(|e| handle_fallback(py, e))?;
@@ -224,6 +227,7 b' pub fn status_wrapper('
224 list_clean,
227 list_clean,
225 list_ignored,
228 list_ignored,
226 list_unknown,
229 list_unknown,
230 collect_traversed_dirs,
227 },
231 },
228 )
232 )
229 .map_err(|e| handle_fallback(py, e))?;
233 .map_err(|e| handle_fallback(py, e))?;
@@ -256,6 +260,7 b' fn build_response('
256 let unknown = collect_pybytes_list(py, status_res.unknown.as_ref());
260 let unknown = collect_pybytes_list(py, status_res.unknown.as_ref());
257 let lookup = collect_pybytes_list(py, lookup.as_ref());
261 let lookup = collect_pybytes_list(py, lookup.as_ref());
258 let bad = collect_bad_matches(py, status_res.bad.as_ref())?;
262 let bad = collect_bad_matches(py, status_res.bad.as_ref())?;
263 let traversed = collect_pybytes_list(py, status_res.traversed.as_ref());
259 let py_warnings = PyList::new(py, &[]);
264 let py_warnings = PyList::new(py, &[]);
260 for warning in warnings.iter() {
265 for warning in warnings.iter() {
261 // We use duck-typing on the Python side for dispatch, good enough for
266 // We use duck-typing on the Python side for dispatch, good enough for
@@ -292,6 +297,7 b' fn build_response('
292 unknown.into_object(),
297 unknown.into_object(),
293 py_warnings.into_object(),
298 py_warnings.into_object(),
294 bad.into_object(),
299 bad.into_object(),
300 traversed.into_object(),
295 ][..],
301 ][..],
296 ))
302 ))
297 }
303 }
General Comments 0
You need to be logged in to leave comments. Login now