This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11762

rhg: Colored output is not supported
ClosedPublic

Authored by SimonSapin on Nov 15 2021, 12:43 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGd71b9902e2de: rhg: Colored output is not supported
Summary

Fallback if it is requested explicitly.

The default is documented as use color "whenever it seems possible".
rhg proceeds without color in that case.

Diff Detail

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

Event Timeline

SimonSapin created this revision.Nov 15 2021, 12:43 PM
SimonSapin updated this revision to Diff 31092.Nov 22 2021, 7:55 AM
Alphare accepted this revision.Nov 24 2021, 6:26 AM
This revision is now accepted and ready to land.Nov 24 2021, 6:26 AM
SimonSapin updated this revision to Diff 31140.Nov 26 2021, 9:59 AM
SimonSapin added a commit: rHGd71b9902e2de: rhg: Colored output is not supported.Nov 26 2021, 10:03 AM
Closed by commit rHGd71b9902e2de: rhg: Colored output is not supported (authored by SimonSapin). · Explain Why
This revision was automatically updated to reflect the committed changes.
baymax updated this revision to Diff 31160.Nov 26 2021, 10:33 AM

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

Revision Contents
Changeset List

PathPackages
Mrust/rhg/src/main.rs (13 lines)
Mtests/test-status-color.t (4 lines)

Diff 31160

rust/rhg/src/main.rs

} }
fn main_with_result( fn main_with_result(
process_start_time: &blackbox::ProcessStartTime, process_start_time: &blackbox::ProcessStartTime,
ui: &ui::Ui, ui: &ui::Ui,
repo: Result<&Repo, &NoRepoInCwdError>, repo: Result<&Repo, &NoRepoInCwdError>,
config: &Config, config: &Config,
) -> Result<(), CommandError> { ) -> Result<(), CommandError> {
check_unsupported(config)?; check_unsupported(config, ui)?;
let app = App::new("rhg") let app = App::new("rhg")
.global_setting(AppSettings::AllowInvalidUtf8) .global_setting(AppSettings::AllowInvalidUtf8)
.global_setting(AppSettings::DisableVersion) .global_setting(AppSettings::DisableVersion)
.setting(AppSettings::SubcommandRequired) .setting(AppSettings::SubcommandRequired)
.setting(AppSettings::VersionlessSubcommands) .setting(AppSettings::VersionlessSubcommands)
.arg( .arg(
Arg::with_name("repository") Arg::with_name("repository")
message: format_bytes!( message: format_bytes!(
b"extensions: {} (consider adding them to 'rhg.ignored-extensions' config)", b"extensions: {} (consider adding them to 'rhg.ignored-extensions' config)",
join(unsupported, b", ") join(unsupported, b", ")
), ),
}) })
} }
} }
fn check_unsupported(config: &Config) -> Result<(), CommandError> { fn check_unsupported(
config: &Config,
ui: &ui::Ui,
) -> Result<(), CommandError> {
check_extensions(config)?; check_extensions(config)?;
if std::env::var_os("HG_PENDING").is_some() { if std::env::var_os("HG_PENDING").is_some() {
// TODO: only if the value is `== repo.working_directory`? // TODO: only if the value is `== repo.working_directory`?
// What about relative v.s. absolute paths? // What about relative v.s. absolute paths?
Err(CommandError::unsupported("$HG_PENDING"))? Err(CommandError::unsupported("$HG_PENDING"))?
} }
if config.has_non_empty_section(b"encode") { if config.has_non_empty_section(b"encode") {
Err(CommandError::unsupported("[encode] config"))? Err(CommandError::unsupported("[encode] config"))?
} }
if config.has_non_empty_section(b"decode") { if config.has_non_empty_section(b"decode") {
Err(CommandError::unsupported("[decode] config"))? Err(CommandError::unsupported("[decode] config"))?
} }
if let Some(color) = config.get(b"ui", b"color") {
if (color == b"always" || color == b"debug") && !ui.plain() {
Err(CommandError::unsupported("colored output"))?
}
}
Ok(()) Ok(())
} }

tests/test-status-color.t

TODO: fix rhg bugs that make this test fail when status is enabled
$ unset RHG_STATUS
$ cat <<EOF >> $HGRCPATH $ cat <<EOF >> $HGRCPATH
> [ui] > [ui]
> color = always > color = always
> [color] > [color]
> mode = ansi > mode = ansi
> EOF > EOF
Terminfo codes compatibility fix Terminfo codes compatibility fix
$ echo "color.none=0" >> $HGRCPATH $ echo "color.none=0" >> $HGRCPATH