facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-06 23:07:18 +03:00
Code Issues Projects Releases Wiki Activity

pyrenderdag: support non-revision-numbers graph vertexes

Browse Source 
Summary:
Change pyrenderdag to accept non-revision-number graph vertexes so it can
render a graph even if the graph does not use revision numbers.

The next diff wants this behavior so it can just emit commit hashes to
the renderer without caring about revision numbers. The type is made
so it can still support revision numbers, since the legacy graphlog
interface would still use revision numbers.

Reviewed By: markbt

Differential Revision: D21554671

fbshipit-source-id: 20572683b831f7cecb03957c83f278ff3903eff0
This commit is contained in:
Jun Wu 2020-05-14 12:01:01 -07:00 committed by Facebook GitHub Bot
parent 96ac755c06
commit a27bf2fc42
2 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
eden/scm/edenscmnative/bindings/modules/pyrenderdag/Cargo.toml
View File

@ -6,5 +6,10 @@ edition = "2018"
[dependencies]
cpython = { version = "0.5", default-features = false }
cpython-ext = { path = "../../../../lib/cpython-ext", default-features = false }
minibytes = { path = "../../../../lib/minibytes" }
renderdag = { path = "../../../../lib/renderdag" }
parking_lot = "0.9"
[features]
python2 = ["cpython/python27-sys", "cpython-ext/python2"]
python3 = ["cpython/python3-sys", "cpython-ext/python3"]

41
eden/scm/edenscmnative/bindings/modules/pyrenderdag/src/lib.rs
View File

@ -11,6 +11,7 @@ use std::sync::Arc;
use cpython::*;
use cpython_ext::PyNone;
use minibytes::Bytes;
use parking_lot::Mutex;
use renderdag::{Ancestor, GraphRowRenderer, Renderer};
@ -35,12 +36,33 @@ pub fn init_module(py: Python, package: &str) -> PyResult<PyModule> {
Ok(m)
}
fn convert_parents(py: Python, parents: Vec<(String, i64)>) -> PyResult<Vec<Ancestor<i64>>> {
pub struct PyNode(Bytes);
impl From<PyNode> for Bytes {
fn from(pynode: PyNode) -> Bytes {
pynode.0
}
}
impl<'a> FromPyObject<'a> for PyNode {
fn extract(py: Python, obj: &'a PyObject) -> PyResult<Self> {
if let Ok(node) = obj.extract::<PyBytes>(py) {
Ok(PyNode(Bytes::copy_from_slice(node.data(py))))
} else if let Ok(rev) = obj.extract::<i64>(py) {
let slice: [u8; 8] = unsafe { std::mem::transmute(rev.to_be()) };
Ok(PyNode(Bytes::copy_from_slice(&slice)))
} else {
Err(PyErr::new::<exc::TypeError, _>(py, "expect bytes or int"))
}
}
}
fn convert_parents(py: Python, parents: Vec<(String, PyNode)>) -> PyResult<Vec<Ancestor<Bytes>>> {
parents
.into_iter()
.map(|(kind, parent)| match kind.as_str() {
"P" => Ok(Ancestor::Parent(parent)),
"G" => Ok(Ancestor::Ancestor(parent)),
"P" => Ok(Ancestor::Parent(parent.into())),
"G" => Ok(Ancestor::Ancestor(parent.into())),
"M" => Ok(Ancestor::Anonymous),
_ => Err(PyErr::new::<exc::ValueError, _>(
py,
@ -51,23 +73,24 @@ fn convert_parents(py: Python, parents: Vec<(String, i64)>) -> PyResult<Vec<Ance
}
py_class!(pub class renderer |py| {
data inner: Arc<Mutex<dyn Renderer<i64, Output = String> + Send>>;
data inner: Arc<Mutex<dyn Renderer<Bytes, Output = String> + Send>>;
def width(&self, node: Option<i64>, parents: Option<Vec<(String, i64)>>) -> PyResult<u64> {
def width(&self, node: Option<PyNode>, parents: Option<Vec<(String, PyNode)>>) -> PyResult<u64> {
let renderer = self.inner(py).lock();
let parents = parents.map(|parents| convert_parents(py, parents)).transpose()?;
let node: Option<Bytes> = node.map(Into::into);
Ok(renderer.width(node.as_ref(), parents.as_ref()))
}
def reserve(&self, node: i64) -> PyResult<PyNone> {
def reserve(&self, node: PyNode) -> PyResult<PyNone> {
let mut renderer = self.inner(py).lock();
renderer.reserve(node);
renderer.reserve(node.into());
Ok(PyNone)
}
def nextrow(&self, node: i64, parents: Vec<(String, i64)>, glyph: String, message: String) -> PyResult<String> {
def nextrow(&self, node: PyNode, parents: Vec<(String, PyNode)>, glyph: String, message: String) -> PyResult<String> {
let mut renderer = self.inner(py).lock();
Ok(renderer.next_row(node, convert_parents(py, parents)?, glyph, message))
Ok(renderer.next_row(node.into(), convert_parents(py, parents)?, glyph, message))
}
});