This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8155

rust-nodemap: add utils to create `Node`s from Python objects
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGd738b7a18438: rust-nodemap: add utils to create `Node`s from Python objects

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

Alphare created this revision.Feb 26 2020, 12:36 PM
Alphare updated this revision to Diff 20654.Mar 10 2020, 6:51 AM
gracinet added a commit: rHGd738b7a18438: rust-nodemap: add utils to create `Node`s from Python objects.Mar 11 2020, 11:42 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGd738b7a18438: rust-nodemap: add utils to create `Node`s from Python objects (authored by gracinet). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mrust/hg-cpython/src/utils.rs (36 lines)

Diff 20330

rust/hg-cpython/src/utils.rs

use cpython::{PyDict, PyObject, PyResult, PyTuple, Python}; use cpython::exc::ValueError;
use cpython::{PyBytes, PyDict, PyErr, PyObject, PyResult, PyTuple, Python};
use hg::revlog::Node;
use std::convert::TryFrom;
#[allow(unused)] #[allow(unused)]
pub fn print_python_trace(py: Python) -> PyResult<PyObject> { pub fn print_python_trace(py: Python) -> PyResult<PyObject> {
eprintln!("==============================="); eprintln!("===============================");
eprintln!("Printing Python stack from Rust"); eprintln!("Printing Python stack from Rust");
eprintln!("==============================="); eprintln!("===============================");
let traceback = py.import("traceback")?; let traceback = py.import("traceback")?;
let sys = py.import("sys")?; let sys = py.import("sys")?;
let kwargs = PyDict::new(py); let kwargs = PyDict::new(py);
kwargs.set_item(py, "file", sys.get(py, "stderr")?)?; kwargs.set_item(py, "file", sys.get(py, "stderr")?)?;
traceback.call(py, "print_stack", PyTuple::new(py, &[]), Some(&kwargs)) traceback.call(py, "print_stack", PyTuple::new(py, &[]), Some(&kwargs))
} }
// Necessary evil for the time being, could maybe be moved to
// a TryFrom in Node itself
const NODE_BYTES_LENGTH: usize = 20;
type NodeData = [u8; NODE_BYTES_LENGTH];
/// Copy incoming Python bytes given as `PyObject` into `Node`,
/// doing the necessary checks
pub fn node_from_py_object<'a>(
py: Python,
bytes: &'a PyObject,
) -> PyResult<Node> {
let as_py_bytes: &'a PyBytes = bytes.extract(py)?;
node_from_py_bytes(py, as_py_bytes)
}
/// Clone incoming Python bytes given as `PyBytes` as a `Node`,
/// doing the necessary checks.
pub fn node_from_py_bytes<'a>(
py: Python,
bytes: &'a PyBytes,
) -> PyResult<Node> {
<NodeData>::try_from(bytes.data(py))
.map_err(|_| {
PyErr::new::<ValueError, _>(
py,
format!("{}-byte hash required", NODE_BYTES_LENGTH),
)
})
.map(|n| n.into())
}