/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: 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/add.py
27
27
except:
28
28
    sys.exit(1)
29
29
 
30
 
import olive.backend.errors as errors
31
 
import olive.backend.fileops as fileops
 
30
import bzrlib.add
 
31
import bzrlib.errors as errors
32
32
 
33
33
class OliveAdd:
34
34
    """ Display the Add file(s) dialog and perform the needed actions. """
73
73
                return
74
74
            
75
75
            try:
76
 
                fileops.add([directory + '/' + filename])
 
76
                bzrlib.add.smart_add([directory + '/' + filename])
77
77
            except errors.NotBranchError:
78
78
                self.dialog.error_dialog(_('Directory is not a branch'),
79
79
                                         _('You can perform this action only in a branch.'))
84
84
        elif radio_unknown.get_active():
85
85
            # Add unknown files recursively
86
86
            try:
87
 
                fileops.add([directory], True)
 
87
                bzrlib.add.smart_add([directory], True)
88
88
            except errors.NotBranchError:
89
89
                self.dialog.error_dialog(_('Directory is not a branch'),
90
90
                                         _('You can perform this action only in a branch.'))