Mercurial > hg
view rust/hg-cpython/src/utils.rs @ 47890:3853e6ee160d
dirstatemap: replace `removefile` by an explicit `entry.set_untracked()`
All the other caller goes through `reset_state`, so we can safely have an
explicit method on `DirstateItem` object.
This means that all the logic to preserve the previous state (from p2, merged,
etc) is now properly encapsulated within the DirstateItem. This pave the way to
using different storage for these information.
Differential Revision: https://phab.mercurial-scm.org/D11315
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 20 Aug 2021 11:27:01 +0200 |
parents | 26114bd6ec60 |
children | c7fb9b74e753 |
line wrap: on
line source
use cpython::exc::ValueError; use cpython::{PyBytes, PyDict, PyErr, PyObject, PyResult, PyTuple, Python}; use hg::revlog::Node; use std::convert::TryFrom; #[allow(unused)] pub fn print_python_trace(py: Python) -> PyResult<PyObject> { eprintln!("==============================="); eprintln!("Printing Python stack from Rust"); eprintln!("==============================="); let traceback = py.import("traceback")?; let sys = py.import("sys")?; let kwargs = PyDict::new(py); kwargs.set_item(py, "file", sys.get(py, "stderr")?)?; 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(py: Python, bytes: &PyBytes) -> PyResult<Node> { <NodeData>::try_from(bytes.data(py)) .map_err(|_| { PyErr::new::<ValueError, _>( py, format!("{}-byte hash required", NODE_BYTES_LENGTH), ) }) .map(Into::into) }