Select remote branch on Alt+Click in side panel #10083
Merged
Conversation
This file contains 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
ghost
assigned 
gerhardol
changed the title
RussKie
approved these changes
Jul 25, 2022
|
I'd like an easy way to toggle branch highlighting too - #8452 |
That is not a conflict, if we agree on how to use the available combinations. Ctrl-Alt-Click (in both left panel and grid) need to be agreed on to (with current PRs it is like Ctrl-Click in side panel and Click in the grid). |
#8452 is no longer a draft, Alt-LClick is always Highlighting. This PR also handles Alt independent of Ctrl, no change needed. |
gerhardol
added a commit
that referenced
this pull request
Jul 28, 2022
Co-authored-by: Gerhard Olsson <gerhardol@users.noreply.github.com> (cherry picked from commit cabe0d2)
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.
Fixes #9194
Proposed changes
When Alt+Click on local branches in the sidepanel, select the tracked remote branch.
Simplify finding remote tracked branches (to for instance find differences).
For branches with no tracked remote the local is selected as before.
Note Ctrl+Alt+Click is not handled now. Should that toggle the remote branch status?
(commit message is not correct right now)
Discussed in #9194.
Cherry-picked from @mstv private branch, with a minor adjustment
Screenshots
Before
The local branch was always selected.
After
One normal click selecting the same branch, one alt-click to select the remote branch revision.
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.