/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: 2006-09-30 10:21:43 UTC
  • Revision ID: jelmer@samba.org-20060930102143-c0ef64d6ca860c21
Merge some files from Olive and bzr-gtk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/add.py
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
import os
 
18
import sys
18
19
 
19
20
try:
20
21
    import pygtk
67
68
                             _('Please select a file from the list,\nor choose the other option.'))
68
69
                return
69
70
            
70
 
            fullpath = self.wt.abspath(os.path.join(self.wtpath, filename))
 
71
            if self.wtpath == "":
 
72
                fullpath = self.wt.abspath(filename)
 
73
            else:
 
74
                fullpath = self.wt.abspath(self.wtpath + os.sep + filename)
71
75
            
72
76
            try:
73
77
                bzrlib.add.smart_add([fullpath])
77
81
                return
78
82
        elif radio_unknown.get_active():
79
83
            # Add unknown files recursively
80
 
            fullpath = self.wt.abspath(self.wtpath)
81
 
            
82
84
            try:
83
 
                bzrlib.add.smart_add([fullpath], True)
 
85
                bzrlib.add.smart_add([self.wtpath], True)
84
86
            except errors.NotBranchError:
85
87
                error_dialog(_('Directory is not a branch'),
86
88
                             _('You can perform this action only in a branch.'))