##// END OF EJS Templates
dirstate: drop all logic around the "non-normal" sets...
dirstate: drop all logic around the "non-normal" sets The dirstate has a lot of code to compute a set of all "non-normal" and "from_other_parent" entries. This is all used in one, unique, location, when `setparent` is called and moved from a merge to a non merge. At that time, any "merge related" information has to be dropped. This is mostly useful for command like `graft` or `shelve` that move to a single-parent state -before- the commit. Otherwise the commit will already have removed all traces of the merge information in the dirstate (e.g. for a regular merges). The bookkeeping for these sets is quite invasive. And it seems simpler to just drop it and do the full computation in the single location where we actually use it (since we have to do the computation at least once anyway). This simplify the code a lot, and clarify why this kind of computation is needed. The possible drawback compared to the previous code are: - if the operation happens in a loop, we will end up doing it multiple time, - the C code to detect entry of interest have been dropped, for now. It will be re-introduced later, with a processing code directly in C for even faster operation. Differential Revision: https://phab.mercurial-scm.org/D11507

File last commit:

r48875:060cd909 default
r48875:060cd909 default
Show More
dirstate.rs
71 lines | 2.0 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;
Simon Sapin
rust: Add Python bindings for DirstateEntry as rustext.dirstate.DirstateItem...
r48857 mod item;
Raphaël Gomès
rust-dirstate-status: rust-cpython bindings for `dirstate.status`...
r43567 mod status;
Simon Sapin
rust: Add Python bindings for DirstateEntry as rustext.dirstate.DirstateItem...
r48857 use self::item::DirstateItem;
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 };
Simon Sapin
dirstate: Use the Rust implementation of DirstateItem when Rust is enabled...
r48858 use cpython::{PyBytes, PyDict, PyList, PyModule, PyObject, PyResult, Python};
Simon Sapin
dirstate-v2: Change the on-disk format when the requirement is enabled...
r48055 use hg::dirstate_tree::on_disk::V2_FORMAT_MARKER;
dirstate-item: also build DistateItem in dirstate.directories()...
r48367
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
rust: Add Python bindings for DirstateEntry as rustext.dirstate.DirstateItem...
r48857 m.add_class::<DirstateItem>(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)
}