/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/add.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/add.py
28
28
import bzrlib.add
29
29
import bzrlib.errors as errors
30
30
 
 
31
from bzrlib.plugins.gtk import _i18n
31
32
from bzrlib.plugins.gtk.dialog import error_dialog
32
33
from guifiles import GLADEFILENAME
33
34
 
64
65
            filename = self.selected
65
66
            
66
67
            if filename is None:
67
 
                error_dialog(_('No file was selected'),
68
 
                             _('Please select a file from the list,\nor choose the other option.'))
 
68
                error_dialog(_i18n('No file was selected'),
 
69
                             _i18n('Please select a file from the list,\nor choose the other option.'))
69
70
                return
70
71
            
71
72
            fullpath = self.wt.abspath(os.path.join(self.wtpath, filename))
73
74
            try:
74
75
                bzrlib.add.smart_add([fullpath])
75
76
            except errors.NotBranchError:
76
 
                error_dialog(_('Directory is not a branch'),
77
 
                             _('You can perform this action only in a branch.'))
 
77
                error_dialog(_i18n('Directory is not a branch'),
 
78
                             _i18n('You can perform this action only in a branch.'))
78
79
                return
79
80
        elif radio_unknown.get_active():
80
81
            # Add unknown files recursively
83
84
            try:
84
85
                bzrlib.add.smart_add([fullpath], True)
85
86
            except errors.NotBranchError:
86
 
                error_dialog(_('Directory is not a branch'),
87
 
                             _('You can perform this action only in a branch.'))
 
87
                error_dialog(_i18n('Directory is not a branch'),
 
88
                             _i18n('You can perform this action only in a branch.'))
88
89
                return
89
90
        
90
91
        self.close()