/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: Adrian Wilkins
  • Date: 2008-04-24 15:26:14 UTC
  • mto: This revision was merged to the branch mainline in revision 470.
  • Revision ID: adrian.wilkins@gmail.com-20080424152614-2rnnljbro6vzqvf7
Detect the reserved null: revision in appropriate places. 

This removes a huge shower of stack traces that get dumped to console when 
you look at the bottom of a log.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/rename.py
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
import os
18
 
import sys
19
18
 
20
19
try:
21
20
    import pygtk
27
26
import gtk.glade
28
27
 
29
28
import bzrlib.errors as errors
 
29
from bzrlib.workingtree import WorkingTree
 
30
 
 
31
from errors import show_bzr_error
 
32
from bzrlib.plugins.gtk.dialog import error_dialog
 
33
from guifiles import GLADEFILENAME
 
34
 
30
35
 
31
36
class OliveRename:
32
37
    """ Display the Rename dialog and perform the needed actions. """
33
 
    def __init__(self, comm):
 
38
    def __init__(self, wt, wtpath, selected=[]):
34
39
        """ Initialize the Rename dialog. """
35
 
        self.glade = gtk.glade.XML(gladefile, 'window_rename')
36
 
        
37
 
        # Communication object
38
 
        self.comm = comm
 
40
        self.glade = gtk.glade.XML(GLADEFILENAME, 'window_rename')
39
41
        
40
42
        self.window = self.glade.get_widget('window_rename')
 
43
        self.entry = self.glade.get_widget('entry_rename')
41
44
        
42
45
        # Dictionary for signal_autoconnect
43
46
        dic = { "on_button_rename_rename_clicked": self.rename,
46
49
        # Connect the signals to the handlers
47
50
        self.glade.signal_autoconnect(dic)
48
51
        
 
52
        self.wt = wt
 
53
        self.wtpath = wtpath
 
54
        self.selected = selected
 
55
        
49
56
    def display(self):
50
57
        """ Display the Rename dialog. """
 
58
        if self.selected is not None:
 
59
            self.entry.set_text(self.selected)
 
60
        
51
61
        self.window.show_all()
52
62
 
 
63
    @show_bzr_error
53
64
    def rename(self, widget):
54
65
        # Get entry
55
 
        entry = self.glade.get_widget('entry_rename')
56
 
        
57
 
        old_filename = self.comm.get_selected_right()
58
 
        new_filename = entry.get_text()
 
66
        old_filename = self.selected
 
67
        new_filename = self.entry.get_text()
59
68
            
60
69
        if old_filename is None:
61
70
            error_dialog(_('No file was selected'),
62
 
                                     _('Please select a file from the list to proceed.'))
 
71
                         _('Please select a file from the list to proceed.'))
63
72
            return
64
73
        
65
74
        if new_filename == "":
66
75
            error_dialog(_('Filename not given'),
67
 
                                     _('Please specify a new name for the file.'))
 
76
                         _('Please specify a new name for the file.'))
68
77
            return
69
78
        
70
 
        source = self.comm.get_path() + '/' + old_filename
71
 
        destination = self.comm.get_path() + '/' + new_filename
 
79
        source = os.path.join(self.wtpath, old_filename)
 
80
        destination = os.path.join(self.wtpath, new_filename)
72
81
        
73
82
        # Rename the file
74
 
        try:
75
 
            wt1, path1 = WorkingTree.open_containing(source)
76
 
            wt2, path2 = WorkingTree.open_containing(source)
 
83
        wt1, path1 = WorkingTree.open_containing(self.wt.abspath(source))
 
84
        wt2, path2 = WorkingTree.open_containing(self.wt.abspath(source))
77
85
 
78
 
            if wt1.base != wt2.base:
79
 
                error_dialog(_('Not the same branch'),
80
 
                                         _('The destination is not in the same branch.'))
81
 
                return
82
 
            wt1.rename_one(source, destination)
83
 
        except errors.NotBranchError:
84
 
            error_dialog(_('File is not in a branch'),
85
 
                                     _('The selected file is not in a branch.'))
 
86
        if wt1.basedir != wt2.basedir:
 
87
            error_dialog(_('Not the same branch'),
 
88
                         _('The destination is not in the same branch.'))
86
89
            return
87
 
 
 
90
        wt1.rename_one(source, destination)
88
91
        self.close()
89
 
        self.comm.refresh_right()
90
92
    
91
93
    def close(self, widget=None):
92
94
        self.window.destroy()