/b-gtk/fix-viz

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

« back to all changes in this revision

Viewing changes to diff.py

  • Committer: Jelmer Vernooij
  • Date: 2007-12-21 20:20:37 UTC
  • mto: This revision was merged to the branch mainline in revision 422.
  • Revision ID: jelmer@samba.org-20071221202037-6zvbwefvrte3e2zy
Fix URL.

Show diffs side-by-side

added added

removed removed

Lines of Context:
diff.py
30
30
except ImportError:
31
31
    have_gconf = False
32
32
 
33
 
from bzrlib import (
34
 
    merge as _mod_merge,
35
 
    osutils,
36
 
    progress,
37
 
    urlutils,
38
 
    workingtree,
39
 
)
 
33
from bzrlib import osutils
40
34
from bzrlib.diff import show_diff_trees, internal_diff
41
35
from bzrlib.errors import NoSuchFile
42
 
from bzrlib.patches import parse_patches
43
36
from bzrlib.trace import warning
44
 
from bzrlib.plugins.gtk import _i18n
45
37
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"""
 
38
 
 
39
 
 
40
class DiffView(gtk.ScrolledWindow):
 
41
    """This is the soft and chewy filling for a DiffWindow."""
56
42
 
57
43
    def __init__(self):
58
44
        gtk.ScrolledWindow.__init__(self)
 
45
 
59
46
        self.construct()
60
 
        self._diffs = {}
 
47
        self.rev_tree = None
 
48
        self.parent_tree = None
61
49
 
62
50
    def construct(self):
63
51
        self.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
146
134
 
147
135
            lang.set_tag_style(tag_id, style)
148
136
 
149
 
    @classmethod
150
 
    def apply_colordiff_colors(klass, lang):
 
137
    @staticmethod
 
138
    def apply_colordiff_colors(lang):
151
139
        """Set style colors for lang using the colordiff configuration file.
152
140
 
153
141
        Both ~/.colordiffrc and ~/.colordiffrc.bzr-gtk are read.
164
152
                except IOError, e:
165
153
                    warning('could not open file %s: %s' % (f, str(e)))
166
154
                else:
167
 
                    colors.update(klass.parse_colordiffrc(f))
 
155
                    colors.update(DiffView.parse_colordiffrc(f))
168
156
                    f.close()
169
157
 
170
158
        if not colors:
228
216
#        self.parent_tree.lock_read()
229
217
#        self.rev_tree.lock_read()
230
218
#        try:
231
 
#            self.delta = iter_changes_to_status(self.parent_tree, self.rev_tree)
 
219
#            self.delta = _iter_changes_to_status(self.parent_tree, self.rev_tree)
232
220
#            self.path_to_status = {}
233
221
#            self.path_to_diff = {}
234
222
#            source_inv = self.parent_tree.inventory
249
237
#            self.parent_tree.unlock()
250
238
 
251
239
    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
240
        s = StringIO()
272
241
        show_diff_trees(self.parent_tree, self.rev_tree, s, specific_files,
273
242
                        old_label='', new_label='',
292
261
        self.buffer.set_text(decoded.encode('UTF-8'))
293
262
 
294
263
 
295
 
class DiffWidget(gtk.HPaned):
296
 
    """Diff widget
 
264
class DiffWindow(Window):
 
265
    """Diff window.
297
266
 
 
267
    This object represents and manages a single window containing the
 
268
    differences between two revisions on a branch.
298
269
    """
299
 
    def __init__(self):
300
 
        super(DiffWidget, self).__init__()
 
270
 
 
271
    def __init__(self, parent=None):
 
272
        Window.__init__(self, parent)
 
273
        self.set_border_width(0)
 
274
        self.set_title("bzrk diff")
 
275
 
 
276
        # Use two thirds of the screen by default
 
277
        screen = self.get_screen()
 
278
        monitor = screen.get_monitor_geometry(0)
 
279
        width = int(monitor.width * 0.66)
 
280
        height = int(monitor.height * 0.66)
 
281
        self.set_default_size(width, height)
 
282
 
 
283
        self.construct()
 
284
 
 
285
    def construct(self):
 
286
        """Construct the window contents."""
 
287
        # The   window  consists  of   a  pane   containing:  the
 
288
        # hierarchical list  of files on  the left, and  the diff
 
289
        # for the currently selected file on the right.
 
290
        pane = gtk.HPaned()
 
291
        self.add(pane)
 
292
        pane.show()
301
293
 
302
294
        # The file hierarchy: a scrollable treeview
303
295
        scrollwin = gtk.ScrolledWindow()
304
296
        scrollwin.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
305
297
        scrollwin.set_shadow_type(gtk.SHADOW_IN)
306
 
        self.pack1(scrollwin)
 
298
        pane.pack1(scrollwin)
307
299
        scrollwin.show()
308
300
 
309
301
        self.model = gtk.TreeStore(str, str)
321
313
        column.add_attribute(cell, "text", 0)
322
314
        self.treeview.append_column(column)
323
315
 
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
316
        # The diffs of the  selected file: a scrollable source or
330
317
        # text view
331
 
 
332
 
    def set_diff_text_sections(self, sections):
333
 
        self.diff_view = DiffFileView()
334
 
        self.diff_view.show()
335
 
        self.pack2(self.diff_view)
336
 
        for oldname, newname, patch in sections:
337
 
            self.diff_view._diffs[newname] = str(patch)
338
 
            if newname is None:
339
 
                newname = ''
340
 
            self.model.append(None, [oldname, newname])
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
318
        self.diff_view = DiffView()
350
 
        self.pack2(self.diff_view)
 
319
        pane.pack2(self.diff_view)
351
320
        self.diff_view.show()
 
321
 
 
322
    def set_diff(self, description, rev_tree, parent_tree):
 
323
        """Set the differences showed by this window.
 
324
 
 
325
        Compares the two trees and populates the window with the
 
326
        differences.
 
327
        """
352
328
        self.diff_view.set_trees(rev_tree, parent_tree)
353
329
        self.rev_tree = rev_tree
354
330
        self.parent_tree = parent_tree
380
356
                self.model.append(titer, [ path, path ])
381
357
 
382
358
        self.treeview.expand_all()
 
359
        self.set_title(description + " - bzrk diff")
383
360
 
384
361
    def set_file(self, file_path):
385
 
        """Select the current file to display"""
386
362
        tv_path = None
387
363
        for data in self.model:
388
364
            for child in data.iterchildren():
406
382
        self.diff_view.show_diff(specific_files)
407
383
 
408
384
 
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, operations=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
 
        self.construct(operations)
428
 
 
429
 
    def construct(self, operations):
430
 
        """Construct the window contents."""
431
 
        self.vbox = gtk.VBox()
432
 
        self.add(self.vbox)
433
 
        self.vbox.show()
434
 
        hbox = self._get_button_bar(operations)
435
 
        if hbox is not None:
436
 
            self.vbox.pack_start(hbox, expand=False, fill=True)
437
 
        self.diff = DiffWidget()
438
 
        self.vbox.add(self.diff)
439
 
        self.diff.show_all()
440
 
 
441
 
    def _get_button_bar(self, operations):
442
 
        """Return a button bar to use.
443
 
 
444
 
        :return: None, meaning that no button bar will be used.
445
 
        """
446
 
        if operations is None:
447
 
            return None
448
 
        hbox = gtk.HButtonBox()
449
 
        hbox.set_layout(gtk.BUTTONBOX_START)
450
 
        for title, method in operations:
451
 
            merge_button = gtk.Button(title)
452
 
            merge_button.show()
453
 
            merge_button.set_relief(gtk.RELIEF_NONE)
454
 
            merge_button.connect("clicked", method)
455
 
            hbox.pack_start(merge_button, expand=False, fill=True)
456
 
        hbox.show()
457
 
        return hbox
458
 
 
459
 
    def _get_merge_target(self):
460
 
        d = gtk.FileChooserDialog('Merge branch', self,
461
 
                                  gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
462
 
                                  buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
463
 
                                           gtk.STOCK_CANCEL,
464
 
                                           gtk.RESPONSE_CANCEL,))
465
 
        try:
466
 
            result = d.run()
467
 
            if result != gtk.RESPONSE_OK:
468
 
                raise SelectCancelled()
469
 
            return d.get_current_folder_uri()
470
 
        finally:
471
 
            d.destroy()
472
 
 
473
 
    def _merge_successful(self):
474
 
        # No conflicts found.
475
 
        info_dialog(_i18n('Merge successful'),
476
 
                    _i18n('All changes applied successfully.'))
477
 
 
478
 
    def _conflicts(self):
479
 
        warning_dialog(_i18n('Conflicts encountered'),
480
 
                       _i18n('Please resolve the conflicts manually'
481
 
                             ' before committing.'))
482
 
 
483
 
    def _handle_error(self, e):
484
 
        error_dialog('Error', str(e))
485
 
 
486
 
    def _get_save_path(self, basename):
487
 
        d = gtk.FileChooserDialog('Save As', self,
488
 
                                  gtk.FILE_CHOOSER_ACTION_SAVE,
489
 
                                  buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
490
 
                                           gtk.STOCK_CANCEL,
491
 
                                           gtk.RESPONSE_CANCEL,))
492
 
        d.set_current_name(basename)
493
 
        try:
494
 
            result = d.run()
495
 
            if result != gtk.RESPONSE_OK:
496
 
                raise SelectCancelled()
497
 
            return urlutils.local_path_from_url(d.get_uri())
498
 
        finally:
499
 
            d.destroy()
500
 
 
501
 
    def set_diff(self, description, rev_tree, parent_tree):
502
 
        """Set the differences showed by this window.
503
 
 
504
 
        Compares the two trees and populates the window with the
505
 
        differences.
506
 
        """
507
 
        self.diff.set_diff(rev_tree, parent_tree)
508
 
        self.set_title(description + " - bzrk diff")
509
 
 
510
 
    def set_file(self, file_path):
511
 
        self.diff.set_file(file_path)
512
 
 
513
 
 
514
 
class DiffController(object):
515
 
 
516
 
    def __init__(self, path, patch, window=None):
517
 
        self.path = path
518
 
        self.patch = patch
519
 
        if window is None:
520
 
            window = DiffWindow(operations=self._provide_operations())
521
 
            self.initialize_window(window)
522
 
        self.window = window
523
 
 
524
 
    def initialize_window(self, window):
525
 
        window.diff.set_diff_text_sections(self.get_diff_sections())
526
 
        window.set_title(self.path + " - diff")
527
 
 
528
 
    def get_diff_sections(self):
529
 
        yield "Complete Diff", None, ''.join(self.patch)
530
 
        for patch in parse_patches(self.patch):
531
 
            oldname = patch.oldname.split('\t')[0]
532
 
            newname = patch.newname.split('\t')[0]
533
 
            yield oldname, newname, str(patch)
534
 
 
535
 
    def perform_save(self, window):
536
 
        try:
537
 
            save_path = self.window._get_save_path(osutils.basename(self.path))
538
 
        except SelectCancelled:
539
 
            return
540
 
        source = open(self.path, 'rb')
541
 
        try:
542
 
            target = open(save_path, 'wb')
543
 
            try:
544
 
                osutils.pumpfile(source, target)
545
 
            finally:
546
 
                target.close()
547
 
        finally:
548
 
            source.close()
549
 
 
550
 
    def _provide_operations(self):
551
 
        return [('Save', self.perform_save)]
552
 
 
553
 
 
554
 
class MergeDirectiveController(DiffController):
555
 
 
556
 
    def __init__(self, path, directive, window=None):
557
 
        DiffController.__init__(self, path, directive.patch.splitlines(True),
558
 
                                window)
559
 
        self.directive = directive
560
 
        self.merge_target = None
561
 
 
562
 
    def _provide_operations(self):
563
 
        return [('Merge', self.perform_merge), ('Save', self.perform_save)]
564
 
 
565
 
    def perform_merge(self, window):
566
 
        if self.merge_target is None:
567
 
            try:
568
 
                self.merge_target = self.window._get_merge_target()
569
 
            except SelectCancelled:
570
 
                return
571
 
        tree = workingtree.WorkingTree.open(self.merge_target)
572
 
        tree.lock_write()
573
 
        try:
574
 
            try:
575
 
                merger, verified = _mod_merge.Merger.from_mergeable(tree,
576
 
                    self.directive, progress.DummyProgress())
577
 
                merger.check_basis(True)
578
 
                merger.merge_type = _mod_merge.Merge3Merger
579
 
                conflict_count = merger.do_merge()
580
 
                merger.set_pending()
581
 
                if conflict_count == 0:
582
 
                    self.window._merge_successful()
583
 
                else:
584
 
                    self.window._conflicts()
585
 
                    # There are conflicts to be resolved.
586
 
                self.window.destroy()
587
 
            except Exception, e:
588
 
                self.window._handle_error(e)
589
 
        finally:
590
 
            tree.unlock()
591
 
 
592
 
 
593
 
def iter_changes_to_status(source, target):
 
385
def _iter_changes_to_status(source, target):
594
386
    """Determine the differences between trees.
595
387
 
596
 
    This is a wrapper around iter_changes which just yields more
 
388
    This is a wrapper around _iter_changes which just yields more
597
389
    understandable results.
598
390
 
599
391
    :param source: The source tree (basis tree)
615
407
        source.lock_read()
616
408
        try:
617
409
            for (file_id, paths, changed_content, versioned, parent_ids, names,
618
 
                 kinds, executables) in target.iter_changes(source):
 
410
                 kinds, executables) in target._iter_changes(source):
619
411
 
620
412
                # Skip the root entry if it isn't very interesting
621
413
                if parent_ids == (None, None):