Skip to content
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.

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

Fix Open with Diff Tool does not work with staged renamed file in FormCommit dialog #8601

Merged
merged 1 commit into from Nov 9, 2020

Conversation

hieuxlu
Copy link
Contributor

@hieuxlu hieuxlu commented Nov 7, 2020

Fixes #8600

Proposed changes

  • Use UICommands.OpenWithDiffTool, just like RevisionDiffControl, with diffKind = RevisionDiffKind.DiffAB

Screenshots

Before

After

Test methodology

  • Manual test. FormCommit has no unit test. I found an integration test for FormCommit, but there's no test for difftool yet.

Test environment(s)

  • Git 2.28.0.windows.1
  • Microsoft Windows NT 10.0.17763.0
  • .NET Framework 4.8.4250.0
  • DPI 144dpi (150% scaling)

✒️ I contribute this code under The Developer Certificate of Origin.

@ghost ghost assigned hieuxlu Nov 7, 2020
@codecov
Copy link

codecov bot commented Nov 7, 2020

Codecov Report

Merging #8601 (a087f9b) into master (45ffd65) will decrease coverage by 0.02%.
The diff coverage is 0.00%.

@@            Coverage Diff             @@
##           master    #8601      +/-   ##
==========================================
- Coverage   55.13%   55.10%   -0.03%     
==========================================
  Files         904      904              
  Lines       65466    65465       -1     
  Branches    11853    11852       -1     
==========================================
- Hits        36094    36077      -17     
- Misses      26548    26560      +12     
- Partials     2824     2828       +4     
Flag Coverage Δ
production 42.12% <0.00%> (-0.03%) ⬇️
tests 94.84% <ø> (-0.02%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Copy link
Member

@gerhardol gerhardol left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Manual test. FormCommit has no unit test. I found an integration test for FormCommit, but there's no test for difftool yet.

This is supposed to be tested with the revisionDiffProvider, but the UI code must call the correct methods too...

Checked other use of Module.OpenWithDifftool() too, no issues seen.
(RevTree has no direct access to renamed files, always compares to worktree.)

Copy link
Member

@mstv mstv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you

@mstv
Copy link
Member

mstv commented Nov 8, 2020

@msftbot merge in 1 day

@ghost ghost added the status: auto merge label Nov 8, 2020
@ghost
Copy link

ghost commented Nov 8, 2020

Hello @mstv!

Because you've given me some instructions on how to help merge this pull request, I'll be modifying my merge approach. Here's how I understand your requirements for merging this pull request:

  • I won't merge this pull request until after the UTC date Mon, 09 Nov 2020 21:25:04 GMT, which is in 1 day

If this doesn't seem right to you, you can tell me to cancel these instructions and use the auto-merge policy that has been configured for this repository. Try telling me "forget everything I just told you".

@RussKie RussKie merged commit 2a5671d into gitextensions:master Nov 9, 2020
@ghost ghost added this to the 4.0 milestone Nov 9, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Difftool does not work with staged renamed file in FormCommit dialog
4 participants