Mercurial > hg
comparison rust/hg-cpython/src/dirstate/dirstate_map.rs @ 48050:2ac0e6b23222
dirstate: Replace dropfile with drop_item_and_copy_source
Those removing a DirstateItem and a copy source are always done together
Differential Revision: https://phab.mercurial-scm.org/D11493
author | Simon Sapin <simon.sapin@octobus.net> |
---|---|
date | Thu, 23 Sep 2021 15:36:43 +0200 |
parents | 76f1c76186a1 |
children | 98c0408324e6 |
comparison
equal
deleted
inserted
replaced
48049:29aa633815db | 48050:2ac0e6b23222 |
---|---|
208 )) | 208 )) |
209 })?; | 209 })?; |
210 Ok(py.None()) | 210 Ok(py.None()) |
211 } | 211 } |
212 | 212 |
213 def dropfile( | 213 def drop_item_and_copy_source( |
214 &self, | 214 &self, |
215 f: PyBytes, | 215 f: PyBytes, |
216 ) -> PyResult<PyNone> { | 216 ) -> PyResult<PyNone> { |
217 self.inner(py) | 217 self.inner(py) |
218 .borrow_mut() | 218 .borrow_mut() |
219 .drop_file(HgPath::new(f.data(py))) | 219 .drop_entry_and_copy_source(HgPath::new(f.data(py))) |
220 .map_err(|e |dirstate_error(py, e))?; | 220 .map_err(|e |dirstate_error(py, e))?; |
221 Ok(PyNone) | 221 Ok(PyNone) |
222 } | 222 } |
223 | 223 |
224 def clearambiguoustimes( | 224 def clearambiguoustimes( |