This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11580

dirstatemap: fix copymap.pop in Rust to return the value it pops
ClosedPublic

Authored by marmoute on Oct 2 2021, 11:05 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGbd5f7c61d69d: dirstatemap: fix copymap.pop in Rust to return the value it pops
Summary

I guess this was overlooked in the initial implementation?

Without this, the next patch would, loose copy information in setparent.

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

marmoute created this revision.Oct 2 2021, 11:05 AM
Alphare added a subscriber: Alphare.Oct 3 2021, 4:35 PM

Oops! Weird that this didn't show up in a test.

Alphare accepted this revision.Oct 3 2021, 4:35 PM
This revision is now accepted and ready to land.Oct 3 2021, 4:35 PM

Revision Contents
Changeset List

Diff 30637

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

) -> PyResult<Option<PyObject>> { ) -> PyResult<Option<PyObject>> {
let key = key.extract::<PyBytes>(py)?; let key = key.extract::<PyBytes>(py)?;
match self match self
.inner(py) .inner(py)
.borrow_mut() .borrow_mut()
.copy_map_remove(HgPath::new(key.data(py))) .copy_map_remove(HgPath::new(key.data(py)))
.map_err(|e| v2_error(py, e))? .map_err(|e| v2_error(py, e))?
{ {
Some(_) => Ok(None), Some(copy) => Ok(Some(
PyBytes::new(py, copy.as_bytes()).into_object(),
)),
None => Ok(default), None => Ok(default),
} }
} }
def copymapiter(&self) -> PyResult<CopyMapKeysIterator> { def copymapiter(&self) -> PyResult<CopyMapKeysIterator> {
let leaked_ref = self.inner(py).leak_immutable(); let leaked_ref = self.inner(py).leak_immutable();
CopyMapKeysIterator::from_inner( CopyMapKeysIterator::from_inner(
py, py,