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

RevFile: Diff any two files #8275

Merged

Conversation

gerhardol
Copy link
Member

Based on #8193, for RevisionFileHistory

Proposed changes

Add Remember file for diff for RevisionFileHistory similar to RevDiff in #8193 The context is shared between the tabs

Screenshots

Before

image

After

image

Test methodology

Tests added for RevisionDiff


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

@ghost ghost assigned gerhardol Jun 27, 2020
@gerhardol gerhardol changed the title Feature/i8048 diff two files history RevFile: Diff any two files Jun 27, 2020
@codecov
Copy link

codecov bot commented Jun 27, 2020

Codecov Report

Merging #8275 into master will decrease coverage by 0.02%.
The diff coverage is 25.64%.

@@            Coverage Diff             @@
##           master    #8275      +/-   ##
==========================================
- Coverage   52.80%   52.78%   -0.03%     
==========================================
  Files         857      857              
  Lines       62305    62339      +34     
  Branches    11190    11202      +12     
==========================================
+ Hits        32900    32904       +4     
- Misses      26799    26827      +28     
- Partials     2606     2608       +2     
Flag Coverage Δ
#production 40.76% <25.64%> (-0.02%) ⬇️
#tests 94.44% <ø> (-0.02%) ⬇️

GitUI/CommandsDialogs/RememberFileContextMenuController.cs Outdated Show resolved Hide resolved
GitUI/CommandsDialogs/RevisionFileTreeControl.cs Outdated Show resolved Hide resolved
GitUI/CommandsDialogs/RevisionDiffControl.cs Outdated Show resolved Hide resolved
GitUI/CommandsDialogs/RevisionFileTreeControl.cs Outdated Show resolved Hide resolved
@RussKie
Copy link
Member

RussKie commented Jun 28, 2020

I'm getting concerned with the size of our context menus.

@gerhardol
Copy link
Member Author

I'm getting concerned with the size of our context menus.

RevFileTree is not that long, should not be a concern.

@mstv
Copy link
Member

mstv commented Jun 29, 2020

Another edge case only if the Working directory is selected:

grafik

I tried to get a diff with meaningful file names where, in addition, the current files can be edited.

@gerhardol
Copy link
Member Author

Another edge case only if the Working directory is selected:

Intentional. If you select a commit, then work tree, Git can compare.
If you select worktree, then commit then no. Disabling the entry for all two selections where diff is not possible.
(Actually, worktree->worktree is possible but a separate case so just ignored.)

Copy link
Member

@RussKie RussKie left a comment

Choose a reason for hiding this comment

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

LGTM

@gerhardol
Copy link
Member Author

Handling posix paths. When @mstv has approved I will squash (probably keep difftool in folder separate) and rebase, then merge

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

@gerhardol gerhardol force-pushed the feature/i8048-diff-two-files-history branch from 9f7f127 to 7dc6e97 Compare July 1, 2020 22:15
@gerhardol
Copy link
Member Author

@msftbot merge in 24 hours

@ghost ghost added the status: auto merge label Jul 1, 2020
@ghost
Copy link

ghost commented Jul 1, 2020

Hello @gerhardol!

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 Thu, 02 Jul 2020 22:17:02 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".

@gerhardol gerhardol merged commit 4073899 into gitextensions:master Jul 2, 2020
@ghost ghost added this to the 4.0 milestone Jul 2, 2020
@gerhardol gerhardol deleted the feature/i8048-diff-two-files-history branch November 14, 2021 13:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants