equal
deleted
inserted
replaced
51 py, |
51 py, |
52 PyBytes::new(py, path.as_bytes()), |
52 PyBytes::new(py, path.as_bytes()), |
53 PyBytes::new(py, copy_path.as_bytes()), |
53 PyBytes::new(py, copy_path.as_bytes()), |
54 )?; |
54 )?; |
55 } |
55 } |
56 Ok( |
56 Ok(dirstate_parents_to_pytuple(py, parents)) |
57 (PyBytes::new(py, &parents.p1), PyBytes::new(py, &parents.p2)) |
|
58 .to_py_object(py), |
|
59 ) |
|
60 } |
57 } |
61 Err(e) => Err(PyErr::new::<exc::ValueError, _>(py, e.to_string())), |
58 Err(e) => Err(PyErr::new::<exc::ValueError, _>(py, e.to_string())), |
62 } |
59 } |
63 } |
60 } |
64 |
61 |
153 let sys_modules: PyDict = sys.get(py, "modules")?.extract(py)?; |
150 let sys_modules: PyDict = sys.get(py, "modules")?.extract(py)?; |
154 sys_modules.set_item(py, dotted_name, &m)?; |
151 sys_modules.set_item(py, dotted_name, &m)?; |
155 |
152 |
156 Ok(m) |
153 Ok(m) |
157 } |
154 } |
|
155 |
|
156 pub(crate) fn dirstate_parents_to_pytuple( |
|
157 py: Python, |
|
158 parents: &DirstateParents, |
|
159 ) -> PyTuple { |
|
160 let p1 = PyBytes::new(py, parents.p1.as_bytes()); |
|
161 let p2 = PyBytes::new(py, parents.p2.as_bytes()); |
|
162 (p1, p2).to_py_object(py) |
|
163 } |