/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: Daniel Schierbeck
  • Date: 2008-04-07 20:34:51 UTC
  • mfrom: (450.6.13 bugs)
  • mto: (463.2.1 bug.78765)
  • mto: This revision was merged to the branch mainline in revision 462.
  • Revision ID: daniel.schierbeck@gmail.com-20080407203451-2i6el7jf9t0k9y64
Merged bug page improvements.

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
 
from xml.etree.ElementTree import Element, SubElement, tostring
21
21
 
22
22
try:
23
 
    import gtksourceview2
 
23
    import gtksourceview
24
24
    have_gtksourceview = True
25
25
except ImportError:
26
26
    have_gtksourceview = False
41
41
from bzrlib.errors import NoSuchFile
42
42
from bzrlib.patches import parse_patches
43
43
from bzrlib.trace import warning
44
 
from bzrlib.plugins.gtk import _i18n
45
44
from bzrlib.plugins.gtk.window import Window
46
45
from dialog import error_dialog, info_dialog, warning_dialog
47
46
 
64
63
        self.set_shadow_type(gtk.SHADOW_IN)
65
64
 
66
65
        if have_gtksourceview:
67
 
            self.buffer = gtksourceview2.Buffer()
68
 
            slm = gtksourceview2.LanguageManager()
69
 
            gsl = slm.guess_language(content_type="text/x-patch")
 
66
            self.buffer = gtksourceview.SourceBuffer()
 
67
            slm = gtksourceview.SourceLanguagesManager()
 
68
            gsl = slm.get_language_from_mime_type("text/x-patch")
70
69
            if have_gconf:
71
 
                self.apply_gedit_colors(self.buffer)
72
 
            self.apply_colordiff_colors(self.buffer)
 
70
                self.apply_gedit_colors(gsl)
 
71
            self.apply_colordiff_colors(gsl)
73
72
            self.buffer.set_language(gsl)
74
 
            self.buffer.set_highlight_syntax(True)
 
73
            self.buffer.set_highlight(True)
75
74
 
76
 
            self.sourceview = gtksourceview2.View(self.buffer)
 
75
            sourceview = gtksourceview.SourceView(self.buffer)
77
76
        else:
78
77
            self.buffer = gtk.TextBuffer()
79
 
            self.sourceview = gtk.TextView(self.buffer)
 
78
            sourceview = gtk.TextView(self.buffer)
80
79
 
81
 
        self.sourceview.set_editable(False)
82
 
        self.sourceview.modify_font(pango.FontDescription("Monospace"))
83
 
        self.add(self.sourceview)
84
 
        self.sourceview.show()
 
80
        sourceview.set_editable(False)
 
81
        sourceview.modify_font(pango.FontDescription("Monospace"))
 
82
        self.add(sourceview)
 
83
        sourceview.show()
85
84
 
86
85
    @staticmethod
87
 
    def apply_gedit_colors(buf):
88
 
        """Set style to that specified in gedit configuration.
 
86
    def apply_gedit_colors(lang):
 
87
        """Set style for lang to that specified in gedit configuration.
89
88
 
90
89
        This method needs the gconf module.
91
90
 
92
 
        :param buf: a gtksourceview2.Buffer object.
 
91
        :param lang: a gtksourceview.SourceLanguage object.
93
92
        """
94
 
        GEDIT_SCHEME_PATH = '/apps/gedit-2/preferences/editor/colors/scheme'
 
93
        GEDIT_SYNTAX_PATH = '/apps/gedit-2/preferences/syntax_highlighting'
 
94
        GEDIT_LANG_PATH = GEDIT_SYNTAX_PATH + '/' + lang.get_id()
95
95
 
96
96
        client = gconf.client_get_default()
97
 
        style_scheme_name = client.get_string(GEDIT_SCHEME_PATH)
98
 
        style_scheme = gtksourceview2.StyleSchemeManager().get_scheme(style_scheme_name)
99
 
        
100
 
        buf.set_style_scheme(style_scheme)
 
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)
101
147
 
102
148
    @classmethod
103
 
    def apply_colordiff_colors(klass, buf):
 
149
    def apply_colordiff_colors(klass, lang):
104
150
        """Set style colors for lang using the colordiff configuration file.
105
151
 
106
152
        Both ~/.colordiffrc and ~/.colordiffrc.bzr-gtk are read.
107
153
 
108
 
        :param buf: a "Diff" gtksourceview2.Buffer object.
 
154
        :param lang: a "Diff" gtksourceview.SourceLanguage object.
109
155
        """
110
 
        scheme_manager = gtksourceview2.StyleSchemeManager()
111
 
        style_scheme = scheme_manager.get_scheme('colordiff')
112
 
        
113
 
        # if style scheme not found, we'll generate it from colordiffrc
114
 
        # TODO: reload if colordiffrc has changed.
115
 
        if style_scheme is None:
116
 
            colors = {}
117
 
 
118
 
            for f in ('~/.colordiffrc', '~/.colordiffrc.bzr-gtk'):
119
 
                f = os.path.expanduser(f)
120
 
                if os.path.exists(f):
121
 
                    try:
122
 
                        f = file(f)
123
 
                    except IOError, e:
124
 
                        warning('could not open file %s: %s' % (f, str(e)))
125
 
                    else:
126
 
                        colors.update(klass.parse_colordiffrc(f))
127
 
                        f.close()
128
 
 
129
 
            if not colors:
130
 
                # ~/.colordiffrc does not exist
131
 
                return
132
 
            
133
 
            mapping = {
134
 
                # map GtkSourceView2 scheme styles to colordiff names
 
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
135
175
                # since GSV is richer, accept new names for extra bits,
136
176
                # defaulting to old names if they're not present
137
 
                'diff:added-line': ['newtext'],
138
 
                'diff:removed-line': ['oldtext'],
139
 
                'diff:location': ['location', 'diffstuff'],
140
 
                'diff:file': ['file', 'diffstuff'],
141
 
                'diff:special-case': ['specialcase', 'diffstuff'],
142
 
            }
143
 
            
144
 
            converted_colors = {}
145
 
            for name, values in mapping.items():
146
 
                color = None
147
 
                for value in values:
148
 
                    color = colors.get(value, None)
149
 
                    if color is not None:
150
 
                        break
151
 
                if color is None:
152
 
                    continue
153
 
                converted_colors[name] = color
154
 
            
155
 
            # some xml magic to produce needed style scheme description
156
 
            e_style_scheme = Element('style-scheme')
157
 
            e_style_scheme.set('id', 'colordiff')
158
 
            e_style_scheme.set('_name', 'ColorDiff')
159
 
            e_style_scheme.set('version', '1.0')
160
 
            for name, color in converted_colors.items():
161
 
                style = SubElement(e_style_scheme, 'style')
162
 
                style.set('name', name)
163
 
                style.set('foreground', '#%s' % color)
164
 
            
165
 
            scheme_xml = tostring(e_style_scheme, 'UTF-8')
166
 
            if not os.path.exists(os.path.expanduser('~/.local/share/gtksourceview-2.0/styles')):
167
 
                os.makedirs(os.path.expanduser('~/.local/share/gtksourceview-2.0/styles'))
168
 
            file(os.path.expanduser('~/.local/share/gtksourceview-2.0/styles/colordiff.xml'), 'w').write(scheme_xml)
169
 
            
170
 
            scheme_manager.force_rescan()
171
 
            style_scheme = scheme_manager.get_scheme('colordiff')
172
 
        
173
 
        buf.set_style_scheme(style_scheme)
 
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)
174
204
 
175
205
    @staticmethod
176
206
    def parse_colordiffrc(fileobj):
274
304
        scrollwin.set_shadow_type(gtk.SHADOW_IN)
275
305
        self.pack1(scrollwin)
276
306
        scrollwin.show()
277
 
        
 
307
 
278
308
        self.model = gtk.TreeStore(str, str)
279
309
        self.treeview = gtk.TreeView(self.model)
280
310
        self.treeview.set_headers_visible(False)
297
327
        """
298
328
        # The diffs of the  selected file: a scrollable source or
299
329
        # text view
300
 
 
301
 
    def set_diff_text_sections(self, sections):
302
 
        if getattr(self, 'diff_view', None) is None:
303
 
            self.diff_view = DiffFileView()
304
 
            self.pack2(self.diff_view)
 
330
        self.diff_view = DiffFileView()
305
331
        self.diff_view.show()
306
 
        for oldname, newname, patch in sections:
 
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]
 
338
            self.model.append(None, [oldname, newname])
307
339
            self.diff_view._diffs[newname] = str(patch)
308
 
            if newname is None:
309
 
                newname = ''
310
 
            self.model.append(None, [oldname, newname])
311
340
        self.diff_view.show_diff(None)
312
341
 
313
342
    def set_diff(self, rev_tree, parent_tree):
316
345
        Compares the two trees and populates the window with the
317
346
        differences.
318
347
        """
319
 
        if getattr(self, 'diff_view', None) is None:
320
 
            self.diff_view = DiffView()
321
 
            self.pack2(self.diff_view)
 
348
        self.diff_view = DiffView()
 
349
        self.pack2(self.diff_view)
322
350
        self.diff_view.show()
323
351
        self.diff_view.set_trees(rev_tree, parent_tree)
324
352
        self.rev_tree = rev_tree
351
379
                self.model.append(titer, [ path, path ])
352
380
 
353
381
        self.treeview.expand_all()
354
 
        self.diff_view.show_diff(None)
355
382
 
356
383
    def set_file(self, file_path):
357
384
        """Select the current file to display"""
374
401
            return
375
402
        elif specific_files == [ "" ]:
376
403
            specific_files = None
377
 
        
 
404
 
378
405
        self.diff_view.show_diff(specific_files)
379
 
    
380
 
    def _on_wraplines_toggled(self, widget=None, wrap=False):
381
 
        """Callback for when the wrap lines checkbutton is toggled"""
382
 
        if wrap or widget.get_active():
383
 
            self.diff_view.sourceview.set_wrap_mode(gtk.WRAP_WORD)
384
 
        else:
385
 
            self.diff_view.sourceview.set_wrap_mode(gtk.WRAP_NONE)
 
406
 
386
407
 
387
408
class DiffWindow(Window):
388
409
    """Diff window.
391
412
    differences between two revisions on a branch.
392
413
    """
393
414
 
394
 
    def __init__(self, parent=None, operations=None):
 
415
    def __init__(self, parent=None):
395
416
        Window.__init__(self, parent)
396
417
        self.set_border_width(0)
397
418
        self.set_title("bzrk diff")
402
423
        width = int(monitor.width * 0.66)
403
424
        height = int(monitor.height * 0.66)
404
425
        self.set_default_size(width, height)
405
 
        self.construct(operations)
406
 
 
407
 
    def construct(self, operations):
 
426
 
 
427
        self.construct()
 
428
 
 
429
    def construct(self):
408
430
        """Construct the window contents."""
409
431
        self.vbox = gtk.VBox()
410
432
        self.add(self.vbox)
411
433
        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)
412
437
        self.diff = DiffWidget()
413
 
        self.vbox.pack_end(self.diff, True, True, 0)
 
438
        self.vbox.add(self.diff)
414
439
        self.diff.show_all()
415
 
        # Build after DiffWidget to connect signals
416
 
        menubar = self._get_menu_bar()
417
 
        self.vbox.pack_start(menubar, False, False, 0)
418
 
        hbox = self._get_button_bar(operations)
419
 
        if hbox is not None:
420
 
            self.vbox.pack_start(hbox, False, True, 0)
421
 
        
422
 
    
423
 
    def _get_menu_bar(self):
424
 
        menubar = gtk.MenuBar()
425
 
        # View menu
426
 
        mb_view = gtk.MenuItem(_i18n("_View"))
427
 
        mb_view_menu = gtk.Menu()
428
 
        mb_view_wrapsource = gtk.CheckMenuItem(_i18n("Wrap _Long Lines"))
429
 
        mb_view_wrapsource.connect('activate', self.diff._on_wraplines_toggled)
430
 
        mb_view_wrapsource.show()
431
 
        mb_view_menu.append(mb_view_wrapsource)
432
 
        mb_view.show()
433
 
        mb_view.set_submenu(mb_view_menu)
434
 
        mb_view.show()
435
 
        menubar.append(mb_view)
436
 
        menubar.show()
437
 
        return menubar
438
 
    
439
 
    def _get_button_bar(self, operations):
 
440
 
 
441
    def _get_button_bar(self):
440
442
        """Return a button bar to use.
441
443
 
442
444
        :return: None, meaning that no button bar will be used.
443
445
        """
444
 
        if operations is None:
445
 
            return None
 
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")
 
456
 
 
457
    def set_diff(self, description, rev_tree, parent_tree):
 
458
        """Set the differences showed by this window.
 
459
 
 
460
        Compares the two trees and populates the window with the
 
461
        differences.
 
462
        """
 
463
        self.diff.set_diff(rev_tree, parent_tree)
 
464
        self.set_title(description + " - bzrk diff")
 
465
 
 
466
    def set_file(self, file_path):
 
467
        self.diff.set_file(file_path)
 
468
 
 
469
 
 
470
class MergeDirectiveWindow(DiffWindow):
 
471
 
 
472
    def __init__(self, directive, path):
 
473
        DiffWindow.__init__(self, None)
 
474
        self._merge_target = None
 
475
        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
 
446
490
        hbox = gtk.HButtonBox()
447
491
        hbox.set_layout(gtk.BUTTONBOX_START)
448
 
        for title, method in operations:
449
 
            merge_button = gtk.Button(title)
450
 
            merge_button.show()
451
 
            merge_button.set_relief(gtk.RELIEF_NONE)
452
 
            merge_button.connect("clicked", method)
453
 
            hbox.pack_start(merge_button, expand=False, fill=True)
 
492
        hbox.pack_start(merge_button, expand=False, fill=True)
 
493
        hbox.pack_start(save_button, expand=False, fill=True)
454
494
        hbox.show()
455
495
        return hbox
456
496
 
457
 
    def _get_merge_target(self):
458
 
        d = gtk.FileChooserDialog('Merge branch', self,
459
 
                                  gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
460
 
                                  buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
461
 
                                           gtk.STOCK_CANCEL,
462
 
                                           gtk.RESPONSE_CANCEL,))
463
 
        try:
464
 
            result = d.run()
465
 
            if result != gtk.RESPONSE_OK:
466
 
                raise SelectCancelled()
467
 
            return d.get_current_folder_uri()
468
 
        finally:
469
 
            d.destroy()
470
 
 
471
 
    def _merge_successful(self):
472
 
        # No conflicts found.
473
 
        info_dialog(_i18n('Merge successful'),
474
 
                    _i18n('All changes applied successfully.'))
475
 
 
476
 
    def _conflicts(self):
477
 
        warning_dialog(_i18n('Conflicts encountered'),
478
 
                       _i18n('Please resolve the conflicts manually'
479
 
                             ' before committing.'))
480
 
 
481
 
    def _handle_error(self, e):
482
 
        error_dialog('Error', str(e))
483
 
 
484
 
    def _get_save_path(self, basename):
485
 
        d = gtk.FileChooserDialog('Save As', self,
486
 
                                  gtk.FILE_CHOOSER_ACTION_SAVE,
487
 
                                  buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
488
 
                                           gtk.STOCK_CANCEL,
489
 
                                           gtk.RESPONSE_CANCEL,))
490
 
        d.set_current_name(basename)
491
 
        try:
492
 
            result = d.run()
493
 
            if result != gtk.RESPONSE_OK:
494
 
                raise SelectCancelled()
495
 
            return urlutils.local_path_from_url(d.get_uri())
496
 
        finally:
497
 
            d.destroy()
498
 
 
499
 
    def set_diff(self, description, rev_tree, parent_tree):
500
 
        """Set the differences showed by this window.
501
 
 
502
 
        Compares the two trees and populates the window with the
503
 
        differences.
504
 
        """
505
 
        self.diff.set_diff(rev_tree, parent_tree)
506
 
        self.set_title(description + " - bzrk diff")
507
 
 
508
 
    def set_file(self, file_path):
509
 
        self.diff.set_file(file_path)
510
 
 
511
 
 
512
 
class DiffController(object):
513
 
 
514
 
    def __init__(self, path, patch, window=None):
515
 
        self.path = path
516
 
        self.patch = patch
517
 
        if window is None:
518
 
            window = DiffWindow(operations=self._provide_operations())
519
 
            self.initialize_window(window)
520
 
        self.window = window
521
 
 
522
 
    def initialize_window(self, window):
523
 
        window.diff.set_diff_text_sections(self.get_diff_sections())
524
 
        window.set_title(self.path + " - diff")
525
 
 
526
 
    def get_diff_sections(self):
527
 
        yield "Complete Diff", None, ''.join(self.patch)
528
 
        for patch in parse_patches(self.patch):
529
 
            oldname = patch.oldname.split('\t')[0]
530
 
            newname = patch.newname.split('\t')[0]
531
 
            yield oldname, newname, str(patch)
532
 
 
533
 
    def perform_save(self, window):
534
 
        try:
535
 
            save_path = self.window._get_save_path(osutils.basename(self.path))
536
 
        except SelectCancelled:
537
 
            return
538
 
        source = open(self.path, 'rb')
539
 
        try:
540
 
            target = open(save_path, 'wb')
541
 
            try:
542
 
                osutils.pumpfile(source, target)
543
 
            finally:
544
 
                target.close()
545
 
        finally:
546
 
            source.close()
547
 
 
548
 
    def _provide_operations(self):
549
 
        return [('Save', self.perform_save)]
550
 
 
551
 
 
552
 
class MergeDirectiveController(DiffController):
553
 
 
554
 
    def __init__(self, path, directive, window=None):
555
 
        DiffController.__init__(self, path, directive.patch.splitlines(True),
556
 
                                window)
557
 
        self.directive = directive
558
 
        self.merge_target = None
559
 
 
560
 
    def _provide_operations(self):
561
 
        return [('Merge', self.perform_merge), ('Save', self.perform_save)]
562
 
 
563
497
    def perform_merge(self, window):
564
 
        if self.merge_target is None:
565
 
            try:
566
 
                self.merge_target = self.window._get_merge_target()
567
 
            except SelectCancelled:
568
 
                return
569
 
        tree = workingtree.WorkingTree.open(self.merge_target)
 
498
        try:
 
499
            tree = self._get_merge_target()
 
500
        except SelectCancelled:
 
501
            return
570
502
        tree.lock_write()
571
503
        try:
572
504
            try:
577
509
                conflict_count = merger.do_merge()
578
510
                merger.set_pending()
579
511
                if conflict_count == 0:
580
 
                    self.window._merge_successful()
 
512
                    # No conflicts found.
 
513
                    info_dialog(_('Merge successful'),
 
514
                                _('All changes applied successfully.'))
581
515
                else:
582
 
                    self.window._conflicts()
583
516
                    # There are conflicts to be resolved.
584
 
                self.window.destroy()
 
517
                    warning_dialog(_('Conflicts encountered'),
 
518
                                   _('Please resolve the conflicts manually'
 
519
                                     ' before committing.'))
 
520
                self.destroy()
585
521
            except Exception, e:
586
 
                self.window._handle_error(e)
 
522
                error_dialog('Error', str(e))
587
523
        finally:
588
524
            tree.unlock()
589
525
 
 
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
 
590
570
 
591
571
def iter_changes_to_status(source, target):
592
572
    """Determine the differences between trees.
604
584
    renamed_and_modified = 'renamed and modified'
605
585
    modified = 'modified'
606
586
    kind_changed = 'kind changed'
607
 
    missing = 'missing'
608
587
 
609
588
    # TODO: Handle metadata changes
610
589
 
625
604
                    source_marker = ''
626
605
                else:
627
606
                    source_marker = osutils.kind_marker(kinds[0])
628
 
 
629
607
                if kinds[1] is None:
630
 
                    if kinds[0] is None:
631
 
                        # We assume bzr will flag only files in that case,
632
 
                        # there may be a bzr bug there as only files seems to
633
 
                        # not receive any kind.
634
 
                        marker = osutils.kind_marker('file')
635
 
                    else:
636
 
                        marker = osutils.kind_marker(kinds[0])
 
608
                    assert kinds[0] is not None
 
609
                    marker = osutils.kind_marker(kinds[0])
637
610
                else:
638
611
                    marker = osutils.kind_marker(kinds[1])
639
612
 
641
614
                if real_path is None:
642
615
                    real_path = paths[0]
643
616
                assert real_path is not None
 
617
                display_path = real_path + marker
644
618
 
645
619
                present_source = versioned[0] and kinds[0] is not None
646
620
                present_target = versioned[1] and kinds[1] is not None
647
621
 
648
 
                if kinds[0] is None and kinds[1] is None:
649
 
                    change_type = missing
650
 
                    display_path = real_path + marker
651
 
                elif present_source != present_target:
 
622
                if present_source != present_target:
652
623
                    if present_target:
653
624
                        change_type = added
654
625
                    else:
655
626
                        assert present_source
656
627
                        change_type = removed
657
 
                    display_path = real_path + marker
658
628
                elif names[0] != names[1] or parent_ids[0] != parent_ids[1]:
659
629
                    # Renamed
660
630
                    if changed_content or executables[0] != executables[1]:
668
638
                    change_type = kind_changed
669
639
                    display_path = (paths[0] + source_marker
670
640
                                    + ' => ' + paths[1] + marker)
671
 
                elif changed_content or executables[0] != executables[1]:
 
641
                elif changed_content is True or executables[0] != executables[1]:
672
642
                    change_type = modified
673
 
                    display_path = real_path + marker
674
643
                else:
675
644
                    assert False, "How did we get here?"
676
645