Blame: Fix "blame previous revision" feature #6841

pmiossec · 2019-06-22T14:28:21Z

Partly fixes #6605 (other part will be fixed by #6807 or #6132)

Proposed changes

Fix "Blame to previous revision" behavior to select the first commit before the one introducing the changes (so the previous, no!?!) as explained in Blame previous revision without function #6605 (comment)
While I was at it, I have added a context menu item to blame selected revision to make explicit what could be done by double-clicking (because I realised with Blame view - use hash instead of timestamp #6832 (comment) that it was probably not evident for new users)

Screenshots

For the 2nd point (the 1st change nothing to the ui)

Before

Focus only on the menu (and not the colors of the lines)

After

Test methodology

Manual

Test environment(s)

Git Extensions 3.2.0
Build 8e4b5fc (Dirty)
Git 2.20.1.windows.1
Microsoft Windows NT 10.0.17134.0
.NET Framework 4.7.3416.0
DPI 96dpi (no scaling)

codecov · 2019-06-22T14:37:49Z

Codecov Report

Merging #6841 into master will increase coverage by 0.01%.
The diff coverage is 0%.

@@            Coverage Diff            @@
##           master   #6841      +/-   ##
=========================================
+ Coverage   47.68%   47.7%   +0.01%     
=========================================
  Files         731     731              
  Lines       53901   53912      +11     
  Branches     7073    7075       +2     
=========================================
+ Hits        25703   25719      +16     
- Misses      26803   26805       +2     
+ Partials     1395    1388       -7

Flag	Coverage Δ
#production	`36.8% <0%> (+0.02%)`	⬆️
#tests	`97.68% <ø> (+0.02%)`	⬆️

mstv

The lines of BlameAuthor and BlameFile are not aligned correctly.
Could you add the correct height calculation to this PR, please?

mstv · 2019-06-23T09:23:03Z

GitUI/UserControls/BlameControl.cs

-            GitBlame blame = Module.Blame(_fileName, objectId + "^", _encoding, originalLine + ",+1");
-            if (blame.Lines.Count > 0)
+
+            selectedRevision = _revGrid.GetRevision(objectId);


_revGrid.GetRevision returns null quite often. Hence the context menu items do not have an effect.

Disable the context menu items in case they will not select an other revision, on opening the context menu, please, because they do not apply at all if already at this revision or if there is no parent revision, respectively.

Best solution: All revisions are available in the RevisionGrid or loaded on demand -- never failing silently without error message.

STR:

blame GitUI/UserControls/BlameControl.cs

select the revision from master 18e4485

try to blame this or the previous revision

@mstv What is STR? Has Stuttgart Airport anything to do with this?

No, there's no obvious relation ;-)
STR = steps to reproduce.

This PR is not intended to fix that behavior that is caused by the regression about following renames. That's why I wrote :

Partly fixes #6605 (other part will be fixed by #6807 or #6132)

And I also want one of these 2 PRs merged in the next release to have a consistent behavior.

Yes, I agree. I had understood that it will need part 2. Though in order to test the disabling of the menu items, I found it helpful to have an example where it occurs.

GitUI/UserControls/BlameControl.cs

mstv

Still open: The lines of BlameAuthor and of BlameFile are not aligned correctly.
Could you add the correct height calculation to this PR, please?

The disabling of the context menu items can be done in the second PR.
I think it would help testing the coming changes.

mstv · 2019-06-26T21:43:35Z

GitUI/UserControls/BlameControl.cs

-                else
+                _revGrid.SetSelectedRevision(revisionId);
+            }
+            else


nit: Our new coding style prefers early return over else in order to reduce nesting.

pmiossec · 2019-06-26T22:43:29Z

@mstv I think I have fixed most of the things related to this PR and that I won't add much.

The 2 others improvements you ask we to do are not really related to the original goal of this PR just intended to fix the 'blame previous commit' feature.

Still open: The lines of BlameAuthor and of BlameFile are not aligned correctly.
Could you add the correct height calculation to this PR, please?

Unfortunately, no 😕 for some reason :

I don't have the problem, so I can't work on it and test the fix
the fix in my other branch is on a component that don't exist in this branch, so the fix should be completely different and I don't know where to do it. That's why I'm not very confident in including it.
not related (like just said)

The disabling of the context menu items can be done in the second PR.
I think it would help testing the coming changes.

Yes, I would like to see it fixed in another PR but I want to wait for the rename regression before working on it.

So, except the last review comment, I think this PR is in good state to be merged...

mstv · 2019-06-26T23:06:04Z

OK

mstv

LGTM. In part 2, the context menu items should be disabled if they are not applicable. This will improve the UX, especially if the file history is not complete. And it will facilitate testing the file history fix.

to select the first commit before the revision selected (so the previous, no!?!) Partly fix gitextensions#6605

to make explicit what could be done by double-clicking

pmiossec · 2019-07-02T09:26:22Z

In part 2, the context menu items should be disabled if they are not applicable

@mstv I finally did it.

mstv

Thank you. LGTM.
@gitextensions/git-extensions-source, I am voting to include this in master now.

gerhardol

Blame this revision is something I often missed
Agree this should go in master now and be included in 3.2

gerhardol · 2019-07-02T20:51:56Z

GitUI/UserControls/BlameControl.cs

@@ -414,7 +414,18 @@ private int GetBlameLine()

        private void contextMenu_Opened(object sender, EventArgs e)
        {
+            blameRevisionToolStripMenuItem.Enabled = false;


I was confused enough to comment and would like to have a comment like
//Disable the menu entries by default
Disabling could be done in the early exit too

I put it back in the early exit as it is equivalent and was what I did first...

RussKie · 2019-07-03T05:02:52Z

Is there a way we can test it?

pmiossec · 2019-07-03T10:53:00Z

Is there a way we can test it?

Looking at the code, I don't see how to achieve it with unit tests because under the hood, it relies on RevisionGridControl which is very difficult to handle.

With integration tests, it should be achievable (with a lot of work).
We have to improve a lot GitModuleTestHelper to be able to create git commits and complex histories and doing file renames.

gerhardol

Suggest merging, adding to 3.2 milestone

pmiossec requested a review from mstv June 22, 2019 14:28

ghost assigned pmiossec Jun 22, 2019

pmiossec force-pushed the blame_previous_commit branch from c61f9c5 to abdbccf Compare June 22, 2019 21:33

mstv requested changes Jun 23, 2019

View reviewed changes

pmiossec force-pushed the blame_previous_commit branch 2 times, most recently from a487fe9 to fa7334c Compare June 26, 2019 11:47

mstv requested changes Jun 26, 2019

View reviewed changes

pmiossec force-pushed the blame_previous_commit branch 3 times, most recently from f715aa8 to c616642 Compare July 1, 2019 08:14

mstv approved these changes Jul 1, 2019

View reviewed changes

mstv added the status: ready label Jul 1, 2019

pmiossec added 3 commits July 2, 2019 10:40

Fix "Blame to previous revision"

eb142f1

to select the first commit before the revision selected (so the previous, no!?!) Partly fix gitextensions#6605

Blame: Add a context menu item to blame selected revision

43cf4ec

to make explicit what could be done by double-clicking

Refactoring & fixes following reviews...

cfbea4b

pmiossec force-pushed the blame_previous_commit branch from c616642 to 8618125 Compare July 2, 2019 09:20

mstv approved these changes Jul 2, 2019

View reviewed changes

gerhardol reviewed Jul 2, 2019

View reviewed changes

Disable blame menu items if revision is not in the revision grid

7be58af

pmiossec force-pushed the blame_previous_commit branch from 8618125 to 7be58af Compare July 3, 2019 11:26

gerhardol approved these changes Jul 5, 2019

View reviewed changes

gerhardol added this to the 3.2.0 milestone Jul 5, 2019

RussKie merged commit b33a12e into gitextensions:master Jul 6, 2019

RussKie removed the status: ready label Jul 6, 2019

pmiossec deleted the blame_previous_commit branch July 8, 2019 07:56

mstv mentioned this pull request Nov 2, 2022

[NBug] Object reference not set to an instance of an object. #10314

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Blame: Fix "blame previous revision" feature #6841

Blame: Fix "blame previous revision" feature #6841

pmiossec commented Jun 22, 2019

codecov bot commented Jun 22, 2019 •

edited

Loading

mstv left a comment

mstv Jun 23, 2019 •

edited

Loading

gerhardol Jun 23, 2019

mstv Jun 23, 2019

pmiossec Jun 23, 2019

mstv Jun 24, 2019

mstv left a comment

mstv Jun 26, 2019

pmiossec commented Jun 26, 2019

mstv commented Jun 26, 2019

mstv left a comment

pmiossec commented Jul 2, 2019

mstv left a comment

gerhardol left a comment

gerhardol Jul 2, 2019

pmiossec Jul 3, 2019

RussKie commented Jul 3, 2019

pmiossec commented Jul 3, 2019

gerhardol left a comment

Blame: Fix "blame previous revision" feature #6841

Blame: Fix "blame previous revision" feature #6841

Conversation

pmiossec commented Jun 22, 2019

Proposed changes

Screenshots

Before

After

Test methodology

Test environment(s)

codecov bot commented Jun 22, 2019 • edited Loading

Codecov Report

mstv left a comment

Choose a reason for hiding this comment

mstv Jun 23, 2019 • edited Loading

Choose a reason for hiding this comment

gerhardol Jun 23, 2019

Choose a reason for hiding this comment

mstv Jun 23, 2019

Choose a reason for hiding this comment

pmiossec Jun 23, 2019

Choose a reason for hiding this comment

mstv Jun 24, 2019

Choose a reason for hiding this comment

mstv left a comment

Choose a reason for hiding this comment

mstv Jun 26, 2019

Choose a reason for hiding this comment

pmiossec commented Jun 26, 2019

mstv commented Jun 26, 2019

mstv left a comment

Choose a reason for hiding this comment

pmiossec commented Jul 2, 2019

mstv left a comment

Choose a reason for hiding this comment

gerhardol left a comment

Choose a reason for hiding this comment

gerhardol Jul 2, 2019

Choose a reason for hiding this comment

pmiossec Jul 3, 2019

Choose a reason for hiding this comment

RussKie commented Jul 3, 2019

pmiossec commented Jul 3, 2019

gerhardol left a comment

Choose a reason for hiding this comment

codecov bot commented Jun 22, 2019 •

edited

Loading

mstv Jun 23, 2019 •

edited

Loading