/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
475.1.2 by Vincent Ladeuil
Fix bug #187283 fix replacing _() by _i18n().
44
from bzrlib.plugins.gtk import _i18n
298.2.1 by Daniel Schierbeck
Refactored the GTK window code, creating a single base window class that handles keyboard events.
45
from bzrlib.plugins.gtk.window import Window
430 by Aaron Bentley
Handle conflicts appropriately
46
from dialog import error_dialog, info_dialog, warning_dialog
428 by Aaron Bentley
Get merging working
47
48
49
class SelectCancelled(Exception):
50
51
    pass
298.2.1 by Daniel Schierbeck
Refactored the GTK window code, creating a single base window class that handles keyboard events.
52
10 by Scott James Remnant
Add an extra window type, clicking the little icons next to a parent
53
424 by Aaron Bentley
Add ghandle-patch
54
class DiffFileView(gtk.ScrolledWindow):
432 by Aaron Bentley
Misc updates
55
    """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
56
51 by Jelmer Vernooij
Rework some of the parameters to DiffWindow.set_diff() to be
57
    def __init__(self):
278.1.4 by John Arbash Meinel
Just playing around.
58
        gtk.ScrolledWindow.__init__(self)
10 by Scott James Remnant
Add an extra window type, clicking the little icons next to a parent
59
        self.construct()
424 by Aaron Bentley
Add ghandle-patch
60
        self._diffs = {}
10 by Scott James Remnant
Add an extra window type, clicking the little icons next to a parent
61
62
    def construct(self):
278.1.4 by John Arbash Meinel
Just playing around.
63
        self.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
64
        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
65
66
        if have_gtksourceview:
67
            self.buffer = gtksourceview.SourceBuffer()
68
            slm = gtksourceview.SourceLanguagesManager()
69
            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.
70
            if have_gconf:
71
                self.apply_gedit_colors(gsl)
232.1.2 by Adeodato Simó
Rename apply_colordiffrc to apply_colordiff_colors, improve docstring.
72
            self.apply_colordiff_colors(gsl)
10 by Scott James Remnant
Add an extra window type, clicking the little icons next to a parent
73
            self.buffer.set_language(gsl)
74
            self.buffer.set_highlight(True)
75
555.2.1 by Jasper Groenewegen
Modify DiffWidget to include a checkbutton to wrap long lines in the diff view
76
            self.sourceview = gtksourceview.SourceView(self.buffer)
10 by Scott James Remnant
Add an extra window type, clicking the little icons next to a parent
77
        else:
78
            self.buffer = gtk.TextBuffer()
555.2.1 by Jasper Groenewegen
Modify DiffWidget to include a checkbutton to wrap long lines in the diff view
79
            self.sourceview = gtk.TextView(self.buffer)
10 by Scott James Remnant
Add an extra window type, clicking the little icons next to a parent
80
555.2.1 by Jasper Groenewegen
Modify DiffWidget to include a checkbutton to wrap long lines in the diff view
81
        self.sourceview.set_editable(False)
82
        self.sourceview.modify_font(pango.FontDescription("Monospace"))
83
        self.add(self.sourceview)
84
        self.sourceview.show()
10 by Scott James Remnant
Add an extra window type, clicking the little icons next to a parent
85
232.1.1 by Adeodato Simó
Read ~/.colordiffrc to set colors in the diff window.
86
    @staticmethod
232.1.3 by Adeodato Simó
Support setting diff colors from gedit's syntax highlighting config too.
87
    def apply_gedit_colors(lang):
88
        """Set style for lang to that specified in gedit configuration.
89
90
        This method needs the gconf module.
278.1.4 by John Arbash Meinel
Just playing around.
91
232.1.3 by Adeodato Simó
Support setting diff colors from gedit's syntax highlighting config too.
92
        :param lang: a gtksourceview.SourceLanguage object.
93
        """
94
        GEDIT_SYNTAX_PATH = '/apps/gedit-2/preferences/syntax_highlighting'
95
        GEDIT_LANG_PATH = GEDIT_SYNTAX_PATH + '/' + lang.get_id()
96
97
        client = gconf.client_get_default()
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)
148
424 by Aaron Bentley
Add ghandle-patch
149
    @classmethod
150
    def apply_colordiff_colors(klass, lang):
232.1.2 by Adeodato Simó
Rename apply_colordiffrc to apply_colordiff_colors, improve docstring.
151
        """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.
152
153
        Both ~/.colordiffrc and ~/.colordiffrc.bzr-gtk are read.
154
232.1.2 by Adeodato Simó
Rename apply_colordiffrc to apply_colordiff_colors, improve docstring.
155
        :param lang: a "Diff" gtksourceview.SourceLanguage object.
232.1.1 by Adeodato Simó
Read ~/.colordiffrc to set colors in the diff window.
156
        """
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:
424 by Aaron Bentley
Add ghandle-patch
167
                    colors.update(klass.parse_colordiffrc(f))
232.1.1 by Adeodato Simó
Read ~/.colordiffrc to set colors in the diff window.
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
176
                # since GSV is richer, accept new names for extra bits,
177
                # defaulting to old names if they're not present
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)
232.1.4 by Adeodato Simó
Add a test for parse_colordiffrc, and fix the function to handle empty lines.
205
206
    @staticmethod
207
    def parse_colordiffrc(fileobj):
208
        """Parse fileobj as a colordiff configuration file.
278.1.4 by John Arbash Meinel
Just playing around.
209
232.1.4 by Adeodato Simó
Add a test for parse_colordiffrc, and fix the function to handle empty lines.
210
        :return: A dict with the key -> value pairs.
211
        """
212
        colors = {}
213
        for line in fileobj:
214
            if re.match(r'^\s*#', line):
215
                continue
216
            if '=' not in line:
217
                continue
218
            key, val = line.split('=', 1)
219
            colors[key.strip()] = val.strip()
220
        return colors
221
278.1.4 by John Arbash Meinel
Just playing around.
222
    def set_trees(self, rev_tree, parent_tree):
223
        self.rev_tree = rev_tree
224
        self.parent_tree = parent_tree
278.1.29 by John Arbash Meinel
Start testing with Unicode data.
225
#        self._build_delta()
226
227
#    def _build_delta(self):
228
#        self.parent_tree.lock_read()
229
#        self.rev_tree.lock_read()
230
#        try:
450 by Aaron Bentley
Update to use new Tree.iter_changes
231
#            self.delta = iter_changes_to_status(self.parent_tree, self.rev_tree)
278.1.29 by John Arbash Meinel
Start testing with Unicode data.
232
#            self.path_to_status = {}
233
#            self.path_to_diff = {}
234
#            source_inv = self.parent_tree.inventory
235
#            target_inv = self.rev_tree.inventory
236
#            for (file_id, real_path, change_type, display_path) in self.delta:
237
#                self.path_to_status[real_path] = u'=== %s %s' % (change_type, display_path)
238
#                if change_type in ('modified', 'renamed and modified'):
239
#                    source_ie = source_inv[file_id]
240
#                    target_ie = target_inv[file_id]
241
#                    sio = StringIO()
242
#                    source_ie.diff(internal_diff, *old path, *old_tree,
243
#                                   *new_path, target_ie, self.rev_tree,
244
#                                   sio)
245
#                    self.path_to_diff[real_path] = 
246
#
247
#        finally:
248
#            self.rev_tree.unlock()
249
#            self.parent_tree.unlock()
278.1.4 by John Arbash Meinel
Just playing around.
250
251
    def show_diff(self, specific_files):
426 by Aaron Bentley
Start support for Merge Directives
252
        sections = []
253
        if specific_files is None:
254
            self.buffer.set_text(self._diffs[None])
255
        else:
256
            for specific_file in specific_files:
257
                sections.append(self._diffs[specific_file])
258
            self.buffer.set_text(''.join(sections))
424 by Aaron Bentley
Add ghandle-patch
259
260
261
class DiffView(DiffFileView):
262
    """This is the soft and chewy filling for a DiffWindow."""
263
264
    def __init__(self):
265
        DiffFileView.__init__(self)
266
        self.rev_tree = None
267
        self.parent_tree = None
268
269
    def show_diff(self, specific_files):
432 by Aaron Bentley
Misc updates
270
        """Show the diff for the specified files"""
278.1.4 by John Arbash Meinel
Just playing around.
271
        s = StringIO()
278.1.18 by John Arbash Meinel
Start checking the diff view is correct.
272
        show_diff_trees(self.parent_tree, self.rev_tree, s, specific_files,
273
                        old_label='', new_label='',
274
                        # path_encoding=sys.getdefaultencoding()
275
                        # The default is utf-8, but we interpret the file
276
                        # contents as getdefaultencoding(), so we should
277
                        # probably try to make the paths in the same encoding.
278
                        )
278.1.29 by John Arbash Meinel
Start testing with Unicode data.
279
        # str.decode(encoding, 'replace') doesn't do anything. Because if a
280
        # character is not valid in 'encoding' there is nothing to replace, the
281
        # 'replace' is for 'str.encode()'
282
        try:
283
            decoded = s.getvalue().decode(sys.getdefaultencoding())
284
        except UnicodeDecodeError:
285
            try:
286
                decoded = s.getvalue().decode('UTF-8')
287
            except UnicodeDecodeError:
288
                decoded = s.getvalue().decode('iso-8859-1')
289
                # This always works, because every byte has a valid
290
                # mapping from iso-8859-1 to Unicode
291
        # TextBuffer must contain pure UTF-8 data
292
        self.buffer.set_text(decoded.encode('UTF-8'))
278.1.4 by John Arbash Meinel
Just playing around.
293
294
423.8.1 by Jelmer Vernooij
Allow using the diff control as a widget
295
class DiffWidget(gtk.HPaned):
296
    """Diff widget
278.1.4 by John Arbash Meinel
Just playing around.
297
298
    """
423.8.1 by Jelmer Vernooij
Allow using the diff control as a widget
299
    def __init__(self):
300
        super(DiffWidget, self).__init__()
278.1.4 by John Arbash Meinel
Just playing around.
301
302
        # The file hierarchy: a scrollable treeview
555.2.1 by Jasper Groenewegen
Modify DiffWidget to include a checkbutton to wrap long lines in the diff view
303
        vbox = gtk.VBox()
304
        self.checkbox_wraplines = gtk.CheckButton(_i18n("W_rap long lines"), True)
305
        self.checkbox_wraplines.set_active(False) # TO DO: Read from config
306
        self.checkbox_wraplines.connect("toggled", self._on_wraplines_toggled)
307
        self.checkbox_wraplines.show()
278.1.4 by John Arbash Meinel
Just playing around.
308
        scrollwin = gtk.ScrolledWindow()
309
        scrollwin.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
310
        scrollwin.set_shadow_type(gtk.SHADOW_IN)
311
        scrollwin.show()
555.2.1 by Jasper Groenewegen
Modify DiffWidget to include a checkbutton to wrap long lines in the diff view
312
        vbox.pack_start(scrollwin, True, True, 0)
313
        vbox.pack_end(self.checkbox_wraplines, False, False, 5)
314
        self.pack1(vbox)
315
        
278.1.4 by John Arbash Meinel
Just playing around.
316
        self.model = gtk.TreeStore(str, str)
317
        self.treeview = gtk.TreeView(self.model)
318
        self.treeview.set_headers_visible(False)
319
        self.treeview.set_search_column(1)
320
        self.treeview.connect("cursor-changed", self._treeview_cursor_cb)
321
        scrollwin.add(self.treeview)
322
        self.treeview.show()
323
324
        cell = gtk.CellRendererText()
325
        cell.set_property("width-chars", 20)
326
        column = gtk.TreeViewColumn()
327
        column.pack_start(cell, expand=True)
328
        column.add_attribute(cell, "text", 0)
329
        self.treeview.append_column(column)
330
429 by Aaron Bentley
Merge from mainline
331
    def set_diff_text(self, lines):
432 by Aaron Bentley
Misc updates
332
        """Set the current diff from a list of lines
333
334
        :param lines: The diff to show, in unified diff format
335
        """
278.1.4 by John Arbash Meinel
Just playing around.
336
        # The diffs of the  selected file: a scrollable source or
337
        # text view
487.2.3 by Aaron Bentley
Much refactoring
338
339
    def set_diff_text_sections(self, sections):
531.7.13 by Scott Scriven
Removed exception-swallowing hasattr()s.
340
        if getattr(self, 'diff_view', None) is None:
531.7.5 by Scott Scriven
Fixed DiffWidget so more than one call to set_diff() will work.
341
            self.diff_view = DiffFileView()
342
            self.pack2(self.diff_view)
278.1.12 by John Arbash Meinel
Delay computing the delta, and clean up some of the diff view names.
343
        self.diff_view.show()
487.2.3 by Aaron Bentley
Much refactoring
344
        for oldname, newname, patch in sections:
345
            self.diff_view._diffs[newname] = str(patch)
346
            if newname is None:
347
                newname = ''
426 by Aaron Bentley
Start support for Merge Directives
348
            self.model.append(None, [oldname, newname])
427 by Aaron Bentley
Add merge button when displaying merge directives
349
        self.diff_view.show_diff(None)
278.1.4 by John Arbash Meinel
Just playing around.
350
429 by Aaron Bentley
Merge from mainline
351
    def set_diff(self, rev_tree, parent_tree):
278.1.4 by John Arbash Meinel
Just playing around.
352
        """Set the differences showed by this window.
353
354
        Compares the two trees and populates the window with the
355
        differences.
356
        """
531.7.13 by Scott Scriven
Removed exception-swallowing hasattr()s.
357
        if getattr(self, 'diff_view', None) is None:
531.7.5 by Scott Scriven
Fixed DiffWidget so more than one call to set_diff() will work.
358
            self.diff_view = DiffView()
359
            self.pack2(self.diff_view)
424 by Aaron Bentley
Add ghandle-patch
360
        self.diff_view.show()
278.1.12 by John Arbash Meinel
Delay computing the delta, and clean up some of the diff view names.
361
        self.diff_view.set_trees(rev_tree, parent_tree)
278.1.4 by John Arbash Meinel
Just playing around.
362
        self.rev_tree = rev_tree
363
        self.parent_tree = parent_tree
364
365
        self.model.clear()
366
        delta = self.rev_tree.changes_from(self.parent_tree)
367
368
        self.model.append(None, [ "Complete Diff", "" ])
369
370
        if len(delta.added):
371
            titer = self.model.append(None, [ "Added", None ])
372
            for path, id, kind in delta.added:
373
                self.model.append(titer, [ path, path ])
374
375
        if len(delta.removed):
376
            titer = self.model.append(None, [ "Removed", None ])
377
            for path, id, kind in delta.removed:
378
                self.model.append(titer, [ path, path ])
379
380
        if len(delta.renamed):
381
            titer = self.model.append(None, [ "Renamed", None ])
382
            for oldpath, newpath, id, kind, text_modified, meta_modified \
383
                    in delta.renamed:
384
                self.model.append(titer, [ oldpath, newpath ])
385
386
        if len(delta.modified):
387
            titer = self.model.append(None, [ "Modified", None ])
388
            for path, id, kind, text_modified, meta_modified in delta.modified:
389
                self.model.append(titer, [ path, path ])
390
391
        self.treeview.expand_all()
531.7.5 by Scott Scriven
Fixed DiffWidget so more than one call to set_diff() will work.
392
        self.diff_view.show_diff(None)
278.1.4 by John Arbash Meinel
Just playing around.
393
394
    def set_file(self, file_path):
432 by Aaron Bentley
Misc updates
395
        """Select the current file to display"""
278.1.4 by John Arbash Meinel
Just playing around.
396
        tv_path = None
397
        for data in self.model:
398
            for child in data.iterchildren():
399
                if child[0] == file_path or child[1] == file_path:
400
                    tv_path = child.path
401
                    break
402
        if tv_path is None:
403
            raise NoSuchFile(file_path)
404
        self.treeview.set_cursor(tv_path)
405
        self.treeview.scroll_to_cell(tv_path)
406
407
    def _treeview_cursor_cb(self, *args):
408
        """Callback for when the treeview cursor changes."""
409
        (path, col) = self.treeview.get_cursor()
410
        specific_files = [ self.model[path][1] ]
411
        if specific_files == [ None ]:
412
            return
413
        elif specific_files == [ "" ]:
414
            specific_files = None
555.2.1 by Jasper Groenewegen
Modify DiffWidget to include a checkbutton to wrap long lines in the diff view
415
        
278.1.12 by John Arbash Meinel
Delay computing the delta, and clean up some of the diff view names.
416
        self.diff_view.show_diff(specific_files)
555.2.1 by Jasper Groenewegen
Modify DiffWidget to include a checkbutton to wrap long lines in the diff view
417
    
418
    def _on_wraplines_toggled(self, widget):
419
        """Callback for when the wrap lines checkbutton is toggled"""
420
        if self.checkbox_wraplines.get_active():
421
            self.diff_view.sourceview.set_wrap_mode(gtk.WRAP_WORD)
422
        else:
423
            self.diff_view.sourceview.set_wrap_mode(gtk.WRAP_NONE)
278.1.29 by John Arbash Meinel
Start testing with Unicode data.
424
423.8.1 by Jelmer Vernooij
Allow using the diff control as a widget
425
class DiffWindow(Window):
426
    """Diff window.
427
428
    This object represents and manages a single window containing the
429
    differences between two revisions on a branch.
430
    """
431
487.2.2 by Aaron Bentley
Unify MergeDirectiveWindow and DiffWindow
432
    def __init__(self, parent=None, operations=None):
423.8.1 by Jelmer Vernooij
Allow using the diff control as a widget
433
        Window.__init__(self, parent)
434
        self.set_border_width(0)
435
        self.set_title("bzrk diff")
436
437
        # Use two thirds of the screen by default
438
        screen = self.get_screen()
439
        monitor = screen.get_monitor_geometry(0)
440
        width = int(monitor.width * 0.66)
441
        height = int(monitor.height * 0.66)
442
        self.set_default_size(width, height)
487.2.3 by Aaron Bentley
Much refactoring
443
        self.construct(operations)
423.8.1 by Jelmer Vernooij
Allow using the diff control as a widget
444
487.2.3 by Aaron Bentley
Much refactoring
445
    def construct(self, operations):
423.8.1 by Jelmer Vernooij
Allow using the diff control as a widget
446
        """Construct the window contents."""
429 by Aaron Bentley
Merge from mainline
447
        self.vbox = gtk.VBox()
448
        self.add(self.vbox)
449
        self.vbox.show()
487.2.3 by Aaron Bentley
Much refactoring
450
        hbox = self._get_button_bar(operations)
429 by Aaron Bentley
Merge from mainline
451
        if hbox is not None:
452
            self.vbox.pack_start(hbox, expand=False, fill=True)
423.8.1 by Jelmer Vernooij
Allow using the diff control as a widget
453
        self.diff = DiffWidget()
429 by Aaron Bentley
Merge from mainline
454
        self.vbox.add(self.diff)
423.8.1 by Jelmer Vernooij
Allow using the diff control as a widget
455
        self.diff.show_all()
456
487.2.3 by Aaron Bentley
Much refactoring
457
    def _get_button_bar(self, operations):
432 by Aaron Bentley
Misc updates
458
        """Return a button bar to use.
459
460
        :return: None, meaning that no button bar will be used.
461
        """
487.2.3 by Aaron Bentley
Much refactoring
462
        if operations is None:
487.2.2 by Aaron Bentley
Unify MergeDirectiveWindow and DiffWindow
463
            return None
464
        hbox = gtk.HButtonBox()
465
        hbox.set_layout(gtk.BUTTONBOX_START)
487.2.3 by Aaron Bentley
Much refactoring
466
        for title, method in operations:
487.2.2 by Aaron Bentley
Unify MergeDirectiveWindow and DiffWindow
467
            merge_button = gtk.Button(title)
468
            merge_button.show()
469
            merge_button.set_relief(gtk.RELIEF_NONE)
470
            merge_button.connect("clicked", method)
471
            hbox.pack_start(merge_button, expand=False, fill=True)
472
        hbox.show()
473
        return hbox
474
475
    def _get_merge_target(self):
476
        d = gtk.FileChooserDialog('Merge branch', self,
477
                                  gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
478
                                  buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
479
                                           gtk.STOCK_CANCEL,
480
                                           gtk.RESPONSE_CANCEL,))
481
        try:
482
            result = d.run()
483
            if result != gtk.RESPONSE_OK:
484
                raise SelectCancelled()
485
            return d.get_current_folder_uri()
486
        finally:
487
            d.destroy()
488
487.2.5 by Aaron Bentley
Test successful merge
489
    def _merge_successful(self):
490
        # No conflicts found.
492 by Aaron Bentley
Allow saving from patch window, refactoring, testing.
491
        info_dialog(_i18n('Merge successful'),
492
                    _i18n('All changes applied successfully.'))
487.2.5 by Aaron Bentley
Test successful merge
493
487.2.7 by Aaron Bentley
Add more merge tests
494
    def _conflicts(self):
492 by Aaron Bentley
Allow saving from patch window, refactoring, testing.
495
        warning_dialog(_i18n('Conflicts encountered'),
496
                       _i18n('Please resolve the conflicts manually'
497
                             ' before committing.'))
487.2.7 by Aaron Bentley
Add more merge tests
498
487.2.8 by Aaron Bentley
Update error handling to use window
499
    def _handle_error(self, e):
500
        error_dialog('Error', str(e))
487.2.7 by Aaron Bentley
Add more merge tests
501
487.2.2 by Aaron Bentley
Unify MergeDirectiveWindow and DiffWindow
502
    def _get_save_path(self, basename):
503
        d = gtk.FileChooserDialog('Save As', self,
504
                                  gtk.FILE_CHOOSER_ACTION_SAVE,
505
                                  buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
506
                                           gtk.STOCK_CANCEL,
507
                                           gtk.RESPONSE_CANCEL,))
508
        d.set_current_name(basename)
509
        try:
510
            result = d.run()
511
            if result != gtk.RESPONSE_OK:
512
                raise SelectCancelled()
513
            return urlutils.local_path_from_url(d.get_uri())
514
        finally:
515
            d.destroy()
429 by Aaron Bentley
Merge from mainline
516
423.8.1 by Jelmer Vernooij
Allow using the diff control as a widget
517
    def set_diff(self, description, rev_tree, parent_tree):
518
        """Set the differences showed by this window.
519
520
        Compares the two trees and populates the window with the
521
        differences.
522
        """
523
        self.diff.set_diff(rev_tree, parent_tree)
524
        self.set_title(description + " - bzrk diff")
525
526
    def set_file(self, file_path):
527
        self.diff.set_file(file_path)
528
529
487.2.2 by Aaron Bentley
Unify MergeDirectiveWindow and DiffWindow
530
class DiffController(object):
531
532
    def __init__(self, path, patch, window=None):
533
        self.path = path
534
        self.patch = patch
535
        if window is None:
536
            window = DiffWindow(operations=self._provide_operations())
537
            self.initialize_window(window)
487.2.3 by Aaron Bentley
Much refactoring
538
        self.window = window
487.2.2 by Aaron Bentley
Unify MergeDirectiveWindow and DiffWindow
539
540
    def initialize_window(self, window):
487.2.3 by Aaron Bentley
Much refactoring
541
        window.diff.set_diff_text_sections(self.get_diff_sections())
542
        window.set_title(self.path + " - diff")
543
544
    def get_diff_sections(self):
545
        yield "Complete Diff", None, ''.join(self.patch)
546
        for patch in parse_patches(self.patch):
547
            oldname = patch.oldname.split('\t')[0]
548
            newname = patch.newname.split('\t')[0]
549
            yield oldname, newname, str(patch)
487.2.2 by Aaron Bentley
Unify MergeDirectiveWindow and DiffWindow
550
551
    def perform_save(self, window):
552
        try:
553
            save_path = self.window._get_save_path(osutils.basename(self.path))
554
        except SelectCancelled:
555
            return
556
        source = open(self.path, 'rb')
557
        try:
558
            target = open(save_path, 'wb')
559
            try:
560
                osutils.pumpfile(source, target)
561
            finally:
562
                target.close()
563
        finally:
564
            source.close()
565
566
    def _provide_operations(self):
567
        return [('Save', self.perform_save)]
568
569
570
class MergeDirectiveController(DiffController):
571
487.2.8 by Aaron Bentley
Update error handling to use window
572
    def __init__(self, path, directive, window=None):
487.2.5 by Aaron Bentley
Test successful merge
573
        DiffController.__init__(self, path, directive.patch.splitlines(True),
574
                                window)
428 by Aaron Bentley
Get merging working
575
        self.directive = directive
487.2.1 by Aaron Bentley
Refactor merge directive window into MergeController
576
        self.merge_target = None
577
578
    def _provide_operations(self):
579
        return [('Merge', self.perform_merge), ('Save', self.perform_save)]
427 by Aaron Bentley
Add merge button when displaying merge directives
580
428 by Aaron Bentley
Get merging working
581
    def perform_merge(self, window):
487.2.1 by Aaron Bentley
Refactor merge directive window into MergeController
582
        if self.merge_target is None:
583
            try:
584
                self.merge_target = self.window._get_merge_target()
585
            except SelectCancelled:
586
                return
587
        tree = workingtree.WorkingTree.open(self.merge_target)
428 by Aaron Bentley
Get merging working
588
        tree.lock_write()
589
        try:
590
            try:
591
                merger, verified = _mod_merge.Merger.from_mergeable(tree,
592
                    self.directive, progress.DummyProgress())
593
                merger.check_basis(True)
594
                merger.merge_type = _mod_merge.Merge3Merger
430 by Aaron Bentley
Handle conflicts appropriately
595
                conflict_count = merger.do_merge()
428 by Aaron Bentley
Get merging working
596
                merger.set_pending()
430 by Aaron Bentley
Handle conflicts appropriately
597
                if conflict_count == 0:
487.2.5 by Aaron Bentley
Test successful merge
598
                    self.window._merge_successful()
430 by Aaron Bentley
Handle conflicts appropriately
599
                else:
487.2.7 by Aaron Bentley
Add more merge tests
600
                    self.window._conflicts()
430 by Aaron Bentley
Handle conflicts appropriately
601
                    # There are conflicts to be resolved.
487.2.1 by Aaron Bentley
Refactor merge directive window into MergeController
602
                self.window.destroy()
428 by Aaron Bentley
Get merging working
603
            except Exception, e:
487.2.8 by Aaron Bentley
Update error handling to use window
604
                self.window._handle_error(e)
428 by Aaron Bentley
Get merging working
605
        finally:
606
            tree.unlock()
607
427 by Aaron Bentley
Add merge button when displaying merge directives
608
450 by Aaron Bentley
Update to use new Tree.iter_changes
609
def iter_changes_to_status(source, target):
278.1.29 by John Arbash Meinel
Start testing with Unicode data.
610
    """Determine the differences between trees.
611
450 by Aaron Bentley
Update to use new Tree.iter_changes
612
    This is a wrapper around iter_changes which just yields more
278.1.29 by John Arbash Meinel
Start testing with Unicode data.
613
    understandable results.
614
615
    :param source: The source tree (basis tree)
616
    :param target: The target tree
617
    :return: A list of (file_id, real_path, change_type, display_path)
618
    """
619
    added = 'added'
620
    removed = 'removed'
621
    renamed = 'renamed'
622
    renamed_and_modified = 'renamed and modified'
623
    modified = 'modified'
624
    kind_changed = 'kind changed'
625
626
    # TODO: Handle metadata changes
627
628
    status = []
629
    target.lock_read()
630
    try:
631
        source.lock_read()
632
        try:
633
            for (file_id, paths, changed_content, versioned, parent_ids, names,
450 by Aaron Bentley
Update to use new Tree.iter_changes
634
                 kinds, executables) in target.iter_changes(source):
278.1.29 by John Arbash Meinel
Start testing with Unicode data.
635
636
                # Skip the root entry if it isn't very interesting
637
                if parent_ids == (None, None):
638
                    continue
639
640
                change_type = None
641
                if kinds[0] is None:
642
                    source_marker = ''
643
                else:
644
                    source_marker = osutils.kind_marker(kinds[0])
645
                if kinds[1] is None:
646
                    assert kinds[0] is not None
647
                    marker = osutils.kind_marker(kinds[0])
648
                else:
649
                    marker = osutils.kind_marker(kinds[1])
650
651
                real_path = paths[1]
652
                if real_path is None:
653
                    real_path = paths[0]
654
                assert real_path is not None
655
                display_path = real_path + marker
656
657
                present_source = versioned[0] and kinds[0] is not None
658
                present_target = versioned[1] and kinds[1] is not None
659
660
                if present_source != present_target:
661
                    if present_target:
662
                        change_type = added
663
                    else:
664
                        assert present_source
665
                        change_type = removed
666
                elif names[0] != names[1] or parent_ids[0] != parent_ids[1]:
667
                    # Renamed
668
                    if changed_content or executables[0] != executables[1]:
669
                        # and modified
670
                        change_type = renamed_and_modified
671
                    else:
672
                        change_type = renamed
673
                    display_path = (paths[0] + source_marker
674
                                    + ' => ' + paths[1] + marker)
675
                elif kinds[0] != kinds[1]:
676
                    change_type = kind_changed
677
                    display_path = (paths[0] + source_marker
678
                                    + ' => ' + paths[1] + marker)
679
                elif changed_content is True or executables[0] != executables[1]:
680
                    change_type = modified
681
                else:
682
                    assert False, "How did we get here?"
683
684
                status.append((file_id, real_path, change_type, display_path))
685
        finally:
686
            source.unlock()
687
    finally:
688
        target.unlock()
689
690
    return status