mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-02-06 11:34:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

cli: split diff options constructors to not require command args

Browse source
This commit is contained in:
Yuya Nishihara 2025-01-23 00:19:22 +09:00
parent fb25e8a4ad
commit 3ed77c9bb3
2 changed files with 41 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cli/src/commit_templater.rs
View file

@ -1792,11 +1792,7 @@ fn builtin_tree_diff_methods<'repo>() -> CommitTemplateBuildMethodFnMap<'repo, T
let conflict_marker_style = language.conflict_marker_style;
let template = (self_property, width_property)
.map(move |(diff, width)| {
let options = diff_util::DiffStatOptions {
line_diff: diff_util::LineDiffOptions {
compare_mode: diff_util::LineCompareMode::Exact,
},
};
let options = diff_util::DiffStatOptions::default();
diff.into_formatted(move |formatter, store, tree_diff| {
diff_util::show_diff_stat(
formatter,

74
cli/src/diff_util.rs
View file

@ -187,15 +187,18 @@ fn diff_formats_from_args(
formats.push(DiffFormat::NameOnly);
}
if args.git {
let options = UnifiedDiffOptions::from_settings_and_args(settings, args)?;
let mut options = UnifiedDiffOptions::from_settings(settings)?;
options.merge_args(args);
formats.push(DiffFormat::Git(Box::new(options)));
}
if args.color_words {
let options = ColorWordsDiffOptions::from_settings_and_args(settings, args)?;
let mut options = ColorWordsDiffOptions::from_settings(settings)?;
options.merge_args(args);
formats.push(DiffFormat::ColorWords(Box::new(options)));
}
if args.stat {
let options = DiffStatOptions::from_args(args);
let mut options = DiffStatOptions::default();
options.merge_args(args);
formats.push(DiffFormat::Stat(Box::new(options)));
}
if let Some(name) = &args.tool {
@ -232,15 +235,18 @@ fn default_diff_format(
"types" => Ok(DiffFormat::Types),
"name-only" => Ok(DiffFormat::NameOnly),
"git" => {
let options = UnifiedDiffOptions::from_settings_and_args(settings, args)?;
let mut options = UnifiedDiffOptions::from_settings(settings)?;
options.merge_args(args);
Ok(DiffFormat::Git(Box::new(options)))
}
"color-words" => {
let options = ColorWordsDiffOptions::from_settings_and_args(settings, args)?;
let mut options = ColorWordsDiffOptions::from_settings(settings)?;
options.merge_args(args);
Ok(DiffFormat::ColorWords(Box::new(options)))
}
"stat" => {
let options = DiffStatOptions::from_args(args);
let mut options = DiffStatOptions::default();
options.merge_args(args);
Ok(DiffFormat::Stat(Box::new(options)))
}
_ => Err(ConfigGetError::Type {
@ -483,7 +489,7 @@ pub fn get_copy_records<'a>(
Ok(block_on_stream(stream).filter_ok(|record| matcher.matches(&record.target)))
}
#[derive(Clone, Debug, Eq, PartialEq)]
#[derive(Clone, Debug, Default, Eq, PartialEq)]
pub struct LineDiffOptions {
/// How equivalence of lines is tested.
pub compare_mode: LineCompareMode,
@ -491,21 +497,21 @@ pub struct LineDiffOptions {
}
impl LineDiffOptions {
fn from_args(args: &DiffFormatArgs) -> Self {
let compare_mode = if args.ignore_all_space {
fn merge_args(&mut self, args: &DiffFormatArgs) {
self.compare_mode = if args.ignore_all_space {
LineCompareMode::IgnoreAllSpace
} else if args.ignore_space_change {
LineCompareMode::IgnoreSpaceChange
} else {
LineCompareMode::Exact
};
LineDiffOptions { compare_mode }
}
}
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
#[derive(Clone, Copy, Debug, Default, Eq, PartialEq)]
pub enum LineCompareMode {
/// Compares lines literally.
#[default]
Exact,
/// Compares lines ignoring any whitespace occurrences.
IgnoreAllSpace,
@ -545,10 +551,7 @@ pub struct ColorWordsDiffOptions {
}
impl ColorWordsDiffOptions {
fn from_settings_and_args(
settings: &UserSettings,
args: &DiffFormatArgs,
) -> Result<Self, ConfigGetError> {
pub fn from_settings(settings: &UserSettings) -> Result<Self, ConfigGetError> {
let max_inline_alternation = {
let name = "diff.color-words.max-inline-alternation";
match settings.get_int(name)? {
@ -560,15 +563,19 @@ impl ColorWordsDiffOptions {
})?),
}
};
let context = args
.context
.map_or_else(|| settings.get("diff.color-words.context"), Ok)?;
Ok(ColorWordsDiffOptions {
context,
line_diff: LineDiffOptions::from_args(args),
context: settings.get("diff.color-words.context")?,
line_diff: LineDiffOptions::default(),
max_inline_alternation,
})
}
fn merge_args(&mut self, args: &DiffFormatArgs) {
if let Some(context) = args.context {
self.context = context;
}
self.line_diff.merge_args(args);
}
}
fn show_color_words_diff_hunks(
@ -1252,18 +1259,19 @@ pub struct UnifiedDiffOptions {
}
impl UnifiedDiffOptions {
fn from_settings_and_args(
settings: &UserSettings,
args: &DiffFormatArgs,
) -> Result<Self, ConfigGetError> {
let context = args
.context
.map_or_else(|| settings.get("diff.git.context"), Ok)?;
pub fn from_settings(settings: &UserSettings) -> Result<Self, ConfigGetError> {
Ok(UnifiedDiffOptions {
context,
line_diff: LineDiffOptions::from_args(args),
context: settings.get("diff.git.context")?,
line_diff: LineDiffOptions::default(),
})
}
fn merge_args(&mut self, args: &DiffFormatArgs) {
if let Some(context) = args.context {
self.context = context;
}
self.line_diff.merge_args(args);
}
}
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
@ -1624,17 +1632,15 @@ pub fn show_diff_summary(
.block_on()
}
#[derive(Clone, Debug, Eq, PartialEq)]
#[derive(Clone, Debug, Default, Eq, PartialEq)]
pub struct DiffStatOptions {
/// How lines are tokenized and compared.
pub line_diff: LineDiffOptions,
}
impl DiffStatOptions {
fn from_args(args: &DiffFormatArgs) -> Self {
DiffStatOptions {
line_diff: LineDiffOptions::from_args(args),
}
fn merge_args(&mut self, args: &DiffFormatArgs) {
self.line_diff.merge_args(args);
}
}