/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: Aaron Bentley
  • Date: 2008-02-23 06:39:14 UTC
  • Revision ID: aaron@aaronbentley.com-20080223063914-49gdt7ed630rug9b
Add handle-patch script

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