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

cli: flatten diff-args-to-formats translation

Browse source 
I'll add more parameters to color-words diffs, and the format variant will no
longer be trivially constructible.
This commit is contained in:
Yuya Nishihara 2024-08-16 23:20:07 +09:00
parent 3d5c5b03de
commit f76db7fa4b
1 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
cli/src/diff_util.rs
View file

@ -137,27 +137,27 @@ fn diff_formats_from_args(
settings: &UserSettings,
args: &DiffFormatArgs,
) -> Result<Vec<DiffFormat>, config::ConfigError> {
let mut formats = [
(args.summary, DiffFormat::Summary),
(args.types, DiffFormat::Types),
(args.name_only, DiffFormat::NameOnly),
(
args.git,
DiffFormat::Git {
context: args.context.unwrap_or(DEFAULT_CONTEXT_LINES),
},
),
(
args.color_words,
DiffFormat::ColorWords {
context: args.context.unwrap_or(DEFAULT_CONTEXT_LINES),
},
),
(args.stat, DiffFormat::Stat),
]
.into_iter()
.filter_map(|(arg, format)| arg.then_some(format))
.collect_vec();
let mut formats = Vec::new();
if args.summary {
formats.push(DiffFormat::Summary);
}
if args.types {
formats.push(DiffFormat::Types);
}
if args.name_only {
formats.push(DiffFormat::NameOnly);
}
if args.git {
let context = args.context.unwrap_or(DEFAULT_CONTEXT_LINES);
formats.push(DiffFormat::Git { context });
}
if args.color_words {
let context = args.context.unwrap_or(DEFAULT_CONTEXT_LINES);
formats.push(DiffFormat::ColorWords { context });
}
if args.stat {
formats.push(DiffFormat::Stat);
}
if let Some(name) = &args.tool {
let tool = merge_tools::get_external_tool_config(settings, name)?
.unwrap_or_else(|| ExternalMergeTool::with_program(name));