##// END OF EJS Templates
dirstate: Remove the `state == ' '` special case...
dirstate: Remove the `state == ' '` special case Previously this was used to create a `DirstateItem` representing dirstate tree nodes that semantically don’t have an associated `DirtateItem`. This isn’t used anymore now that `dirstatemap.debug_iter` yields plain tuples. Differential Revision: https://phab.mercurial-scm.org/D11464

File last commit:

r48837:631f6b44 default
r48837:631f6b44 default
Show More
dirstate.rs
112 lines | 3.4 KiB | application/rls-services+xml | RustLexer
Raphaël Gomès
rust-dirstate: add rust-cpython bindings to the new parse/pack functions...
r42489 // dirstate.rs
//
// Copyright 2019 Raphaël Gomès <rgomes@octobus.net>
//
// This software may be used and distributed according to the terms of the
// GNU General Public License version 2 or any later version.
//! Bindings for the `hg::dirstate` module provided by the
//! `hg-core` package.
//!
//! From Python, this will be seen as `mercurial.rustext.dirstate`
Raphaël Gomès
rust-dirstate: rust-cpython bridge for dirstatemap...
r42999 mod copymap;
Raphaël Gomès
rust-dirstate: create dirstate submodule in hg-cpython...
r42991 mod dirs_multiset;
Raphaël Gomès
rust-dirstate: rust-cpython bridge for dirstatemap...
r42999 mod dirstate_map;
Raphaël Gomès
rust-dirstatemap: add `NonNormalEntries` class...
r44779 mod non_normal_entries;
Raphaël Gomès
rust-dirstate-status: rust-cpython bindings for `dirstate.status`...
r43567 mod status;
Raphaël Gomès
rust-status: update rust-cpython bridge to account for the changes in core...
r45016 use crate::{
dirstate::{
dirs_multiset::Dirs, dirstate_map::DirstateMap, status::status_wrapper,
},
exceptions,
Raphaël Gomès
rust-dirstate-status: rust-cpython bindings for `dirstate.status`...
r43567 };
Raphaël Gomès
rust-dirstate: add rust-cpython bindings to the new parse/pack functions...
r42489 use cpython::{
Simon Sapin
rust: Remove support for passing a dict to the Rust pathutil.dirs()...
r48833 PyBytes, PyDict, PyErr, PyList, PyModule, PyObject, PyResult, Python,
Raphaël Gomès
rust-dirstate: add rust-cpython bindings to the new parse/pack functions...
r42489 };
Simon Sapin
dirstate-v2: Change the on-disk format when the requirement is enabled...
r48055 use hg::dirstate_tree::on_disk::V2_FORMAT_MARKER;
Simon Sapin
rust: Remove support for passing a dict to the Rust pathutil.dirs()...
r48833 use hg::DirstateEntry;
Raphaël Gomès
rust: switch hg-core and hg-cpython to rust 2018 edition...
r42828 use libc::{c_char, c_int};
Raphaël Gomès
rust-dirstate: add rust-cpython bindings to the new parse/pack functions...
r42489
Yuya Nishihara
rust-cpython: turn inline comments into non-doc comments
r43482 // C code uses a custom `dirstate_tuple` type, checks in multiple instances
// for this type, and raises a Python `Exception` if the check does not pass.
// Because this type differs only in name from the regular Python tuple, it
// would be a good idea in the near future to remove it entirely to allow
// for a pure Python tuple of the same effective structure to be used,
// rendering this type and the capsule below useless.
Yuya Nishihara
rust-cpython: leverage upstreamed py_capsule_fn!() macro
r43484 py_capsule_fn!(
dirstate-item: rename the class to DirstateItem...
r48328 from mercurial.cext.parsers import make_dirstate_item_CAPI
as make_dirstate_item_capi
Yuya Nishihara
rust-cpython: leverage upstreamed py_capsule_fn!() macro
r43484 signature (
state: c_char,
mode: c_int,
size: c_int,
mtime: c_int,
) -> *mut RawPyObject
);
Raphaël Gomès
rust-dirstate: add rust-cpython bindings to the new parse/pack functions...
r42489
dirstate-item: rename the class to DirstateItem...
r48328 pub fn make_dirstate_item(
Yuya Nishihara
rust-cpython: add wrapper around decapsule_make_dirstate_tuple()...
r43479 py: Python,
entry: &DirstateEntry,
) -> PyResult<PyObject> {
// Explicitly go through u8 first, then cast to platform-specific `c_char`
// because Into<u8> has a specific implementation while `as c_char` would
// just do a naive enum cast.
Simon Sapin
rust: Make the fields of DirstateEntry private...
r48834 let state_code: u8 = entry.state().into();
Yuya Nishihara
rust-cpython: add wrapper around decapsule_make_dirstate_tuple()...
r43479
dirstate-item: also build DistateItem in dirstate.directories()...
r48367 let make = make_dirstate_item_capi::retrieve(py)?;
let maybe_obj = unsafe {
Simon Sapin
dirstate: Remove the `state == ' '` special case...
r48837 let ptr = make(
state_code as c_char,
entry.mode(),
entry.size(),
entry.mtime(),
);
dirstate-item: also build DistateItem in dirstate.directories()...
r48367 PyObject::from_owned_ptr_opt(py, ptr)
};
maybe_obj.ok_or_else(|| PyErr::fetch(py))
}
Raphaël Gomès
rust-dirstate: add rust-cpython bindings to the new parse/pack functions...
r42489 /// Create the module, with `__package__` given from parent
pub fn init_module(py: Python, package: &str) -> PyResult<PyModule> {
let dotted_name = &format!("{}.dirstate", package);
let m = PyModule::new(py, dotted_name)?;
Raphaël Gomès
rust-dirstate: add "dirs" rust-cpython binding...
r42737
Raphaël Gomès
rust-cpython: switch logging facade from `simple_logger` to `env_logger`...
r46090 env_logger::init();
Raphaël Gomès
rust: add logging utils...
r45027
Raphaël Gomès
rust-dirstate: add rust-cpython bindings to the new parse/pack functions...
r42489 m.add(py, "__package__", package)?;
m.add(py, "__doc__", "Dirstate - Rust implementation")?;
Raphaël Gomès
rust-status: update rust-cpython bridge to account for the changes in core...
r45016 m.add(
py,
"FallbackError",
py.get_type::<exceptions::FallbackError>(),
)?;
Raphaël Gomès
rust-dirstate: add "dirs" rust-cpython binding...
r42737 m.add_class::<Dirs>(py)?;
Raphaël Gomès
rust-dirstate: rust-cpython bridge for dirstatemap...
r42999 m.add_class::<DirstateMap>(py)?;
Simon Sapin
dirstate-v2: Change the on-disk format when the requirement is enabled...
r48055 m.add(py, "V2_FORMAT_MARKER", PyBytes::new(py, V2_FORMAT_MARKER))?;
Raphaël Gomès
rust-dirstate-status: rust-cpython bindings for `dirstate.status`...
r43567 m.add(
py,
"status",
py_fn!(
py,
status_wrapper(
dmap: DirstateMap,
root_dir: PyObject,
Raphaël Gomès
rust-dirstate-status: update bridge for new rust version of `dirstate.status`...
r44368 matcher: PyObject,
Raphaël Gomès
rust-status: update rust-cpython bridge to account for the changes in core...
r45016 ignorefiles: PyList,
check_exec: bool,
Raphaël Gomès
rust-dirstate-status: rust-cpython bindings for `dirstate.status`...
r43567 last_normal_time: i64,
Raphaël Gomès
rust-status: update rust-cpython bridge to account for the changes in core...
r45016 list_clean: bool,
list_ignored: bool,
Raphaël Gomès
rust-hg-cpython: update status bridge with the new `traversedir` support...
r45354 list_unknown: bool,
collect_traversed_dirs: bool
Raphaël Gomès
rust-dirstate-status: rust-cpython bindings for `dirstate.status`...
r43567 )
),
)?;
Raphaël Gomès
rust-dirstate: add "dirs" rust-cpython binding...
r42737
Raphaël Gomès
rust-dirstate: add rust-cpython bindings to the new parse/pack functions...
r42489 let sys = PyModule::import(py, "sys")?;
let sys_modules: PyDict = sys.get(py, "modules")?.extract(py)?;
sys_modules.set_item(py, dotted_name, &m)?;
Ok(m)
}