This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11814

rhg: signal when falling back in logs
ClosedPublic

Authored by Alphare on Nov 26 2021, 9:38 AM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHGf19be290756a: rhg: signal when falling back in logs
rHG3d8fa7cf3192: rhg: signal when falling back in logs
Summary

We use the trace level for the actual message because it can get really busy.

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

Alphare created this revision.Nov 26 2021, 9:38 AM

Pending CI refresh

baymax updated this revision to Diff 31653.Jan 14 2022, 10:41 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

marmoute accepted this revision.Jan 14 2022, 10:44 AM
Alphare updated this revision to Diff 32217.Feb 15 2022, 11:39 AM
Alphare added a commit: rHG3d8fa7cf3192: rhg: signal when falling back in logs.Feb 15 2022, 12:05 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG3d8fa7cf3192: rhg: signal when falling back in logs (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.
martinvonz added a subscriber: martinvonz.Feb 15 2022, 11:43 PM
martinvonz added inline comments.
rust/rhg/src/ui.rs
228

This second blank line made the formatting check unhappy. I've amended it in flight.

Revision Contents
Changeset List

PathPackages
Mrust/rhg/src/main.rs (6 lines)
Mrust/rhg/src/ui.rs (7 lines)

Diff 32219

rust/rhg/src/main.rs

extern crate log; extern crate log;
use crate::error::CommandError; use crate::error::CommandError;
use crate::ui::Ui; use crate::ui::{local_to_utf8, Ui};
use clap::App; use clap::App;
use clap::AppSettings; use clap::AppSettings;
use clap::Arg; use clap::Arg;
use clap::ArgMatches; use clap::ArgMatches;
use format_bytes::{format_bytes, join}; use format_bytes::{format_bytes, join};
use hg::config::{Config, ConfigSource}; use hg::config::{Config, ConfigSource};
use hg::exit_codes; use hg::exit_codes;
use hg::repo::{Repo, RepoError}; use hg::repo::{Repo, RepoError};
initial_current_dir: &Option<PathBuf>, initial_current_dir: &Option<PathBuf>,
ui: &Ui, ui: &Ui,
mut on_unsupported: OnUnsupported, mut on_unsupported: OnUnsupported,
result: Result<(), CommandError>, result: Result<(), CommandError>,
use_detailed_exit_code: bool, use_detailed_exit_code: bool,
) -> ! { ) -> ! {
if let ( if let (
OnUnsupported::Fallback { executable }, OnUnsupported::Fallback { executable },
Err(CommandError::UnsupportedFeature { .. }), Err(CommandError::UnsupportedFeature { message }),
) = (&on_unsupported, &result) ) = (&on_unsupported, &result)
{ {
let mut args = std::env::args_os(); let mut args = std::env::args_os();
let executable = match executable { let executable = match executable {
None => { None => {
exit_no_fallback( exit_no_fallback(
ui, ui,
OnUnsupported::Abort, OnUnsupported::Abort,
// exhaustion. // exhaustion.
let _ = ui.write_stderr(&format_bytes!( let _ = ui.write_stderr(&format_bytes!(
b"Blocking recursive fallback. The 'rhg.fallback-executable = {}' config \ b"Blocking recursive fallback. The 'rhg.fallback-executable = {}' config \
points to `rhg` itself.\n", points to `rhg` itself.\n",
executable executable
)); ));
on_unsupported = OnUnsupported::Abort on_unsupported = OnUnsupported::Abort
} else { } else {
log::debug!("falling back (see trace-level log)");
log::trace!("{}", local_to_utf8(message));
// `args` is now `argv[1..]` since we’ve already consumed // `args` is now `argv[1..]` since we’ve already consumed
// `argv[0]` // `argv[0]`
let mut command = Command::new(executable_path); let mut command = Command::new(executable_path);
command.args(args); command.args(args);
if let Some(initial) = initial_current_dir { if let Some(initial) = initial_current_dir {
command.current_dir(initial); command.current_dir(initial);
} }
let result = command.status(); let result = command.status();

rust/rhg/src/ui.rs

/// Encode rust strings according to the user system. /// Encode rust strings according to the user system.
pub fn utf8_to_local(s: &str) -> Cow<[u8]> { pub fn utf8_to_local(s: &str) -> Cow<[u8]> {
// TODO encode for the user's system // // TODO encode for the user's system //
let bytes = s.as_bytes(); let bytes = s.as_bytes();
Cow::Borrowed(bytes) Cow::Borrowed(bytes)
} }
/// Decode user system bytes to Rust string.
pub fn local_to_utf8(s: &[u8]) -> Cow<str> {
// TODO decode from the user's system
String::from_utf8_lossy(s)
}
martinvonzUnsubmitted
Not Done

This second blank line made the formatting check unhappy. I've amended it in flight.

martinvonz: This second blank line made the formatting check unhappy. I've amended it in flight.
/// Should formatted output be used? /// Should formatted output be used?
/// ///
/// Note: rhg does not have the formatter mechanism yet, /// Note: rhg does not have the formatter mechanism yet,
/// but this is also used when deciding whether to use color. /// but this is also used when deciding whether to use color.
pub fn formatted(config: &Config) -> Result<bool, HgError> { pub fn formatted(config: &Config) -> Result<bool, HgError> {
if let Some(formatted) = config.get_option(b"ui", b"formatted")? { if let Some(formatted) = config.get_option(b"ui", b"formatted")? {
Ok(formatted) Ok(formatted)
} else { } else {