Mercurial > public > mercurial-scm > hg-stable
diff rust/hg-core/src/update.rs @ 52308:bd8081e9fd62
rust: don't star export from the `revlog` module
This made a lot of the imports confusing because they didn't make sense
at the top level (so, outside of `revlog`), and they hide the more common
types when autocompleting.
| author | Rapha?l Gom?s <rgomes@octobus.net> |
|---|---|
| date | Thu, 26 Sep 2024 14:26:24 +0200 |
| parents | 039b7caeb4d9 |
| children | 65d516db7309 |
line wrap: on
line diff
--- a/rust/hg-core/src/update.rs Thu Aug 01 11:27:20 2024 +0200 +++ b/rust/hg-core/src/update.rs Thu Sep 26 14:26:24 2024 +0200 @@ -14,14 +14,14 @@ dirstate_map::DirstateEntryReset, on_disk::write_tracked_key, }, errors::{HgError, IoResultExt}, - exit_codes, - filelog::Filelog, - narrow, - node::NULL_NODE, + exit_codes, narrow, operations::{list_rev_tracked_files, ExpandedManifestEntry}, - options::{default_revlog_options, RevlogOpenOptions}, progress::Progress, repo::Repo, + revlog::filelog::Filelog, + revlog::node::NULL_NODE, + revlog::options::{default_revlog_options, RevlogOpenOptions}, + revlog::RevlogError, sparse, utils::{ files::{filesystem_now, get_path_from_bytes}, @@ -29,7 +29,7 @@ path_auditor::PathAuditor, }, vfs::{is_on_nfs_mount, VfsImpl}, - DirstateParents, RevlogError, UncheckedRevision, + DirstateParents, UncheckedRevision, }; use crossbeam_channel::{Receiver, Sender}; use rayon::prelude::*; @@ -93,7 +93,7 @@ let options = default_revlog_options( repo.config(), repo.requirements(), - crate::RevlogType::Filelog, + crate::revlog::RevlogType::Filelog, )?; let (errors_sender, errors_receiver) = crossbeam_channel::unbounded(); let (files_sender, files_receiver) = crossbeam_channel::unbounded(); @@ -134,7 +134,7 @@ fn handle_revlog_error(e: RevlogError) -> HgError { match e { - crate::RevlogError::Other(hg_error) => hg_error, + crate::revlog::RevlogError::Other(hg_error) => hg_error, e => HgError::abort( format!("revlog error: {}", e), exit_codes::ABORT,