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

  • Committer: Aaron Bentley
  • Date: 2007-01-17 06:42:55 UTC
  • mto: This revision was merged to the branch mainline in revision 129.
  • Revision ID: aaron.bentley@utoronto.ca-20070117064255-x4gznz5e0lyjq3gk
Remove usused span selector

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/rename.py
28
28
import bzrlib.errors as errors
29
29
from bzrlib.workingtree import WorkingTree
30
30
 
31
 
from bzrlib.plugins.gtk.dialog import error_dialog
 
31
from dialog import error_dialog
32
32
from guifiles import GLADEFILENAME
33
33
 
34
34
 
59
59
        
60
60
        self.window.show_all()
61
61
 
62
 
    @show_bzr_error
63
62
    def rename(self, widget):
64
63
        # Get entry
65
64
        old_filename = self.selected
79
78
        destination = os.path.join(self.wtpath, new_filename)
80
79
        
81
80
        # Rename the file
82
 
        wt1, path1 = WorkingTree.open_containing(self.wt.abspath(source))
83
 
        wt2, path2 = WorkingTree.open_containing(self.wt.abspath(source))
 
81
        try:
 
82
            wt1, path1 = WorkingTree.open_containing(self.wt.abspath(source))
 
83
            wt2, path2 = WorkingTree.open_containing(self.wt.abspath(source))
84
84
 
85
 
        if wt1.basedir != wt2.basedir:
86
 
            error_dialog(_('Not the same branch'),
87
 
                         _('The destination is not in the same branch.'))
 
85
            if wt1.basedir != wt2.basedir:
 
86
                error_dialog(_('Not the same branch'),
 
87
                             _('The destination is not in the same branch.'))
 
88
                return
 
89
            wt1.rename_one(source, destination)
 
90
        except errors.NotBranchError:
 
91
            error_dialog(_('File is not in a branch'),
 
92
                         _('The selected file is not in a branch.'))
88
93
            return
89
 
        wt1.rename_one(source, destination)
 
94
        except errors.BzrError, msg:
 
95
            error_dialog(_('Unknown bzr error'), str(msg))
 
96
 
90
97
        self.close()
91
98
    
92
99
    def close(self, widget=None):