/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-05-09 03:34:41 UTC
  • mto: This revision was merged to the branch mainline in revision 492.
  • Revision ID: aaron@aaronbentley.com-20080509033441-6tdpc72hzxiu754o
Test successful merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
diff.py
469
469
        finally:
470
470
            d.destroy()
471
471
 
 
472
    def _merge_successful(self):
 
473
        # No conflicts found.
 
474
        info_dialog(_('Merge successful'),
 
475
                    _('All changes applied successfully.'))
 
476
 
472
477
    def _get_save_path(self, basename):
473
478
        d = gtk.FileChooserDialog('Save As', self,
474
479
                                  gtk.FILE_CHOOSER_ACTION_SAVE,
539
544
 
540
545
class MergeDirectiveController(DiffController):
541
546
 
542
 
    def __init__(self, path, directive):
543
 
        DiffController.__init__(self, path, directive.patch.splitlines(True))
 
547
    def __init__(self, path, directive, window):
 
548
        DiffController.__init__(self, path, directive.patch.splitlines(True),
 
549
                                window)
544
550
        self.directive = directive
545
551
        self.merge_target = None
546
552
 
564
570
                conflict_count = merger.do_merge()
565
571
                merger.set_pending()
566
572
                if conflict_count == 0:
567
 
                    # No conflicts found.
568
 
                    info_dialog(_('Merge successful'),
569
 
                                _('All changes applied successfully.'))
 
573
                    self.window._merge_successful()
570
574
                else:
571
575
                    # There are conflicts to be resolved.
572
576
                    warning_dialog(_('Conflicts encountered'),