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