Implement --diff-args #1697
Open
Implement --diff-args #1697
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dandavison
force-pushed
the
git-diff-options
branch
from
c6fdfb9
to
71473d5
Compare
th1000s
reviewed
May 7, 2024
Comment on lines
+320
to
+334
| #[arg( | ||
| long = "diff-args", | ||
| short = '@', | ||
| default_value = "", | ||
| value_name = "STRING" | ||
| )] | ||
| /// Arguments to pass to `git diff` when using delta to diff two files. | ||
| /// | ||
| /// E.g. `delta --diff-args=-U999 file_1 file_2` is equivalent to | ||
| /// `git diff -U999 --no-index --color file_1 file_2 | delta`. | ||
| /// | ||
| /// However, if you use process substitution instead of real file paths, it falls back to `diff -u` instead of `git | ||
| /// diff`. | ||
| pub diff_args: String, | ||
|
|
There was a problem hiding this comment.
That's actually a good use of the unique -@ argument.
Wording: "Arguments" -> "Extra arguments", -U999 comes after --color, and give a brief example of process substitution:
... process substitution (`delta <(grep a file_1) <(cmd_2)`) instead of ...
Comment on lines
26
to
28
| let diff_cmd = if via_process_substitution(minus_file) || via_process_substitution(plus_file) { | ||
| ["diff", "-u", "--"].as_slice() | ||
| format!("diff -u {} --", config.diff_args) | ||
| } else { |
There was a problem hiding this comment.
diff's -u (defaults to 3 context) will override a following -U<N> (GNU diffutils at least), so replace with -U3 which can be overwritten (and adapt help output above).
Comment on lines
42
to
47
|
|
||
| let diff_process = process::Command::new(diff_path) | ||
| .args(&diff_cmd[1..]) | ||
| .args(diff_cmd) | ||
| .args([minus_file, plus_file]) | ||
| .stdout(process::Stdio::piped()) | ||
| .spawn(); |
There was a problem hiding this comment.
git diff --no-index --nonsense will exit with 129 and first print error: unknown option 'nonsense' and then the full --help output. Maybe catch such cases (diff will just exit with 2) and print the actual (quoted, in case split_whitespace() was the culprit) command delta called.
2 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Allow extra arguments to
git diffto be passed from the delta commands line, as suggested by @calestyo in #1644 (comment)E.g.
Note that the
=is required in this case, due to the-that comes next.