/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz
10 by Scott James Remnant
Add an extra window type, clicking the little icons next to a parent
1
# -*- coding: UTF-8 -*-
2
"""Difference window.
3
4
This module contains the code to manage the diff window which shows
5
the changes made between two revisions on a branch.
6
"""
7
8
__copyright__ = "Copyright © 2005 Canonical Ltd."
9
__author__    = "Scott James Remnant <scott@ubuntu.com>"
10
11
12
from cStringIO import StringIO
13
252 by Aaron Bentley
Fix test suite
14
import pygtk
15
pygtk.require("2.0")
10 by Scott James Remnant
Add an extra window type, clicking the little icons next to a parent
16
import gtk
17
import pango
232.1.1 by Adeodato Simó
Read ~/.colordiffrc to set colors in the diff window.
18
import os
19
import re
76 by Jelmer Vernooij
Replace non-UTF8 characters rather than generating an exception (fixes #44677).
20
import sys
10 by Scott James Remnant
Add an extra window type, clicking the little icons next to a parent
21
22
try:
23
    import gtksourceview
24
    have_gtksourceview = True
25
except ImportError:
26
    have_gtksourceview = False
232.1.3 by Adeodato Simó
Support setting diff colors from gedit's syntax highlighting config too.
27
try:
28
    import gconf
29
    have_gconf = True
30
except ImportError:
31
    have_gconf = False
10 by Scott James Remnant
Add an extra window type, clicking the little icons next to a parent
32
434 by Aaron Bentley
Better errors, merge directive saving
33
from bzrlib import (
34
    merge as _mod_merge,
35
    osutils,
36
    progress,
37
    urlutils,
38
    workingtree,
39
)
278.1.29 by John Arbash Meinel
Start testing with Unicode data.
40
from bzrlib.diff import show_diff_trees, internal_diff
59.2.4 by Aaron Bentley
Teach gdiff to accept a single file argument
41
from bzrlib.errors import NoSuchFile
426 by Aaron Bentley
Start support for Merge Directives
42
from bzrlib.patches import parse_patches
232.1.1 by Adeodato Simó
Read ~/.colordiffrc to set colors in the diff window.
43
from bzrlib.trace import warning
298.2.1 by Daniel Schierbeck
Refactored the GTK window code, creating a single base window class that handles keyboard events.
44
from bzrlib.plugins.gtk.window import Window
430 by Aaron Bentley
Handle conflicts appropriately
45
from dialog import error_dialog, info_dialog, warning_dialog
428 by Aaron Bentley
Get merging working
46
47
48
class SelectCancelled(Exception):
49
50
    pass
298.2.1 by Daniel Schierbeck
Refactored the GTK window code, creating a single base window class that handles keyboard events.
51
10 by Scott James Remnant
Add an extra window type, clicking the little icons next to a parent
52
424 by Aaron Bentley
Add ghandle-patch
53
class DiffFileView(gtk.ScrolledWindow):
432 by Aaron Bentley
Misc updates
54
    """Window for displaying diffs from a diff file"""
10 by Scott James Remnant
Add an extra window type, clicking the little icons next to a parent
55
51 by Jelmer Vernooij
Rework some of the parameters to DiffWindow.set_diff() to be
56
    def __init__(self):
278.1.4 by John Arbash Meinel
Just playing around.
57
        gtk.ScrolledWindow.__init__(self)
10 by Scott James Remnant
Add an extra window type, clicking the little icons next to a parent
58
        self.construct()
424 by Aaron Bentley
Add ghandle-patch
59
        self._diffs = {}
10 by Scott James Remnant
Add an extra window type, clicking the little icons next to a parent
60
61
    def construct(self):
278.1.4 by John Arbash Meinel
Just playing around.
62
        self.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
63
        self.set_shadow_type(gtk.SHADOW_IN)
10 by Scott James Remnant
Add an extra window type, clicking the little icons next to a parent
64
65
        if have_gtksourceview:
66
            self.buffer = gtksourceview.SourceBuffer()
67
            slm = gtksourceview.SourceLanguagesManager()
68
            gsl = slm.get_language_from_mime_type("text/x-patch")
232.1.3 by Adeodato Simó
Support setting diff colors from gedit's syntax highlighting config too.
69
            if have_gconf:
70
                self.apply_gedit_colors(gsl)
232.1.2 by Adeodato Simó
Rename apply_colordiffrc to apply_colordiff_colors, improve docstring.
71
            self.apply_colordiff_colors(gsl)
10 by Scott James Remnant
Add an extra window type, clicking the little icons next to a parent
72
            self.buffer.set_language(gsl)
73
            self.buffer.set_highlight(True)
74
75
            sourceview = gtksourceview.SourceView(self.buffer)
76
        else:
77
            self.buffer = gtk.TextBuffer()
78
            sourceview = gtk.TextView(self.buffer)
79
80
        sourceview.set_editable(False)
81
        sourceview.modify_font(pango.FontDescription("Monospace"))
278.1.4 by John Arbash Meinel
Just playing around.
82
        self.add(sourceview)
10 by Scott James Remnant
Add an extra window type, clicking the little icons next to a parent
83
        sourceview.show()
84
232.1.1 by Adeodato Simó
Read ~/.colordiffrc to set colors in the diff window.
85
    @staticmethod
232.1.3 by Adeodato Simó
Support setting diff colors from gedit's syntax highlighting config too.
86
    def apply_gedit_colors(lang):
87
        """Set style for lang to that specified in gedit configuration.
88
89
        This method needs the gconf module.
278.1.4 by John Arbash Meinel
Just playing around.
90
232.1.3 by Adeodato Simó
Support setting diff colors from gedit's syntax highlighting config too.
91
        :param lang: a gtksourceview.SourceLanguage object.
92
        """
93
        GEDIT_SYNTAX_PATH = '/apps/gedit-2/preferences/syntax_highlighting'
94
        GEDIT_LANG_PATH = GEDIT_SYNTAX_PATH + '/' + lang.get_id()
95
96
        client = gconf.client_get_default()
97
        client.add_dir(GEDIT_LANG_PATH, gconf.CLIENT_PRELOAD_NONE)
98
99
        for tag in lang.get_tags():
100
            tag_id = tag.get_id()
101
            gconf_key = GEDIT_LANG_PATH + '/' + tag_id
102
            style_string = client.get_string(gconf_key)
103
104
            if style_string is None:
105
                continue
106
107
            # function to get a bool from a string that's either '0' or '1'
108
            string_bool = lambda x: bool(int(x))
109
110
            # style_string is a string like "2/#FFCCAA/#000000/0/1/0/0"
111
            # values are: mask, fg, bg, italic, bold, underline, strike
112
            # this packs them into (str_value, attr_name, conv_func) tuples
113
            items = zip(style_string.split('/'), ['mask', 'foreground',
114
                'background', 'italic', 'bold', 'underline', 'strikethrough' ],
115
                [ int, gtk.gdk.color_parse, gtk.gdk.color_parse, string_bool,
116
                    string_bool, string_bool, string_bool ]
117
            )
118
119
            style = gtksourceview.SourceTagStyle()
120
121
            # XXX The mask attribute controls whether the present values of
122
            # foreground and background color should in fact be used. Ideally
123
            # (and that's what gedit does), one could set all three attributes,
124
            # and let the TagStyle object figure out which colors to use.
125
            # However, in the GtkSourceview python bindings, the mask attribute
126
            # is read-only, and it's derived instead from the colors being
127
            # set or not. This means that we have to sometimes refrain from
128
            # setting fg or bg colors, depending on the value of the mask.
129
            # This code could go away if mask were writable.
130
            mask = int(items[0][0])
131
            if not (mask & 1): # GTK_SOURCE_TAG_STYLE_USE_BACKGROUND
132
                items[2:3] = []
133
            if not (mask & 2): # GTK_SOURCE_TAG_STYLE_USE_FOREGROUND
134
                items[1:2] = []
135
            items[0:1] = [] # skip the mask unconditionally
136
137
            for value, attr, func in items:
138
                try:
139
                    value = func(value)
140
                except ValueError:
141
                    warning('gconf key %s contains an invalid value: %s'
142
                            % gconf_key, value)
143
                else:
144
                    setattr(style, attr, value)
145
146
            lang.set_tag_style(tag_id, style)
147
424 by Aaron Bentley
Add ghandle-patch
148
    @classmethod
149
    def apply_colordiff_colors(klass, lang):
232.1.2 by Adeodato Simó
Rename apply_colordiffrc to apply_colordiff_colors, improve docstring.
150
        """Set style colors for lang using the colordiff configuration file.
232.1.1 by Adeodato Simó
Read ~/.colordiffrc to set colors in the diff window.
151
152
        Both ~/.colordiffrc and ~/.colordiffrc.bzr-gtk are read.
153
232.1.2 by Adeodato Simó
Rename apply_colordiffrc to apply_colordiff_colors, improve docstring.
154
        :param lang: a "Diff" gtksourceview.SourceLanguage object.
232.1.1 by Adeodato Simó
Read ~/.colordiffrc to set colors in the diff window.
155
        """
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:
424 by Aaron Bentley
Add ghandle-patch
166
                    colors.update(klass.parse_colordiffrc(f))
232.1.1 by Adeodato Simó
Read ~/.colordiffrc to set colors in the diff window.
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
175
                # since GSV is richer, accept new names for extra bits,
176
                # defaulting to old names if they're not present
177
                'Added@32@line': ['newtext'],
178
                'Removed@32@line': ['oldtext'],
179
                'Location': ['location', 'diffstuff'],
180
                'Diff@32@file': ['file', 'diffstuff'],
181
                'Special@32@case': ['specialcase', 'diffstuff'],
182
        }
183
184
        for tag in lang.get_tags():
185
            tag_id = tag.get_id()
186
            keys = mapping.get(tag_id, [])
187
            color = None
188
189
            for key in keys:
190
                color = colors.get(key, None)
191
                if color is not None:
192
                    break
193
194
            if color is None:
195
                continue
196
197
            style = gtksourceview.SourceTagStyle()
198
            try:
199
                style.foreground = gtk.gdk.color_parse(color)
200
            except ValueError:
201
                warning('not a valid color: %s' % color)
202
            else:
203
                lang.set_tag_style(tag_id, style)
232.1.4 by Adeodato Simó
Add a test for parse_colordiffrc, and fix the function to handle empty lines.
204
205
    @staticmethod
206
    def parse_colordiffrc(fileobj):
207
        """Parse fileobj as a colordiff configuration file.
278.1.4 by John Arbash Meinel
Just playing around.
208
232.1.4 by Adeodato Simó
Add a test for parse_colordiffrc, and fix the function to handle empty lines.
209
        :return: A dict with the key -> value pairs.
210
        """
211
        colors = {}
212
        for line in fileobj:
213
            if re.match(r'^\s*#', line):
214
                continue
215
            if '=' not in line:
216
                continue
217
            key, val = line.split('=', 1)
218
            colors[key.strip()] = val.strip()
219
        return colors
220
278.1.4 by John Arbash Meinel
Just playing around.
221
    def set_trees(self, rev_tree, parent_tree):
222
        self.rev_tree = rev_tree
223
        self.parent_tree = parent_tree
278.1.29 by John Arbash Meinel
Start testing with Unicode data.
224
#        self._build_delta()
225
226
#    def _build_delta(self):
227
#        self.parent_tree.lock_read()
228
#        self.rev_tree.lock_read()
229
#        try:
450 by Aaron Bentley
Update to use new Tree.iter_changes
230
#            self.delta = iter_changes_to_status(self.parent_tree, self.rev_tree)
278.1.29 by John Arbash Meinel
Start testing with Unicode data.
231
#            self.path_to_status = {}
232
#            self.path_to_diff = {}
233
#            source_inv = self.parent_tree.inventory
234
#            target_inv = self.rev_tree.inventory
235
#            for (file_id, real_path, change_type, display_path) in self.delta:
236
#                self.path_to_status[real_path] = u'=== %s %s' % (change_type, display_path)
237
#                if change_type in ('modified', 'renamed and modified'):
238
#                    source_ie = source_inv[file_id]
239
#                    target_ie = target_inv[file_id]
240
#                    sio = StringIO()
241
#                    source_ie.diff(internal_diff, *old path, *old_tree,
242
#                                   *new_path, target_ie, self.rev_tree,
243
#                                   sio)
244
#                    self.path_to_diff[real_path] = 
245
#
246
#        finally:
247
#            self.rev_tree.unlock()
248
#            self.parent_tree.unlock()
278.1.4 by John Arbash Meinel
Just playing around.
249
250
    def show_diff(self, specific_files):
426 by Aaron Bentley
Start support for Merge Directives
251
        sections = []
252
        if specific_files is None:
253
            self.buffer.set_text(self._diffs[None])
254
        else:
255
            for specific_file in specific_files:
256
                sections.append(self._diffs[specific_file])
257
            self.buffer.set_text(''.join(sections))
424 by Aaron Bentley
Add ghandle-patch
258
259
260
class DiffView(DiffFileView):
261
    """This is the soft and chewy filling for a DiffWindow."""
262
263
    def __init__(self):
264
        DiffFileView.__init__(self)
265
        self.rev_tree = None
266
        self.parent_tree = None
267
268
    def show_diff(self, specific_files):
432 by Aaron Bentley
Misc updates
269
        """Show the diff for the specified files"""
278.1.4 by John Arbash Meinel
Just playing around.
270
        s = StringIO()
278.1.18 by John Arbash Meinel
Start checking the diff view is correct.
271
        show_diff_trees(self.parent_tree, self.rev_tree, s, specific_files,
272
                        old_label='', new_label='',
273
                        # path_encoding=sys.getdefaultencoding()
274
                        # The default is utf-8, but we interpret the file
275
                        # contents as getdefaultencoding(), so we should
276
                        # probably try to make the paths in the same encoding.
277
                        )
278.1.29 by John Arbash Meinel
Start testing with Unicode data.
278
        # str.decode(encoding, 'replace') doesn't do anything. Because if a
279
        # character is not valid in 'encoding' there is nothing to replace, the
280
        # 'replace' is for 'str.encode()'
281
        try:
282
            decoded = s.getvalue().decode(sys.getdefaultencoding())
283
        except UnicodeDecodeError:
284
            try:
285
                decoded = s.getvalue().decode('UTF-8')
286
            except UnicodeDecodeError:
287
                decoded = s.getvalue().decode('iso-8859-1')
288
                # This always works, because every byte has a valid
289
                # mapping from iso-8859-1 to Unicode
290
        # TextBuffer must contain pure UTF-8 data
291
        self.buffer.set_text(decoded.encode('UTF-8'))
278.1.4 by John Arbash Meinel
Just playing around.
292
293
423.8.1 by Jelmer Vernooij
Allow using the diff control as a widget
294
class DiffWidget(gtk.HPaned):
295
    """Diff widget
278.1.4 by John Arbash Meinel
Just playing around.
296
297
    """
423.8.1 by Jelmer Vernooij
Allow using the diff control as a widget
298
    def __init__(self):
299
        super(DiffWidget, self).__init__()
278.1.4 by John Arbash Meinel
Just playing around.
300
301
        # The file hierarchy: a scrollable treeview
302
        scrollwin = gtk.ScrolledWindow()
303
        scrollwin.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
304
        scrollwin.set_shadow_type(gtk.SHADOW_IN)
423.8.1 by Jelmer Vernooij
Allow using the diff control as a widget
305
        self.pack1(scrollwin)
278.1.4 by John Arbash Meinel
Just playing around.
306
        scrollwin.show()
307
308
        self.model = gtk.TreeStore(str, str)
309
        self.treeview = gtk.TreeView(self.model)
310
        self.treeview.set_headers_visible(False)
311
        self.treeview.set_search_column(1)
312
        self.treeview.connect("cursor-changed", self._treeview_cursor_cb)
313
        scrollwin.add(self.treeview)
314
        self.treeview.show()
315
316
        cell = gtk.CellRendererText()
317
        cell.set_property("width-chars", 20)
318
        column = gtk.TreeViewColumn()
319
        column.pack_start(cell, expand=True)
320
        column.add_attribute(cell, "text", 0)
321
        self.treeview.append_column(column)
322
429 by Aaron Bentley
Merge from mainline
323
    def set_diff_text(self, lines):
432 by Aaron Bentley
Misc updates
324
        """Set the current diff from a list of lines
325
326
        :param lines: The diff to show, in unified diff format
327
        """
278.1.4 by John Arbash Meinel
Just playing around.
328
        # The diffs of the  selected file: a scrollable source or
329
        # text view
487.2.3 by Aaron Bentley
Much refactoring
330
331
    def set_diff_text_sections(self, sections):
424 by Aaron Bentley
Add ghandle-patch
332
        self.diff_view = DiffFileView()
278.1.12 by John Arbash Meinel
Delay computing the delta, and clean up some of the diff view names.
333
        self.diff_view.show()
429 by Aaron Bentley
Merge from mainline
334
        self.pack2(self.diff_view)
487.2.3 by Aaron Bentley
Much refactoring
335
        for oldname, newname, patch in sections:
336
            self.diff_view._diffs[newname] = str(patch)
337
            if newname is None:
338
                newname = ''
426 by Aaron Bentley
Start support for Merge Directives
339
            self.model.append(None, [oldname, newname])
427 by Aaron Bentley
Add merge button when displaying merge directives
340
        self.diff_view.show_diff(None)
278.1.4 by John Arbash Meinel
Just playing around.
341
429 by Aaron Bentley
Merge from mainline
342
    def set_diff(self, rev_tree, parent_tree):
278.1.4 by John Arbash Meinel
Just playing around.
343
        """Set the differences showed by this window.
344
345
        Compares the two trees and populates the window with the
346
        differences.
347
        """
424 by Aaron Bentley
Add ghandle-patch
348
        self.diff_view = DiffView()
423.8.1 by Jelmer Vernooij
Allow using the diff control as a widget
349
        self.pack2(self.diff_view)
424 by Aaron Bentley
Add ghandle-patch
350
        self.diff_view.show()
278.1.12 by John Arbash Meinel
Delay computing the delta, and clean up some of the diff view names.
351
        self.diff_view.set_trees(rev_tree, parent_tree)
278.1.4 by John Arbash Meinel
Just playing around.
352
        self.rev_tree = rev_tree
353
        self.parent_tree = parent_tree
354
355
        self.model.clear()
356
        delta = self.rev_tree.changes_from(self.parent_tree)
357
358
        self.model.append(None, [ "Complete Diff", "" ])
359
360
        if len(delta.added):
361
            titer = self.model.append(None, [ "Added", None ])
362
            for path, id, kind in delta.added:
363
                self.model.append(titer, [ path, path ])
364
365
        if len(delta.removed):
366
            titer = self.model.append(None, [ "Removed", None ])
367
            for path, id, kind in delta.removed:
368
                self.model.append(titer, [ path, path ])
369
370
        if len(delta.renamed):
371
            titer = self.model.append(None, [ "Renamed", None ])
372
            for oldpath, newpath, id, kind, text_modified, meta_modified \
373
                    in delta.renamed:
374
                self.model.append(titer, [ oldpath, newpath ])
375
376
        if len(delta.modified):
377
            titer = self.model.append(None, [ "Modified", None ])
378
            for path, id, kind, text_modified, meta_modified in delta.modified:
379
                self.model.append(titer, [ path, path ])
380
381
        self.treeview.expand_all()
382
383
    def set_file(self, file_path):
432 by Aaron Bentley
Misc updates
384
        """Select the current file to display"""
278.1.4 by John Arbash Meinel
Just playing around.
385
        tv_path = None
386
        for data in self.model:
387
            for child in data.iterchildren():
388
                if child[0] == file_path or child[1] == file_path:
389
                    tv_path = child.path
390
                    break
391
        if tv_path is None:
392
            raise NoSuchFile(file_path)
393
        self.treeview.set_cursor(tv_path)
394
        self.treeview.scroll_to_cell(tv_path)
395
396
    def _treeview_cursor_cb(self, *args):
397
        """Callback for when the treeview cursor changes."""
398
        (path, col) = self.treeview.get_cursor()
399
        specific_files = [ self.model[path][1] ]
400
        if specific_files == [ None ]:
401
            return
402
        elif specific_files == [ "" ]:
403
            specific_files = None
404
278.1.12 by John Arbash Meinel
Delay computing the delta, and clean up some of the diff view names.
405
        self.diff_view.show_diff(specific_files)
278.1.29 by John Arbash Meinel
Start testing with Unicode data.
406
407
423.8.1 by Jelmer Vernooij
Allow using the diff control as a widget
408
class DiffWindow(Window):
409
    """Diff window.
410
411
    This object represents and manages a single window containing the
412
    differences between two revisions on a branch.
413
    """
414
487.2.2 by Aaron Bentley
Unify MergeDirectiveWindow and DiffWindow
415
    def __init__(self, parent=None, operations=None):
423.8.1 by Jelmer Vernooij
Allow using the diff control as a widget
416
        Window.__init__(self, parent)
417
        self.set_border_width(0)
418
        self.set_title("bzrk diff")
419
420
        # Use two thirds of the screen by default
421
        screen = self.get_screen()
422
        monitor = screen.get_monitor_geometry(0)
423
        width = int(monitor.width * 0.66)
424
        height = int(monitor.height * 0.66)
425
        self.set_default_size(width, height)
487.2.3 by Aaron Bentley
Much refactoring
426
        self.construct(operations)
423.8.1 by Jelmer Vernooij
Allow using the diff control as a widget
427
487.2.3 by Aaron Bentley
Much refactoring
428
    def construct(self, operations):
423.8.1 by Jelmer Vernooij
Allow using the diff control as a widget
429
        """Construct the window contents."""
429 by Aaron Bentley
Merge from mainline
430
        self.vbox = gtk.VBox()
431
        self.add(self.vbox)
432
        self.vbox.show()
487.2.3 by Aaron Bentley
Much refactoring
433
        hbox = self._get_button_bar(operations)
429 by Aaron Bentley
Merge from mainline
434
        if hbox is not None:
435
            self.vbox.pack_start(hbox, expand=False, fill=True)
423.8.1 by Jelmer Vernooij
Allow using the diff control as a widget
436
        self.diff = DiffWidget()
429 by Aaron Bentley
Merge from mainline
437
        self.vbox.add(self.diff)
423.8.1 by Jelmer Vernooij
Allow using the diff control as a widget
438
        self.diff.show_all()
439
487.2.3 by Aaron Bentley
Much refactoring
440
    def _get_button_bar(self, operations):
432 by Aaron Bentley
Misc updates
441
        """Return a button bar to use.
442
443
        :return: None, meaning that no button bar will be used.
444
        """
487.2.3 by Aaron Bentley
Much refactoring
445
        if operations is None:
487.2.2 by Aaron Bentley
Unify MergeDirectiveWindow and DiffWindow
446
            return None
447
        hbox = gtk.HButtonBox()
448
        hbox.set_layout(gtk.BUTTONBOX_START)
487.2.3 by Aaron Bentley
Much refactoring
449
        for title, method in operations:
487.2.2 by Aaron Bentley
Unify MergeDirectiveWindow and DiffWindow
450
            merge_button = gtk.Button(title)
451
            merge_button.show()
452
            merge_button.set_relief(gtk.RELIEF_NONE)
453
            merge_button.connect("clicked", method)
454
            hbox.pack_start(merge_button, expand=False, fill=True)
455
        hbox.show()
456
        return hbox
457
458
    def _get_merge_target(self):
459
        d = gtk.FileChooserDialog('Merge branch', self,
460
                                  gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
461
                                  buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
462
                                           gtk.STOCK_CANCEL,
463
                                           gtk.RESPONSE_CANCEL,))
464
        try:
465
            result = d.run()
466
            if result != gtk.RESPONSE_OK:
467
                raise SelectCancelled()
468
            return d.get_current_folder_uri()
469
        finally:
470
            d.destroy()
471
487.2.5 by Aaron Bentley
Test successful merge
472
    def _merge_successful(self):
473
        # No conflicts found.
474
        info_dialog(_('Merge successful'),
475
                    _('All changes applied successfully.'))
476
487.2.7 by Aaron Bentley
Add more merge tests
477
    def _conflicts(self):
478
        warning_dialog(_('Conflicts encountered'),
479
                       _('Please resolve the conflicts manually'
480
                         ' before committing.'))
481
487.2.8 by Aaron Bentley
Update error handling to use window
482
    def _handle_error(self, e):
483
        error_dialog('Error', str(e))
487.2.7 by Aaron Bentley
Add more merge tests
484
487.2.2 by Aaron Bentley
Unify MergeDirectiveWindow and DiffWindow
485
    def _get_save_path(self, basename):
486
        d = gtk.FileChooserDialog('Save As', self,
487
                                  gtk.FILE_CHOOSER_ACTION_SAVE,
488
                                  buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
489
                                           gtk.STOCK_CANCEL,
490
                                           gtk.RESPONSE_CANCEL,))
491
        d.set_current_name(basename)
492
        try:
493
            result = d.run()
494
            if result != gtk.RESPONSE_OK:
495
                raise SelectCancelled()
496
            return urlutils.local_path_from_url(d.get_uri())
497
        finally:
498
            d.destroy()
429 by Aaron Bentley
Merge from mainline
499
423.8.1 by Jelmer Vernooij
Allow using the diff control as a widget
500
    def set_diff(self, description, rev_tree, parent_tree):
501
        """Set the differences showed by this window.
502
503
        Compares the two trees and populates the window with the
504
        differences.
505
        """
506
        self.diff.set_diff(rev_tree, parent_tree)
507
        self.set_title(description + " - bzrk diff")
508
509
    def set_file(self, file_path):
510
        self.diff.set_file(file_path)
511
512
487.2.2 by Aaron Bentley
Unify MergeDirectiveWindow and DiffWindow
513
class DiffController(object):
514
515
    def __init__(self, path, patch, window=None):
516
        self.path = path
517
        self.patch = patch
518
        if window is None:
519
            window = DiffWindow(operations=self._provide_operations())
520
            self.initialize_window(window)
487.2.3 by Aaron Bentley
Much refactoring
521
        self.window = window
487.2.2 by Aaron Bentley
Unify MergeDirectiveWindow and DiffWindow
522
523
    def initialize_window(self, window):
487.2.3 by Aaron Bentley
Much refactoring
524
        window.diff.set_diff_text_sections(self.get_diff_sections())
525
        window.set_title(self.path + " - diff")
526
527
    def get_diff_sections(self):
528
        yield "Complete Diff", None, ''.join(self.patch)
529
        for patch in parse_patches(self.patch):
530
            oldname = patch.oldname.split('\t')[0]
531
            newname = patch.newname.split('\t')[0]
532
            yield oldname, newname, str(patch)
487.2.2 by Aaron Bentley
Unify MergeDirectiveWindow and DiffWindow
533
534
    def perform_save(self, window):
535
        try:
536
            save_path = self.window._get_save_path(osutils.basename(self.path))
537
        except SelectCancelled:
538
            return
539
        source = open(self.path, 'rb')
540
        try:
541
            target = open(save_path, 'wb')
542
            try:
543
                osutils.pumpfile(source, target)
544
            finally:
545
                target.close()
546
        finally:
547
            source.close()
548
549
    def _provide_operations(self):
550
        return [('Save', self.perform_save)]
551
552
553
class MergeDirectiveController(DiffController):
554
487.2.8 by Aaron Bentley
Update error handling to use window
555
    def __init__(self, path, directive, window=None):
487.2.5 by Aaron Bentley
Test successful merge
556
        DiffController.__init__(self, path, directive.patch.splitlines(True),
557
                                window)
428 by Aaron Bentley
Get merging working
558
        self.directive = directive
487.2.1 by Aaron Bentley
Refactor merge directive window into MergeController
559
        self.merge_target = None
560
561
    def _provide_operations(self):
562
        return [('Merge', self.perform_merge), ('Save', self.perform_save)]
427 by Aaron Bentley
Add merge button when displaying merge directives
563
428 by Aaron Bentley
Get merging working
564
    def perform_merge(self, window):
487.2.1 by Aaron Bentley
Refactor merge directive window into MergeController
565
        if self.merge_target is None:
566
            try:
567
                self.merge_target = self.window._get_merge_target()
568
            except SelectCancelled:
569
                return
570
        tree = workingtree.WorkingTree.open(self.merge_target)
428 by Aaron Bentley
Get merging working
571
        tree.lock_write()
572
        try:
573
            try:
574
                merger, verified = _mod_merge.Merger.from_mergeable(tree,
575
                    self.directive, progress.DummyProgress())
576
                merger.check_basis(True)
577
                merger.merge_type = _mod_merge.Merge3Merger
430 by Aaron Bentley
Handle conflicts appropriately
578
                conflict_count = merger.do_merge()
428 by Aaron Bentley
Get merging working
579
                merger.set_pending()
430 by Aaron Bentley
Handle conflicts appropriately
580
                if conflict_count == 0:
487.2.5 by Aaron Bentley
Test successful merge
581
                    self.window._merge_successful()
430 by Aaron Bentley
Handle conflicts appropriately
582
                else:
487.2.7 by Aaron Bentley
Add more merge tests
583
                    self.window._conflicts()
430 by Aaron Bentley
Handle conflicts appropriately
584
                    # There are conflicts to be resolved.
487.2.1 by Aaron Bentley
Refactor merge directive window into MergeController
585
                self.window.destroy()
428 by Aaron Bentley
Get merging working
586
            except Exception, e:
487.2.8 by Aaron Bentley
Update error handling to use window
587
                self.window._handle_error(e)
428 by Aaron Bentley
Get merging working
588
        finally:
589
            tree.unlock()
590
427 by Aaron Bentley
Add merge button when displaying merge directives
591
450 by Aaron Bentley
Update to use new Tree.iter_changes
592
def iter_changes_to_status(source, target):
278.1.29 by John Arbash Meinel
Start testing with Unicode data.
593
    """Determine the differences between trees.
594
450 by Aaron Bentley
Update to use new Tree.iter_changes
595
    This is a wrapper around iter_changes which just yields more
278.1.29 by John Arbash Meinel
Start testing with Unicode data.
596
    understandable results.
597
598
    :param source: The source tree (basis tree)
599
    :param target: The target tree
600
    :return: A list of (file_id, real_path, change_type, display_path)
601
    """
602
    added = 'added'
603
    removed = 'removed'
604
    renamed = 'renamed'
605
    renamed_and_modified = 'renamed and modified'
606
    modified = 'modified'
607
    kind_changed = 'kind changed'
608
609
    # TODO: Handle metadata changes
610
611
    status = []
612
    target.lock_read()
613
    try:
614
        source.lock_read()
615
        try:
616
            for (file_id, paths, changed_content, versioned, parent_ids, names,
450 by Aaron Bentley
Update to use new Tree.iter_changes
617
                 kinds, executables) in target.iter_changes(source):
278.1.29 by John Arbash Meinel
Start testing with Unicode data.
618
619
                # Skip the root entry if it isn't very interesting
620
                if parent_ids == (None, None):
621
                    continue
622
623
                change_type = None
624
                if kinds[0] is None:
625
                    source_marker = ''
626
                else:
627
                    source_marker = osutils.kind_marker(kinds[0])
628
                if kinds[1] is None:
629
                    assert kinds[0] is not None
630
                    marker = osutils.kind_marker(kinds[0])
631
                else:
632
                    marker = osutils.kind_marker(kinds[1])
633
634
                real_path = paths[1]
635
                if real_path is None:
636
                    real_path = paths[0]
637
                assert real_path is not None
638
                display_path = real_path + marker
639
640
                present_source = versioned[0] and kinds[0] is not None
641
                present_target = versioned[1] and kinds[1] is not None
642
643
                if present_source != present_target:
644
                    if present_target:
645
                        change_type = added
646
                    else:
647
                        assert present_source
648
                        change_type = removed
649
                elif names[0] != names[1] or parent_ids[0] != parent_ids[1]:
650
                    # Renamed
651
                    if changed_content or executables[0] != executables[1]:
652
                        # and modified
653
                        change_type = renamed_and_modified
654
                    else:
655
                        change_type = renamed
656
                    display_path = (paths[0] + source_marker
657
                                    + ' => ' + paths[1] + marker)
658
                elif kinds[0] != kinds[1]:
659
                    change_type = kind_changed
660
                    display_path = (paths[0] + source_marker
661
                                    + ' => ' + paths[1] + marker)
662
                elif changed_content is True or executables[0] != executables[1]:
663
                    change_type = modified
664
                else:
665
                    assert False, "How did we get here?"
666
667
                status.append((file_id, real_path, change_type, display_path))
668
        finally:
669
            source.unlock()
670
    finally:
671
        target.unlock()
672
673
    return status