Merge lp://staging/~sinzui/bzr-gtk/gtksourceview into lp://staging/bzr-gtk
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Jelmer Vernooij | ||||
| Approved revision: | 775 | ||||
| Merged at revision: | 775 | ||||
| Proposed branch: | lp://staging/~sinzui/bzr-gtk/gtksourceview | ||||
| Merge into: | lp://staging/bzr-gtk | ||||
| Diff against target: |
268 lines (+30/-161) 2 files modified
diff.py (+5/-142) tests/test_diff.py (+25/-19) |
||||
| To merge this branch: | bzr merge lp://staging/~sinzui/bzr-gtk/gtksourceview | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Jelmer Vernooij (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Remove unneeded gtksourceview1 support.
Launchpad bug: https:/
Pre-
bzr crashed with TypeError in apply_gedit_
style and language features to gtksourceview2. bzr-gtk now uses
gtksourceview3. The code to construct style information is not needed.
-------
RULES
* Remove unneeded code and tests.
* ADDENDUM: .modify_font() is deprecated, use override_font instead
and add a test that it used by the widget.
QA
* In a tree with changes, run
bzr gdiff
* Verify the highlighting matches the colours seen when viewing the
same diff in gedit.
* Verify the font is monospace.
IMPLEMENTATION
* Removed the unneeded calls, then the methods that were called,
then the imports, then the test.
* Updated the call to .modify_font to be override_font() because
the method was deprecated. Wrote a replacement testcase for
the old test to verify the DiffFileView default construction and
with gtksourceview.
| Jelmer Vernooij (jelmer) | # |
