Put file-modified label in front of mode changes. #874
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
When using `--navigate` with files that get their mode modified, the file-modified label was not being prefixed, so these changes were not being marked as skip destinations. This is particularly bad if a file has line changes along with the mode change AND the user has an empty hunk label (since that would make the entire file's changes get skipped with an "n"). I added a test of a mode-change with a line-change, and a test for a mode change where the old & new mode values are not one of the two expected value-pairs. I also used format_file() on the mode filenames since the other format() calls were using it.
WayneD
added a commit
to WayneD/delta
that referenced
this pull request
Dec 30, 2021
This change makes the tests pass, but it will need to be reverted to work with the output change in dandavison#874.
|
LGTM, thanks @WayneD. |
dandavison
reviewed
Jan 1, 2022
| integration_test_utils::run_delta(GIT_DIFF_FILE_MODE_CHANGE_UNEXPECTED_BITS, &config); | ||
| let output = strip_ansi_codes(&output); | ||
| assert!(output.contains(r"Δ src/delta.rs: 100700 -> 100644")); | ||
| } |
There was a problem hiding this comment.
Incidentally, there's a utility to make writing these tests easier now. It doesn't yet have an expect_contains() method but I'll add that, at which point this test will be able to be written as
fn test_file_mode_change_unexpected_bits() {
DeltaTest::with(&["--navigate", "--right-arrow=->"])
.with_input(GIT_DIFF_FILE_MODE_CHANGE_UNEXPECTED_BITS)
.expect_contains(r"Δ src/delta.rs: 100700 -> 100644");
}There was a problem hiding this comment.
Thanks for pointing that out. I've created a pull request that implements this (along with some other changes).
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.
When using
--navigatewith files that get their mode modified, the file-modified label was not being prefixed, so these changes were not being marked as skip destinations. This is particularly bad if a file has line changes along with the mode change and the user has an empty hunk label (since that would make the entire file's changes get skipped with an "n").I added a test of a mode-change with a line-change, and a test for a mode change where the old & new mode values are not one of the two expected value-pairs. I also used format_file() on the mode filenames since the other format() headings were using it.