ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

cli: move default ui.pager config to misc.toml

Browse source
This commit is contained in:
Martin von Zweigbergk 2023-03-28 16:12:00 -07:00 committed by Martin von Zweigbergk
parent 5ae6698f81
commit 68ea927c66
2 changed files with 3 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/config/misc.toml
View file

@ -9,4 +9,5 @@ fetch = "origin"
# Placeholder: added by user # Placeholder: added by user
[ui] [ui]
pager = { command = ["less", "-FRX"], env = { LESSCHARSET = "utf-8" } }
log-word-wrap = false log-word-wrap = false

17
src/ui.rs
View file

@ -18,10 +18,9 @@ use std::str::FromStr;
use std::{env, fmt, io, mem}; use std::{env, fmt, io, mem};
use crossterm::tty::IsTty; use crossterm::tty::IsTty;
use maplit::hashmap;
use crate::cli_util::CommandError; use crate::cli_util::CommandError;
use crate::config::{CommandNameAndArgs, NonEmptyCommandArgsVec}; use crate::config::CommandNameAndArgs;
use crate::formatter::{Formatter, FormatterFactory, LabeledWriter}; use crate::formatter::{Formatter, FormatterFactory, LabeledWriter};
pub struct Ui { pub struct Ui {
@ -95,19 +94,7 @@ pub enum PaginationChoice {
fn pager_setting(config: &config::Config) -> Result<CommandNameAndArgs, CommandError> { fn pager_setting(config: &config::Config) -> Result<CommandNameAndArgs, CommandError> {
config config
.get::<CommandNameAndArgs>("ui.pager") .get::<CommandNameAndArgs>("ui.pager")
.or_else(|err| match err { .map_err(|err| CommandError::ConfigError(format!("Invalid `ui.pager`: {err:?}")))
config::ConfigError::NotFound(_) => Ok(CommandNameAndArgs::Structured {
command: NonEmptyCommandArgsVec::try_from(vec![
"less".to_string(),
"-FRX".to_string(),
])
.unwrap(),
env: hashmap! { "LESSCHARSET".to_string() => "utf-8".to_string() },
}),
err => Err(CommandError::ConfigError(format!(
"Invalid `ui.pager`: {err:?}"
))),
})
} }
impl Ui { impl Ui {