( )⚙ D11941 rhg: Properly format warnings related to ignore patterns

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11941

rhg: Properly format warnings related to ignore patterns
ClosedPublic

Authored by SimonSapin on Dec 17 2021, 11:45 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGc9abfb80b4e3: rhg: Properly format warnings related to ignore patterns

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

SimonSapin created this revision.Dec 17 2021, 11:45 AM
Alphare requested changes to this revision.Dec 20 2021, 4:41 AM
Alphare added a subscriber: Alphare.
Alphare added inline comments.
rust/rhg/src/commands/status.rs
241

Is the path guaranteed to be UTF8? This could be any sub-ignore file, couldn't it?

This revision now requires changes to proceed.Dec 20 2021, 4:41 AM
SimonSapin updated this revision to Diff 31549.Dec 20 2021, 5:59 AM
SimonSapin updated this revision to Diff 31550.Dec 20 2021, 6:01 AM
Alphare accepted this revision.Dec 20 2021, 8:21 AM
This revision is now accepted and ready to land.Dec 20 2021, 8:21 AM

Revision Contents
Changeset List

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

Diff 31554

rust/rhg/src/commands/status.rs

use hg::dirstate::TruncatedTimestamp; use hg::dirstate::TruncatedTimestamp;
use hg::dirstate::RANGE_MASK_31BIT; use hg::dirstate::RANGE_MASK_31BIT;
use hg::errors::{HgError, IoResultExt}; use hg::errors::{HgError, IoResultExt};
use hg::lock::LockError; use hg::lock::LockError;
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::files::get_bytes_from_os_string; use hg::utils::files::get_bytes_from_os_string;
use hg::utils::files::get_bytes_from_path;
use hg::utils::files::get_path_from_bytes; use hg::utils::files::get_path_from_bytes;
use hg::utils::hg_path::{hg_path_to_path_buf, HgPath}; use hg::utils::hg_path::{hg_path_to_path_buf, HgPath};
use hg::StatusOptions; use hg::StatusOptions;
use log::{info, warn}; use log::info;
use std::io; use std::io;
use std::path::PathBuf; use std::path::PathBuf;
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`.
collect_traversed_dirs: false, collect_traversed_dirs: false,
}; };
let (mut ds_status, pattern_warnings) = dmap.status( let (mut ds_status, pattern_warnings) = dmap.status(
&AlwaysMatcher, &AlwaysMatcher,
repo.working_directory_path().to_owned(), repo.working_directory_path().to_owned(),
ignore_files(repo, config), ignore_files(repo, config),
options, options,
)?; )?;
if !pattern_warnings.is_empty() { for warning in pattern_warnings {
warn!("Pattern warnings: {:?}", &pattern_warnings); match warning {
hg::PatternFileWarning::InvalidSyntax(path, syntax) => ui
.write_stderr(&format_bytes!(
b"{}: ignoring invalid syntax '{}'\n",
AlphareUnsubmitted
Not Done

Is the path guaranteed to be UTF8? This could be any sub-ignore file, couldn't it?

Alphare: Is the path guaranteed to be UTF8? This could be any sub-ignore file, couldn't it?
get_bytes_from_path(path),
&*syntax
))?,
hg::PatternFileWarning::NoSuchFile(path) => {
let path = if let Ok(relative) =
path.strip_prefix(repo.working_directory_path())
{
relative
} else {
&*path
};
ui.write_stderr(&format_bytes!(
b"skipping unreadable pattern file '{}': \
No such file or directory\n",
get_bytes_from_path(path),
))?
}
}
} }
for (path, error) in ds_status.bad { for (path, error) in ds_status.bad {
let error = match error { let error = match error {
hg::BadMatch::OsError(code) => { hg::BadMatch::OsError(code) => {
std::io::Error::from_raw_os_error(code).to_string() std::io::Error::from_raw_os_error(code).to_string()
} }
hg::BadMatch::BadType(ty) => { hg::BadMatch::BadType(ty) => {