/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/menu.py

  • Committer: Szilveszter Farkas (Phanatic)
  • Date: 2006-09-27 19:11:59 UTC
  • mfrom: (0.8.90 merge)
  • mto: (93.1.1 win32.bialix)
  • mto: This revision was merged to the branch mainline in revision 103.
  • Revision ID: Szilveszter.Farkas@gmail.com-20060927191159-cc4e54f613575779
Merge all changes. Release 0.11.0.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/menu.py
28
28
except:
29
29
    sys.exit(1)
30
30
 
31
 
import olive.backend.fileops as fileops
32
 
import olive.backend.errors as errors
 
31
import bzrlib.errors as errors
33
32
 
34
33
from launch import launch
35
34
 
144
143
            return
145
144
        
146
145
        try:
147
 
            fileops.add([directory + '/' + filename])
 
146
            bzrlib.add.smart_add([directory + '/' + filename])
148
147
        except errors.NotBranchError:
149
148
            self.dialog.error_dialog(_('Directory is not a branch'),
150
149
                                     _('You can perform this action only in a branch.'))
151
150
            return
152
 
        except:
153
 
            raise
154
151
        
155
152
        self.comm.refresh_right()
156
153
    
166
163
            return
167
164
        
168
165
        try:
169
 
            fileops.remove([directory + '/' + filename])
 
166
            wt, path = WorkingTree.open_containing(directory+'/'+filename)
 
167
            wt.remove(path)
 
168
 
170
169
        except errors.NotBranchError:
171
170
            self.dialog.error_dialog(_('Directory is not a branch'),
172
171
                                     _('You can perform this action only in a branch.'))