/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: Jasper Groenewegen
  • Date: 2008-07-20 13:23:29 UTC
  • mto: This revision was merged to the branch mainline in revision 560.
  • Revision ID: colbrac@xs4all.nl-20080720132329-srxnl5lf1k3z43jz
Better way to return response

Show diffs side-by-side

added added

removed removed

Lines of Context:
diff.py
 
1
# -*- coding: UTF-8 -*-
1
2
"""Difference window.
2
3
 
3
4
This module contains the code to manage the diff window which shows
4
5
the changes made between two revisions on a branch.
5
6
"""
6
7
 
7
 
__copyright__ = "Copyright 2005 Canonical Ltd."
 
8
__copyright__ = "Copyright © 2005 Canonical Ltd."
8
9
__author__    = "Scott James Remnant <scott@ubuntu.com>"
9
10
 
10
11
 
17
18
import os
18
19
import re
19
20
import sys
20
 
import inspect
21
 
try:
22
 
    from xml.etree.ElementTree import Element, SubElement, tostring
23
 
except ImportError:
24
 
    from elementtree.ElementTree import Element, SubElement, tostring
25
21
 
26
22
try:
27
 
    import gtksourceview2
 
23
    import gtksourceview
28
24
    have_gtksourceview = True
29
25
except ImportError:
30
26
    have_gtksourceview = False
35
31
    have_gconf = False
36
32
 
37
33
from bzrlib import (
38
 
    errors,
39
34
    merge as _mod_merge,
40
35
    osutils,
 
36
    progress,
41
37
    urlutils,
42
38
    workingtree,
43
39
)
44
40
from bzrlib.diff import show_diff_trees, internal_diff
 
41
from bzrlib.errors import NoSuchFile
45
42
from bzrlib.patches import parse_patches
46
43
from bzrlib.trace import warning
47
44
from bzrlib.plugins.gtk import _i18n
49
46
from dialog import error_dialog, info_dialog, warning_dialog
50
47
 
51
48
 
52
 
def fallback_guess_language(slm, content_type):
53
 
    for lang_id in slm.get_language_ids():
54
 
        lang = slm.get_language(lang_id)
55
 
        if "text/x-patch" in lang.get_mime_types():
56
 
            return lang
57
 
    return None
58
 
 
59
 
 
60
49
class SelectCancelled(Exception):
61
50
 
62
51
    pass
75
64
        self.set_shadow_type(gtk.SHADOW_IN)
76
65
 
77
66
        if have_gtksourceview:
78
 
            self.buffer = gtksourceview2.Buffer()
79
 
            slm = gtksourceview2.LanguageManager()
80
 
            guess_language = getattr(gtksourceview2.LanguageManager, 
81
 
                "guess_language", fallback_guess_language)
82
 
            gsl = guess_language(slm, content_type="text/x-patch")
 
67
            self.buffer = gtksourceview.SourceBuffer()
 
68
            slm = gtksourceview.SourceLanguagesManager()
 
69
            gsl = slm.get_language_from_mime_type("text/x-patch")
83
70
            if have_gconf:
84
 
                self.apply_gedit_colors(self.buffer)
85
 
            self.apply_colordiff_colors(self.buffer)
 
71
                self.apply_gedit_colors(gsl)
 
72
            self.apply_colordiff_colors(gsl)
86
73
            self.buffer.set_language(gsl)
87
 
            self.buffer.set_highlight_syntax(True)
 
74
            self.buffer.set_highlight(True)
88
75
 
89
 
            self.sourceview = gtksourceview2.View(self.buffer)
 
76
            sourceview = gtksourceview.SourceView(self.buffer)
90
77
        else:
91
78
            self.buffer = gtk.TextBuffer()
92
 
            self.sourceview = gtk.TextView(self.buffer)
 
79
            sourceview = gtk.TextView(self.buffer)
93
80
 
94
 
        self.sourceview.set_editable(False)
95
 
        self.sourceview.modify_font(pango.FontDescription("Monospace"))
96
 
        self.add(self.sourceview)
97
 
        self.sourceview.show()
 
81
        sourceview.set_editable(False)
 
82
        sourceview.modify_font(pango.FontDescription("Monospace"))
 
83
        self.add(sourceview)
 
84
        sourceview.show()
98
85
 
99
86
    @staticmethod
100
 
    def apply_gedit_colors(buf):
101
 
        """Set style to that specified in gedit configuration.
 
87
    def apply_gedit_colors(lang):
 
88
        """Set style for lang to that specified in gedit configuration.
102
89
 
103
90
        This method needs the gconf module.
104
91
 
105
 
        :param buf: a gtksourceview2.Buffer object.
 
92
        :param lang: a gtksourceview.SourceLanguage object.
106
93
        """
107
 
        GEDIT_SCHEME_PATH = '/apps/gedit-2/preferences/editor/colors/scheme'
 
94
        GEDIT_SYNTAX_PATH = '/apps/gedit-2/preferences/syntax_highlighting'
 
95
        GEDIT_LANG_PATH = GEDIT_SYNTAX_PATH + '/' + lang.get_id()
108
96
 
109
97
        client = gconf.client_get_default()
110
 
        style_scheme_name = client.get_string(GEDIT_SCHEME_PATH)
111
 
        if style_scheme_name is not None:
112
 
            style_scheme = gtksourceview2.StyleSchemeManager().get_scheme(style_scheme_name)
113
 
            
114
 
            buf.set_style_scheme(style_scheme)
 
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)
115
148
 
116
149
    @classmethod
117
 
    def apply_colordiff_colors(klass, buf):
 
150
    def apply_colordiff_colors(klass, lang):
118
151
        """Set style colors for lang using the colordiff configuration file.
119
152
 
120
153
        Both ~/.colordiffrc and ~/.colordiffrc.bzr-gtk are read.
121
154
 
122
 
        :param buf: a "Diff" gtksourceview2.Buffer object.
 
155
        :param lang: a "Diff" gtksourceview.SourceLanguage object.
123
156
        """
124
 
        scheme_manager = gtksourceview2.StyleSchemeManager()
125
 
        style_scheme = scheme_manager.get_scheme('colordiff')
126
 
        
127
 
        # if style scheme not found, we'll generate it from colordiffrc
128
 
        # TODO: reload if colordiffrc has changed.
129
 
        if style_scheme is None:
130
 
            colors = {}
131
 
 
132
 
            for f in ('~/.colordiffrc', '~/.colordiffrc.bzr-gtk'):
133
 
                f = os.path.expanduser(f)
134
 
                if os.path.exists(f):
135
 
                    try:
136
 
                        f = file(f)
137
 
                    except IOError, e:
138
 
                        warning('could not open file %s: %s' % (f, str(e)))
139
 
                    else:
140
 
                        colors.update(klass.parse_colordiffrc(f))
141
 
                        f.close()
142
 
 
143
 
            if not colors:
144
 
                # ~/.colordiffrc does not exist
145
 
                return
146
 
            
147
 
            mapping = {
148
 
                # map GtkSourceView2 scheme styles to colordiff names
 
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
149
176
                # since GSV is richer, accept new names for extra bits,
150
177
                # defaulting to old names if they're not present
151
 
                'diff:added-line': ['newtext'],
152
 
                'diff:removed-line': ['oldtext'],
153
 
                'diff:location': ['location', 'diffstuff'],
154
 
                'diff:file': ['file', 'diffstuff'],
155
 
                'diff:special-case': ['specialcase', 'diffstuff'],
156
 
            }
157
 
            
158
 
            converted_colors = {}
159
 
            for name, values in mapping.items():
160
 
                color = None
161
 
                for value in values:
162
 
                    color = colors.get(value, None)
163
 
                    if color is not None:
164
 
                        break
165
 
                if color is None:
166
 
                    continue
167
 
                converted_colors[name] = color
168
 
            
169
 
            # some xml magic to produce needed style scheme description
170
 
            e_style_scheme = Element('style-scheme')
171
 
            e_style_scheme.set('id', 'colordiff')
172
 
            e_style_scheme.set('_name', 'ColorDiff')
173
 
            e_style_scheme.set('version', '1.0')
174
 
            for name, color in converted_colors.items():
175
 
                style = SubElement(e_style_scheme, 'style')
176
 
                style.set('name', name)
177
 
                style.set('foreground', '#%s' % color)
178
 
            
179
 
            scheme_xml = tostring(e_style_scheme, 'UTF-8')
180
 
            if not os.path.exists(os.path.expanduser('~/.local/share/gtksourceview-2.0/styles')):
181
 
                os.makedirs(os.path.expanduser('~/.local/share/gtksourceview-2.0/styles'))
182
 
            file(os.path.expanduser('~/.local/share/gtksourceview-2.0/styles/colordiff.xml'), 'w').write(scheme_xml)
183
 
            
184
 
            scheme_manager.force_rescan()
185
 
            style_scheme = scheme_manager.get_scheme('colordiff')
186
 
        
187
 
        buf.set_style_scheme(style_scheme)
 
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)
188
205
 
189
206
    @staticmethod
190
207
    def parse_colordiffrc(fileobj):
288
305
        scrollwin.set_shadow_type(gtk.SHADOW_IN)
289
306
        self.pack1(scrollwin)
290
307
        scrollwin.show()
291
 
        
 
308
 
292
309
        self.model = gtk.TreeStore(str, str)
293
310
        self.treeview = gtk.TreeView(self.model)
294
311
        self.treeview.set_headers_visible(False)
376
393
                    tv_path = child.path
377
394
                    break
378
395
        if tv_path is None:
379
 
            raise errors.NoSuchFile(file_path)
 
396
            raise NoSuchFile(file_path)
380
397
        self.treeview.set_cursor(tv_path)
381
398
        self.treeview.scroll_to_cell(tv_path)
382
399
 
388
405
            return
389
406
        elif specific_files == [ "" ]:
390
407
            specific_files = None
391
 
        
 
408
 
392
409
        self.diff_view.show_diff(specific_files)
393
 
    
394
 
    def _on_wraplines_toggled(self, widget=None, wrap=False):
395
 
        """Callback for when the wrap lines checkbutton is toggled"""
396
 
        if wrap or widget.get_active():
397
 
            self.diff_view.sourceview.set_wrap_mode(gtk.WRAP_WORD)
398
 
        else:
399
 
            self.diff_view.sourceview.set_wrap_mode(gtk.WRAP_NONE)
 
410
 
400
411
 
401
412
class DiffWindow(Window):
402
413
    """Diff window.
423
434
        self.vbox = gtk.VBox()
424
435
        self.add(self.vbox)
425
436
        self.vbox.show()
 
437
        hbox = self._get_button_bar(operations)
 
438
        if hbox is not None:
 
439
            self.vbox.pack_start(hbox, expand=False, fill=True)
426
440
        self.diff = DiffWidget()
427
 
        self.vbox.pack_end(self.diff, True, True, 0)
 
441
        self.vbox.add(self.diff)
428
442
        self.diff.show_all()
429
 
        # Build after DiffWidget to connect signals
430
 
        menubar = self._get_menu_bar()
431
 
        self.vbox.pack_start(menubar, False, False, 0)
432
 
        hbox = self._get_button_bar(operations)
433
 
        if hbox is not None:
434
 
            self.vbox.pack_start(hbox, False, True, 0)
435
 
        
436
 
    
437
 
    def _get_menu_bar(self):
438
 
        menubar = gtk.MenuBar()
439
 
        # View menu
440
 
        mb_view = gtk.MenuItem(_i18n("_View"))
441
 
        mb_view_menu = gtk.Menu()
442
 
        mb_view_wrapsource = gtk.CheckMenuItem(_i18n("Wrap _Long Lines"))
443
 
        mb_view_wrapsource.connect('activate', self.diff._on_wraplines_toggled)
444
 
        mb_view_wrapsource.show()
445
 
        mb_view_menu.append(mb_view_wrapsource)
446
 
        mb_view.show()
447
 
        mb_view.set_submenu(mb_view_menu)
448
 
        mb_view.show()
449
 
        menubar.append(mb_view)
450
 
        menubar.show()
451
 
        return menubar
452
 
    
 
443
 
453
444
    def _get_button_bar(self, operations):
454
445
        """Return a button bar to use.
455
446
 
525
516
 
526
517
class DiffController(object):
527
518
 
528
 
    def __init__(self, path, patch, window=None, allow_dirty=False):
 
519
    def __init__(self, path, patch, window=None):
529
520
        self.path = path
530
521
        self.patch = patch
531
 
        self.allow_dirty = allow_dirty
532
522
        if window is None:
533
523
            window = DiffWindow(operations=self._provide_operations())
534
524
            self.initialize_window(window)
540
530
 
541
531
    def get_diff_sections(self):
542
532
        yield "Complete Diff", None, ''.join(self.patch)
543
 
        # allow_dirty was added to parse_patches in bzrlib 2.2b1
544
 
        if 'allow_dirty' in inspect.getargspec(parse_patches).args:
545
 
            patches = parse_patches(self.patch, allow_dirty=self.allow_dirty)
546
 
        else:
547
 
            patches = parse_patches(self.patch)
548
 
        for patch in patches:
 
533
        for patch in parse_patches(self.patch):
549
534
            oldname = patch.oldname.split('\t')[0]
550
535
            newname = patch.newname.split('\t')[0]
551
536
            yield oldname, newname, str(patch)
590
575
        tree.lock_write()
591
576
        try:
592
577
            try:
593
 
                if tree.has_changes():
594
 
                    raise errors.UncommittedChanges(tree)
595
 
                merger, verified = _mod_merge.Merger.from_mergeable(
596
 
                    tree, self.directive, pb=None)
 
578
                merger, verified = _mod_merge.Merger.from_mergeable(tree,
 
579
                    self.directive, progress.DummyProgress())
 
580
                merger.check_basis(True)
597
581
                merger.merge_type = _mod_merge.Merge3Merger
598
582
                conflict_count = merger.do_merge()
599
583
                merger.set_pending()
625
609
    renamed_and_modified = 'renamed and modified'
626
610
    modified = 'modified'
627
611
    kind_changed = 'kind changed'
628
 
    missing = 'missing'
629
612
 
630
613
    # TODO: Handle metadata changes
631
614
 
646
629
                    source_marker = ''
647
630
                else:
648
631
                    source_marker = osutils.kind_marker(kinds[0])
649
 
 
650
632
                if kinds[1] is None:
651
 
                    if kinds[0] is None:
652
 
                        # We assume bzr will flag only files in that case,
653
 
                        # there may be a bzr bug there as only files seems to
654
 
                        # not receive any kind.
655
 
                        marker = osutils.kind_marker('file')
656
 
                    else:
657
 
                        marker = osutils.kind_marker(kinds[0])
 
633
                    assert kinds[0] is not None
 
634
                    marker = osutils.kind_marker(kinds[0])
658
635
                else:
659
636
                    marker = osutils.kind_marker(kinds[1])
660
637
 
662
639
                if real_path is None:
663
640
                    real_path = paths[0]
664
641
                assert real_path is not None
 
642
                display_path = real_path + marker
665
643
 
666
644
                present_source = versioned[0] and kinds[0] is not None
667
645
                present_target = versioned[1] and kinds[1] is not None
668
646
 
669
 
                if kinds[0] is None and kinds[1] is None:
670
 
                    change_type = missing
671
 
                    display_path = real_path + marker
672
 
                elif present_source != present_target:
 
647
                if present_source != present_target:
673
648
                    if present_target:
674
649
                        change_type = added
675
650
                    else:
676
651
                        assert present_source
677
652
                        change_type = removed
678
 
                    display_path = real_path + marker
679
653
                elif names[0] != names[1] or parent_ids[0] != parent_ids[1]:
680
654
                    # Renamed
681
655
                    if changed_content or executables[0] != executables[1]:
689
663
                    change_type = kind_changed
690
664
                    display_path = (paths[0] + source_marker
691
665
                                    + ' => ' + paths[1] + marker)
692
 
                elif changed_content or executables[0] != executables[1]:
 
666
                elif changed_content is True or executables[0] != executables[1]:
693
667
                    change_type = modified
694
 
                    display_path = real_path + marker
695
668
                else:
696
669
                    assert False, "How did we get here?"
697
670