Mercurial > public > mercurial-scm > hg-stable

diff rust/hg-core/src/repo.rs @ 52334: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 a3fa37bdb7ec
children 79e8118cd846
line wrap: on
line diff
--- a/rust/hg-core/src/repo.rs	Mon Nov 04 10:38:17 2024 +0100
+++ b/rust/hg-core/src/repo.rs	Mon Nov 04 11:00:58 2024 +0100
@@ -1,10 +1,8 @@
 use crate::config::{Config, ConfigError, ConfigParseError};
+use crate::dirstate::dirstate_map::{DirstateIdentity, DirstateMapWriteMode};
+use crate::dirstate::on_disk::Docket as DirstateDocket;
+use crate::dirstate::owning::OwningDirstateMap;
 use crate::dirstate::DirstateParents;
-use crate::dirstate_tree::dirstate_map::{
-    DirstateIdentity, DirstateMapWriteMode,
-};
-use crate::dirstate_tree::on_disk::Docket as DirstateDocket;
-use crate::dirstate_tree::owning::OwningDirstateMap;
 use crate::errors::HgResultExt;
 use crate::errors::{HgError, IoResultExt};
 use crate::lock::{try_with_lock_no_wait, LockError};
@@ -321,8 +319,7 @@
         let parents = if dirstate.is_empty() {
             DirstateParents::NULL
         } else if self.use_dirstate_v2() {
-            let docket_res =
-                crate::dirstate_tree::on_disk::read_docket(&dirstate);
+            let docket_res = crate::dirstate::on_disk::read_docket(&dirstate);
             match docket_res {
                 Ok(docket) => docket.parents(),
                 Err(_) => {
@@ -361,8 +358,7 @@
         if dirstate.is_empty() {
             Ok((identity, None, 0))
         } else {
-            let docket_res =
-                crate::dirstate_tree::on_disk::read_docket(&dirstate);
+            let docket_res = crate::dirstate::on_disk::read_docket(&dirstate);
             match docket_res {
                 Ok(docket) => {
                     self.dirstate_parents.set(docket.parents());
@@ -464,9 +460,8 @@
         if dirstate_file_contents.is_empty() {
             return Ok(OwningDirstateMap::new_empty(Vec::new(), identity));
         }
-        let docket = crate::dirstate_tree::on_disk::read_docket(
-            &dirstate_file_contents,
-        )?;
+        let docket =
+            crate::dirstate::on_disk::read_docket(&dirstate_file_contents)?;
         debug_wait_for_file_or_print(
             self.config(),
             "dirstate.post-docket-read-file",