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

annotate rust/hg-cpython/src/dirstate.rs @ 52298:db065b33fa56

rust-dirstate: merge `dirstate_tree` module into `dirstate` The historical reasonning for `dirstate_tree` existing in the first place is that a new approach was needed for the tree-like dirstate and it was easier to start somewhat fresh. Now that the former dirstate is (long) gone, we can merge those two modules to avoid the confusion that even the module creators sometimes get.

author	Rapha?l Gom?s <rgomes@octobus.net>
date	Mon, 04 Nov 2024 11:00:58 +0100
parents	ea0467ed76aa
children

rev	line source
42303 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	1 // dirstate.rs
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
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	8 //! Bindings for the `hg::dirstate` module provided by the
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 //!
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	11 //! From Python, this will be seen as `mercurial.rustext.dirstate`
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: 42749 diff changeset	12 mod copymap;
42746 b3518b0baa47 rust-dirstate: create dirstate submodule in hg-cpython Rapha?l Gom?s <rgomes@octobus.net> parents: 42609 diff changeset	13 mod dirs_multiset;
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: 42749 diff changeset	14 mod dirstate_map;
48043 3e69bef2031a rust: Add Python bindings for DirstateEntry as rustext.dirstate.DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48025 diff changeset	15 mod item;
43273 478d0b1bf0c5 rust-dirstate-status: rust-cpython bindings for `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43213 diff changeset	16 mod status;
48043 3e69bef2031a rust: Add Python bindings for DirstateEntry as rustext.dirstate.DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48025 diff changeset	17 use self::item::DirstateItem;
44529 f96b28aa4b79 rust-status: update rust-cpython bridge to account for the changes in core Rapha?l Gom?s <rgomes@octobus.net> parents: 44297 diff changeset	18 use crate::{
52050 ea0467ed76aa rust-dirstate-map: use a more precise identity Rapha?l Gom?s <rgomes@octobus.net> parents: 48391 diff changeset	19 dirstate::{dirs_multiset::Dirs, status::status_wrapper},
44529 f96b28aa4b79 rust-status: update rust-cpython bridge to account for the changes in core Rapha?l Gom?s <rgomes@octobus.net> parents: 44297 diff changeset	20 exceptions,
43273 478d0b1bf0c5 rust-dirstate-status: rust-cpython bindings for `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43213 diff changeset	21 };
48044 d5528ac9b4f2 dirstate: Use the Rust implementation of DirstateItem when Rust is enabled Simon Sapin <simon.sapin@octobus.net> parents: 48043 diff changeset	22 use cpython::{PyBytes, PyDict, PyList, PyModule, PyObject, PyResult, Python};
52050 ea0467ed76aa rust-dirstate-map: use a more precise identity Rapha?l Gom?s <rgomes@octobus.net> parents: 48391 diff changeset	23 use dirstate_map::{DirstateIdentity, DirstateMap};
52298 db065b33fa56 rust-dirstate: merge `dirstate_tree` module into `dirstate` Rapha?l Gom?s <rgomes@octobus.net> parents: 52050 diff changeset	24 use hg::dirstate::on_disk::V2_FORMAT_MARKER;
47567 7a15dea6d303 dirstate-item: also build DistateItem in dirstate.directories() Pierre-Yves David <pierre-yves.david@octobus.net> parents: 47539 diff changeset	25
42303 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	26 /// Create the module, with `__package__` given from parent
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	27 pub fn init_module(py: Python, package: &str) -> PyResult<PyModule> {
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	28 let dotted_name = &format!("{}.dirstate", package);
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	29 let m = PyModule::new(py, dotted_name)?;
42537 ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	30
45517 2a68a5ec8dd0 rust-cpython: switch logging facade from `simple_logger` to `env_logger` Rapha?l Gom?s <rgomes@octobus.net> parents: 44839 diff changeset	31 env_logger::init();
44540 82f51ab7a2dd rust: add logging utils Rapha?l Gom?s <rgomes@octobus.net> parents: 44529 diff changeset	32
42303 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	33 m.add(py, "__package__", package)?;
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	34 m.add(py, "__doc__", "Dirstate - Rust implementation")?;
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	35
44529 f96b28aa4b79 rust-status: update rust-cpython bridge to account for the changes in core Rapha?l Gom?s <rgomes@octobus.net> parents: 44297 diff changeset	36 m.add(
f96b28aa4b79 rust-status: update rust-cpython bridge to account for the changes in core Rapha?l Gom?s <rgomes@octobus.net> parents: 44297 diff changeset	37 py,
f96b28aa4b79 rust-status: update rust-cpython bridge to account for the changes in core Rapha?l Gom?s <rgomes@octobus.net> parents: 44297 diff changeset	38 "FallbackError",
f96b28aa4b79 rust-status: update rust-cpython bridge to account for the changes in core Rapha?l Gom?s <rgomes@octobus.net> parents: 44297 diff changeset	39 py.get_type::<exceptions::FallbackError>(),
f96b28aa4b79 rust-status: update rust-cpython bridge to account for the changes in core Rapha?l Gom?s <rgomes@octobus.net> parents: 44297 diff changeset	40 )?;
42537 ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	41 m.add_class::<Dirs>(py)?;
42754 4e8f504424f3 rust-dirstate: rust-cpython bridge for dirstatemap Rapha?l Gom?s <rgomes@octobus.net> parents: 42749 diff changeset	42 m.add_class::<DirstateMap>(py)?;
48043 3e69bef2031a rust: Add Python bindings for DirstateEntry as rustext.dirstate.DirstateItem Simon Sapin <simon.sapin@octobus.net> parents: 48025 diff changeset	43 m.add_class::<DirstateItem>(py)?;
52050 ea0467ed76aa rust-dirstate-map: use a more precise identity Rapha?l Gom?s <rgomes@octobus.net> parents: 48391 diff changeset	44 m.add_class::<DirstateIdentity>(py)?;
47280 1766130fe9ba dirstate-v2: Change the on-disk format when the requirement is enabled Simon Sapin <simon.sapin@octobus.net> parents: 47123 diff changeset	45 m.add(py, "V2_FORMAT_MARKER", PyBytes::new(py, V2_FORMAT_MARKER))?;
43273 478d0b1bf0c5 rust-dirstate-status: rust-cpython bindings for `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43213 diff changeset	46 m.add(
478d0b1bf0c5 rust-dirstate-status: rust-cpython bindings for `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43213 diff changeset	47 py,
478d0b1bf0c5 rust-dirstate-status: rust-cpython bindings for `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43213 diff changeset	48 "status",
478d0b1bf0c5 rust-dirstate-status: rust-cpython bindings for `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43213 diff changeset	49 py_fn!(
478d0b1bf0c5 rust-dirstate-status: rust-cpython bindings for `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43213 diff changeset	50 py,
478d0b1bf0c5 rust-dirstate-status: rust-cpython bindings for `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43213 diff changeset	51 status_wrapper(
478d0b1bf0c5 rust-dirstate-status: rust-cpython bindings for `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43213 diff changeset	52 dmap: DirstateMap,
478d0b1bf0c5 rust-dirstate-status: rust-cpython bindings for `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43213 diff changeset	53 root_dir: PyObject,
43916 6a88ced33c40 rust-dirstate-status: update bridge for new rust version of `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43456 diff changeset	54 matcher: PyObject,
44529 f96b28aa4b79 rust-status: update rust-cpython bridge to account for the changes in core Rapha?l Gom?s <rgomes@octobus.net> parents: 44297 diff changeset	55 ignorefiles: PyList,
f96b28aa4b79 rust-status: update rust-cpython bridge to account for the changes in core Rapha?l Gom?s <rgomes@octobus.net> parents: 44297 diff changeset	56 check_exec: bool,
f96b28aa4b79 rust-status: update rust-cpython bridge to account for the changes in core Rapha?l Gom?s <rgomes@octobus.net> parents: 44297 diff changeset	57 list_clean: bool,
f96b28aa4b79 rust-status: update rust-cpython bridge to account for the changes in core Rapha?l Gom?s <rgomes@octobus.net> parents: 44297 diff changeset	58 list_ignored: bool,
44839 01afda7e7d6c rust-hg-cpython: update status bridge with the new `traversedir` support Rapha?l Gom?s <rgomes@octobus.net> parents: 44540 diff changeset	59 list_unknown: bool,
01afda7e7d6c rust-hg-cpython: update status bridge with the new `traversedir` support Rapha?l Gom?s <rgomes@octobus.net> parents: 44540 diff changeset	60 collect_traversed_dirs: bool
43273 478d0b1bf0c5 rust-dirstate-status: rust-cpython bindings for `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43213 diff changeset	61 )
478d0b1bf0c5 rust-dirstate-status: rust-cpython bindings for `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43213 diff changeset	62 ),
478d0b1bf0c5 rust-dirstate-status: rust-cpython bindings for `dirstate.status` Rapha?l Gom?s <rgomes@octobus.net> parents: 43213 diff changeset	63 )?;
42537 ce94f9622acd rust-dirstate: add "dirs" rust-cpython binding Rapha?l Gom?s <rgomes@octobus.net> parents: 42408 diff changeset	64
42303 e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	65 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	66 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	67 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	68
e240bec26626 rust-dirstate: add rust-cpython bindings to the new parse/pack functions Rapha?l Gom?s <rgomes@octobus.net> parents: diff changeset	69 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	70 }

Mercurial > public > mercurial-scm > hg

annotate rust/hg-cpython/src/dirstate.rs @ 52298:db065b33fa56