Daniel Hofstetter
2a899a9fc7
Fix clippy warnings in tests
...
from needless_borrows_for_generic_args lint
2024-09-06 09:27:53 +02:00
Olivier Tilloy
fa4e0c6097
Make error message consistent with GNU diff's implementation when failing to read input file(s)
2024-06-04 14:57:50 +02:00
Tanmay Patil
8c6a648aef
Merge branch 'main' into handle-directory-input
2024-04-23 23:11:31 +05:30
Olivier Tilloy
b7261a43f4
Break out the logic to match context/unified diff params into separate functions, for improved readability
2024-04-22 18:01:00 +02:00
Olivier Tilloy
37fe1ae808
Handle --normal, -e and --ed options
2024-04-22 18:01:00 +02:00
Olivier Tilloy
22d973fce6
Parse all valid arguments accepted by GNU diff to request a regular context (with an optional number of lines)
2024-04-22 18:01:00 +02:00
Olivier Tilloy
fe28610f21
Parse all valid arguments accepted by GNU diff to request a unified context (with an optional number of lines)
2024-04-22 18:01:00 +02:00
Sylvestre Ledru
3a8eddfe2c
Fix typos
2024-04-21 16:07:01 +02:00
Tanmay Patil
39d2ece187
Handle directory-file and file-directory comparisons in the diff
...
GNU diff treats `diff DIRECTORY FILE` as `diff DIRECTORY/FILE FILE`
2024-04-21 16:10:48 +05:30
Olivier Tilloy
14799eea89
Move test assertions in the cfg block where they belong
2024-04-21 00:13:52 +02:00
Olivier Tilloy
831348d1fc
Fix file path in ed diff tests
2024-04-21 00:12:43 +02:00
Tanmay Patil
aedd0684d1
Replace only the first two occurences of timestamp regex
2024-04-16 10:41:38 +05:30
Tanmay Patil
54c02bdf0b
Use NamedTempFile instead of manually creating files
2024-04-16 10:17:09 +05:30
Tanmay Patil
ba7cb0aef9
Do not create dummy files
...
Since we now returning SystemTime::now() for invalid file input,
there is no need to crate dummy files
2024-04-14 22:56:37 +05:30
Tanmay Patil
33783d094e
Improve tests
2024-04-14 17:16:53 +05:30
Tanmay Patil
900e1c3a68
Tests: Replace modification time in diff with "TIMESTAMP" placeholder
2024-04-14 13:43:30 +05:30
Tanmay Patil
0a77fe12b9
Add tests for get_modification_time function
2024-04-13 21:31:13 +05:30
Tanmay Patil
86bd05c739
Merge branch 'context-diff-modification-time' of github.com:TanmayPatil105/diffutils into context-diff-modification-time
2024-04-10 22:31:09 +05:30
Tanmay Patil
00e18a6b0c
Define assert_diff_eq macro for context&unified diff comparison
2024-04-10 22:20:48 +05:30
Tanmay
f6eb0835b0
Merge branch 'main' into context-diff-modification-time
2024-04-10 22:13:18 +05:30
Olivier Tilloy
84ad116845
Use io::stdin() to read from standard input in a portable manner
2024-04-08 20:21:24 +02:00
Olivier Tilloy
6dc34fed44
Handle the rewrite of "-" to "/dev/stdin" in main to leave the filenames unchanged ( fixes #46 )
2024-04-08 20:21:24 +02:00
Olivier Tilloy
c325291696
Unit test to verify that conflicting output styles result in an error
2024-04-05 23:22:26 +02:00
Tanmay Patil
72da7fca40
Show current time if fs::metadata errors
2024-04-04 20:01:11 +05:30
Tanmay
61fb0657c1
Merge branch 'main' into context-diff-modification-time
2024-04-04 19:56:13 +05:30
Daniel Hofstetter
2d9e625a5b
Disable tests on Windows that use ed
2024-04-04 08:30:54 +02:00
Sylvestre Ledru
281098d751
Run clippy pedantic fixes
2024-04-03 23:25:48 +02:00
Tanmay Patil
a3a372ff36
Display modification times of input files in unified diff
2024-04-04 00:13:41 +05:30
Tanmay Patil
5b814f8530
Fix tests
2024-04-03 10:50:52 +05:30
Olivier Tilloy
b8fada8faa
Add unit tests for missing arguments
2024-04-02 21:10:41 +02:00
Olivier Tilloy
a213272d0c
Add tests for when '-' is used to signify to use standard input
2024-04-02 20:41:01 +02:00
Tanmay Patil
88a7568b52
Merge branch 'main' into context-diff-modification-time
2024-04-01 13:05:37 +05:30
Olivier Tilloy
e6a0ba28c5
Pass a Params reference to the various diff() functions, instead of a long list of arguments
2024-03-31 21:27:28 +02:00
Tanmay Patil
80c9944bf7
Create foo/bar in target/context-diff
2024-03-31 22:57:51 +05:30
Sylvestre Ledru
043c5f9493
Merge branch 'main' into context-diff-modification-time
2024-03-31 16:17:23 +02:00
Tanmay Patil
9ff8f89626
Fix tests
2024-03-31 16:14:44 +05:30
Olivier Tilloy
f60fefaf6e
Implement the Default trait for Params
2024-03-30 23:50:58 +01:00
Olivier Tilloy
f2fd2127ed
Politely ask clippy to not complain about too many arguments
2024-03-28 18:10:31 +01:00
Olivier Tilloy
e0283083f2
Implement --tabsize option
2024-03-28 18:10:29 +01:00
Olivier Tilloy
8d65c2badd
Implement -t/--expand-tabs option
2024-03-28 18:09:03 +01:00
Tanmay Patil
42eb15b87a
Display modification times of input files in context diff
...
Fixes #31
2024-03-27 22:46:23 +05:30
Daniel Hofstetter
f916f1ce86
clippy: fix warnings from useless_vec lint
2024-03-24 14:05:44 +01:00
Olivier Tilloy
4ed7ea1553
Implement -q/--brief option ( fixes #19 ) ( #20 )
...
* Implement -q/--brief option
* Optimization: stop analyzing the files as soon as there are any differences
* Unit tests for the stop_early parameter
* Simplify checks
2024-03-19 11:45:06 +01:00
Olivier Tilloy
c68d386170
Implement -s/--report-identical-files option ( fixes #23 )
2024-03-01 14:45:41 +01:00
Olivier Tilloy
a89f30afa0
Ed diff: compact ranges of lines where possible ( fixes #21 )
2024-02-24 11:55:54 +01:00
Olivier Tilloy
1241db4806
Match GNU diff's implementation for exit codes ( fixes #17 )
2024-02-22 17:26:24 +01:00
Olivier Tilloy
54a5407bec
Fix trivial typo in error message
2024-02-09 17:51:50 +01:00
Olivier Tilloy
3f9556aa05
Add comments to ease readability and maintainability
2024-02-09 10:28:39 +01:00
Olivier Tilloy
a94c6a60cf
Normal diff: compact ranges of lines where possible ( fixes #10 )
2024-02-09 10:28:39 +01:00
Sylvestre Ledru
f5b65a5720
add debug info
2024-01-23 12:49:20 +01:00