/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/move.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/move.py
29
29
import bzrlib.errors as errors
30
30
from bzrlib.workingtree import WorkingTree
31
31
 
32
 
from bzrlib.plugins.gtk.dialog import error_dialog
33
 
from errors import show_bzr_error
 
32
from dialog import error_dialog
34
33
from guifiles import GLADEFILENAME
35
34
 
36
35
 
69
68
        """ Display the Move dialog. """
70
69
        self.window.show_all()
71
70
 
72
 
    @show_bzr_error
73
71
    def move(self, widget):
74
72
        destination = self.filechooser.get_filename()
75
73
 
83
81
        source = os.path.join(self.wtpath, filename)
84
82
        
85
83
        # Move the file to a directory
86
 
        wt1, path1 = WorkingTree.open_containing(self.wt.abspath(source))
87
 
        wt2, path2 = WorkingTree.open_containing(destination)
88
 
        if wt1.basedir != wt2.basedir:
89
 
            error_dialog(_('Not the same branch'),
90
 
                         _('The destination is not in the same branch.'))
 
84
        try:
 
85
            wt1, path1 = WorkingTree.open_containing(self.wt.abspath(source))
 
86
            wt2, path2 = WorkingTree.open_containing(destination)
 
87
            if wt1.basedir != wt2.basedir:
 
88
                error_dialog(_('Not the same branch'),
 
89
                             _('The destination is not in the same branch.'))
 
90
                return
 
91
 
 
92
            wt1.move([source], wt1.relpath(destination))
 
93
        except errors.NotBranchError:
 
94
            error_dialog(_('File is not in a branch'),
 
95
                         _('The selected file is not in a branch.'))
91
96
            return
92
97
 
93
 
        wt1.move([source], wt1.relpath(destination))
94
98
        self.close()
95
99
    
96
100
    def close(self, widget=None):