mercurial-scm/hg-stable: rust/hg-cpython/src/parsers.rs annotate

annotate rust/hg-cpython/src/parsers.rs @ 43208:1ca3823aeefd

rust-cpython: add wrapper around decapsule_make_dirstate_tuple() There are a couple of safety issues. First, the returned function pointer must be unsafe. Second, its return value must be a raw pointer (i.e. python27_sys::PyObject), not a cpython::PyObject. The wrapper function will address these issues.

author	Yuya Nishihara <yuya@tcha.org>
date	Sun, 13 Oct 2019 16:55:17 +0900
parents	7a01778bc7b7
children	ce088b38f92b

rev	line source
42763 760a7851e9ba rust-parsers: move parser bindings to their own file and Python module Rapha?l Gom?s <rgomes@octobus.net> parents: 42762 diff changeset	1 // parsers.rs
42330 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	2 //
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	3 // Copyright 2019 Raphaël Gomès <rgomes@octobus.net>
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	4 //
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	5 // This software may be used and distributed according to the terms of the
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	6 // GNU General Public License version 2 or any later version.
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	7
42763 760a7851e9ba rust-parsers: move parser bindings to their own file and Python module Rapha?l Gom?s <rgomes@octobus.net> parents: 42762 diff changeset	8 //! Bindings for the `hg::dirstate::parsers` module provided by the
42330 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	9 //! `hg-core` package.
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	10 //!
42763 760a7851e9ba rust-parsers: move parser bindings to their own file and Python module Rapha?l Gom?s <rgomes@octobus.net> parents: 42762 diff changeset	11 //! From Python, this will be seen as `mercurial.rustext.parsers`
760a7851e9ba rust-parsers: move parser bindings to their own file and Python module Rapha?l Gom?s <rgomes@octobus.net> parents: 42762 diff changeset	12 //!
42330 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	13 use cpython::{
42763 760a7851e9ba rust-parsers: move parser bindings to their own file and Python module Rapha?l Gom?s <rgomes@octobus.net> parents: 42762 diff changeset	14 exc, PyBytes, PyDict, PyErr, PyInt, PyModule, PyResult, PyTuple, Python,
42809 98901eb12245 rust-parsers: fix unboxing of PyInt on Python 3 Yuya Nishihara <yuya@tcha.org> parents: 42765 diff changeset	15 PythonObject, ToPyObject,
42330 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	16 };
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	17 use hg::{
43208 1ca3823aeefd rust-cpython: add wrapper around decapsule_make_dirstate_tuple() Yuya Nishihara <yuya@tcha.org> parents: 42960 diff changeset	18 pack_dirstate, parse_dirstate, utils::hg_path::HgPathBuf,
42960 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42818 diff changeset	19 DirstatePackError, DirstateParents, DirstateParseError, PARENT_SIZE,
42330 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	20 };
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	21 use std::collections::HashMap;
42815 5399532510ae rust: simply use TryInto to convert slice to array Yuya Nishihara <yuya@tcha.org> parents: 42809 diff changeset	22 use std::convert::TryInto;
42330 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	23
43208 1ca3823aeefd rust-cpython: add wrapper around decapsule_make_dirstate_tuple() Yuya Nishihara <yuya@tcha.org> parents: 42960 diff changeset	24 use crate::dirstate::{extract_dirstate, make_dirstate_tuple};
42764 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42763 diff changeset	25 use std::time::Duration;
42330 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	26
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	27 fn parse_dirstate_wrapper(
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	28 py: Python,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	29 dmap: PyDict,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	30 copymap: PyDict,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	31 st: PyBytes,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	32 ) -> PyResult<PyTuple> {
42764 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42763 diff changeset	33 let mut dirstate_map = HashMap::new();
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42763 diff changeset	34 let mut copies = HashMap::new();
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42763 diff changeset	35
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42763 diff changeset	36 match parse_dirstate(&mut dirstate_map, &mut copies, st.data(py)) {
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42763 diff changeset	37 Ok(parents) => {
43208 1ca3823aeefd rust-cpython: add wrapper around decapsule_make_dirstate_tuple() Yuya Nishihara <yuya@tcha.org> parents: 42960 diff changeset	38 for (filename, entry) in &dirstate_map {
42330 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	39 dmap.set_item(
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	40 py,
42960 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42818 diff changeset	41 PyBytes::new(py, filename.as_ref()),
43208 1ca3823aeefd rust-cpython: add wrapper around decapsule_make_dirstate_tuple() Yuya Nishihara <yuya@tcha.org> parents: 42960 diff changeset	42 make_dirstate_tuple(py, entry)?,
42330 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	43 )?;
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	44 }
42764 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42763 diff changeset	45 for (path, copy_path) in copies {
42330 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	46 copymap.set_item(
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	47 py,
42960 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42818 diff changeset	48 PyBytes::new(py, path.as_ref()),
7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42818 diff changeset	49 PyBytes::new(py, copy_path.as_ref()),
42330 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	50 )?;
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	51 }
42764 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42763 diff changeset	52 Ok(
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42763 diff changeset	53 (PyBytes::new(py, &parents.p1), PyBytes::new(py, &parents.p2))
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42763 diff changeset	54 .to_py_object(py),
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42763 diff changeset	55 )
42330 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	56 }
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	57 Err(e) => Err(PyErr::new::<exc::ValueError, _>(
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	58 py,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	59 match e {
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	60 DirstateParseError::TooLittleData => {
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	61 "too little data for parents".to_string()
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	62 }
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	63 DirstateParseError::Overflow => {
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	64 "overflow in dirstate".to_string()
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	65 }
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	66 DirstateParseError::CorruptedEntry(e) => e,
42764 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42763 diff changeset	67 DirstateParseError::Damaged => {
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42763 diff changeset	68 "dirstate appears to be damaged".to_string()
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42763 diff changeset	69 }
42330 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	70 },
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	71 )),
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	72 }
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	73 }
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	74
42544 ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42427 diff changeset	75 fn pack_dirstate_wrapper(
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42427 diff changeset	76 py: Python,
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42427 diff changeset	77 dmap: PyDict,
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42427 diff changeset	78 copymap: PyDict,
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42427 diff changeset	79 pl: PyTuple,
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42427 diff changeset	80 now: PyInt,
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42427 diff changeset	81 ) -> PyResult<PyBytes> {
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42427 diff changeset	82 let p1 = pl.get_item(py, 0).extract::<PyBytes>(py)?;
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42427 diff changeset	83 let p1: &[u8] = p1.data(py);
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42427 diff changeset	84 let p2 = pl.get_item(py, 1).extract::<PyBytes>(py)?;
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42427 diff changeset	85 let p2: &[u8] = p2.data(py);
ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42427 diff changeset	86
42764 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42763 diff changeset	87 let mut dirstate_map = extract_dirstate(py, &dmap)?;
42330 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	88
42960 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42818 diff changeset	89 let copies: Result<HashMap<HgPathBuf, HgPathBuf>, PyErr> = copymap
42330 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	90 .items(py)
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	91 .iter()
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	92 .map(\|(key, value)\| {
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	93 Ok((
42960 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42818 diff changeset	94 HgPathBuf::from_bytes(key.extract::<PyBytes>(py)?.data(py)),
7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42818 diff changeset	95 HgPathBuf::from_bytes(value.extract::<PyBytes>(py)?.data(py)),
42330 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	96 ))
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	97 })
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	98 .collect();
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	99
42764 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42763 diff changeset	100 if p1.len() != PARENT_SIZE \|\| p2.len() != PARENT_SIZE {
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42763 diff changeset	101 return Err(PyErr::new::<exc::ValueError, _>(
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42763 diff changeset	102 py,
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42763 diff changeset	103 "expected a 20-byte hash".to_string(),
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42763 diff changeset	104 ));
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42763 diff changeset	105 }
7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42763 diff changeset	106
42330 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	107 match pack_dirstate(
42764 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42763 diff changeset	108 &mut dirstate_map,
42330 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	109 &copies?,
42764 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42763 diff changeset	110 DirstateParents {
42815 5399532510ae rust: simply use TryInto to convert slice to array Yuya Nishihara <yuya@tcha.org> parents: 42809 diff changeset	111 p1: p1.try_into().unwrap(),
5399532510ae rust: simply use TryInto to convert slice to array Yuya Nishihara <yuya@tcha.org> parents: 42809 diff changeset	112 p2: p2.try_into().unwrap(),
42764 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42763 diff changeset	113 },
42809 98901eb12245 rust-parsers: fix unboxing of PyInt on Python 3 Yuya Nishihara <yuya@tcha.org> parents: 42765 diff changeset	114 Duration::from_secs(now.as_object().extract::<u64>(py)?),
42330 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	115 ) {
42764 7cae6bc29ff9 rust-parsers: switch to parse/pack_dirstate to mutate-on-loop Rapha?l Gom?s <rgomes@octobus.net> parents: 42763 diff changeset	116 Ok(packed) => {
43208 1ca3823aeefd rust-cpython: add wrapper around decapsule_make_dirstate_tuple() Yuya Nishihara <yuya@tcha.org> parents: 42960 diff changeset	117 for (filename, entry) in &dirstate_map {
42330 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	118 dmap.set_item(
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	119 py,
42960 7a01778bc7b7 rust-hgpath: replace all paths and filenames with HgPath/HgPathBuf Rapha?l Gom?s <rgomes@octobus.net> parents: 42818 diff changeset	120 PyBytes::new(py, filename.as_ref()),
43208 1ca3823aeefd rust-cpython: add wrapper around decapsule_make_dirstate_tuple() Yuya Nishihara <yuya@tcha.org> parents: 42960 diff changeset	121 make_dirstate_tuple(py, entry)?,
42330 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	122 )?;
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	123 }
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	124 Ok(PyBytes::new(py, &packed))
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	125 }
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	126 Err(error) => Err(PyErr::new::<exc::ValueError, _>(
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	127 py,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	128 match error {
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	129 DirstatePackError::CorruptedParent => {
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	130 "expected a 20-byte hash".to_string()
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	131 }
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	132 DirstatePackError::CorruptedEntry(e) => e,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	133 DirstatePackError::BadSize(expected, actual) => {
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	134 format!("bad dirstate size: {} != {}", actual, expected)
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	135 }
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	136 },
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	137 )),
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	138 }
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	139 }
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	140
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	141 /// Create the module, with `__package__` given from parent
42763 760a7851e9ba rust-parsers: move parser bindings to their own file and Python module Rapha?l Gom?s <rgomes@octobus.net> parents: 42762 diff changeset	142 pub fn init_parsers_module(py: Python, package: &str) -> PyResult<PyModule> {
760a7851e9ba rust-parsers: move parser bindings to their own file and Python module Rapha?l Gom?s <rgomes@octobus.net> parents: 42762 diff changeset	143 let dotted_name = &format!("{}.parsers", package);
42330 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	144 let m = PyModule::new(py, dotted_name)?;
42544 ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42427 diff changeset	145
42330 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	146 m.add(py, "__package__", package)?;
42763 760a7851e9ba rust-parsers: move parser bindings to their own file and Python module Rapha?l Gom?s <rgomes@octobus.net> parents: 42762 diff changeset	147 m.add(py, "__doc__", "Parsers - Rust implementation")?;
760a7851e9ba rust-parsers: move parser bindings to their own file and Python module Rapha?l Gom?s <rgomes@octobus.net> parents: 42762 diff changeset	148
42330 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	149 m.add(
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	150 py,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	151 "parse_dirstate",
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	152 py_fn!(
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	153 py,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	154 parse_dirstate_wrapper(dmap: PyDict, copymap: PyDict, st: PyBytes)
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	155 ),
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	156 )?;
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	157 m.add(
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	158 py,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	159 "pack_dirstate",
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	160 py_fn!(
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	161 py,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	162 pack_dirstate_wrapper(
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	163 dmap: PyDict,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	164 copymap: PyDict,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	165 pl: PyTuple,
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	166 now: PyInt
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	167 )
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	168 ),
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	169 )?;
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	170
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	171 let sys = PyModule::import(py, "sys")?;
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	172 let sys_modules: PyDict = sys.get(py, "modules")?.extract(py)?;
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	173 sys_modules.set_item(py, dotted_name, &m)?;
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	174
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	175 Ok(m)
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	176 }

Mercurial > public > mercurial-scm > hg-stable

annotate rust/hg-cpython/src/parsers.rs @ 43208:1ca3823aeefd