fix(FileStatusList): status for renamed in branch diffs #12245
Merged
Conversation
This file contains hidden or 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 comparing status for branches, the status compared to BASE is shown as Unequal/Same/A/B. For renamed and copied files, the old name was not used when comparing, so status was not set correctly.
mstv
reviewed
Mar 8, 2025
| List<GitItemStatus> onlyB = allBaseToB.Except(allBaseToA, comparer).ToList(); | ||
| List<GitItemStatus> sameBaseToAandB = [.. allBaseToB | ||
| .Intersect(allBaseToA, comparer) | ||
| .Except(allAToB.Where(i => !((i.IsRenamed || i.IsCopied) && i.RenameCopyPercentage == "100")), comparer)]; |
There was a problem hiding this comment.
This subexpression is worth having a name, e.g.
GitItemStatus[] allAToBExceptExactRenameCopy = [.. allAToB.Where(i => !((i.IsRenamed || i.IsCopied) && i.RenameCopyPercentage == "100"))];
For performance reasons, we should use arrays instead of List<>.
There was a problem hiding this comment.
note also that allAToBExceptExactRenameCopy etc only needs the path so e.g. a HashSet could be used, but that should not make a noticeable difference
| @@ -3,18 +3,32 @@ | |||
| namespace GitCommands.Git | |||
| { | |||
| /// <summary> | |||
| /// Compares the file names/>. | |||
| /// Compares the file names | |||
There was a problem hiding this comment.
Suggested change
| /// Compares the file names | |
| /// Compares the file names. |
Comment on lines
-249
to
+253
| return sameBaseToAandB.Any(i => i.Name == f.Name) ? DiffBranchStatus.SameChange | ||
| : onlyA.Any(i => i.Name == f.Name) ? DiffBranchStatus.OnlyAChange | ||
| : onlyB.Any(i => i.Name == f.Name) ? DiffBranchStatus.OnlyBChange | ||
| return sameBaseToAandB.Any(i => comparer.Equals(i, f)) ? DiffBranchStatus.SameChange | ||
| : onlyA.Any(i => comparer.Equals(i, f)) ? DiffBranchStatus.OnlyAChange | ||
| : onlyB.Any(i => comparer.Equals(i, f)) ? DiffBranchStatus.OnlyBChange |
There was a problem hiding this comment.
There might be more occasions where this comparer should be used - in / around FileStatusList.
bd2d62f to
76f94c2
Compare
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.
Proposed changes
When comparing status for branches, the status compared to BASE is shown as Unequal/Same/A/B.
For renamed and copied files, the old name was not used when comparing, so status was not set correctly.
Screenshots
Comparing 8863b8b with my private branch tmp/test-modified
Before
After
Note that the status A-B is not always the same as BASE-A/B
Test methodology
Manual
Merge strategy
I agree that the maintainer squash merge this PR (if the commit message is clear).
✒️ I contribute this code under The Developer Certificate of Origin.