Skip to content

Display modification times of input files in context and unified diff #33

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 18 commits into from
Apr 16, 2024
Merged

Display modification times of input files in context and unified diff #33

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
42eb15b
Display modification times of input files in context diff
TanmayPatil105 Mar 27, 2024
9ff8f89
Fix tests
TanmayPatil105 Mar 28, 2024
043c5f9
Merge branch 'main' into context-diff-modification-time
sylvestre Mar 31, 2024
80c9944
Create foo/bar in target/context-diff
TanmayPatil105 Mar 31, 2024
88a7568
Merge branch 'main' into context-diff-modification-time
TanmayPatil105 Apr 1, 2024
5b814f8
Fix tests
TanmayPatil105 Apr 3, 2024
a3a372f
Display modification times of input files in unified diff
TanmayPatil105 Apr 3, 2024
61fb065
Merge branch 'main' into context-diff-modification-time
TanmayPatil105 Apr 4, 2024
72da7fc
Show current time if fs::metadata errors
TanmayPatil105 Apr 4, 2024
f6eb083
Merge branch 'main' into context-diff-modification-time
TanmayPatil105 Apr 10, 2024
00e18a6
Define assert_diff_eq macro for context&unified diff comparison
TanmayPatil105 Apr 10, 2024
86bd05c
Merge branch 'context-diff-modification-time' of github.com:TanmayPat…
TanmayPatil105 Apr 10, 2024
0a77fe1
Add tests for get_modification_time function
TanmayPatil105 Apr 10, 2024
900e1c3
Tests: Replace modification time in diff with "TIMESTAMP" placeholder
TanmayPatil105 Apr 14, 2024
33783d0
Improve tests
TanmayPatil105 Apr 14, 2024
ba7cb0a
Do not create dummy files
TanmayPatil105 Apr 14, 2024
54c02bd
Use NamedTempFile instead of manually creating files
TanmayPatil105 Apr 16, 2024
aedd068
Replace only the first two occurences of timestamp regex
TanmayPatil105 Apr 16, 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
Prev Previous commit
Next Next commit
Create foo/bar in target/context-diff
  • Loading branch information
@TanmayPatil105
TanmayPatil105 committed Mar 31, 2024
commit 80c9944bf79ddf71c73324b58faabd4408bd5f69
17 changes: 10 additions & 7 deletions src/context_diff.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,11 +747,14 @@ mod tests {
use std::fs::File;
use std::str;

let from_filename = "foo";
let _ = File::create(&format!("foo")).unwrap();
let target = "target/context-diff";
// test all possible six-line files.
let _ = std::fs::create_dir(target);
let from_filename = &format!("{target}/foo");
let _ = File::create(from_filename).unwrap();
let from = ["a", "b", "c", ""].join("\n");
let to_filename = "bar";
let _ = File::create(&format!("bar")).unwrap();
let to_filename = &format!("{target}/bar");
let _ = File::create(to_filename).unwrap();
let to = ["a", "d", "c", ""].join("\n");
let context_size: usize = 3;

Expand All @@ -771,8 +774,8 @@ mod tests {
let diff_full = re.replace_all(diff_full_text, "");

let expected_full = [
"*** foo\t",
"--- bar\t",
"*** target/context-diff/foo\t",
"--- target/context-diff/bar\t",
"***************",
"*** 1,3 ****",
" a",
Expand Down Expand Up @@ -801,7 +804,7 @@ mod tests {
let diff_brief_text = str::from_utf8(&diff_brief).unwrap();
let re = Regex::new(r"\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [+-]\d{4}").unwrap();
let diff_brief = re.replace_all(diff_brief_text, "");
let expected_brief = ["*** foo\t", "--- bar\t", ""].join("\n");
let expected_brief = ["*** target/context-diff/foo\t", "--- target/context-diff/bar\t", ""].join("\n");
assert_eq!(diff_brief, expected_brief);

let nodiff_full = diff(
Expand Down