/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to diff.py

  • Committer: Mark Lee
  • Date: 2009-07-11 18:39:14 UTC
  • mto: This revision was merged to the branch mainline in revision 661.
  • Revision ID: bzr@lazymalevolence.com-20090711183914-zuii3et5skiv2njo
Re-ignore credits.pickle.

Show diffs side-by-side

added added

removed removed

Lines of Context:
diff.py
1
 
# -*- coding: UTF-8 -*-
2
1
"""Difference window.
3
2
 
4
3
This module contains the code to manage the diff window which shows
5
4
the changes made between two revisions on a branch.
6
5
"""
7
6
 
8
 
__copyright__ = "Copyright © 2005 Canonical Ltd."
 
7
__copyright__ = "Copyright 2005 Canonical Ltd."
9
8
__author__    = "Scott James Remnant <scott@ubuntu.com>"
10
9
 
11
10
 
18
17
import os
19
18
import re
20
19
import sys
 
20
from xml.etree.ElementTree import Element, SubElement, tostring
21
21
 
22
22
try:
23
 
    import gtksourceview
 
23
    import gtksourceview2
24
24
    have_gtksourceview = True
25
25
except ImportError:
26
26
    have_gtksourceview = False
64
64
        self.set_shadow_type(gtk.SHADOW_IN)
65
65
 
66
66
        if have_gtksourceview:
67
 
            self.buffer = gtksourceview.SourceBuffer()
68
 
            slm = gtksourceview.SourceLanguagesManager()
69
 
            gsl = slm.get_language_from_mime_type("text/x-patch")
 
67
            self.buffer = gtksourceview2.Buffer()
 
68
            slm = gtksourceview2.LanguageManager()
 
69
            gsl = slm.guess_language(content_type="text/x-patch")
70
70
            if have_gconf:
71
 
                self.apply_gedit_colors(gsl)
72
 
            self.apply_colordiff_colors(gsl)
 
71
                self.apply_gedit_colors(self.buffer)
 
72
            self.apply_colordiff_colors(self.buffer)
73
73
            self.buffer.set_language(gsl)
74
 
            self.buffer.set_highlight(True)
 
74
            self.buffer.set_highlight_syntax(True)
75
75
 
76
 
            self.sourceview = gtksourceview.SourceView(self.buffer)
 
76
            self.sourceview = gtksourceview2.View(self.buffer)
77
77
        else:
78
78
            self.buffer = gtk.TextBuffer()
79
79
            self.sourceview = gtk.TextView(self.buffer)
84
84
        self.sourceview.show()
85
85
 
86
86
    @staticmethod
87
 
    def apply_gedit_colors(lang):
88
 
        """Set style for lang to that specified in gedit configuration.
 
87
    def apply_gedit_colors(buf):
 
88
        """Set style to that specified in gedit configuration.
89
89
 
90
90
        This method needs the gconf module.
91
91
 
92
 
        :param lang: a gtksourceview.SourceLanguage object.
 
92
        :param buf: a gtksourceview2.Buffer object.
93
93
        """
94
 
        GEDIT_SYNTAX_PATH = '/apps/gedit-2/preferences/syntax_highlighting'
95
 
        GEDIT_LANG_PATH = GEDIT_SYNTAX_PATH + '/' + lang.get_id()
 
94
        GEDIT_SCHEME_PATH = '/apps/gedit-2/preferences/editor/colors/scheme'
96
95
 
97
96
        client = gconf.client_get_default()
98
 
        client.add_dir(GEDIT_LANG_PATH, gconf.CLIENT_PRELOAD_NONE)
99
 
 
100
 
        for tag in lang.get_tags():
101
 
            tag_id = tag.get_id()
102
 
            gconf_key = GEDIT_LANG_PATH + '/' + tag_id
103
 
            style_string = client.get_string(gconf_key)
104
 
 
105
 
            if style_string is None:
106
 
                continue
107
 
 
108
 
            # function to get a bool from a string that's either '0' or '1'
109
 
            string_bool = lambda x: bool(int(x))
110
 
 
111
 
            # style_string is a string like "2/#FFCCAA/#000000/0/1/0/0"
112
 
            # values are: mask, fg, bg, italic, bold, underline, strike
113
 
            # this packs them into (str_value, attr_name, conv_func) tuples
114
 
            items = zip(style_string.split('/'), ['mask', 'foreground',
115
 
                'background', 'italic', 'bold', 'underline', 'strikethrough' ],
116
 
                [ int, gtk.gdk.color_parse, gtk.gdk.color_parse, string_bool,
117
 
                    string_bool, string_bool, string_bool ]
118
 
            )
119
 
 
120
 
            style = gtksourceview.SourceTagStyle()
121
 
 
122
 
            # XXX The mask attribute controls whether the present values of
123
 
            # foreground and background color should in fact be used. Ideally
124
 
            # (and that's what gedit does), one could set all three attributes,
125
 
            # and let the TagStyle object figure out which colors to use.
126
 
            # However, in the GtkSourceview python bindings, the mask attribute
127
 
            # is read-only, and it's derived instead from the colors being
128
 
            # set or not. This means that we have to sometimes refrain from
129
 
            # setting fg or bg colors, depending on the value of the mask.
130
 
            # This code could go away if mask were writable.
131
 
            mask = int(items[0][0])
132
 
            if not (mask & 1): # GTK_SOURCE_TAG_STYLE_USE_BACKGROUND
133
 
                items[2:3] = []
134
 
            if not (mask & 2): # GTK_SOURCE_TAG_STYLE_USE_FOREGROUND
135
 
                items[1:2] = []
136
 
            items[0:1] = [] # skip the mask unconditionally
137
 
 
138
 
            for value, attr, func in items:
139
 
                try:
140
 
                    value = func(value)
141
 
                except ValueError:
142
 
                    warning('gconf key %s contains an invalid value: %s'
143
 
                            % gconf_key, value)
144
 
                else:
145
 
                    setattr(style, attr, value)
146
 
 
147
 
            lang.set_tag_style(tag_id, style)
 
97
        style_scheme_name = client.get_string(GEDIT_SCHEME_PATH)
 
98
        if style_scheme_name is not None:
 
99
            style_scheme = gtksourceview2.StyleSchemeManager().get_scheme(style_scheme_name)
 
100
            
 
101
            buf.set_style_scheme(style_scheme)
148
102
 
149
103
    @classmethod
150
 
    def apply_colordiff_colors(klass, lang):
 
104
    def apply_colordiff_colors(klass, buf):
151
105
        """Set style colors for lang using the colordiff configuration file.
152
106
 
153
107
        Both ~/.colordiffrc and ~/.colordiffrc.bzr-gtk are read.
154
108
 
155
 
        :param lang: a "Diff" gtksourceview.SourceLanguage object.
 
109
        :param buf: a "Diff" gtksourceview2.Buffer object.
156
110
        """
157
 
        colors = {}
158
 
 
159
 
        for f in ('~/.colordiffrc', '~/.colordiffrc.bzr-gtk'):
160
 
            f = os.path.expanduser(f)
161
 
            if os.path.exists(f):
162
 
                try:
163
 
                    f = file(f)
164
 
                except IOError, e:
165
 
                    warning('could not open file %s: %s' % (f, str(e)))
166
 
                else:
167
 
                    colors.update(klass.parse_colordiffrc(f))
168
 
                    f.close()
169
 
 
170
 
        if not colors:
171
 
            # ~/.colordiffrc does not exist
172
 
            return
173
 
 
174
 
        mapping = {
175
 
                # map GtkSourceView tags to colordiff names
 
111
        scheme_manager = gtksourceview2.StyleSchemeManager()
 
112
        style_scheme = scheme_manager.get_scheme('colordiff')
 
113
        
 
114
        # if style scheme not found, we'll generate it from colordiffrc
 
115
        # TODO: reload if colordiffrc has changed.
 
116
        if style_scheme is None:
 
117
            colors = {}
 
118
 
 
119
            for f in ('~/.colordiffrc', '~/.colordiffrc.bzr-gtk'):
 
120
                f = os.path.expanduser(f)
 
121
                if os.path.exists(f):
 
122
                    try:
 
123
                        f = file(f)
 
124
                    except IOError, e:
 
125
                        warning('could not open file %s: %s' % (f, str(e)))
 
126
                    else:
 
127
                        colors.update(klass.parse_colordiffrc(f))
 
128
                        f.close()
 
129
 
 
130
            if not colors:
 
131
                # ~/.colordiffrc does not exist
 
132
                return
 
133
            
 
134
            mapping = {
 
135
                # map GtkSourceView2 scheme styles to colordiff names
176
136
                # since GSV is richer, accept new names for extra bits,
177
137
                # defaulting to old names if they're not present
178
 
                'Added@32@line': ['newtext'],
179
 
                'Removed@32@line': ['oldtext'],
180
 
                'Location': ['location', 'diffstuff'],
181
 
                'Diff@32@file': ['file', 'diffstuff'],
182
 
                'Special@32@case': ['specialcase', 'diffstuff'],
183
 
        }
184
 
 
185
 
        for tag in lang.get_tags():
186
 
            tag_id = tag.get_id()
187
 
            keys = mapping.get(tag_id, [])
188
 
            color = None
189
 
 
190
 
            for key in keys:
191
 
                color = colors.get(key, None)
192
 
                if color is not None:
193
 
                    break
194
 
 
195
 
            if color is None:
196
 
                continue
197
 
 
198
 
            style = gtksourceview.SourceTagStyle()
199
 
            try:
200
 
                style.foreground = gtk.gdk.color_parse(color)
201
 
            except ValueError:
202
 
                warning('not a valid color: %s' % color)
203
 
            else:
204
 
                lang.set_tag_style(tag_id, style)
 
138
                'diff:added-line': ['newtext'],
 
139
                'diff:removed-line': ['oldtext'],
 
140
                'diff:location': ['location', 'diffstuff'],
 
141
                'diff:file': ['file', 'diffstuff'],
 
142
                'diff:special-case': ['specialcase', 'diffstuff'],
 
143
            }
 
144
            
 
145
            converted_colors = {}
 
146
            for name, values in mapping.items():
 
147
                color = None
 
148
                for value in values:
 
149
                    color = colors.get(value, None)
 
150
                    if color is not None:
 
151
                        break
 
152
                if color is None:
 
153
                    continue
 
154
                converted_colors[name] = color
 
155
            
 
156
            # some xml magic to produce needed style scheme description
 
157
            e_style_scheme = Element('style-scheme')
 
158
            e_style_scheme.set('id', 'colordiff')
 
159
            e_style_scheme.set('_name', 'ColorDiff')
 
160
            e_style_scheme.set('version', '1.0')
 
161
            for name, color in converted_colors.items():
 
162
                style = SubElement(e_style_scheme, 'style')
 
163
                style.set('name', name)
 
164
                style.set('foreground', '#%s' % color)
 
165
            
 
166
            scheme_xml = tostring(e_style_scheme, 'UTF-8')
 
167
            if not os.path.exists(os.path.expanduser('~/.local/share/gtksourceview-2.0/styles')):
 
168
                os.makedirs(os.path.expanduser('~/.local/share/gtksourceview-2.0/styles'))
 
169
            file(os.path.expanduser('~/.local/share/gtksourceview-2.0/styles/colordiff.xml'), 'w').write(scheme_xml)
 
170
            
 
171
            scheme_manager.force_rescan()
 
172
            style_scheme = scheme_manager.get_scheme('colordiff')
 
173
        
 
174
        buf.set_style_scheme(style_scheme)
205
175
 
206
176
    @staticmethod
207
177
    def parse_colordiffrc(fileobj):
635
605
    renamed_and_modified = 'renamed and modified'
636
606
    modified = 'modified'
637
607
    kind_changed = 'kind changed'
 
608
    missing = 'missing'
638
609
 
639
610
    # TODO: Handle metadata changes
640
611
 
655
626
                    source_marker = ''
656
627
                else:
657
628
                    source_marker = osutils.kind_marker(kinds[0])
 
629
 
658
630
                if kinds[1] is None:
659
 
                    assert kinds[0] is not None
660
 
                    marker = osutils.kind_marker(kinds[0])
 
631
                    if kinds[0] is None:
 
632
                        # We assume bzr will flag only files in that case,
 
633
                        # there may be a bzr bug there as only files seems to
 
634
                        # not receive any kind.
 
635
                        marker = osutils.kind_marker('file')
 
636
                    else:
 
637
                        marker = osutils.kind_marker(kinds[0])
661
638
                else:
662
639
                    marker = osutils.kind_marker(kinds[1])
663
640
 
665
642
                if real_path is None:
666
643
                    real_path = paths[0]
667
644
                assert real_path is not None
668
 
                display_path = real_path + marker
669
645
 
670
646
                present_source = versioned[0] and kinds[0] is not None
671
647
                present_target = versioned[1] and kinds[1] is not None
672
648
 
673
 
                if present_source != present_target:
 
649
                if kinds[0] is None and kinds[1] is None:
 
650
                    change_type = missing
 
651
                    display_path = real_path + marker
 
652
                elif present_source != present_target:
674
653
                    if present_target:
675
654
                        change_type = added
676
655
                    else:
677
656
                        assert present_source
678
657
                        change_type = removed
 
658
                    display_path = real_path + marker
679
659
                elif names[0] != names[1] or parent_ids[0] != parent_ids[1]:
680
660
                    # Renamed
681
661
                    if changed_content or executables[0] != executables[1]:
689
669
                    change_type = kind_changed
690
670
                    display_path = (paths[0] + source_marker
691
671
                                    + ' => ' + paths[1] + marker)
692
 
                elif changed_content is True or executables[0] != executables[1]:
 
672
                elif changed_content or executables[0] != executables[1]:
693
673
                    change_type = modified
 
674
                    display_path = real_path + marker
694
675
                else:
695
676
                    assert False, "How did we get here?"
696
677