/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to diff.py

  • Committer: Jelmer Vernooij
  • Date: 2008-03-09 13:47:52 UTC
  • mto: This revision was merged to the branch mainline in revision 447.
  • Revision ID: jelmer@samba.org-20080309134752-syf9kwzy6e919jhj
Add note about python-nautilus requiring a libpythonXX.so symlink.

Show diffs side-by-side

added added

removed removed

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