comparison rust/hg-cpython/src/dirstate/dirstate_map.rs @ 48135:bd5f7c61d69d

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

I guess this was overlooked in the initial implementation?

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

Differential Revision: https://phab.mercurial-scm.org/D11580

48134:3c7db97ce541

            .inner(py)
            .borrow_mut()
            .copy_map_remove(HgPath::new(key.data(py)))
            .map_err(|e| v2_error(py, e))?
        {
            Some(_) => Ok(None),
            None => Ok(default),
        }
    }

    def copymapiter(&self) -> PyResult<CopyMapKeysIterator> {

48135:bd5f7c61d69d

            .inner(py)
            .borrow_mut()
            .copy_map_remove(HgPath::new(key.data(py)))
            .map_err(|e| v2_error(py, e))?
        {
            Some(copy) => Ok(Some(
                PyBytes::new(py, copy.as_bytes()).into_object(),
            )),
            None => Ok(default),
        }
    }

    def copymapiter(&self) -> PyResult<CopyMapKeysIterator> {