This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11813

rhg: don't run `blackbox` if not activated
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG9ff246cd6200: rhg: don't run `blackbox` if not activated
Summary

You currently have no way of turning off blackbox. Aside from being a bug, this
can be annoying if you use rhg in your shell prompt, but also because the
current implementation of blackbox is quite slow due to user querying.

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:12 AM

Pending CI refresh

Alphare added a commit: rHG9ff246cd6200: rhg: don't run `blackbox` if not activated.Dec 7 2021, 9:44 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG9ff246cd6200: rhg: don't run `blackbox` if not activated (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mrust/rhg/src/main.rs (29 lines)

Diff 31348

rust/rhg/src/main.rs

if let Ok(repo) = repo { if let Ok(repo) = repo {
// We don't support subrepos, fallback if the subrepos file is present // We don't support subrepos, fallback if the subrepos file is present
if repo.working_directory_vfs().join(".hgsub").exists() { if repo.working_directory_vfs().join(".hgsub").exists() {
let msg = "subrepos (.hgsub is present)"; let msg = "subrepos (.hgsub is present)";
return Err(CommandError::unsupported(msg)); return Err(CommandError::unsupported(msg));
} }
} }
let blackbox = blackbox::Blackbox::new(&invocation, process_start_time)?; if config.is_extension_enabled(b"blackbox") {
let blackbox =
blackbox::Blackbox::new(&invocation, process_start_time)?;
blackbox.log_command_start(); blackbox.log_command_start();
let result = run(&invocation); let result = run(&invocation);
blackbox.log_command_end(exit_code( blackbox.log_command_end(exit_code(
&result, &result,
// TODO: show a warning or combine with original error if `get_bool` // TODO: show a warning or combine with original error if
// returns an error // `get_bool` returns an error
config config
.get_bool(b"ui", b"detailed-exit-code") .get_bool(b"ui", b"detailed-exit-code")
.unwrap_or(false), .unwrap_or(false),
)); ));
result result
} else {
run(&invocation)
}
} }
fn main() { fn main() {
// Run this first, before we find out if the blackbox extension is even // Run this first, before we find out if the blackbox extension is even
// enabled, in order to include everything in-between in the duration // enabled, in order to include everything in-between in the duration
// measurements. Reading config files can be slow if they’re on NFS. // measurements. Reading config files can be slow if they’re on NFS.
let process_start_time = blackbox::ProcessStartTime::now(); let process_start_time = blackbox::ProcessStartTime::now();