mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-16 00:56:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

cli: store resolved pager command in Ui

Browse source 
ui.settings() will be removed.
This commit is contained in:
Yuya Nishihara 2023-01-04 21:38:21 +09:00
parent 825d00e62a
commit cfac7468d8
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/ui.rs
View file

@ -25,6 +25,7 @@ use crate::formatter::{Formatter, FormatterFactory};
pub struct Ui { pub struct Ui {
color: bool, color: bool,
pager_cmd: FullCommandArgs,
paginate: PaginationChoice, paginate: PaginationChoice,
progress_indicator: bool, progress_indicator: bool,
formatter_factory: FormatterFactory, formatter_factory: FormatterFactory,
@ -127,6 +128,7 @@ impl Ui {
Ui { Ui {
color, color,
formatter_factory, formatter_factory,
pager_cmd: pager_setting(&settings),
paginate: PaginationChoice::Auto, paginate: PaginationChoice::Auto,
progress_indicator, progress_indicator,
output: UiOutput::new_terminal(), output: UiOutput::new_terminal(),
@ -137,6 +139,7 @@ impl Ui {
pub fn reset(&mut self, settings: UserSettings) { pub fn reset(&mut self, settings: UserSettings) {
// TODO: maybe Ui shouldn't take ownership of UserSettings // TODO: maybe Ui shouldn't take ownership of UserSettings
self.color = use_color(color_setting(&settings)); self.color = use_color(color_setting(&settings));
self.pager_cmd = pager_setting(&settings);
self.progress_indicator = progress_indicator_setting(&settings); self.progress_indicator = progress_indicator_setting(&settings);
self.formatter_factory = FormatterFactory::prepare(&settings, self.color); self.formatter_factory = FormatterFactory::prepare(&settings, self.color);
self.settings = settings; self.settings = settings;
@ -155,7 +158,7 @@ impl Ui {
match self.output { match self.output {
UiOutput::Terminal { .. } if io::stdout().is_tty() => { UiOutput::Terminal { .. } if io::stdout().is_tty() => {
match UiOutput::new_paged(&self.settings) { match UiOutput::new_paged(&self.pager_cmd) {
Ok(new_output) => { Ok(new_output) => {
self.output = new_output; self.output = new_output;
} }
@ -342,8 +345,7 @@ impl UiOutput {
} }
} }
fn new_paged(settings: &UserSettings) -> io::Result<UiOutput> { fn new_paged(pager_cmd: &FullCommandArgs) -> io::Result<UiOutput> {
let pager_cmd = pager_setting(settings);
let mut child = pager_cmd.to_command().stdin(Stdio::piped()).spawn()?; let mut child = pager_cmd.to_command().stdin(Stdio::piped()).spawn()?;
let child_stdin = child.stdin.take().unwrap(); let child_stdin = child.stdin.take().unwrap();
Ok(UiOutput::Paged { child, child_stdin }) Ok(UiOutput::Paged { child, child_stdin })