/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-10 03:23:00 UTC
  • mto: This revision was merged to the branch mainline in revision 492.
  • Revision ID: aaron@aaronbentley.com-20080510032300-v7mdhm2zae04o356
Add more merge tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
diff.py
41
41
from bzrlib.errors import NoSuchFile
42
42
from bzrlib.patches import parse_patches
43
43
from bzrlib.trace import warning
44
 
from bzrlib.plugins.gtk import _i18n
45
44
from bzrlib.plugins.gtk.window import Window
46
45
from dialog import error_dialog, info_dialog, warning_dialog
47
46
 
472
471
 
473
472
    def _merge_successful(self):
474
473
        # No conflicts found.
475
 
        info_dialog(_i18n('Merge successful'),
476
 
                    _i18n('All changes applied successfully.'))
 
474
        info_dialog(_('Merge successful'),
 
475
                    _('All changes applied successfully.'))
477
476
 
478
477
    def _conflicts(self):
479
 
        warning_dialog(_i18n('Conflicts encountered'),
480
 
                       _i18n('Please resolve the conflicts manually'
481
 
                             ' before committing.'))
 
478
        warning_dialog(_('Conflicts encountered'),
 
479
                       _('Please resolve the conflicts manually'
 
480
                         ' before committing.'))
482
481
 
483
 
    def _handle_error(self, e):
484
 
        error_dialog('Error', str(e))
485
482
 
486
483
    def _get_save_path(self, basename):
487
484
        d = gtk.FileChooserDialog('Save As', self,
553
550
 
554
551
class MergeDirectiveController(DiffController):
555
552
 
556
 
    def __init__(self, path, directive, window=None):
 
553
    def __init__(self, path, directive, window):
557
554
        DiffController.__init__(self, path, directive.patch.splitlines(True),
558
555
                                window)
559
556
        self.directive = directive
585
582
                    # There are conflicts to be resolved.
586
583
                self.window.destroy()
587
584
            except Exception, e:
588
 
                self.window._handle_error(e)
 
585
                error_dialog('Error', str(e))
589
586
        finally:
590
587
            tree.unlock()
591
588