Skip to content

Handle directory-file and file-directory comparisons in the diff #56

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

Merged
oSoMoN merged 5 commits into from
Apr 23, 2024
Merged

Handle directory-file and file-directory comparisons in the diff #56

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
39d2ece
Handle directory-file and file-directory comparisons in the diff
TanmayPatil105 Apr 20, 2024
65993d6
Add tests for `diff FILE DIRECTORY`
TanmayPatil105 Apr 20, 2024
476e69e
Windows: Fix tests
TanmayPatil105 Apr 21, 2024
0304391
Create test files in temporary directory
TanmayPatil105 Apr 23, 2024
8c6a648
Merge branch 'main' into handle-directory-input
TanmayPatil105 Apr 23, 2024
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
Next Next commit
Handle directory-file and file-directory comparisons in the diff 
GNU diff treats `diff DIRECTORY FILE` as `diff DIRECTORY/FILE FILE`
  • Loading branch information
@TanmayPatil105
TanmayPatil105 committed Apr 21, 2024
commit 39d2ece18772bc01c83bffd3365a3fffddc54571
15 changes: 15 additions & 0 deletions src/params.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use std::ffi::{OsStr, OsString};
use std::path::PathBuf;

use regex::Regex;

Expand Down Expand Up @@ -178,6 +179,20 @@ pub fn parse_params<I: IntoIterator<Item = OsString>>(opts: I) -> Result<Params,
} else {
return Err(format!("Usage: {} <from> <to>", exe.to_string_lossy()));
};

// diff DIRECTORY FILE => diff DIRECTORY/FILE FILE
// diff FILE DIRECTORY => diff FILE DIRECTORY/FILE
let mut from_path: PathBuf = PathBuf::from(&params.from);
let mut to_path: PathBuf = PathBuf::from(&params.to);

if from_path.is_dir() && to_path.is_file() {
from_path.push(to_path.file_name().unwrap());
params.from = from_path.into_os_string();
} else if from_path.is_file() && to_path.is_dir() {
to_path.push(from_path.file_name().unwrap());
params.to = to_path.into_os_string();
}

params.format = format.unwrap_or(Format::default());
Ok(params)
}
Expand Down
31 changes: 31 additions & 0 deletions tests/integration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
use assert_cmd::cmd::Command;
use diffutilslib::assert_diff_eq;
use predicates::prelude::*;
use std::fs::File;
use std::io::Write;
use tempfile::NamedTempFile;

Expand Down Expand Up @@ -234,3 +235,33 @@ fn read_from_stdin() -> Result<(), Box<dyn std::error::Error>> {

Ok(())
}

#[test]
fn read_from_directory() -> Result<(), Box<dyn std::error::Error>> {
let mut cmd = Command::cargo_bin("diffutils")?;

let target = "target/integration";
let _ = std::fs::create_dir(target);
let directory = &format!("{target}/d");
let _ = std::fs::create_dir(directory);
let mut a = File::create(&format!("{target}/a")).unwrap();
a.write_all(b"a\n").unwrap();
let mut da = File::create(&format!("{directory}/a")).unwrap();
da.write_all(b"da\n").unwrap();

cmd.arg("-u")
.arg(&format!("{target}/d"))
.arg(&format!("{target}/a"));
cmd.assert().code(predicate::eq(1)).failure();

let output = cmd.output().unwrap().stdout;
assert_diff_eq!(
output,
format!(
"--- {}/d/a\tTIMESTAMP\n+++ {}/a\tTIMESTAMP\n@@ -1 +1 @@\n-da\n+a\n",
target, target
)
);

Ok(())
}