/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: Jelmer Vernooij
  • Date: 2008-06-29 18:32:05 UTC
  • mto: This revision was merged to the branch mainline in revision 518.
  • Revision ID: jelmer@samba.org-20080629183205-mmj1fnd8t9l80czj
https://launchpad.net/bugs/244027
Fix another use of smart_add.

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 dialog import error_dialog
 
31
from bzrlib.plugins.gtk import _i18n
 
32
from bzrlib.plugins.gtk.dialog import error_dialog
32
33
from guifiles import GLADEFILENAME
33
34
 
34
35
 
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
 
            fullpath = self.wt.abspath(os.path.join(self.wtpath, filename))
72
 
            
73
72
            try:
74
 
                bzrlib.add.smart_add([fullpath])
 
73
                self.wt.add([filename])
75
74
            except errors.NotBranchError:
76
 
                error_dialog(_('Directory is not a branch'),
77
 
                             _('You can perform this action only in a branch.'))
 
75
                error_dialog(_i18n('Directory is not a branch'),
 
76
                             _i18n('You can perform this action only in a branch.'))
78
77
                return
79
78
        elif radio_unknown.get_active():
80
79
            # Add unknown files recursively
81
 
            fullpath = self.wt.abspath(self.wtpath)
82
 
            
83
80
            try:
84
 
                bzrlib.add.smart_add([fullpath], True)
 
81
                self.wt.add(self.wt.unknowns())
85
82
            except errors.NotBranchError:
86
 
                error_dialog(_('Directory is not a branch'),
87
 
                             _('You can perform this action only in a branch.'))
 
83
                error_dialog(_i18n('Directory is not a branch'),
 
84
                             _i18n('You can perform this action only in a branch.'))
88
85
                return
89
86
        
90
87
        self.close()