/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: Adrian Room
  • Date: 2009-12-23 05:17:26 UTC
  • mto: This revision was merged to the branch mainline in revision 684.
  • Revision ID: ingolemo@gmail.com-20091223051726-zfl6dt9hslbyxuuh
Added tooltips and 'important button' status to the olive toolbar buttons

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
try:
 
21
    from xml.etree.ElementTree import Element, SubElement, tostring
 
22
except ImportError:
 
23
    from elementtree.ElementTree import Element, SubElement, tostring
21
24
 
22
25
try:
23
 
    import gtksourceview
 
26
    import gtksourceview2
24
27
    have_gtksourceview = True
25
28
except ImportError:
26
29
    have_gtksourceview = False
41
44
from bzrlib.errors import NoSuchFile
42
45
from bzrlib.patches import parse_patches
43
46
from bzrlib.trace import warning
 
47
from bzrlib.plugins.gtk import _i18n
44
48
from bzrlib.plugins.gtk.window import Window
45
49
from dialog import error_dialog, info_dialog, warning_dialog
46
50
 
47
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
 
48
60
class SelectCancelled(Exception):
49
61
 
50
62
    pass
63
75
        self.set_shadow_type(gtk.SHADOW_IN)
64
76
 
65
77
        if have_gtksourceview:
66
 
            self.buffer = gtksourceview.SourceBuffer()
67
 
            slm = gtksourceview.SourceLanguagesManager()
68
 
            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")
69
83
            if have_gconf:
70
 
                self.apply_gedit_colors(gsl)
71
 
            self.apply_colordiff_colors(gsl)
 
84
                self.apply_gedit_colors(self.buffer)
 
85
            self.apply_colordiff_colors(self.buffer)
72
86
            self.buffer.set_language(gsl)
73
 
            self.buffer.set_highlight(True)
 
87
            self.buffer.set_highlight_syntax(True)
74
88
 
75
 
            sourceview = gtksourceview.SourceView(self.buffer)
 
89
            self.sourceview = gtksourceview2.View(self.buffer)
76
90
        else:
77
91
            self.buffer = gtk.TextBuffer()
78
 
            sourceview = gtk.TextView(self.buffer)
 
92
            self.sourceview = gtk.TextView(self.buffer)
79
93
 
80
 
        sourceview.set_editable(False)
81
 
        sourceview.modify_font(pango.FontDescription("Monospace"))
82
 
        self.add(sourceview)
83
 
        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()
84
98
 
85
99
    @staticmethod
86
 
    def apply_gedit_colors(lang):
87
 
        """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.
88
102
 
89
103
        This method needs the gconf module.
90
104
 
91
 
        :param lang: a gtksourceview.SourceLanguage object.
 
105
        :param buf: a gtksourceview2.Buffer object.
92
106
        """
93
 
        GEDIT_SYNTAX_PATH = '/apps/gedit-2/preferences/syntax_highlighting'
94
 
        GEDIT_LANG_PATH = GEDIT_SYNTAX_PATH + '/' + lang.get_id()
 
107
        GEDIT_SCHEME_PATH = '/apps/gedit-2/preferences/editor/colors/scheme'
95
108
 
96
109
        client = gconf.client_get_default()
97
 
        client.add_dir(GEDIT_LANG_PATH, gconf.CLIENT_PRELOAD_NONE)
98
 
 
99
 
        for tag in lang.get_tags():
100
 
            tag_id = tag.get_id()
101
 
            gconf_key = GEDIT_LANG_PATH + '/' + tag_id
102
 
            style_string = client.get_string(gconf_key)
103
 
 
104
 
            if style_string is None:
105
 
                continue
106
 
 
107
 
            # function to get a bool from a string that's either '0' or '1'
108
 
            string_bool = lambda x: bool(int(x))
109
 
 
110
 
            # style_string is a string like "2/#FFCCAA/#000000/0/1/0/0"
111
 
            # values are: mask, fg, bg, italic, bold, underline, strike
112
 
            # this packs them into (str_value, attr_name, conv_func) tuples
113
 
            items = zip(style_string.split('/'), ['mask', 'foreground',
114
 
                'background', 'italic', 'bold', 'underline', 'strikethrough' ],
115
 
                [ int, gtk.gdk.color_parse, gtk.gdk.color_parse, string_bool,
116
 
                    string_bool, string_bool, string_bool ]
117
 
            )
118
 
 
119
 
            style = gtksourceview.SourceTagStyle()
120
 
 
121
 
            # XXX The mask attribute controls whether the present values of
122
 
            # foreground and background color should in fact be used. Ideally
123
 
            # (and that's what gedit does), one could set all three attributes,
124
 
            # and let the TagStyle object figure out which colors to use.
125
 
            # However, in the GtkSourceview python bindings, the mask attribute
126
 
            # is read-only, and it's derived instead from the colors being
127
 
            # set or not. This means that we have to sometimes refrain from
128
 
            # setting fg or bg colors, depending on the value of the mask.
129
 
            # This code could go away if mask were writable.
130
 
            mask = int(items[0][0])
131
 
            if not (mask & 1): # GTK_SOURCE_TAG_STYLE_USE_BACKGROUND
132
 
                items[2:3] = []
133
 
            if not (mask & 2): # GTK_SOURCE_TAG_STYLE_USE_FOREGROUND
134
 
                items[1:2] = []
135
 
            items[0:1] = [] # skip the mask unconditionally
136
 
 
137
 
            for value, attr, func in items:
138
 
                try:
139
 
                    value = func(value)
140
 
                except ValueError:
141
 
                    warning('gconf key %s contains an invalid value: %s'
142
 
                            % gconf_key, value)
143
 
                else:
144
 
                    setattr(style, attr, value)
145
 
 
146
 
            lang.set_tag_style(tag_id, style)
 
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)
147
115
 
148
116
    @classmethod
149
 
    def apply_colordiff_colors(klass, lang):
 
117
    def apply_colordiff_colors(klass, buf):
150
118
        """Set style colors for lang using the colordiff configuration file.
151
119
 
152
120
        Both ~/.colordiffrc and ~/.colordiffrc.bzr-gtk are read.
153
121
 
154
 
        :param lang: a "Diff" gtksourceview.SourceLanguage object.
 
122
        :param buf: a "Diff" gtksourceview2.Buffer object.
155
123
        """
156
 
        colors = {}
157
 
 
158
 
        for f in ('~/.colordiffrc', '~/.colordiffrc.bzr-gtk'):
159
 
            f = os.path.expanduser(f)
160
 
            if os.path.exists(f):
161
 
                try:
162
 
                    f = file(f)
163
 
                except IOError, e:
164
 
                    warning('could not open file %s: %s' % (f, str(e)))
165
 
                else:
166
 
                    colors.update(klass.parse_colordiffrc(f))
167
 
                    f.close()
168
 
 
169
 
        if not colors:
170
 
            # ~/.colordiffrc does not exist
171
 
            return
172
 
 
173
 
        mapping = {
174
 
                # map GtkSourceView tags to colordiff names
 
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
175
149
                # since GSV is richer, accept new names for extra bits,
176
150
                # defaulting to old names if they're not present
177
 
                'Added@32@line': ['newtext'],
178
 
                'Removed@32@line': ['oldtext'],
179
 
                'Location': ['location', 'diffstuff'],
180
 
                'Diff@32@file': ['file', 'diffstuff'],
181
 
                'Special@32@case': ['specialcase', 'diffstuff'],
182
 
        }
183
 
 
184
 
        for tag in lang.get_tags():
185
 
            tag_id = tag.get_id()
186
 
            keys = mapping.get(tag_id, [])
187
 
            color = None
188
 
 
189
 
            for key in keys:
190
 
                color = colors.get(key, None)
191
 
                if color is not None:
192
 
                    break
193
 
 
194
 
            if color is None:
195
 
                continue
196
 
 
197
 
            style = gtksourceview.SourceTagStyle()
198
 
            try:
199
 
                style.foreground = gtk.gdk.color_parse(color)
200
 
            except ValueError:
201
 
                warning('not a valid color: %s' % color)
202
 
            else:
203
 
                lang.set_tag_style(tag_id, style)
 
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)
204
188
 
205
189
    @staticmethod
206
190
    def parse_colordiffrc(fileobj):
304
288
        scrollwin.set_shadow_type(gtk.SHADOW_IN)
305
289
        self.pack1(scrollwin)
306
290
        scrollwin.show()
307
 
 
 
291
        
308
292
        self.model = gtk.TreeStore(str, str)
309
293
        self.treeview = gtk.TreeView(self.model)
310
294
        self.treeview.set_headers_visible(False)
327
311
        """
328
312
        # The diffs of the  selected file: a scrollable source or
329
313
        # text view
330
 
        self.diff_view = DiffFileView()
 
314
 
 
315
    def set_diff_text_sections(self, sections):
 
316
        if getattr(self, 'diff_view', None) is None:
 
317
            self.diff_view = DiffFileView()
 
318
            self.pack2(self.diff_view)
331
319
        self.diff_view.show()
332
 
        self.pack2(self.diff_view)
333
 
        self.model.append(None, [ "Complete Diff", "" ])
334
 
        self.diff_view._diffs[None] = ''.join(lines)
335
 
        for patch in parse_patches(lines):
336
 
            oldname = patch.oldname.split('\t')[0]
337
 
            newname = patch.newname.split('\t')[0]
 
320
        for oldname, newname, patch in sections:
 
321
            self.diff_view._diffs[newname] = str(patch)
 
322
            if newname is None:
 
323
                newname = ''
338
324
            self.model.append(None, [oldname, newname])
339
 
            self.diff_view._diffs[newname] = str(patch)
340
325
        self.diff_view.show_diff(None)
341
326
 
342
327
    def set_diff(self, rev_tree, parent_tree):
345
330
        Compares the two trees and populates the window with the
346
331
        differences.
347
332
        """
348
 
        self.diff_view = DiffView()
349
 
        self.pack2(self.diff_view)
 
333
        if getattr(self, 'diff_view', None) is None:
 
334
            self.diff_view = DiffView()
 
335
            self.pack2(self.diff_view)
350
336
        self.diff_view.show()
351
337
        self.diff_view.set_trees(rev_tree, parent_tree)
352
338
        self.rev_tree = rev_tree
379
365
                self.model.append(titer, [ path, path ])
380
366
 
381
367
        self.treeview.expand_all()
 
368
        self.diff_view.show_diff(None)
382
369
 
383
370
    def set_file(self, file_path):
384
371
        """Select the current file to display"""
401
388
            return
402
389
        elif specific_files == [ "" ]:
403
390
            specific_files = None
404
 
 
 
391
        
405
392
        self.diff_view.show_diff(specific_files)
406
 
 
 
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)
407
400
 
408
401
class DiffWindow(Window):
409
402
    """Diff window.
412
405
    differences between two revisions on a branch.
413
406
    """
414
407
 
415
 
    def __init__(self, parent=None):
 
408
    def __init__(self, parent=None, operations=None):
416
409
        Window.__init__(self, parent)
417
410
        self.set_border_width(0)
418
411
        self.set_title("bzrk diff")
423
416
        width = int(monitor.width * 0.66)
424
417
        height = int(monitor.height * 0.66)
425
418
        self.set_default_size(width, height)
426
 
 
427
 
        self.construct()
428
 
 
429
 
    def construct(self):
 
419
        self.construct(operations)
 
420
 
 
421
    def construct(self, operations):
430
422
        """Construct the window contents."""
431
423
        self.vbox = gtk.VBox()
432
424
        self.add(self.vbox)
433
425
        self.vbox.show()
434
 
        hbox = self._get_button_bar()
435
 
        if hbox is not None:
436
 
            self.vbox.pack_start(hbox, expand=False, fill=True)
437
426
        self.diff = DiffWidget()
438
 
        self.vbox.add(self.diff)
 
427
        self.vbox.pack_end(self.diff, True, True, 0)
439
428
        self.diff.show_all()
440
 
 
441
 
    def _get_button_bar(self):
 
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
    
 
453
    def _get_button_bar(self, operations):
442
454
        """Return a button bar to use.
443
455
 
444
456
        :return: None, meaning that no button bar will be used.
445
457
        """
446
 
        return None
447
 
 
448
 
    def set_diff_text(self, description, lines):
449
 
        """Set the diff from a text.
450
 
 
451
 
        The diff must be in unified diff format, and will be parsed to
452
 
        determine filenames.
453
 
        """
454
 
        self.diff.set_diff_text(lines)
455
 
        self.set_title(description + " - bzrk diff")
 
458
        if operations is None:
 
459
            return None
 
460
        hbox = gtk.HButtonBox()
 
461
        hbox.set_layout(gtk.BUTTONBOX_START)
 
462
        for title, method in operations:
 
463
            merge_button = gtk.Button(title)
 
464
            merge_button.show()
 
465
            merge_button.set_relief(gtk.RELIEF_NONE)
 
466
            merge_button.connect("clicked", method)
 
467
            hbox.pack_start(merge_button, expand=False, fill=True)
 
468
        hbox.show()
 
469
        return hbox
 
470
 
 
471
    def _get_merge_target(self):
 
472
        d = gtk.FileChooserDialog('Merge branch', self,
 
473
                                  gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
 
474
                                  buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
 
475
                                           gtk.STOCK_CANCEL,
 
476
                                           gtk.RESPONSE_CANCEL,))
 
477
        try:
 
478
            result = d.run()
 
479
            if result != gtk.RESPONSE_OK:
 
480
                raise SelectCancelled()
 
481
            return d.get_current_folder_uri()
 
482
        finally:
 
483
            d.destroy()
 
484
 
 
485
    def _merge_successful(self):
 
486
        # No conflicts found.
 
487
        info_dialog(_i18n('Merge successful'),
 
488
                    _i18n('All changes applied successfully.'))
 
489
 
 
490
    def _conflicts(self):
 
491
        warning_dialog(_i18n('Conflicts encountered'),
 
492
                       _i18n('Please resolve the conflicts manually'
 
493
                             ' before committing.'))
 
494
 
 
495
    def _handle_error(self, e):
 
496
        error_dialog('Error', str(e))
 
497
 
 
498
    def _get_save_path(self, basename):
 
499
        d = gtk.FileChooserDialog('Save As', self,
 
500
                                  gtk.FILE_CHOOSER_ACTION_SAVE,
 
501
                                  buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
 
502
                                           gtk.STOCK_CANCEL,
 
503
                                           gtk.RESPONSE_CANCEL,))
 
504
        d.set_current_name(basename)
 
505
        try:
 
506
            result = d.run()
 
507
            if result != gtk.RESPONSE_OK:
 
508
                raise SelectCancelled()
 
509
            return urlutils.local_path_from_url(d.get_uri())
 
510
        finally:
 
511
            d.destroy()
456
512
 
457
513
    def set_diff(self, description, rev_tree, parent_tree):
458
514
        """Set the differences showed by this window.
467
523
        self.diff.set_file(file_path)
468
524
 
469
525
 
470
 
class MergeDirectiveWindow(DiffWindow):
471
 
 
472
 
    def __init__(self, directive, path):
473
 
        DiffWindow.__init__(self, None)
474
 
        self._merge_target = None
 
526
class DiffController(object):
 
527
 
 
528
    def __init__(self, path, patch, window=None):
 
529
        self.path = path
 
530
        self.patch = patch
 
531
        if window is None:
 
532
            window = DiffWindow(operations=self._provide_operations())
 
533
            self.initialize_window(window)
 
534
        self.window = window
 
535
 
 
536
    def initialize_window(self, window):
 
537
        window.diff.set_diff_text_sections(self.get_diff_sections())
 
538
        window.set_title(self.path + " - diff")
 
539
 
 
540
    def get_diff_sections(self):
 
541
        yield "Complete Diff", None, ''.join(self.patch)
 
542
        for patch in parse_patches(self.patch):
 
543
            oldname = patch.oldname.split('\t')[0]
 
544
            newname = patch.newname.split('\t')[0]
 
545
            yield oldname, newname, str(patch)
 
546
 
 
547
    def perform_save(self, window):
 
548
        try:
 
549
            save_path = self.window._get_save_path(osutils.basename(self.path))
 
550
        except SelectCancelled:
 
551
            return
 
552
        source = open(self.path, 'rb')
 
553
        try:
 
554
            target = open(save_path, 'wb')
 
555
            try:
 
556
                osutils.pumpfile(source, target)
 
557
            finally:
 
558
                target.close()
 
559
        finally:
 
560
            source.close()
 
561
 
 
562
    def _provide_operations(self):
 
563
        return [('Save', self.perform_save)]
 
564
 
 
565
 
 
566
class MergeDirectiveController(DiffController):
 
567
 
 
568
    def __init__(self, path, directive, window=None):
 
569
        DiffController.__init__(self, path, directive.patch.splitlines(True),
 
570
                                window)
475
571
        self.directive = directive
476
 
        self.path = path
477
 
 
478
 
    def _get_button_bar(self):
479
 
        """The button bar has only the Merge button"""
480
 
        merge_button = gtk.Button('Merge')
481
 
        merge_button.show()
482
 
        merge_button.set_relief(gtk.RELIEF_NONE)
483
 
        merge_button.connect("clicked", self.perform_merge)
484
 
 
485
 
        save_button = gtk.Button('Save')
486
 
        save_button.show()
487
 
        save_button.set_relief(gtk.RELIEF_NONE)
488
 
        save_button.connect("clicked", self.perform_save)
489
 
 
490
 
        hbox = gtk.HButtonBox()
491
 
        hbox.set_layout(gtk.BUTTONBOX_START)
492
 
        hbox.pack_start(merge_button, expand=False, fill=True)
493
 
        hbox.pack_start(save_button, expand=False, fill=True)
494
 
        hbox.show()
495
 
        return hbox
 
572
        self.merge_target = None
 
573
 
 
574
    def _provide_operations(self):
 
575
        return [('Merge', self.perform_merge), ('Save', self.perform_save)]
496
576
 
497
577
    def perform_merge(self, window):
498
 
        try:
499
 
            tree = self._get_merge_target()
500
 
        except SelectCancelled:
501
 
            return
 
578
        if self.merge_target is None:
 
579
            try:
 
580
                self.merge_target = self.window._get_merge_target()
 
581
            except SelectCancelled:
 
582
                return
 
583
        tree = workingtree.WorkingTree.open(self.merge_target)
502
584
        tree.lock_write()
503
585
        try:
504
586
            try:
509
591
                conflict_count = merger.do_merge()
510
592
                merger.set_pending()
511
593
                if conflict_count == 0:
512
 
                    # No conflicts found.
513
 
                    info_dialog(_('Merge successful'),
514
 
                                _('All changes applied successfully.'))
 
594
                    self.window._merge_successful()
515
595
                else:
 
596
                    self.window._conflicts()
516
597
                    # There are conflicts to be resolved.
517
 
                    warning_dialog(_('Conflicts encountered'),
518
 
                                   _('Please resolve the conflicts manually'
519
 
                                     ' before committing.'))
520
 
                self.destroy()
 
598
                self.window.destroy()
521
599
            except Exception, e:
522
 
                error_dialog('Error', str(e))
 
600
                self.window._handle_error(e)
523
601
        finally:
524
602
            tree.unlock()
525
603
 
526
 
    def _get_merge_target(self):
527
 
        if self._merge_target is not None:
528
 
            return self._merge_target
529
 
        d = gtk.FileChooserDialog('Merge branch', self,
530
 
                                  gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
531
 
                                  buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
532
 
                                           gtk.STOCK_CANCEL,
533
 
                                           gtk.RESPONSE_CANCEL,))
534
 
        try:
535
 
            result = d.run()
536
 
            if result != gtk.RESPONSE_OK:
537
 
                raise SelectCancelled()
538
 
            uri = d.get_current_folder_uri()
539
 
        finally:
540
 
            d.destroy()
541
 
        return workingtree.WorkingTree.open(uri)
542
 
 
543
 
    def perform_save(self, window):
544
 
        d = gtk.FileChooserDialog('Save As', self,
545
 
                                  gtk.FILE_CHOOSER_ACTION_SAVE,
546
 
                                  buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
547
 
                                           gtk.STOCK_CANCEL,
548
 
                                           gtk.RESPONSE_CANCEL,))
549
 
        d.set_current_name(osutils.basename(self.path))
550
 
        try:
551
 
            try:
552
 
                result = d.run()
553
 
                if result != gtk.RESPONSE_OK:
554
 
                    raise SelectCancelled()
555
 
                uri = d.get_uri()
556
 
            finally:
557
 
                d.destroy()
558
 
        except SelectCancelled:
559
 
            return
560
 
        source = open(self.path, 'rb')
561
 
        try:
562
 
            target = open(urlutils.local_path_from_url(uri), 'wb')
563
 
            try:
564
 
                target.write(source.read())
565
 
            finally:
566
 
                target.close()
567
 
        finally:
568
 
            source.close()
569
 
 
570
604
 
571
605
def iter_changes_to_status(source, target):
572
606
    """Determine the differences between trees.
584
618
    renamed_and_modified = 'renamed and modified'
585
619
    modified = 'modified'
586
620
    kind_changed = 'kind changed'
 
621
    missing = 'missing'
587
622
 
588
623
    # TODO: Handle metadata changes
589
624
 
604
639
                    source_marker = ''
605
640
                else:
606
641
                    source_marker = osutils.kind_marker(kinds[0])
 
642
 
607
643
                if kinds[1] is None:
608
 
                    assert kinds[0] is not None
609
 
                    marker = osutils.kind_marker(kinds[0])
 
644
                    if kinds[0] is None:
 
645
                        # We assume bzr will flag only files in that case,
 
646
                        # there may be a bzr bug there as only files seems to
 
647
                        # not receive any kind.
 
648
                        marker = osutils.kind_marker('file')
 
649
                    else:
 
650
                        marker = osutils.kind_marker(kinds[0])
610
651
                else:
611
652
                    marker = osutils.kind_marker(kinds[1])
612
653
 
614
655
                if real_path is None:
615
656
                    real_path = paths[0]
616
657
                assert real_path is not None
617
 
                display_path = real_path + marker
618
658
 
619
659
                present_source = versioned[0] and kinds[0] is not None
620
660
                present_target = versioned[1] and kinds[1] is not None
621
661
 
622
 
                if present_source != present_target:
 
662
                if kinds[0] is None and kinds[1] is None:
 
663
                    change_type = missing
 
664
                    display_path = real_path + marker
 
665
                elif present_source != present_target:
623
666
                    if present_target:
624
667
                        change_type = added
625
668
                    else:
626
669
                        assert present_source
627
670
                        change_type = removed
 
671
                    display_path = real_path + marker
628
672
                elif names[0] != names[1] or parent_ids[0] != parent_ids[1]:
629
673
                    # Renamed
630
674
                    if changed_content or executables[0] != executables[1]:
638
682
                    change_type = kind_changed
639
683
                    display_path = (paths[0] + source_marker
640
684
                                    + ' => ' + paths[1] + marker)
641
 
                elif changed_content is True or executables[0] != executables[1]:
 
685
                elif changed_content or executables[0] != executables[1]:
642
686
                    change_type = modified
 
687
                    display_path = real_path + marker
643
688
                else:
644
689
                    assert False, "How did we get here?"
645
690