Mercurial > public > mercurial-scm > hg
view rust/rhg/src/commands/files.rs @ 48069:3d0a9c6e614d
dirstate: Remove the Rust abstraction DirstateMapMethods
This Rust trait used to exist in order to allow the DirstateMap class exposed
to Python to be backed by either of two implementations: one similar to the
Python implementation based on a "flat" `HashMap<HgPathBuf, DirstateEntry>`,
and the newer one based on a tree of nodes matching the directory structure
of tracked files. A boxed trait object was used with dynamic dispatch.
With the flat implementation removed and only the tree one remaining, this
abstraction is not useful anymore and the concrete type can be stored directly.
It remains that the trait was implemented separately for `DirstateMap<'_>`
(which takes a lifetime parameter) and `OwningDirstateMap` (whose job is to
wrap the former and hide the lifetime parameter), with the latter impl only
forwarding calls.
This changeset also removes this forwarding. Instead, the methods formerly of
the `DirstateMapMethods` trait are now inherent methods implemented for
`OwningDirstateMap` (where they will actually be used) but in the module that
defines `DirstateMap`. This unusual setup gives access to the private fields
of `DirstateMap` from those methods.
Differential Revision: https://phab.mercurial-scm.org/D11517
author | Simon Sapin <simon.sapin@octobus.net> |
---|---|
date | Mon, 27 Sep 2021 13:52:49 +0200 |
parents | b5e8bf10436e |
children | 9ecf802b06e0 |
line wrap: on
line source
use crate::error::CommandError; use crate::ui::Ui; use clap::Arg; use hg::operations::list_rev_tracked_files; use hg::operations::Dirstate; use hg::repo::Repo; use hg::utils::current_dir; use hg::utils::files::{get_bytes_from_path, relativize_path}; use hg::utils::hg_path::{HgPath, HgPathBuf}; pub const HELP_TEXT: &str = " List tracked files. Returns 0 on success. "; pub fn args() -> clap::App<'static, 'static> { clap::SubCommand::with_name("files") .arg( Arg::with_name("rev") .help("search the repository as it is in REV") .short("-r") .long("--revision") .value_name("REV") .takes_value(true), ) .about(HELP_TEXT) } pub fn run(invocation: &crate::CliInvocation) -> Result<(), CommandError> { let relative = invocation.config.get(b"ui", b"relative-paths"); if relative.is_some() { return Err(CommandError::unsupported( "non-default ui.relative-paths", )); } let rev = invocation.subcommand_args.value_of("rev"); let repo = invocation.repo?; if let Some(rev) = rev { let files = list_rev_tracked_files(repo, rev).map_err(|e| (e, rev))?; display_files(invocation.ui, repo, files.iter()) } else { let distate = Dirstate::new(repo)?; let files = distate.tracked_files()?; display_files(invocation.ui, repo, files) } } fn display_files<'a>( ui: &Ui, repo: &Repo, files: impl IntoIterator<Item = &'a HgPath>, ) -> Result<(), CommandError> { let mut stdout = ui.stdout_buffer(); let cwd = current_dir()?; let working_directory = repo.working_directory_path(); let working_directory = cwd.join(working_directory); // Make it absolute let mut any = false; if let Ok(cwd_relative_to_repo) = cwd.strip_prefix(&working_directory) { // The current directory is inside the repo, so we can work with // relative paths let cwd = HgPathBuf::from(get_bytes_from_path(cwd_relative_to_repo)); for file in files { any = true; stdout.write_all(relativize_path(&file, &cwd).as_ref())?; stdout.write_all(b"\n")?; } } else { let working_directory = HgPathBuf::from(get_bytes_from_path(working_directory)); let cwd = HgPathBuf::from(get_bytes_from_path(cwd)); for file in files { any = true; // Absolute path in the filesystem let file = working_directory.join(file); stdout.write_all(relativize_path(&file, &cwd).as_ref())?; stdout.write_all(b"\n")?; } } stdout.flush()?; if any { Ok(()) } else { Err(CommandError::Unsuccessful) } }