/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: Vincent Ladeuil
  • Date: 2008-05-05 18:16:46 UTC
  • mto: (487.1.1 gtk)
  • mto: This revision was merged to the branch mainline in revision 490.
  • Revision ID: v.ladeuil+lp@free.fr-20080505181646-n95l8ltw2u6jtr26
Fix bug #187283 fix replacing _() by _i18n().

* genpot.sh 
Remove duplication. Add the ability to specify the genrated pot
file on command-line for debugging purposes.

* po/olive-gtk.pot:
Regenerated.

* __init__.py, branch.py, branchview/treeview.py, checkout.py,
commit.py, conflicts.py, diff.py, errors.py, initialize.py,
merge.py, nautilus-bzr.py, olive/__init__.py, olive/add.py,
olive/bookmark.py, olive/guifiles.py, olive/info.py,
olive/menu.py, olive/mkdir.py, olive/move.py, olive/remove.py,
olive/rename.py, push.py, revbrowser.py, status.py, tags.py:
Replace all calls to _() by calls to _i18n(), the latter being
defined in __init__.py and imported in the other modules from
there. This fix the problem encountered countless times when
running bzr selftest and getting silly error messages about
boolean not being callables.

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