mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-18 18:27:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

cli: fix --color=auto to not test isatty() unless initialized for terminal

Browse source 
No behavior change since ui here is always initialized for_terminal().
This commit is contained in:
Yuya Nishihara 2022-10-08 15:37:04 +09:00
parent 6a126bc033
commit 832457d4a5
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/cli_util.rs
View file

@ -1275,8 +1275,7 @@ pub fn parse_args(
let matches = app.clone().get_matches_from(&string_args);
let args: Args = Args::from_arg_matches(&matches).unwrap();
if let Some(choice) = args.global_args.color {
// Here we assume ui was created for_terminal().
ui.reset_color_for_terminal(choice);
ui.reset_color(choice);
}
let command_helper = CommandHelper::new(app, string_args, args.global_args);
Ok((command_helper, matches))

11
src/ui.rs
View file

@ -66,11 +66,11 @@ fn color_setting(settings: &UserSettings) -> ColorChoice {
.unwrap_or_default()
}
fn use_color(choice: ColorChoice) -> bool {
fn use_color(choice: ColorChoice, maybe_tty: bool) -> bool {
match choice {
ColorChoice::Always => true,
ColorChoice::Never => false,
ColorChoice::Auto => atty::is(Stream::Stdout),
ColorChoice::Auto => maybe_tty && atty::is(Stream::Stdout),
}
}
@ -96,7 +96,7 @@ impl<'stdout> Ui<'stdout> {
pub fn for_terminal(settings: UserSettings) -> Ui<'static> {
let cwd = std::env::current_dir().unwrap();
let color = use_color(color_setting(&settings));
let color = use_color(color_setting(&settings), true);
let formatter_factory = FormatterFactory::prepare(&settings, color);
Ui {
cwd,
@ -110,8 +110,9 @@ impl<'stdout> Ui<'stdout> {
}
/// Reconfigures the underlying outputs with the new color choice.
pub fn reset_color_for_terminal(&mut self, choice: ColorChoice) {
let color = use_color(choice);
pub fn reset_color(&mut self, choice: ColorChoice) {
let maybe_tty = matches!(&self.output_pair, UiOutputPair::Terminal { .. });
let color = use_color(choice, maybe_tty);
if self.formatter_factory.is_color() != color {
self.formatter_factory = FormatterFactory::prepare(&self.settings, color);
}