Mercurial > hg

diff rust/hg-cpython/src/dirstate/copymap.rs @ 52302:db065b33fa56

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 bf8837e3d7ce
children
line wrap: on
line diff
--- a/rust/hg-cpython/src/dirstate/copymap.rs	Mon Nov 04 10:38:17 2024 +0100
+++ b/rust/hg-cpython/src/dirstate/copymap.rs	Mon Nov 04 11:00:58 2024 +0100
@@ -15,8 +15,8 @@
 
 use crate::dirstate::dirstate_map::v2_error;
 use crate::dirstate::dirstate_map::DirstateMap;
+use hg::dirstate::on_disk::DirstateV2ParseError;
 use hg::dirstate::CopyMapIter;
-use hg::dirstate_tree::on_disk::DirstateV2ParseError;
 use hg::utils::hg_path::HgPath;
 
 py_class!(pub class CopyMap |py| {