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

Blame: Start on line also when control already exists #9832

Merged

Conversation

gerhardol
Copy link
Member

This is the core change in #9805
To add tests to this, a lot more has to be changed and this change is useful to functional testing other upcoming GoToLine changes,
so it was broken out to a separate PR.

#9805 is kept to handle the tests.

Proposed changes

Blame can start presenting on a line. This is is available in
RevDiff and RevFileTree since #9424.
(Even if the code enabling this has existed for long time,
it was just used for a special case.)

The "goto line" was only used if the control had to be init,
not if e.g. toggling to Diff and selecting an new diff line
and then Blame again.

Screenshots

See #9805

Test methodology

Manual - tests in #9805

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.

@ghost ghost assigned gerhardol Jan 22, 2022
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.

Works for switching Diff to Blame.
Though FileViewerInternal.GoToLine should center the Caret.Position if it is not entirely visible - separate issue.

GitUI/UserControls/BlameControl.cs Outdated Show resolved Hide resolved
Blame can start presenting on a line. This is is available in
RevDiff and RevFileTree since gitextensions#9424.
(Even if the code enabling this has existed for long time,
it was just used for a special case.)

The "goto line" was only used if the control had to be init,
not if e.g. toggling to Diff and selecting an new diff line
and then Blame again.
@gerhardol gerhardol force-pushed the feature/i9796-blame-line-number-1 branch from 49ddf11 to 0e518e1 Compare January 23, 2022 12:15
@gerhardol gerhardol merged commit 4b65b49 into gitextensions:master Jan 25, 2022
@ghost ghost added this to the vNext milestone Jan 25, 2022
@gerhardol gerhardol deleted the feature/i9796-blame-line-number-1 branch January 25, 2022 23:41
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

2 participants