mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-26 14:06:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 17

cli: fix --no-pager to persist across layered config loading

Browse source
This commit is contained in:
Yuya Nishihara 2023-08-12 13:25:42 +09:00
parent 1d4b5d04fa
commit 28633bb754
2 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cli/src/cli_util.rs
View file

@ -2488,7 +2488,7 @@ fn handle_early_args(
args.config_toml.push(format!(r#"ui.color="{choice}""#)); args.config_toml.push(format!(r#"ui.color="{choice}""#));
} }
if args.no_pager.unwrap_or_default() { if args.no_pager.unwrap_or_default() {
ui.set_pagination(crate::ui::PaginationChoice::Never); args.config_toml.push(r#"ui.paginate="never""#.to_owned());
} }
if !args.config_toml.is_empty() { if !args.config_toml.is_empty() {
layered_configs.parse_config_args(&args.config_toml)?; layered_configs.parse_config_args(&args.config_toml)?;

5
cli/src/ui.rs
View file

@ -132,11 +132,6 @@ impl Ui {
Ok(()) Ok(())
} }
/// Sets the pagination value.
pub fn set_pagination(&mut self, choice: PaginationChoice) {
self.paginate = choice;
}
/// Switches the output to use the pager, if allowed. /// Switches the output to use the pager, if allowed.
#[instrument(skip_all)] #[instrument(skip_all)]
pub fn request_pager(&mut self) { pub fn request_pager(&mut self) {