/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: Vincent Ladeuil
  • Date: 2008-06-10 15:25:47 UTC
  • mto: This revision was merged to the branch mainline in revision 504.
  • Revision ID: v.ladeuil+lp@free.fr-20080610152547-dwmil1p8pd0mfpnl
Fix third failing test (thanks to jam).

* tests/test_commit.py:
(TestPendingRevisions.test_pending_revisions_multi_merge): Fix
provided by jam: bzr we now filter the pending merges so that only
the 'heads()' are included. We just ensure that the pending merges
contain the unique tips for the ancestries.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/move.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
from os.path import dirname
19
19
 
20
20
try:
21
21
    import pygtk
22
22
    pygtk.require("2.0")
23
23
except:
24
24
    pass
25
 
try:
26
 
    import gtk
27
 
    import gtk.glade
28
 
except:
29
 
    sys.exit(1)
 
25
 
 
26
import gtk
 
27
import gtk.glade
30
28
 
31
29
import bzrlib.errors as errors
 
30
from bzrlib.workingtree import WorkingTree
 
31
 
 
32
from bzrlib.plugins.gtk import _i18n
 
33
from bzrlib.plugins.gtk.dialog import error_dialog
 
34
from errors import show_bzr_error
 
35
from guifiles import GLADEFILENAME
 
36
 
32
37
 
33
38
class OliveMove:
34
39
    """ Display the Move dialog and perform the needed actions. """
35
 
    def __init__(self, gladefile, comm):
 
40
    def __init__(self, wt, wtpath, selected=[]):
36
41
        """ Initialize the Move dialog. """
37
 
        self.gladefile = gladefile
38
 
        self.glade = gtk.glade.XML(self.gladefile, 'window_move', 'olive-gtk')
39
 
        
40
 
        # Communication object
41
 
        self.comm = comm
 
42
        self.glade = gtk.glade.XML(GLADEFILENAME, 'window_move', 'olive-gtk')
42
43
        
43
44
        self.window = self.glade.get_widget('window_move')
44
45
        
49
50
        # Connect the signals to the handlers
50
51
        self.glade.signal_autoconnect(dic)
51
52
        
 
53
        self.wt = wt
 
54
        self.wtpath = wtpath
 
55
        self.selected = selected
 
56
        
 
57
        if self.selected is None:
 
58
            self.selected = ""
 
59
        
 
60
        if self.wtpath == "":
 
61
            directory = dirname(self.wt.abspath(self.selected))
 
62
        else:
 
63
            directory = dirname(self.wt.abspath(self.wtpath + os.sep + self.selected))
 
64
        
52
65
        # Set FileChooser directory
53
66
        self.filechooser = self.glade.get_widget('filechooserbutton_move')
54
 
        self.filechooser.set_filename(self.comm.get_path())
 
67
        self.filechooser.set_filename(directory)
55
68
 
56
69
    def display(self):
57
70
        """ Display the Move dialog. """
58
71
        self.window.show_all()
59
72
 
 
73
    @show_bzr_error
60
74
    def move(self, widget):
61
75
        destination = self.filechooser.get_filename()
62
76
 
63
 
        filename = self.comm.get_selected_right()
 
77
        filename = self.selected
64
78
            
65
79
        if filename is None:
66
 
            error_dialog(_('No file was selected'),
67
 
                                     _('Please select a file from the list to proceed.'))
 
80
            error_dialog(_i18n('No file was selected'),
 
81
                         _i18n('Please select a file from the list to proceed.'))
68
82
            return
69
83
        
70
 
        source = self.comm.get_path() + '/' + filename
 
84
        source = os.path.join(self.wtpath, filename)
71
85
        
72
86
        # Move the file to a directory
73
 
        try:
74
 
            wt1, path1 = WorkingTree.open_containing(source)
75
 
            wt2, path2 = WorkingTree.open_containing(destination)
76
 
            if wt1.base != wt2.base:
77
 
                error_dialog(_('Not the same branch'),
78
 
                                         _('The destination is not in the same branch.'))
79
 
                return
80
 
 
81
 
            wt1.move([source], destination)
82
 
        except errors.NotBranchError:
83
 
            error_dialog(_('File is not in a branch'),
84
 
                                     _('The selected file is not in a branch.'))
 
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.'))
85
92
            return
86
93
 
 
94
        wt1.move([source], wt1.relpath(destination))
87
95
        self.close()
88
 
        self.comm.refresh_right()
89
96
    
90
97
    def close(self, widget=None):
91
98
        self.window.destroy()