##// END OF EJS Templates
copies: avoid unwanted side effect from one branch to another...
copies: avoid unwanted side effect from one branch to another Without this copy, change in a one descendant branch (With "remove" change only) could affect computation on another descendant branches. This was not caugh by the test because the test graph are "too simple". I started writing more test in that regards, but I a submitting this changes earlier because I want to get more code landed to allow other optimisation work to happens. Differential Revision: https://phab.mercurial-scm.org/D9416

File last commit:

r46549:2ad2745e default
r46599:b6b7626d default
Show More
files.rs
138 lines | 4.5 KiB | application/rls-services+xml | RustLexer
use crate::commands::Command;
use crate::error::{CommandError, CommandErrorKind};
use crate::ui::utf8_to_local;
use crate::ui::Ui;
use hg::operations::FindRoot;
use hg::operations::{
ListDirstateTrackedFiles, ListDirstateTrackedFilesError,
ListDirstateTrackedFilesErrorKind,
};
use hg::operations::{
ListRevTrackedFiles, ListRevTrackedFilesError,
ListRevTrackedFilesErrorKind,
};
use hg::requirements;
use hg::utils::files::{get_bytes_from_path, relativize_path};
use hg::utils::hg_path::{HgPath, HgPathBuf};
use std::path::PathBuf;
pub const HELP_TEXT: &str = "
List tracked files.
Returns 0 on success.
";
pub struct FilesCommand<'a> {
rev: Option<&'a str>,
}
impl<'a> FilesCommand<'a> {
pub fn new(rev: Option<&'a str>) -> Self {
FilesCommand { rev }
}
fn display_files(
&self,
ui: &Ui,
root: &PathBuf,
files: impl IntoIterator<Item = &'a HgPath>,
) -> Result<(), CommandError> {
let cwd = std::env::current_dir()
.or_else(|e| Err(CommandErrorKind::CurrentDirNotFound(e)))?;
let rooted_cwd = cwd
.strip_prefix(&root)
.expect("cwd was already checked within the repository");
let rooted_cwd = HgPathBuf::from(get_bytes_from_path(rooted_cwd));
let mut stdout = ui.stdout_buffer();
for file in files {
stdout.write_all(relativize_path(file, &rooted_cwd).as_ref())?;
stdout.write_all(b"\n")?;
}
stdout.flush()?;
Ok(())
}
}
impl<'a> Command for FilesCommand<'a> {
fn run(&self, ui: &Ui) -> Result<(), CommandError> {
let root = FindRoot::new().run()?;
requirements::check(&root)?;
if let Some(rev) = self.rev {
let mut operation = ListRevTrackedFiles::new(&root, rev)
.map_err(|e| map_rev_error(rev, e))?;
let files = operation.run().map_err(|e| map_rev_error(rev, e))?;
self.display_files(ui, &root, files)
} else {
let mut operation = ListDirstateTrackedFiles::new(&root)
.map_err(map_dirstate_error)?;
let files = operation.run().map_err(map_dirstate_error)?;
self.display_files(ui, &root, files)
}
}
}
/// Convert `ListRevTrackedFilesErrorKind` to `CommandError`
fn map_rev_error(rev: &str, err: ListRevTrackedFilesError) -> CommandError {
CommandError {
kind: match err.kind {
ListRevTrackedFilesErrorKind::IoError(err) => {
CommandErrorKind::Abort(Some(
utf8_to_local(&format!("abort: {}\n", err)).into(),
))
}
ListRevTrackedFilesErrorKind::InvalidRevision => {
CommandErrorKind::Abort(Some(
utf8_to_local(&format!(
"abort: invalid revision identifier{}\n",
rev
))
.into(),
))
}
ListRevTrackedFilesErrorKind::UnsuportedRevlogVersion(version) => {
CommandErrorKind::Abort(Some(
utf8_to_local(&format!(
"abort: unsupported revlog version {}\n",
version
))
.into(),
))
}
ListRevTrackedFilesErrorKind::CorruptedRevlog => {
CommandErrorKind::Abort(Some(
"abort: corrupted revlog\n".into(),
))
}
ListRevTrackedFilesErrorKind::UnknowRevlogDataFormat(format) => {
CommandErrorKind::Abort(Some(
utf8_to_local(&format!(
"abort: unknow revlog dataformat {:?}\n",
format
))
.into(),
))
}
},
}
}
/// Convert `ListDirstateTrackedFilesError` to `CommandError`
fn map_dirstate_error(err: ListDirstateTrackedFilesError) -> CommandError {
CommandError {
kind: match err.kind {
ListDirstateTrackedFilesErrorKind::IoError(err) => {
CommandErrorKind::Abort(Some(
utf8_to_local(&format!("abort: {}\n", err)).into(),
))
}
ListDirstateTrackedFilesErrorKind::ParseError(_) => {
CommandErrorKind::Abort(Some(
// TODO find a better error message
b"abort: parse error\n".to_vec(),
))
}
},
}
}