This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8158

rust-nodemap: add binding for `nodemap_data_all`
ClosedPublic

Authored by Alphare on Feb 26 2020, 12:36 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGb581231ae9d1: rust-nodemap: add binding for `nodemap_data_all`

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

Alphare created this revision.Feb 26 2020, 12:36 PM
marmoute updated this revision to Diff 20377.Feb 28 2020, 1:53 PM
Alphare updated this revision to Diff 20657.Mar 10 2020, 6:52 AM
gracinet added a commit: rHGb581231ae9d1: rust-nodemap: add binding for `nodemap_data_all`.Mar 11 2020, 11:42 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGb581231ae9d1: rust-nodemap: add binding for `nodemap_data_all` (authored by gracinet). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mrust/hg-cpython/src/revlog.rs (27 lines)

Diff 20696

rust/hg-cpython/src/revlog.rs

"has_node", "has_node",
PyTuple::new(py, &[item]), PyTuple::new(py, &[item]),
None)? None)?
.extract(py) .extract(py)
} }
} }
} }
def nodemap_data_all(&self) -> PyResult<PyBytes> {
self.inner_nodemap_data_all(py)
}
}); });
impl MixedIndex { impl MixedIndex {
fn new(py: Python, cindex: PyObject) -> PyResult<MixedIndex> { fn new(py: Python, cindex: PyObject) -> PyResult<MixedIndex> {
Self::create_instance( Self::create_instance(
py, py,
RefCell::new(cindex::Index::new(py, cindex)?), RefCell::new(cindex::Index::new(py, cindex)?),
.borrow() .borrow()
.inner() .inner()
.call_method(py, name, args, kwargs) .call_method(py, name, args, kwargs)
} }
pub fn clone_cindex(&self, py: Python) -> cindex::Index { pub fn clone_cindex(&self, py: Python) -> cindex::Index {
self.cindex(py).borrow().clone_ref(py) self.cindex(py).borrow().clone_ref(py)
} }
/// Returns the full nodemap bytes to be written as-is to disk
fn inner_nodemap_data_all(&self, py: Python) -> PyResult<PyBytes> {
let nodemap = self.get_nodetree(py)?.borrow_mut().take().unwrap();
let (readonly, bytes) = nodemap.into_readonly_and_added_bytes();
// If there's anything readonly, we need to build the data again from
// scratch
let bytes = if readonly.len() > 0 {
let mut nt = NodeTree::load_bytes(Box::new(vec![]), 0);
self.fill_nodemap(py, &mut nt)?;
let (readonly, bytes) = nt.into_readonly_and_added_bytes();
assert_eq!(readonly.len(), 0);
bytes
} else {
bytes
};
let bytes = PyBytes::new(py, &bytes);
Ok(bytes)
}
} }
fn revlog_error(py: Python) -> PyErr { fn revlog_error(py: Python) -> PyErr {
match py match py
.import("mercurial.error") .import("mercurial.error")
.and_then(|m| m.get(py, "RevlogError")) .and_then(|m| m.get(py, "RevlogError"))
{ {
Err(e) => e, Err(e) => e,