diff: fix changing diff viewer options #834
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
In commit 649de5b the diff viewer was refactored to be able to display images diffs. As a result of that change the "parent" passed to the Options object is now a Viewer rather than a DiffEditor. In the Options.update_options() method, it calls the update_options() method of the "parent" provided when it was constructed. However, unlike DiffEditor, Viewer did not have an update_options() method, which would cause an exception when Options.update_options() was executed. To address this add an update_options() method to Viewer which delegates to the update_options() method of the contained DiffEditor. Fixes: git-cola#833 Signed-off-by: Daniel Harding <dharding@living180.net>
davvid
added a commit
to davvid/git-cola
that referenced
this pull request
May 28, 2018
This reverts commit 68399e3. Related-to: git-cola#833 Related-to: git-cola#834 Signed-off-by: David Aguilar <davvid@gmail.com>
davvid
added a commit
to davvid/git-cola
that referenced
this pull request
May 28, 2018
* living180/fix_diff_options: diff: fix changing diff viewer options Closes git-cola#833 Signed-off-by: David Aguilar <davvid@gmail.com>
|
Just tested this out -- yup, reverting my commit was the right thing to do. Thanks! |
|
Thanks for the merge! I hit the issue while running 3.1, and tried to test |
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.
In commit 649de5b the diff viewer was refactored to be able to display images diffs. As a result of that change the
parentpassed to theOptionsobject is now aViewerrather than aDiffEditor. In theOptions.update_options()method, it calls theupdate_options()method of theparentprovided when it was constructed. However, unlikeDiffEditor,Viewerdid not have anupdate_options()method, which would cause an exception whenOptions.update_options()was executed.To address this add an
update_options()method toViewerwhich delegates to theupdate_options()method of the containedDiffEditor.Fixes: #833