This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11614

rhg: add relative paths support in `rhg status`
ClosedPublic

Authored by pulkit on Oct 5 2021, 8:45 AM.

Details

Reviewers
martinvonz
Group Reviewers
hg-reviewers
Commits
rHG707c58880cd0: rhg: add relative paths support in `rhg status`

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Oct 5 2021, 8:45 AM
martinvonz accepted this revision.Oct 11 2021, 1:54 PM
martinvonz added a subscriber: martinvonz.
martinvonz added inline comments.
rust/rhg/src/commands/status.rs
275–277

You may, at some point, want to add a write_fmt() method to Ui so this can be written using the writeln! macro as writeln!(ui, "{} {}", status_prefix, path.as_ref())

This revision is now accepted and ready to land.Oct 11 2021, 1:54 PM
pulkit added a commit: rHG707c58880cd0: rhg: add relative paths support in `rhg status`.Oct 11 2021, 2:31 PM
Closed by commit rHG707c58880cd0: rhg: add relative paths support in `rhg status` (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mrust/rhg/src/commands/status.rs (51 lines)

Diff 30702

rust/rhg/src/commands/status.rs

// status.rs // status.rs
// //
// Copyright 2020, Georges Racinet <georges.racinets@octobus.net> // Copyright 2020, Georges Racinet <georges.racinets@octobus.net>
// //
// This software may be used and distributed according to the terms of the // This software may be used and distributed according to the terms of the
// GNU General Public License version 2 or any later version. // GNU General Public License version 2 or any later version.
use crate::error::CommandError; use crate::error::CommandError;
use crate::ui::Ui; use crate::ui::{Ui, UiError};
use crate::utils::path_utils::relativize_paths;
use clap::{Arg, SubCommand}; use clap::{Arg, SubCommand};
use hg; use hg;
use hg::config::Config;
use hg::errors::HgError; use hg::errors::HgError;
use hg::manifest::Manifest; use hg::manifest::Manifest;
use hg::matchers::AlwaysMatcher; use hg::matchers::AlwaysMatcher;
use hg::repo::Repo; use hg::repo::Repo;
use hg::utils::hg_path::{hg_path_to_os_string, HgPath}; use hg::utils::hg_path::{hg_path_to_os_string, HgPath};
use hg::{HgPathCow, StatusOptions}; use hg::{HgPathCow, StatusOptions};
use log::{info, warn}; use log::{info, warn};
use std::borrow::Cow;
pub const HELP_TEXT: &str = " pub const HELP_TEXT: &str = "
Show changed files in the working directory Show changed files in the working directory
This is a pure Rust version of `hg status`. This is a pure Rust version of `hg status`.
Some options might be missing, check the list below. Some options might be missing, check the list below.
"; ";
} }
if invocation.config.get_bool(b"ui", b"statuscopies").ok() == Some(true) { if invocation.config.get_bool(b"ui", b"statuscopies").ok() == Some(true) {
return Err(CommandError::unsupported( return Err(CommandError::unsupported(
"ui.statuscopies is not yet supported with rhg status", "ui.statuscopies is not yet supported with rhg status",
)); ));
} }
let ui = invocation.ui; let ui = invocation.ui;
let config = invocation.config;
let args = invocation.subcommand_args; let args = invocation.subcommand_args;
let display_states = if args.is_present("all") { let display_states = if args.is_present("all") {
// TODO when implementing `--quiet`: it excludes clean files // TODO when implementing `--quiet`: it excludes clean files
// from `--all` // from `--all`
ALL_DISPLAY_STATES ALL_DISPLAY_STATES
} else { } else {
let requested = DisplayStates { let requested = DisplayStates {
modified: args.is_present("modified"), modified: args.is_present("modified"),
} else { } else {
if display_states.clean { if display_states.clean {
ds_status.clean.push(to_check); ds_status.clean.push(to_check);
} }
} }
} }
} }
if display_states.modified { if display_states.modified {
display_status_paths(ui, &mut ds_status.modified, b"M")?; display_status_paths(ui, repo, config, &mut ds_status.modified, b"M")?;
} }
if display_states.added { if display_states.added {
display_status_paths(ui, &mut ds_status.added, b"A")?; display_status_paths(ui, repo, config, &mut ds_status.added, b"A")?;
} }
if display_states.removed { if display_states.removed {
display_status_paths(ui, &mut ds_status.removed, b"R")?; display_status_paths(ui, repo, config, &mut ds_status.removed, b"R")?;
} }
if display_states.deleted { if display_states.deleted {
display_status_paths(ui, &mut ds_status.deleted, b"!")?; display_status_paths(ui, repo, config, &mut ds_status.deleted, b"!")?;
} }
if display_states.unknown { if display_states.unknown {
display_status_paths(ui, &mut ds_status.unknown, b"?")?; display_status_paths(ui, repo, config, &mut ds_status.unknown, b"?")?;
} }
if display_states.ignored { if display_states.ignored {
display_status_paths(ui, &mut ds_status.ignored, b"I")?; display_status_paths(ui, repo, config, &mut ds_status.ignored, b"I")?;
} }
if display_states.clean { if display_states.clean {
display_status_paths(ui, &mut ds_status.clean, b"C")?; display_status_paths(ui, repo, config, &mut ds_status.clean, b"C")?;
} }
Ok(()) Ok(())
} }
// Probably more elegant to use a Deref or Borrow trait rather than // Probably more elegant to use a Deref or Borrow trait rather than
// harcode HgPathBuf, but probably not really useful at this point // harcode HgPathBuf, but probably not really useful at this point
fn display_status_paths( fn display_status_paths(
ui: &Ui, ui: &Ui,
repo: &Repo,
config: &Config,
paths: &mut [HgPathCow], paths: &mut [HgPathCow],
status_prefix: &[u8], status_prefix: &[u8],
) -> Result<(), CommandError> { ) -> Result<(), CommandError> {
paths.sort_unstable(); paths.sort_unstable();
let mut relative: bool =
config.get_bool(b"ui", b"relative-paths").unwrap_or(false);
relative = config
.get_bool(b"commands", b"status.relative")
.unwrap_or(relative);
if relative {
relativize_paths(
repo,
paths,
|path: Cow<[u8]>| -> Result<(), UiError> {
ui.write_stdout(
&[status_prefix, b" ", path.as_ref(), b"\n"].concat(),
)
martinvonzUnsubmitted
Not Done

You may, at some point, want to add a write_fmt() method to Ui so this can be written using the writeln! macro as writeln!(ui, "{} {}", status_prefix, path.as_ref())

martinvonz: You may, at some point, want to add a `write_fmt()` method to `Ui` so this can be written using…
},
)?;
} else {
for path in paths { for path in paths {
// Same TODO as in commands::root // Same TODO as in commands::root
let bytes: &[u8] = path.as_bytes(); let bytes: &[u8] = path.as_bytes();
// TODO optim, probably lots of unneeded copies here, especially // TODO optim, probably lots of unneeded copies here, especially
// if out stream is buffered // if out stream is buffered
ui.write_stdout(&[status_prefix, b" ", bytes, b"\n"].concat())?; ui.write_stdout(&[status_prefix, b" ", bytes, b"\n"].concat())?;
} }
}
Ok(()) Ok(())
} }
/// Check if a file is modified by comparing actual repo store and file system. /// Check if a file is modified by comparing actual repo store and file system.
/// ///
/// This meant to be used for those that the dirstate cannot resolve, due /// This meant to be used for those that the dirstate cannot resolve, due
/// to time resolution limits. /// to time resolution limits.
/// ///