/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: Jelmer Vernooij
  • Date: 2011-02-18 11:53:18 UTC
  • mfrom: (452.5.2 viz-locks)
  • Revision ID: jelmer@samba.org-20110218115318-xgsxhn13fd3m6nj9
https://launchpad.net/bugs/93652
Add lock dialog. (Daniel Schierbeck)

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
import inspect
 
21
try:
 
22
    from xml.etree.ElementTree import Element, SubElement, tostring
 
23
except ImportError:
 
24
    from elementtree.ElementTree import Element, SubElement, tostring
21
25
 
22
26
try:
23
 
    import gtksourceview
 
27
    import gtksourceview2
24
28
    have_gtksourceview = True
25
29
except ImportError:
26
30
    have_gtksourceview = False
31
35
    have_gconf = False
32
36
 
33
37
from bzrlib import (
 
38
    errors,
34
39
    merge as _mod_merge,
35
40
    osutils,
36
 
    progress,
37
41
    urlutils,
38
42
    workingtree,
39
43
)
40
44
from bzrlib.diff import show_diff_trees, internal_diff
41
 
from bzrlib.errors import NoSuchFile
42
45
from bzrlib.patches import parse_patches
43
46
from bzrlib.trace import warning
44
47
from bzrlib.plugins.gtk import _i18n
46
49
from dialog import error_dialog, info_dialog, warning_dialog
47
50
 
48
51
 
 
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
 
49
60
class SelectCancelled(Exception):
50
61
 
51
62
    pass
64
75
        self.set_shadow_type(gtk.SHADOW_IN)
65
76
 
66
77
        if have_gtksourceview:
67
 
            self.buffer = gtksourceview.SourceBuffer()
68
 
            slm = gtksourceview.SourceLanguagesManager()
69
 
            gsl = slm.get_language_from_mime_type("text/x-patch")
 
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")
70
83
            if have_gconf:
71
 
                self.apply_gedit_colors(gsl)
72
 
            self.apply_colordiff_colors(gsl)
 
84
                self.apply_gedit_colors(self.buffer)
 
85
            self.apply_colordiff_colors(self.buffer)
73
86
            self.buffer.set_language(gsl)
74
 
            self.buffer.set_highlight(True)
 
87
            self.buffer.set_highlight_syntax(True)
75
88
 
76
 
            sourceview = gtksourceview.SourceView(self.buffer)
 
89
            self.sourceview = gtksourceview2.View(self.buffer)
77
90
        else:
78
91
            self.buffer = gtk.TextBuffer()
79
 
            sourceview = gtk.TextView(self.buffer)
 
92
            self.sourceview = gtk.TextView(self.buffer)
80
93
 
81
 
        sourceview.set_editable(False)
82
 
        sourceview.modify_font(pango.FontDescription("Monospace"))
83
 
        self.add(sourceview)
84
 
        sourceview.show()
 
94
        self.sourceview.set_editable(False)
 
95
        self.sourceview.modify_font(pango.FontDescription("Monospace"))
 
96
        self.add(self.sourceview)
 
97
        self.sourceview.show()
85
98
 
86
99
    @staticmethod
87
 
    def apply_gedit_colors(lang):
88
 
        """Set style for lang to that specified in gedit configuration.
 
100
    def apply_gedit_colors(buf):
 
101
        """Set style to that specified in gedit configuration.
89
102
 
90
103
        This method needs the gconf module.
91
104
 
92
 
        :param lang: a gtksourceview.SourceLanguage object.
 
105
        :param buf: a gtksourceview2.Buffer object.
93
106
        """
94
 
        GEDIT_SYNTAX_PATH = '/apps/gedit-2/preferences/syntax_highlighting'
95
 
        GEDIT_LANG_PATH = GEDIT_SYNTAX_PATH + '/' + lang.get_id()
 
107
        GEDIT_SCHEME_PATH = '/apps/gedit-2/preferences/editor/colors/scheme'
 
108
        GEDIT_USER_STYLES_PATH = os.path.expanduser('~/.gnome2/gedit/styles')
96
109
 
97
110
        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)
 
111
        style_scheme_name = client.get_string(GEDIT_SCHEME_PATH)
 
112
        if style_scheme_name is not None:
 
113
            style_scheme_mgr = gtksourceview2.StyleSchemeManager()
 
114
            style_scheme_mgr.append_search_path(GEDIT_USER_STYLES_PATH)
 
115
            
 
116
            style_scheme = style_scheme_mgr.get_scheme(style_scheme_name)
 
117
            
 
118
            if style_scheme is not None:
 
119
                buf.set_style_scheme(style_scheme)
148
120
 
149
121
    @classmethod
150
 
    def apply_colordiff_colors(klass, lang):
 
122
    def apply_colordiff_colors(klass, buf):
151
123
        """Set style colors for lang using the colordiff configuration file.
152
124
 
153
125
        Both ~/.colordiffrc and ~/.colordiffrc.bzr-gtk are read.
154
126
 
155
 
        :param lang: a "Diff" gtksourceview.SourceLanguage object.
 
127
        :param buf: a "Diff" gtksourceview2.Buffer object.
156
128
        """
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
 
129
        scheme_manager = gtksourceview2.StyleSchemeManager()
 
130
        style_scheme = scheme_manager.get_scheme('colordiff')
 
131
        
 
132
        # if style scheme not found, we'll generate it from colordiffrc
 
133
        # TODO: reload if colordiffrc has changed.
 
134
        if style_scheme is None:
 
135
            colors = {}
 
136
 
 
137
            for f in ('~/.colordiffrc', '~/.colordiffrc.bzr-gtk'):
 
138
                f = os.path.expanduser(f)
 
139
                if os.path.exists(f):
 
140
                    try:
 
141
                        f = file(f)
 
142
                    except IOError, e:
 
143
                        warning('could not open file %s: %s' % (f, str(e)))
 
144
                    else:
 
145
                        colors.update(klass.parse_colordiffrc(f))
 
146
                        f.close()
 
147
 
 
148
            if not colors:
 
149
                # ~/.colordiffrc does not exist
 
150
                return
 
151
            
 
152
            mapping = {
 
153
                # map GtkSourceView2 scheme styles to colordiff names
176
154
                # since GSV is richer, accept new names for extra bits,
177
155
                # 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)
 
156
                'diff:added-line': ['newtext'],
 
157
                'diff:removed-line': ['oldtext'],
 
158
                'diff:location': ['location', 'diffstuff'],
 
159
                'diff:file': ['file', 'diffstuff'],
 
160
                'diff:special-case': ['specialcase', 'diffstuff'],
 
161
            }
 
162
            
 
163
            converted_colors = {}
 
164
            for name, values in mapping.items():
 
165
                color = None
 
166
                for value in values:
 
167
                    color = colors.get(value, None)
 
168
                    if color is not None:
 
169
                        break
 
170
                if color is None:
 
171
                    continue
 
172
                converted_colors[name] = color
 
173
            
 
174
            # some xml magic to produce needed style scheme description
 
175
            e_style_scheme = Element('style-scheme')
 
176
            e_style_scheme.set('id', 'colordiff')
 
177
            e_style_scheme.set('_name', 'ColorDiff')
 
178
            e_style_scheme.set('version', '1.0')
 
179
            for name, color in converted_colors.items():
 
180
                style = SubElement(e_style_scheme, 'style')
 
181
                style.set('name', name)
 
182
                style.set('foreground', '#%s' % color)
 
183
            
 
184
            scheme_xml = tostring(e_style_scheme, 'UTF-8')
 
185
            if not os.path.exists(os.path.expanduser('~/.local/share/gtksourceview-2.0/styles')):
 
186
                os.makedirs(os.path.expanduser('~/.local/share/gtksourceview-2.0/styles'))
 
187
            file(os.path.expanduser('~/.local/share/gtksourceview-2.0/styles/colordiff.xml'), 'w').write(scheme_xml)
 
188
            
 
189
            scheme_manager.force_rescan()
 
190
            style_scheme = scheme_manager.get_scheme('colordiff')
 
191
        
 
192
        buf.set_style_scheme(style_scheme)
205
193
 
206
194
    @staticmethod
207
195
    def parse_colordiffrc(fileobj):
305
293
        scrollwin.set_shadow_type(gtk.SHADOW_IN)
306
294
        self.pack1(scrollwin)
307
295
        scrollwin.show()
308
 
 
 
296
        
309
297
        self.model = gtk.TreeStore(str, str)
310
298
        self.treeview = gtk.TreeView(self.model)
311
299
        self.treeview.set_headers_visible(False)
330
318
        # text view
331
319
 
332
320
    def set_diff_text_sections(self, sections):
333
 
        self.diff_view = DiffFileView()
 
321
        if getattr(self, 'diff_view', None) is None:
 
322
            self.diff_view = DiffFileView()
 
323
            self.pack2(self.diff_view)
334
324
        self.diff_view.show()
335
 
        self.pack2(self.diff_view)
336
325
        for oldname, newname, patch in sections:
337
326
            self.diff_view._diffs[newname] = str(patch)
338
327
            if newname is None:
346
335
        Compares the two trees and populates the window with the
347
336
        differences.
348
337
        """
349
 
        self.diff_view = DiffView()
350
 
        self.pack2(self.diff_view)
 
338
        if getattr(self, 'diff_view', None) is None:
 
339
            self.diff_view = DiffView()
 
340
            self.pack2(self.diff_view)
351
341
        self.diff_view.show()
352
342
        self.diff_view.set_trees(rev_tree, parent_tree)
353
343
        self.rev_tree = rev_tree
380
370
                self.model.append(titer, [ path, path ])
381
371
 
382
372
        self.treeview.expand_all()
 
373
        self.diff_view.show_diff(None)
383
374
 
384
375
    def set_file(self, file_path):
385
376
        """Select the current file to display"""
390
381
                    tv_path = child.path
391
382
                    break
392
383
        if tv_path is None:
393
 
            raise NoSuchFile(file_path)
 
384
            raise errors.NoSuchFile(file_path)
394
385
        self.treeview.set_cursor(tv_path)
395
386
        self.treeview.scroll_to_cell(tv_path)
396
387
 
402
393
            return
403
394
        elif specific_files == [ "" ]:
404
395
            specific_files = None
405
 
 
 
396
        
406
397
        self.diff_view.show_diff(specific_files)
407
 
 
 
398
    
 
399
    def _on_wraplines_toggled(self, widget=None, wrap=False):
 
400
        """Callback for when the wrap lines checkbutton is toggled"""
 
401
        if wrap or widget.get_active():
 
402
            self.diff_view.sourceview.set_wrap_mode(gtk.WRAP_WORD)
 
403
        else:
 
404
            self.diff_view.sourceview.set_wrap_mode(gtk.WRAP_NONE)
408
405
 
409
406
class DiffWindow(Window):
410
407
    """Diff window.
431
428
        self.vbox = gtk.VBox()
432
429
        self.add(self.vbox)
433
430
        self.vbox.show()
 
431
        self.diff = DiffWidget()
 
432
        self.vbox.pack_end(self.diff, True, True, 0)
 
433
        self.diff.show_all()
 
434
        # Build after DiffWidget to connect signals
 
435
        menubar = self._get_menu_bar()
 
436
        self.vbox.pack_start(menubar, False, False, 0)
434
437
        hbox = self._get_button_bar(operations)
435
438
        if hbox is not None:
436
 
            self.vbox.pack_start(hbox, expand=False, fill=True)
437
 
        self.diff = DiffWidget()
438
 
        self.vbox.add(self.diff)
439
 
        self.diff.show_all()
440
 
 
 
439
            self.vbox.pack_start(hbox, False, True, 0)
 
440
        
 
441
    
 
442
    def _get_menu_bar(self):
 
443
        menubar = gtk.MenuBar()
 
444
        # View menu
 
445
        mb_view = gtk.MenuItem(_i18n("_View"))
 
446
        mb_view_menu = gtk.Menu()
 
447
        mb_view_wrapsource = gtk.CheckMenuItem(_i18n("Wrap _Long Lines"))
 
448
        mb_view_wrapsource.connect('activate', self.diff._on_wraplines_toggled)
 
449
        mb_view_wrapsource.show()
 
450
        mb_view_menu.append(mb_view_wrapsource)
 
451
        mb_view.show()
 
452
        mb_view.set_submenu(mb_view_menu)
 
453
        mb_view.show()
 
454
        menubar.append(mb_view)
 
455
        menubar.show()
 
456
        return menubar
 
457
    
441
458
    def _get_button_bar(self, operations):
442
459
        """Return a button bar to use.
443
460
 
513
530
 
514
531
class DiffController(object):
515
532
 
516
 
    def __init__(self, path, patch, window=None):
 
533
    def __init__(self, path, patch, window=None, allow_dirty=False):
517
534
        self.path = path
518
535
        self.patch = patch
 
536
        self.allow_dirty = allow_dirty
519
537
        if window is None:
520
538
            window = DiffWindow(operations=self._provide_operations())
521
539
            self.initialize_window(window)
527
545
 
528
546
    def get_diff_sections(self):
529
547
        yield "Complete Diff", None, ''.join(self.patch)
530
 
        for patch in parse_patches(self.patch):
 
548
        # allow_dirty was added to parse_patches in bzrlib 2.2b1
 
549
        if 'allow_dirty' in inspect.getargspec(parse_patches).args:
 
550
            patches = parse_patches(self.patch, allow_dirty=self.allow_dirty)
 
551
        else:
 
552
            patches = parse_patches(self.patch)
 
553
        for patch in patches:
531
554
            oldname = patch.oldname.split('\t')[0]
532
555
            newname = patch.newname.split('\t')[0]
533
556
            yield oldname, newname, str(patch)
572
595
        tree.lock_write()
573
596
        try:
574
597
            try:
575
 
                merger, verified = _mod_merge.Merger.from_mergeable(tree,
576
 
                    self.directive, progress.DummyProgress())
577
 
                merger.check_basis(True)
 
598
                if tree.has_changes():
 
599
                    raise errors.UncommittedChanges(tree)
 
600
                merger, verified = _mod_merge.Merger.from_mergeable(
 
601
                    tree, self.directive, pb=None)
578
602
                merger.merge_type = _mod_merge.Merge3Merger
579
603
                conflict_count = merger.do_merge()
580
604
                merger.set_pending()
606
630
    renamed_and_modified = 'renamed and modified'
607
631
    modified = 'modified'
608
632
    kind_changed = 'kind changed'
 
633
    missing = 'missing'
609
634
 
610
635
    # TODO: Handle metadata changes
611
636
 
626
651
                    source_marker = ''
627
652
                else:
628
653
                    source_marker = osutils.kind_marker(kinds[0])
 
654
 
629
655
                if kinds[1] is None:
630
 
                    assert kinds[0] is not None
631
 
                    marker = osutils.kind_marker(kinds[0])
 
656
                    if kinds[0] is None:
 
657
                        # We assume bzr will flag only files in that case,
 
658
                        # there may be a bzr bug there as only files seems to
 
659
                        # not receive any kind.
 
660
                        marker = osutils.kind_marker('file')
 
661
                    else:
 
662
                        marker = osutils.kind_marker(kinds[0])
632
663
                else:
633
664
                    marker = osutils.kind_marker(kinds[1])
634
665
 
636
667
                if real_path is None:
637
668
                    real_path = paths[0]
638
669
                assert real_path is not None
639
 
                display_path = real_path + marker
640
670
 
641
671
                present_source = versioned[0] and kinds[0] is not None
642
672
                present_target = versioned[1] and kinds[1] is not None
643
673
 
644
 
                if present_source != present_target:
 
674
                if kinds[0] is None and kinds[1] is None:
 
675
                    change_type = missing
 
676
                    display_path = real_path + marker
 
677
                elif present_source != present_target:
645
678
                    if present_target:
646
679
                        change_type = added
647
680
                    else:
648
681
                        assert present_source
649
682
                        change_type = removed
 
683
                    display_path = real_path + marker
650
684
                elif names[0] != names[1] or parent_ids[0] != parent_ids[1]:
651
685
                    # Renamed
652
686
                    if changed_content or executables[0] != executables[1]:
660
694
                    change_type = kind_changed
661
695
                    display_path = (paths[0] + source_marker
662
696
                                    + ' => ' + paths[1] + marker)
663
 
                elif changed_content is True or executables[0] != executables[1]:
 
697
                elif changed_content or executables[0] != executables[1]:
664
698
                    change_type = modified
 
699
                    display_path = real_path + marker
665
700
                else:
666
701
                    assert False, "How did we get here?"
667
702