/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 olive/info.py

  • Committer: Vincent Ladeuil
  • Date: 2008-06-10 15:25:47 UTC
  • mto: This revision was merged to the branch mainline in revision 504.
  • Revision ID: v.ladeuil+lp@free.fr-20080610152547-dwmil1p8pd0mfpnl
Fix third failing test (thanks to jam).

* tests/test_commit.py:
(TestPendingRevisions.test_pending_revisions_multi_merge): Fix
provided by jam: bzr we now filter the pending merges so that only
the 'heads()' are included. We just ensure that the pending merges
contain the unique tips for the ancestries.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/info.py
25
25
 
26
26
import bzrlib.errors as errors
27
27
 
 
28
from bzrlib.plugins.gtk import _i18n
28
29
from bzrlib.plugins.gtk.dialog import error_dialog
29
30
from guifiles import GLADEFILENAME
30
31
 
553
554
    def display(self):
554
555
        """ Display the Informations window. """
555
556
        if self.notbranch:
556
 
            error_dialog(_('Directory is not a branch'),
557
 
                         _('You can perform this action only in a branch.'))
 
557
            error_dialog(_i18n('Directory is not a branch'),
 
558
                         _i18n('You can perform this action only in a branch.'))
558
559
            self.close()
559
560
        else:
560
561
            self.window.show()