Fix issue #330 #333
Merged
Fix issue #330 #333
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
This new method is a cheaper alternative to DiffEditor.offset_and_selection() if the actual content of the selection is not needed. Signed-off-by: Daniel Harding <dharding@living180.net>
Pull a repeated check for s.modified up into the parent if statement. Signed-off-by: Daniel Harding <dharding@living180.net>
In the DiffEditor.offset_and_selection() method, use cursor.selectionStart() instead of cursor.position() because cursor.position() can be at either end of the selection. Signed-off-by: Daniel Harding <dharding@living180.net>
Previously the Stage, Unstage, and Revert commands each had two variants, e.g. "Stage Diff Hunk" and "Stage Selected Lines". The "Diff Hunk" variant would act upon the hunk underneath the cursor if there was no selection, or on all hunks falling within the selection if there was a selection. The "Selected Lines" variant was only enabled if there was a selection and would operate on the lines falling within the selection. It was decided to simplify things and combine the two variants into a single command that adapts to the context. Returning to the "Stage" case, the command stages the hunk under the cursor if there is no selection, and stages the selected lines if there is a selection. This was actually implemented by making a single context-sensitive action for the Stage/Unstage case, and another action for the Revert case. The action text (and icon, for the Stage/Unstage action) is set dynamically when creating the context menu. Closes git-cola#330 Suggested-by: Uri Okrent <uokrent@gmail.com> Helped-by: David Aguilar <davvid@gmail.com> Signed-off-by: Daniel Harding <dharding@living180.net>
davvid
added a commit
that referenced
this pull request
Jul 29, 2014
widgets.diff: improve stage and revert actions Closes #330 Signed-off-by: David Aguilar <davvid@gmail.com>
|
One thing I forgot to mention on this PR - it removed some translatable strings ( |
|
I think |
|
@davvid |
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.
This PR implements the changes discussed in issue #330 by combining commands such as Stage Diff Hunks and Stage Selected Lines into a single command that behaves appropriately depending on whether or not there is a selection.