/b-gtk/fix-viz

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

« back to all changes in this revision

Viewing changes to diff.py

  • Committer: Jelmer Vernooij
  • Date: 2008-06-29 19:18:34 UTC
  • mto: This revision was merged to the branch mainline in revision 515.
  • Revision ID: jelmer@samba.org-20080629191834-ha2ecpv5szt96nge
Make sure signed testament matches repository data.

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 merge as _mod_merge, osutils, progress, workingtree
 
33
from bzrlib import (
 
34
    merge as _mod_merge,
 
35
    osutils,
 
36
    progress,
 
37
    urlutils,
 
38
    workingtree,
 
39
)
34
40
from bzrlib.diff import show_diff_trees, internal_diff
35
41
from bzrlib.errors import NoSuchFile
36
42
from bzrlib.patches import parse_patches
37
43
from bzrlib.trace import warning
 
44
from bzrlib.plugins.gtk import _i18n
38
45
from bzrlib.plugins.gtk.window import Window
39
46
from dialog import error_dialog, info_dialog, warning_dialog
40
47
 
45
52
 
46
53
 
47
54
class DiffFileView(gtk.ScrolledWindow):
 
55
    """Window for displaying diffs from a diff file"""
48
56
 
49
57
    def __init__(self):
50
58
        gtk.ScrolledWindow.__init__(self)
220
228
#        self.parent_tree.lock_read()
221
229
#        self.rev_tree.lock_read()
222
230
#        try:
223
 
#            self.delta = _iter_changes_to_status(self.parent_tree, self.rev_tree)
 
231
#            self.delta = iter_changes_to_status(self.parent_tree, self.rev_tree)
224
232
#            self.path_to_status = {}
225
233
#            self.path_to_diff = {}
226
234
#            source_inv = self.parent_tree.inventory
259
267
        self.parent_tree = None
260
268
 
261
269
    def show_diff(self, specific_files):
 
270
        """Show the diff for the specified files"""
262
271
        s = StringIO()
263
272
        show_diff_trees(self.parent_tree, self.rev_tree, s, specific_files,
264
273
                        old_label='', new_label='',
313
322
        self.treeview.append_column(column)
314
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
        """
316
329
        # The diffs of the  selected file: a scrollable source or
317
330
        # text view
 
331
 
 
332
    def set_diff_text_sections(self, sections):
318
333
        self.diff_view = DiffFileView()
319
334
        self.diff_view.show()
320
335
        self.pack2(self.diff_view)
321
 
        self.model.append(None, [ "Complete Diff", "" ])
322
 
        self.diff_view._diffs[None] = ''.join(lines)
323
 
        for patch in parse_patches(lines):
324
 
            oldname = patch.oldname.split('\t')[0]
325
 
            newname = patch.newname.split('\t')[0]
 
336
        for oldname, newname, patch in sections:
 
337
            self.diff_view._diffs[newname] = str(patch)
 
338
            if newname is None:
 
339
                newname = ''
326
340
            self.model.append(None, [oldname, newname])
327
 
            self.diff_view._diffs[newname] = str(patch)
328
341
        self.diff_view.show_diff(None)
329
342
 
330
343
    def set_diff(self, rev_tree, parent_tree):
369
382
        self.treeview.expand_all()
370
383
 
371
384
    def set_file(self, file_path):
 
385
        """Select the current file to display"""
372
386
        tv_path = None
373
387
        for data in self.model:
374
388
            for child in data.iterchildren():
399
413
    differences between two revisions on a branch.
400
414
    """
401
415
 
402
 
    def __init__(self, parent=None):
 
416
    def __init__(self, parent=None, operations=None):
403
417
        Window.__init__(self, parent)
404
418
        self.set_border_width(0)
405
419
        self.set_title("bzrk diff")
410
424
        width = int(monitor.width * 0.66)
411
425
        height = int(monitor.height * 0.66)
412
426
        self.set_default_size(width, height)
413
 
 
414
 
        self.construct()
415
 
 
416
 
    def construct(self):
 
427
        self.construct(operations)
 
428
 
 
429
    def construct(self, operations):
417
430
        """Construct the window contents."""
418
431
        self.vbox = gtk.VBox()
419
432
        self.add(self.vbox)
420
433
        self.vbox.show()
421
 
        hbox = self._get_button_bar()
 
434
        hbox = self._get_button_bar(operations)
422
435
        if hbox is not None:
423
436
            self.vbox.pack_start(hbox, expand=False, fill=True)
424
437
        self.diff = DiffWidget()
425
438
        self.vbox.add(self.diff)
426
439
        self.diff.show_all()
427
440
 
428
 
    def _get_button_bar(self):
429
 
        return None
430
 
 
431
 
    def set_diff_text(self, description, lines):
432
 
        self.diff.set_diff_text(lines)
433
 
        self.set_title(description + " - bzrk diff")
 
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()
434
500
 
435
501
    def set_diff(self, description, rev_tree, parent_tree):
436
502
        """Set the differences showed by this window.
445
511
        self.diff.set_file(file_path)
446
512
 
447
513
 
448
 
class MergeDirectiveWindow(DiffWindow):
449
 
 
450
 
    def __init__(self, directive, parent=None):
451
 
        DiffWindow.__init__(self, parent)
452
 
        self._merge_target = None
 
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)
453
559
        self.directive = directive
454
 
 
455
 
    def _get_button_bar(self):
456
 
        merge_button = gtk.Button('Merge')
457
 
        merge_button.show()
458
 
        merge_button.set_relief(gtk.RELIEF_NONE)
459
 
        merge_button.connect("clicked", self.perform_merge)
460
 
 
461
 
        hbox = gtk.HButtonBox()
462
 
        hbox.set_layout(gtk.BUTTONBOX_START)
463
 
        hbox.pack_start(merge_button, expand=False, fill=True)
464
 
        hbox.show()
465
 
        return hbox
 
560
        self.merge_target = None
 
561
 
 
562
    def _provide_operations(self):
 
563
        return [('Merge', self.perform_merge), ('Save', self.perform_save)]
466
564
 
467
565
    def perform_merge(self, window):
468
 
        try:
469
 
            tree = self._get_merge_target()
470
 
        except SelectCancelled:
471
 
            return
 
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)
472
572
        tree.lock_write()
473
573
        try:
474
574
            try:
479
579
                conflict_count = merger.do_merge()
480
580
                merger.set_pending()
481
581
                if conflict_count == 0:
482
 
                    # No conflicts found.
483
 
                    info_dialog(_('Merge successful'),
484
 
                                _('All changes applied successfully.'))
 
582
                    self.window._merge_successful()
485
583
                else:
 
584
                    self.window._conflicts()
486
585
                    # There are conflicts to be resolved.
487
 
                    warning_dialog(_('Conflicts encountered'),
488
 
                                   _('Please resolve the conflicts manually'
489
 
                                     ' before committing.'))
490
 
                self.destroy()
 
586
                self.window.destroy()
491
587
            except Exception, e:
492
 
                error_dialog('Error', str(e))
 
588
                self.window._handle_error(e)
493
589
        finally:
494
590
            tree.unlock()
495
591
 
496
 
    def _get_merge_target(self):
497
 
        if self._merge_target is not None:
498
 
            return self._merge_target
499
 
        d = gtk.FileChooserDialog('Merge branch', self,
500
 
                                  gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
501
 
                                  buttons=(gtk.STOCK_OK, gtk.RESPONSE_OK,
502
 
                                           gtk.STOCK_CANCEL,
503
 
                                           gtk.RESPONSE_CANCEL,))
504
 
        try:
505
 
            result = d.run()
506
 
            if result == gtk.RESPONSE_OK:
507
 
                uri = d.get_current_folder_uri()
508
 
                return workingtree.WorkingTree.open(uri)
509
 
            else:
510
 
                raise SelectCancelled()
511
 
        finally:
512
 
            d.destroy()
513
 
 
514
 
 
515
 
def _iter_changes_to_status(source, target):
 
592
 
 
593
def iter_changes_to_status(source, target):
516
594
    """Determine the differences between trees.
517
595
 
518
 
    This is a wrapper around _iter_changes which just yields more
 
596
    This is a wrapper around iter_changes which just yields more
519
597
    understandable results.
520
598
 
521
599
    :param source: The source tree (basis tree)
537
615
        source.lock_read()
538
616
        try:
539
617
            for (file_id, paths, changed_content, versioned, parent_ids, names,
540
 
                 kinds, executables) in target._iter_changes(source):
 
618
                 kinds, executables) in target.iter_changes(source):
541
619
 
542
620
                # Skip the root entry if it isn't very interesting
543
621
                if parent_ids == (None, None):