Skip to content

diff: accept clustered short options such as -qst and -ut #304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SichenLiang wants to merge 1 commit into
base: main
Choose a base branch
from
+217 −29
Open

diff: accept clustered short options such as -qst and -ut #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
172 changes: 143 additions & 29 deletions src/params.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,37 +79,58 @@ pub fn parse_params<I: Iterator<Item = OsString>>(mut opts: Peekable<I>) -> Resu
}
continue;
}
if param == "-s" || param == "--report-identical-files" {
if let Some(short) = param
.to_str()
.and_then(|arg| arg.strip_prefix('-'))
.filter(|arg| !arg.starts_with('-'))
{
if short.len() == 1 {
if apply_short_option(short.as_bytes()[0], &mut params, &mut format)? {
continue;
}
} else if short.len() > 1 {
// Leave mixed words whole for legacy numeric options and their diagnostics.
let all_recognized = short.bytes().all(|option| {
let mut isolated_format = None;
matches!(
apply_short_option(option, &mut Params::default(), &mut isolated_format),
Ok(true)
)
});
if all_recognized {
let mut clustered_params = params.clone();
let mut clustered_format = format;
for option in short.bytes() {
apply_short_option(option, &mut clustered_params, &mut clustered_format)?;
}
params = clustered_params;
format = clustered_format;
continue;
}
}
}
if param == "--report-identical-files" {
params.report_identical_files = true;
continue;
}
if param == "-q" || param == "--brief" {
if param == "--brief" {
params.brief = true;
continue;
}
if param == "-t" || param == "--expand-tabs" {
if param == "--expand-tabs" {
params.expand_tabs = true;
continue;
}
if param == "--normal" {
if format.is_some() && format != Some(Format::Normal) {
return Err("Conflicting output style options".to_string());
}
format = Some(Format::Normal);
set_format(&mut format, Format::Normal)?;
continue;
}
if param == "-e" || param == "--ed" {
if format.is_some() && format != Some(Format::Ed) {
return Err("Conflicting output style options".to_string());
}
format = Some(Format::Ed);
if param == "--ed" {
set_format(&mut format, Format::Ed)?;
continue;
}
if param == "-y" || param == "--side-by-side" {
if format.is_some() && format != Some(Format::SideBySide) {
return Err("Conflicting output style option".to_string());
}
format = Some(Format::SideBySide);
if param == "--side-by-side" {
set_format(&mut format, Format::SideBySide)?;
continue;
}
if width_re.is_match(param.to_string_lossy().as_ref()) {
Expand Down Expand Up @@ -156,14 +177,13 @@ pub fn parse_params<I: Iterator<Item = OsString>>(mut opts: Peekable<I>) -> Resu

continue;
}
match match_context_diff_params(&param, next_param, format) {
match match_context_diff_params(&param, next_param, &mut format) {
Ok(DiffStyleMatch {
is_match,
context_count,
next_param_consumed,
}) => {
if is_match {
format = Some(Format::Context);
if context_count.is_some() {
context = context_count;
}
Expand All @@ -175,14 +195,13 @@ pub fn parse_params<I: Iterator<Item = OsString>>(mut opts: Peekable<I>) -> Resu
}
Err(error) => return Err(error),
}
match match_unified_diff_params(&param, next_param, format) {
match match_unified_diff_params(&param, next_param, &mut format) {
Ok(DiffStyleMatch {
is_match,
context_count,
next_param_consumed,
}) => {
if is_match {
format = Some(Format::Unified);
if context_count.is_some() {
context = context_count;
}
Expand Down Expand Up @@ -249,6 +268,38 @@ pub fn parse_params<I: Iterator<Item = OsString>>(mut opts: Peekable<I>) -> Resu
Ok(params)
}

fn set_format(format: &mut Option<Format>, requested: Format) -> Result<(), String> {
if format.is_some() && *format != Some(requested) {
// Preserve the singular side-by-side diagnostic for compatibility.
let message = if requested == Format::SideBySide {
"Conflicting output style option"
} else {
"Conflicting output style options"
};
return Err(message.to_string());
}
*format = Some(requested);
Ok(())
}

fn apply_short_option(
option: u8,
params: &mut Params,
format: &mut Option<Format>,
) -> Result<bool, String> {
match option {
b'c' => set_format(format, Format::Context)?,
b'e' => set_format(format, Format::Ed)?,
b'q' => params.brief = true,
b's' => params.report_identical_files = true,
b't' => params.expand_tabs = true,
b'u' => set_format(format, Format::Unified)?,
b'y' => set_format(format, Format::SideBySide)?,
_ => return Ok(false),
}
Ok(true)
}

struct DiffStyleMatch {
is_match: bool,
context_count: Option<usize>,
Expand All @@ -258,17 +309,15 @@ struct DiffStyleMatch {
fn match_context_diff_params(
param: &OsString,
next_param: Option<&OsString>,
format: Option<Format>,
format: &mut Option<Format>,
) -> Result<DiffStyleMatch, String> {
const CONTEXT_RE: &str = r"^(-[cC](?<num1>\d*)|--context(=(?<num2>\d*))?|-(?<num3>\d+)c)$";
let regex = Regex::new(CONTEXT_RE).unwrap();
let is_match = regex.is_match(param.to_string_lossy().as_ref());
let mut context_count = None;
let mut next_param_consumed = false;
if is_match {
if format.is_some() && format != Some(Format::Context) {
return Err("Conflicting output style options".to_string());
}
set_format(format, Format::Context)?;
let captures = regex.captures(param.to_str().unwrap()).unwrap();
let num = captures
.name("num1")
Expand Down Expand Up @@ -302,17 +351,15 @@ fn match_context_diff_params(
fn match_unified_diff_params(
param: &OsString,
next_param: Option<&OsString>,
format: Option<Format>,
format: &mut Option<Format>,
) -> Result<DiffStyleMatch, String> {
const UNIFIED_RE: &str = r"^(-[uU](?<num1>\d*)|--unified(=(?<num2>\d*))?|-(?<num3>\d+)u)$";
let regex = Regex::new(UNIFIED_RE).unwrap();
let is_match = regex.is_match(param.to_string_lossy().as_ref());
let mut context_count = None;
let mut next_param_consumed = false;
if is_match {
if format.is_some() && format != Some(Format::Unified) {
return Err("Conflicting output style options".to_string());
}
set_format(format, Format::Unified)?;
let captures = regex.captures(param.to_str().unwrap()).unwrap();
let num = captures
.name("num1")
Expand Down Expand Up @@ -719,6 +766,64 @@ mod tests {
}
}
#[test]
fn short_option_clusters() {
for (cluster, format, brief, report_identical_files, expand_tabs) in [
("-cc", Format::Context, false, false, false),
("-ee", Format::Ed, false, false, false),
("-qq", Format::Normal, true, false, false),
("-ss", Format::Normal, false, true, false),
("-tt", Format::Normal, false, false, true),
("-uu", Format::Unified, false, false, false),
("-yy", Format::SideBySide, false, false, false),
("-cqt", Format::Context, true, false, true),
("-eqs", Format::Ed, true, true, false),
("-qst", Format::Normal, true, true, true),
("-uqt", Format::Unified, true, false, true),
("-yqs", Format::SideBySide, true, true, false),
] {
assert_eq!(
Ok(Params {
executable: os("diff"),
from: os("foo"),
to: os("bar"),
format,
brief,
report_identical_files,
expand_tabs,
..Default::default()
}),
parse_params(
[os("diff"), os(cluster), os("foo"), os("bar")]
.iter()
.cloned()
.peekable()
),
"{cluster}"
);
}
}
#[test]
fn control_partly_recognized_short_option_clusters() {
for options in [
vec!["-qg"],
vec!["-u", "-cX"],
vec!["-u", "-qcX"],
vec!["-c", "-uX"],
] {
let unknown = options.last().unwrap().to_string();
let args = ["diff"]
.into_iter()
.chain(options)
.chain(["foo", "bar"])
.map(os)
.collect::<Vec<_>>();
assert_eq!(
Err(format!("unrecognized option '{unknown}'")),
parse_params(args.into_iter().peekable())
);
}
}
#[test]
fn tabsize() {
assert_eq!(
Ok(Params {
Expand Down Expand Up @@ -965,5 +1070,14 @@ mod tests {
)
.is_err());
}
assert_eq!(
Err("Conflicting output style options".to_string()),
parse_params(
[os("diff"), os("-c"), os("-ut"), os("foo"), os("bar")]
.iter()
.cloned()
.peekable()
)
);
}
}
74 changes: 74 additions & 0 deletions tests/integration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,80 @@ mod diff {
Ok(())
}

#[test]
fn short_option_clusters_match_split_options() -> Result<(), Box<dyn std::error::Error>> {
let mut left = NamedTempFile::new()?;
left.write_all(b"a\tb\n")?;
let mut right = NamedTempFile::new()?;
right.write_all(b"a b\n")?;

let equivalent = |cluster: &[&str],
split: &[&str],
other: &std::path::Path|
-> Result<std::process::Output, Box<dyn std::error::Error>> {
let run = |options: &[&str]| {
cargo_bin_cmd!("diffutils")
.arg("diff")
.args(options)
.arg(left.path())
.arg(other)
.output()
};
let clustered = run(cluster)?;
let separate = run(split)?;
assert_eq!(
clustered.status.code(),
separate.status.code(),
"{cluster:?}"
);
assert_eq!(clustered.stdout, separate.stdout, "{cluster:?}");
assert_eq!(clustered.stderr, separate.stderr, "{cluster:?}");
Ok(clustered)
};

for (cluster, split, expected_code) in [
(&["-cc"][..], &["-c", "-c"][..], Some(1)),
(&["-ee"], &["-e", "-e"], Some(1)),
(&["-qq"], &["-q", "-q"], Some(1)),
(&["-ss"], &["-s", "-s"], Some(1)),
(&["-tt"], &["-t", "-t"], Some(1)),
(&["-uu"], &["-u", "-u"], Some(1)),
(&["-cqt"], &["-c", "-q", "-t"], Some(1)),
(&["-eqs"], &["-e", "-q", "-s"], Some(1)),
(&["-qst"], &["-q", "-s", "-t"], Some(1)),
(&["-uqt"], &["-u", "-q", "-t"], Some(1)),
(&["-cu"], &["-c", "-u"], Some(2)),
(&["-uc"], &["-u", "-c"], Some(2)),
(&["-eu"], &["-e", "-u"], Some(2)),
(&["-c", "-ut"], &["-c", "-u", "-t"], Some(2)),
(&["-ut", "-c"], &["-u", "-t", "-c"], Some(2)),
] {
let clustered = equivalent(cluster, split, right.path())?;
assert_eq!(clustered.status.code(), expected_code, "{cluster:?}");
}

let mut same = NamedTempFile::new()?;
same.write_all(b"a\tb\n")?;
let identical = format!(
"Files {} and {} are identical\n",
left.path().to_string_lossy(),
same.path().to_string_lossy()
);
for (cluster, split) in [
(&["-ss"][..], &["-s", "-s"][..]),
(&["-qs"], &["-q", "-s"]),
(&["-ys"], &["-y", "-s"]),
] {
let clustered = equivalent(cluster, split, same.path())?;
assert_eq!(clustered.status.code(), Some(0), "{cluster:?}");
assert!(
clustered.stdout.ends_with(identical.as_bytes()),
"{cluster:?}"
);
}
Ok(())
}

#[test]
fn missing_newline() -> Result<(), Box<dyn std::error::Error>> {
let mut file1 = NamedTempFile::new()?;
Expand Down
Loading