( )⚙ D10910 rhg: refactor code a little around printing of relative paths

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10910

rhg: refactor code a little around printing of relative paths
AbandonedPublic

Authored by pulkit on Jun 25 2021, 5:34 AM.

Details

Reviewers
SimonSapin
Group Reviewers
hg-reviewers
Summary

It's easier to understand when setup to compute relative path is decoupled from
actual iteration over list of files.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

pulkit created this revision.Jun 25 2021, 5:34 AM
SimonSapin accepted this revision.Jun 29 2021, 1:25 PM
SimonSapin added a subscriber: SimonSapin.

Introducing a boolean variable in order to deduplicate very few lines doesn’t feel like much of an improvement to me, but according to your next patches this is gonna be rewritten/refactored soon anyway so let’s go ahead.

pulkit planned changes to this revision.Oct 5 2021, 7:49 AM

Revision Contents
Changeset List

PathPackages
Mrust/rhg/src/commands/files.rs (36 lines)

Diff 28695

rust/rhg/src/commands/files.rs

repo: &Repo, repo: &Repo,
files: impl IntoIterator<Item = &'a HgPath>, files: impl IntoIterator<Item = &'a HgPath>,
) -> Result<(), CommandError> { ) -> Result<(), CommandError> {
let mut stdout = ui.stdout_buffer(); let mut stdout = ui.stdout_buffer();
let cwd = current_dir()?; let cwd = current_dir()?;
let working_directory = repo.working_directory_path(); let working_directory = repo.working_directory_path();
let working_directory = cwd.join(working_directory); // Make it absolute let working_directory = cwd.join(working_directory); // Make it absolute
let working_directory_hgpath =
HgPathBuf::from(get_bytes_from_path(working_directory.to_owned()));
let mut any = false; let outside_repo: bool;
let cwd_hgpath: HgPathBuf;
if let Ok(cwd_relative_to_repo) = cwd.strip_prefix(&working_directory) { if let Ok(cwd_relative_to_repo) = cwd.strip_prefix(&working_directory) {
// The current directory is inside the repo, so we can work with // The current directory is inside the repo, so we can work with
// relative paths // relative paths
let cwd = HgPathBuf::from(get_bytes_from_path(cwd_relative_to_repo)); outside_repo = false;
for file in files { cwd_hgpath =
any = true; HgPathBuf::from(get_bytes_from_path(cwd_relative_to_repo));
stdout.write_all(relativize_path(&file, &cwd).as_ref())?;
stdout.write_all(b"\n")?;
}
} else { } else {
let working_directory = outside_repo = true;
HgPathBuf::from(get_bytes_from_path(working_directory)); cwd_hgpath = HgPathBuf::from(get_bytes_from_path(cwd));
let cwd = HgPathBuf::from(get_bytes_from_path(cwd)); }
let mut any = false;
for file in files { for file in files {
any = true; any = true;
// Absolute path in the filesystem if outside_repo {
let file = working_directory.join(file); let file = working_directory_hgpath.join(file);
stdout.write_all(relativize_path(&file, &cwd).as_ref())?; stdout.write_all(relativize_path(&file, &cwd_hgpath).as_ref())?;
stdout.write_all(b"\n")?; } else {
stdout.write_all(relativize_path(&file, &cwd_hgpath).as_ref())?;
} }
stdout.write_all(b"\n")?;
} }
stdout.flush()?; stdout.flush()?;
if any { if any {
Ok(()) Ok(())
} else { } else {
Err(CommandError::Unsuccessful) Err(CommandError::Unsuccessful)
} }
} }