/b-gtk/fix-viz

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

« back to all changes in this revision

Viewing changes to diff.py

  • Committer: Vincent Ladeuil
  • Date: 2008-05-05 18:18:08 UTC
  • mfrom: (487 trunk)
  • mto: (487.1.1 gtk)
  • mto: This revision was merged to the branch mainline in revision 490.
  • Revision ID: v.ladeuil+lp@free.fr-20080505181808-ilh1cyl2v4crpc5i
merge bzr-gtk trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
diff.py
11
11
 
12
12
from cStringIO import StringIO
13
13
 
 
14
import pygtk
 
15
pygtk.require("2.0")
14
16
import gtk
15
17
import pango
16
18
import os
28
30
except ImportError:
29
31
    have_gconf = False
30
32
 
31
 
import bzrlib
32
 
 
33
 
from bzrlib.diff import show_diff_trees
 
33
from bzrlib import (
 
34
    merge as _mod_merge,
 
35
    osutils,
 
36
    progress,
 
37
    urlutils,
 
38
    workingtree,
 
39
)
 
40
from bzrlib.diff import show_diff_trees, internal_diff
34
41
from bzrlib.errors import NoSuchFile
 
42
from bzrlib.patches import parse_patches
35
43
from bzrlib.trace import warning
36
 
 
37
 
 
38
 
class DiffWindow(gtk.Window):
39
 
    """Diff window.
40
 
 
41
 
    This object represents and manages a single window containing the
42
 
    differences between two revisions on a branch.
43
 
    """
 
44
from bzrlib.plugins.gtk import _i18n
 
45
from bzrlib.plugins.gtk.window import Window
 
46
from dialog import error_dialog, info_dialog, warning_dialog
 
47
 
 
48
 
 
49
class SelectCancelled(Exception):
 
50
 
 
51
    pass
 
52
 
 
53
 
 
54
class DiffFileView(gtk.ScrolledWindow):
 
55
    """Window for displaying diffs from a diff file"""
44
56
 
45
57
    def __init__(self):
46
 
        gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
47
 
        self.set_border_width(0)
48
 
        self.set_title("bzrk diff")
49
 
 
50
 
        # Use two thirds of the screen by default
51
 
        screen = self.get_screen()
52
 
        monitor = screen.get_monitor_geometry(0)
53
 
        width = int(monitor.width * 0.66)
54
 
        height = int(monitor.height * 0.66)
55
 
        self.set_default_size(width, height)
56
 
 
 
58
        gtk.ScrolledWindow.__init__(self)
57
59
        self.construct()
 
60
        self._diffs = {}
58
61
 
59
62
    def construct(self):
60
 
        """Construct the window contents."""
61
 
        # The   window  consists  of   a  pane   containing:  the
62
 
        # hierarchical list  of files on  the left, and  the diff
63
 
        # for the currently selected file on the right.
64
 
        pane = gtk.HPaned()
65
 
        self.add(pane)
66
 
        pane.show()
67
 
 
68
 
        # The file hierarchy: a scrollable treeview
69
 
        scrollwin = gtk.ScrolledWindow()
70
 
        scrollwin.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
71
 
        scrollwin.set_shadow_type(gtk.SHADOW_IN)
72
 
        pane.pack1(scrollwin)
73
 
        scrollwin.show()
74
 
 
75
 
        self.model = gtk.TreeStore(str, str)
76
 
        self.treeview = gtk.TreeView(self.model)
77
 
        self.treeview.set_headers_visible(False)
78
 
        self.treeview.set_search_column(1)
79
 
        self.treeview.connect("cursor-changed", self._treeview_cursor_cb)
80
 
        scrollwin.add(self.treeview)
81
 
        self.treeview.show()
82
 
 
83
 
        cell = gtk.CellRendererText()
84
 
        cell.set_property("width-chars", 20)
85
 
        column = gtk.TreeViewColumn()
86
 
        column.pack_start(cell, expand=True)
87
 
        column.add_attribute(cell, "text", 0)
88
 
        self.treeview.append_column(column)
89
 
 
90
 
        # The diffs of the  selected file: a scrollable source or
91
 
        # text view
92
 
        scrollwin = gtk.ScrolledWindow()
93
 
        scrollwin.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
94
 
        scrollwin.set_shadow_type(gtk.SHADOW_IN)
95
 
        pane.pack2(scrollwin)
96
 
        scrollwin.show()
 
63
        self.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
 
64
        self.set_shadow_type(gtk.SHADOW_IN)
97
65
 
98
66
        if have_gtksourceview:
99
67
            self.buffer = gtksourceview.SourceBuffer()
112
80
 
113
81
        sourceview.set_editable(False)
114
82
        sourceview.modify_font(pango.FontDescription("Monospace"))
115
 
        scrollwin.add(sourceview)
 
83
        self.add(sourceview)
116
84
        sourceview.show()
117
85
 
118
 
    def set_diff(self, description, rev_tree, parent_tree):
119
 
        """Set the differences showed by this window.
120
 
 
121
 
        Compares the two trees and populates the window with the
122
 
        differences.
123
 
        """
124
 
        self.rev_tree = rev_tree
125
 
        self.parent_tree = parent_tree
126
 
 
127
 
        self.model.clear()
128
 
        delta = self.rev_tree.changes_from(self.parent_tree)
129
 
 
130
 
        self.model.append(None, [ "Complete Diff", "" ])
131
 
 
132
 
        if len(delta.added):
133
 
            titer = self.model.append(None, [ "Added", None ])
134
 
            for path, id, kind in delta.added:
135
 
                self.model.append(titer, [ path, path ])
136
 
 
137
 
        if len(delta.removed):
138
 
            titer = self.model.append(None, [ "Removed", None ])
139
 
            for path, id, kind in delta.removed:
140
 
                self.model.append(titer, [ path, path ])
141
 
 
142
 
        if len(delta.renamed):
143
 
            titer = self.model.append(None, [ "Renamed", None ])
144
 
            for oldpath, newpath, id, kind, text_modified, meta_modified \
145
 
                    in delta.renamed:
146
 
                self.model.append(titer, [ oldpath, newpath ])
147
 
 
148
 
        if len(delta.modified):
149
 
            titer = self.model.append(None, [ "Modified", None ])
150
 
            for path, id, kind, text_modified, meta_modified in delta.modified:
151
 
                self.model.append(titer, [ path, path ])
152
 
 
153
 
        self.treeview.expand_all()
154
 
        self.set_title(description + " - bzrk diff")
155
 
 
156
 
    def set_file(self, file_path):
157
 
        tv_path = None
158
 
        for data in self.model:
159
 
            for child in data.iterchildren():
160
 
                if child[0] == file_path or child[1] == file_path:
161
 
                    tv_path = child.path
162
 
                    break
163
 
        if tv_path is None:
164
 
            raise NoSuchFile(file_path)
165
 
        self.treeview.set_cursor(tv_path)
166
 
        self.treeview.scroll_to_cell(tv_path)
167
 
 
168
 
    def _treeview_cursor_cb(self, *args):
169
 
        """Callback for when the treeview cursor changes."""
170
 
        (path, col) = self.treeview.get_cursor()
171
 
        specific_files = [ self.model[path][1] ]
172
 
        if specific_files == [ None ]:
173
 
            return
174
 
        elif specific_files == [ "" ]:
175
 
            specific_files = []
176
 
 
177
 
        s = StringIO()
178
 
        show_diff_trees(self.parent_tree, self.rev_tree, s, specific_files)
179
 
        self.buffer.set_text(s.getvalue().decode(sys.getdefaultencoding(), 'replace'))
180
 
 
181
86
    @staticmethod
182
87
    def apply_gedit_colors(lang):
183
88
        """Set style for lang to that specified in gedit configuration.
184
89
 
185
90
        This method needs the gconf module.
186
 
        
 
91
 
187
92
        :param lang: a gtksourceview.SourceLanguage object.
188
93
        """
189
94
        GEDIT_SYNTAX_PATH = '/apps/gedit-2/preferences/syntax_highlighting'
241
146
 
242
147
            lang.set_tag_style(tag_id, style)
243
148
 
244
 
    @staticmethod
245
 
    def apply_colordiff_colors(lang):
 
149
    @classmethod
 
150
    def apply_colordiff_colors(klass, lang):
246
151
        """Set style colors for lang using the colordiff configuration file.
247
152
 
248
153
        Both ~/.colordiffrc and ~/.colordiffrc.bzr-gtk are read.
259
164
                except IOError, e:
260
165
                    warning('could not open file %s: %s' % (f, str(e)))
261
166
                else:
262
 
                    colors.update(DiffWindow.parse_colordiffrc(f))
 
167
                    colors.update(klass.parse_colordiffrc(f))
263
168
                    f.close()
264
169
 
265
170
        if not colors:
301
206
    @staticmethod
302
207
    def parse_colordiffrc(fileobj):
303
208
        """Parse fileobj as a colordiff configuration file.
304
 
        
 
209
 
305
210
        :return: A dict with the key -> value pairs.
306
211
        """
307
212
        colors = {}
314
219
            colors[key.strip()] = val.strip()
315
220
        return colors
316
221
 
 
222
    def set_trees(self, rev_tree, parent_tree):
 
223
        self.rev_tree = rev_tree
 
224
        self.parent_tree = parent_tree
 
225
#        self._build_delta()
 
226
 
 
227
#    def _build_delta(self):
 
228
#        self.parent_tree.lock_read()
 
229
#        self.rev_tree.lock_read()
 
230
#        try:
 
231
#            self.delta = iter_changes_to_status(self.parent_tree, self.rev_tree)
 
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()
 
250
 
 
251
    def show_diff(self, specific_files):
 
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))
 
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):
 
270
        """Show the diff for the specified files"""
 
271
        s = StringIO()
 
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
                        )
 
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'))
 
293
 
 
294
 
 
295
class DiffWidget(gtk.HPaned):
 
296
    """Diff widget
 
297
 
 
298
    """
 
299
    def __init__(self):
 
300
        super(DiffWidget, self).__init__()
 
301
 
 
302
        # The file hierarchy: a scrollable treeview
 
303
        scrollwin = gtk.ScrolledWindow()
 
304
        scrollwin.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
 
305
        scrollwin.set_shadow_type(gtk.SHADOW_IN)
 
306
        self.pack1(scrollwin)
 
307
        scrollwin.show()
 
308
 
 
309
        self.model = gtk.TreeStore(str, str)
 
310
        self.treeview = gtk.TreeView(self.model)
 
311
        self.treeview.set_headers_visible(False)
 
312
        self.treeview.set_search_column(1)
 
313
        self.treeview.connect("cursor-changed", self._treeview_cursor_cb)
 
314
        scrollwin.add(self.treeview)
 
315
        self.treeview.show()
 
316
 
 
317
        cell = gtk.CellRendererText()
 
318
        cell.set_property("width-chars", 20)
 
319
        column = gtk.TreeViewColumn()
 
320
        column.pack_start(cell, expand=True)
 
321
        column.add_attribute(cell, "text", 0)
 
322
        self.treeview.append_column(column)
 
323
 
 
324
    def set_diff_text(self, lines):
 
325
        """Set the current diff from a list of lines
 
326
 
 
327
        :param lines: The diff to show, in unified diff format
 
328
        """
 
329
        # The diffs of the  selected file: a scrollable source or
 
330
        # text view
 
331
        self.diff_view = DiffFileView()
 
332
        self.diff_view.show()
 
333
        self.pack2(self.diff_view)
 
334
        self.model.append(None, [ "Complete Diff", "" ])
 
335
        self.diff_view._diffs[None] = ''.join(lines)
 
336
        for patch in parse_patches(lines):
 
337
            oldname = patch.oldname.split('\t')[0]
 
338
            newname = patch.newname.split('\t')[0]
 
339
            self.model.append(None, [oldname, newname])
 
340
            self.diff_view._diffs[newname] = str(patch)
 
341
        self.diff_view.show_diff(None)
 
342
 
 
343
    def set_diff(self, rev_tree, parent_tree):
 
344
        """Set the differences showed by this window.
 
345
 
 
346
        Compares the two trees and populates the window with the
 
347
        differences.
 
348
        """
 
349
        self.diff_view = DiffView()
 
350
        self.pack2(self.diff_view)
 
351
        self.diff_view.show()
 
352
        self.diff_view.set_trees(rev_tree, parent_tree)
 
353
        self.rev_tree = rev_tree
 
354
        self.parent_tree = parent_tree
 
355
 
 
356
        self.model.clear()
 
357
        delta = self.rev_tree.changes_from(self.parent_tree)
 
358
 
 
359
        self.model.append(None, [ "Complete Diff", "" ])
 
360
 
 
361
        if len(delta.added):
 
362
            titer = self.model.append(None, [ "Added", None ])
 
363
            for path, id, kind in delta.added:
 
364
                self.model.append(titer, [ path, path ])
 
365
 
 
366
        if len(delta.removed):
 
367
            titer = self.model.append(None, [ "Removed", None ])
 
368
            for path, id, kind in delta.removed:
 
369
                self.model.append(titer, [ path, path ])
 
370
 
 
371
        if len(delta.renamed):
 
372
            titer = self.model.append(None, [ "Renamed", None ])
 
373
            for oldpath, newpath, id, kind, text_modified, meta_modified \
 
374
                    in delta.renamed:
 
375
                self.model.append(titer, [ oldpath, newpath ])
 
376
 
 
377
        if len(delta.modified):
 
378
            titer = self.model.append(None, [ "Modified", None ])
 
379
            for path, id, kind, text_modified, meta_modified in delta.modified:
 
380
                self.model.append(titer, [ path, path ])
 
381
 
 
382
        self.treeview.expand_all()
 
383
 
 
384
    def set_file(self, file_path):
 
385
        """Select the current file to display"""
 
386
        tv_path = None
 
387
        for data in self.model:
 
388
            for child in data.iterchildren():
 
389
                if child[0] == file_path or child[1] == file_path:
 
390
                    tv_path = child.path
 
391
                    break
 
392
        if tv_path is None:
 
393
            raise NoSuchFile(file_path)
 
394
        self.treeview.set_cursor(tv_path)
 
395
        self.treeview.scroll_to_cell(tv_path)
 
396
 
 
397
    def _treeview_cursor_cb(self, *args):
 
398
        """Callback for when the treeview cursor changes."""
 
399
        (path, col) = self.treeview.get_cursor()
 
400
        specific_files = [ self.model[path][1] ]
 
401
        if specific_files == [ None ]:
 
402
            return
 
403
        elif specific_files == [ "" ]:
 
404
            specific_files = None
 
405
 
 
406
        self.diff_view.show_diff(specific_files)
 
407
 
 
408
 
 
409
class DiffWindow(Window):
 
410
    """Diff window.
 
411
 
 
412
    This object represents and manages a single window containing the
 
413
    differences between two revisions on a branch.
 
414
    """
 
415
 
 
416
    def __init__(self, parent=None):
 
417
        Window.__init__(self, parent)
 
418
        self.set_border_width(0)
 
419
        self.set_title("bzrk diff")
 
420
 
 
421
        # Use two thirds of the screen by default
 
422
        screen = self.get_screen()
 
423
        monitor = screen.get_monitor_geometry(0)
 
424
        width = int(monitor.width * 0.66)
 
425
        height = int(monitor.height * 0.66)
 
426
        self.set_default_size(width, height)
 
427
 
 
428
        self.construct()
 
429
 
 
430
    def construct(self):
 
431
        """Construct the window contents."""
 
432
        self.vbox = gtk.VBox()
 
433
        self.add(self.vbox)
 
434
        self.vbox.show()
 
435
        hbox = self._get_button_bar()
 
436
        if hbox is not None:
 
437
            self.vbox.pack_start(hbox, expand=False, fill=True)
 
438
        self.diff = DiffWidget()
 
439
        self.vbox.add(self.diff)
 
440
        self.diff.show_all()
 
441
 
 
442
    def _get_button_bar(self):
 
443
        """Return a button bar to use.
 
444
 
 
445
        :return: None, meaning that no button bar will be used.
 
446
        """
 
447
        return None
 
448
 
 
449
    def set_diff_text(self, description, lines):
 
450
        """Set the diff from a text.
 
451
 
 
452
        The diff must be in unified diff format, and will be parsed to
 
453
        determine filenames.
 
454
        """
 
455
        self.diff.set_diff_text(lines)
 
456
        self.set_title(description + " - bzrk diff")
 
457
 
 
458
    def set_diff(self, description, rev_tree, parent_tree):
 
459
        """Set the differences showed by this window.
 
460
 
 
461
        Compares the two trees and populates the window with the
 
462
        differences.
 
463
        """
 
464
        self.diff.set_diff(rev_tree, parent_tree)
 
465
        self.set_title(description + " - bzrk diff")
 
466
 
 
467
    def set_file(self, file_path):
 
468
        self.diff.set_file(file_path)
 
469
 
 
470
 
 
471
class MergeDirectiveWindow(DiffWindow):
 
472
 
 
473
    def __init__(self, directive, path):
 
474
        DiffWindow.__init__(self, None)
 
475
        self._merge_target = None
 
476
        self.directive = directive
 
477
        self.path = path
 
478
 
 
479
    def _get_button_bar(self):
 
480
        """The button bar has only the Merge button"""
 
481
        merge_button = gtk.Button('Merge')
 
482
        merge_button.show()
 
483
        merge_button.set_relief(gtk.RELIEF_NONE)
 
484
        merge_button.connect("clicked", self.perform_merge)
 
485
 
 
486
        save_button = gtk.Button('Save')
 
487
        save_button.show()
 
488
        save_button.set_relief(gtk.RELIEF_NONE)
 
489
        save_button.connect("clicked", self.perform_save)
 
490
 
 
491
        hbox = gtk.HButtonBox()
 
492
        hbox.set_layout(gtk.BUTTONBOX_START)
 
493
        hbox.pack_start(merge_button, expand=False, fill=True)
 
494
        hbox.pack_start(save_button, expand=False, fill=True)
 
495
        hbox.show()
 
496
        return hbox
 
497
 
 
498
    def perform_merge(self, window):
 
499
        try:
 
500
            tree = self._get_merge_target()
 
501
        except SelectCancelled:
 
502
            return
 
503
        tree.lock_write()
 
504
        try:
 
505
            try:
 
506
                merger, verified = _mod_merge.Merger.from_mergeable(tree,
 
507
                    self.directive, progress.DummyProgress())
 
508
                merger.check_basis(True)
 
509
                merger.merge_type = _mod_merge.Merge3Merger
 
510
                conflict_count = merger.do_merge()
 
511
                merger.set_pending()
 
512
                if conflict_count == 0:
 
513
                    # No conflicts found.
 
514
                    info_dialog(_i18n('Merge successful'),
 
515
                                _i18n('All changes applied successfully.'))
 
516
                else:
 
517
                    # There are conflicts to be resolved.
 
518
                    warning_dialog(_i18n('Conflicts encountered'),
 
519
                                   _i18n('Please resolve the conflicts manually'
 
520
                                         ' before committing.'))
 
521
                self.destroy()
 
522
            except Exception, e:
 
523
                error_dialog('Error', str(e))
 
524
        finally:
 
525
            tree.unlock()
 
526
 
 
527
    def _get_merge_target(self):
 
528
        if self._merge_target is not None:
 
529
            return self._merge_target
 
530
        d = gtk.FileChooserDialog('Merge branch', self,
 
531
                                  gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
 
532
                                  buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
 
533
                                           gtk.STOCK_CANCEL,
 
534
                                           gtk.RESPONSE_CANCEL,))
 
535
        try:
 
536
            result = d.run()
 
537
            if result != gtk.RESPONSE_OK:
 
538
                raise SelectCancelled()
 
539
            uri = d.get_current_folder_uri()
 
540
        finally:
 
541
            d.destroy()
 
542
        return workingtree.WorkingTree.open(uri)
 
543
 
 
544
    def perform_save(self, window):
 
545
        d = gtk.FileChooserDialog('Save As', self,
 
546
                                  gtk.FILE_CHOOSER_ACTION_SAVE,
 
547
                                  buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
 
548
                                           gtk.STOCK_CANCEL,
 
549
                                           gtk.RESPONSE_CANCEL,))
 
550
        d.set_current_name(osutils.basename(self.path))
 
551
        try:
 
552
            try:
 
553
                result = d.run()
 
554
                if result != gtk.RESPONSE_OK:
 
555
                    raise SelectCancelled()
 
556
                uri = d.get_uri()
 
557
            finally:
 
558
                d.destroy()
 
559
        except SelectCancelled:
 
560
            return
 
561
        source = open(self.path, 'rb')
 
562
        try:
 
563
            target = open(urlutils.local_path_from_url(uri), 'wb')
 
564
            try:
 
565
                target.write(source.read())
 
566
            finally:
 
567
                target.close()
 
568
        finally:
 
569
            source.close()
 
570
 
 
571
 
 
572
def iter_changes_to_status(source, target):
 
573
    """Determine the differences between trees.
 
574
 
 
575
    This is a wrapper around iter_changes which just yields more
 
576
    understandable results.
 
577
 
 
578
    :param source: The source tree (basis tree)
 
579
    :param target: The target tree
 
580
    :return: A list of (file_id, real_path, change_type, display_path)
 
581
    """
 
582
    added = 'added'
 
583
    removed = 'removed'
 
584
    renamed = 'renamed'
 
585
    renamed_and_modified = 'renamed and modified'
 
586
    modified = 'modified'
 
587
    kind_changed = 'kind changed'
 
588
 
 
589
    # TODO: Handle metadata changes
 
590
 
 
591
    status = []
 
592
    target.lock_read()
 
593
    try:
 
594
        source.lock_read()
 
595
        try:
 
596
            for (file_id, paths, changed_content, versioned, parent_ids, names,
 
597
                 kinds, executables) in target.iter_changes(source):
 
598
 
 
599
                # Skip the root entry if it isn't very interesting
 
600
                if parent_ids == (None, None):
 
601
                    continue
 
602
 
 
603
                change_type = None
 
604
                if kinds[0] is None:
 
605
                    source_marker = ''
 
606
                else:
 
607
                    source_marker = osutils.kind_marker(kinds[0])
 
608
                if kinds[1] is None:
 
609
                    assert kinds[0] is not None
 
610
                    marker = osutils.kind_marker(kinds[0])
 
611
                else:
 
612
                    marker = osutils.kind_marker(kinds[1])
 
613
 
 
614
                real_path = paths[1]
 
615
                if real_path is None:
 
616
                    real_path = paths[0]
 
617
                assert real_path is not None
 
618
                display_path = real_path + marker
 
619
 
 
620
                present_source = versioned[0] and kinds[0] is not None
 
621
                present_target = versioned[1] and kinds[1] is not None
 
622
 
 
623
                if present_source != present_target:
 
624
                    if present_target:
 
625
                        change_type = added
 
626
                    else:
 
627
                        assert present_source
 
628
                        change_type = removed
 
629
                elif names[0] != names[1] or parent_ids[0] != parent_ids[1]:
 
630
                    # Renamed
 
631
                    if changed_content or executables[0] != executables[1]:
 
632
                        # and modified
 
633
                        change_type = renamed_and_modified
 
634
                    else:
 
635
                        change_type = renamed
 
636
                    display_path = (paths[0] + source_marker
 
637
                                    + ' => ' + paths[1] + marker)
 
638
                elif kinds[0] != kinds[1]:
 
639
                    change_type = kind_changed
 
640
                    display_path = (paths[0] + source_marker
 
641
                                    + ' => ' + paths[1] + marker)
 
642
                elif changed_content is True or executables[0] != executables[1]:
 
643
                    change_type = modified
 
644
                else:
 
645
                    assert False, "How did we get here?"
 
646
 
 
647
                status.append((file_id, real_path, change_type, display_path))
 
648
        finally:
 
649
            source.unlock()
 
650
    finally:
 
651
        target.unlock()
 
652
 
 
653
    return status