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

  • Committer: Jelmer Vernooij
  • Date: 2007-03-09 17:47:28 UTC
  • Revision ID: jelmer@samba.org-20070309174728-gljlmt9b7fu0rrn9
Add simple test for tortoise_bzr

Show diffs side-by-side

added added

removed removed

Lines of Context:
push.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
import sys
18
 
 
19
17
try:
20
18
    import pygtk
21
19
    pygtk.require("2.0")
23
21
    pass
24
22
    
25
23
import gtk
26
 
import gtk.gdk
27
 
import gtk.glade
28
 
 
 
24
 
 
25
from errors import show_bzr_error
 
26
 
 
27
from bzrlib.config import LocationConfig
29
28
import bzrlib.errors as errors
30
29
 
31
 
from olive import gladefile
32
 
 
33
 
class OlivePush:
34
 
    """ Display Push dialog and perform the needed actions. """
35
 
    def __init__(self, branch):
 
30
from dialog import error_dialog, info_dialog, question_dialog
 
31
 
 
32
from history import UrlHistory
 
33
 
 
34
class PushDialog(gtk.Dialog):
 
35
    """ New implementation of the Push dialog. """
 
36
    def __init__(self, branch, parent=None):
36
37
        """ Initialize the Push dialog. """
37
 
        self.glade = gtk.glade.XML(gladefile, 'window_push')
 
38
        gtk.Dialog.__init__(self, title="Push - Olive",
 
39
                                  parent=parent,
 
40
                                  flags=0,
 
41
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
38
42
        
39
 
        self.window = self.glade.get_widget('window_push')
40
 
 
 
43
        # Get arguments
41
44
        self.branch = branch
42
45
        
43
 
        # Dictionary for signal_autoconnect
44
 
        dic = { "on_button_push_push_clicked": self.push,
45
 
                "on_button_push_cancel_clicked": self.close,
46
 
                "on_button_push_test_clicked": self.test,
47
 
                "on_radiobutton_push_stored_toggled": self.stored_toggled,
48
 
                "on_radiobutton_push_specific_toggled": self.specific_toggled, }
49
 
        
50
 
        # Connect the signals to the handlers
51
 
        self.glade.signal_autoconnect(dic)
52
 
        
53
 
        # Get some useful widgets
54
 
        self.radio_stored = self.glade.get_widget('radiobutton_push_stored')
55
 
        self.radio_specific = self.glade.get_widget('radiobutton_push_specific')
56
 
        self.entry_stored = self.glade.get_widget('entry_push_stored')
57
 
        self.entry_location = self.glade.get_widget('entry_push_location')
58
 
        self.check_remember = self.glade.get_widget('checkbutton_push_remember')
59
 
        self.check_overwrite = self.glade.get_widget('checkbutton_push_overwrite')
60
 
        self.check_create = self.glade.get_widget('checkbutton_push_create')
61
 
        self.label_test = self.glade.get_widget('label_push_test')
62
 
        self.image_test = self.glade.get_widget('image_push_test')
63
 
        
64
 
        # Set initial state
65
 
        self.entry_location.set_sensitive(0)
66
 
        self.check_remember.set_sensitive(0)
67
 
        self.check_create.set_sensitive(0)
68
 
        
69
 
        self.entry_stored.set_text(branch.get_push_location())
70
 
    
71
 
    def display(self):
72
 
        """ Display the Push dialog. """
73
 
        self.window.show()
74
 
        self.width, self.height = self.window.get_size()
75
 
    
76
 
    def stored_toggled(self, widget):
77
 
        if widget.get_active():
78
 
            self.entry_stored.set_sensitive(1)
79
 
            self.entry_location.set_sensitive(0)
80
 
            self.check_remember.set_sensitive(0)
81
 
            self.check_create.set_sensitive(0)
82
 
        else:
83
 
            self.entry_stored.set_sensitive(0)
84
 
            self.entry_location.set_sensitive(1)
85
 
            self.check_remember.set_sensitive(1)
86
 
            self.check_create.set_sensitive(1)
87
 
    
88
 
    def specific_toggled(self, widget):
89
 
        if widget.get_active():
90
 
            self.entry_stored.set_sensitive(0)
91
 
            self.entry_location.set_sensitive(1)
92
 
            self.check_remember.set_sensitive(1)
93
 
            self.check_create.set_sensitive(1)
94
 
        else:
95
 
            self.entry_stored.set_sensitive(1)
96
 
            self.entry_location.set_sensitive(0)
97
 
            self.check_remember.set_sensitive(0)
98
 
            self.check_create.set_sensitive(0)
99
 
    
100
 
    def push(self, widget):
101
 
        revs = 0
102
 
        if self.radio_stored.get_active():
103
 
            try:
104
 
                revs = do_push(self.branch,
105
 
                               overwrite=self.check_overwrite.get_active())
106
 
            except errors.NotBranchError:
107
 
                error_dialog(_('Directory is not a branch'),
108
 
                                         _('You can perform this action only in a branch.'))
109
 
                return
110
 
            except errors.DivergedBranches:
111
 
                error_dialog(_('Branches have been diverged'),
112
 
                                         _('You cannot push if branches have diverged. Use the\noverwrite option if you want to push anyway.'))
113
 
                return
114
 
        elif self.radio_specific.get_active():
115
 
            location = self.entry_location.get_text()
116
 
            if location == '':
117
 
                error_dialog(_('No location specified'),
118
 
                                         _('Please specify a location or use the default.'))
119
 
                return
120
 
            
121
 
            try:
122
 
                revs = do_push(self.branch, location,
123
 
                               self.check_remember.get_active(),
124
 
                               self.check_overwrite.get_active(),
125
 
                               self.check_create.get_active())
126
 
            except errors.NotBranchError:
127
 
                error_dialog(_('Directory is not a branch'),
128
 
                                         _('You can perform this action only in a branch.'))
129
 
                return
130
 
            except errors.DivergedBranches:
131
 
                error_dialog(_('Branches have been diverged'),
132
 
                                         _('You cannot push if branches have diverged. Use the\noverwrite option if you want to push anyway.'))
133
 
                return
134
 
        
135
 
        self.close()
136
 
        info_dialog(_('Push successful'),
137
 
                                _('%d revision(s) pushed.') % revs)
138
 
    
139
 
    def test(self, widget):
140
 
        """ Test if write access possible. """
 
46
        # Create the widgets
 
47
        self._label_location = gtk.Label(_("Location:"))
 
48
        self._label_test = gtk.Label(_("(click the Test button to check write access)"))
 
49
        self._check_remember = gtk.CheckButton(_("_Remember as default location"),
 
50
                                               use_underline=True)
 
51
        self._check_prefix = gtk.CheckButton(_("Create the path _leading up to the location"),
 
52
                                             use_underline=True)
 
53
        self._check_overwrite = gtk.CheckButton(_("_Overwrite target if diverged"),
 
54
                                                use_underline=True)
 
55
        self._combo = gtk.ComboBoxEntry()
 
56
        self._button_test = gtk.Button(_("_Test"), use_underline=True)
 
57
        self._button_push = gtk.Button(_("_Push"), use_underline=True)
 
58
        self._hbox_location = gtk.HBox()
 
59
        self._hbox_test = gtk.HBox()
 
60
        self._image_test = gtk.Image()
 
61
        
 
62
        # Set callbacks
 
63
        self._button_test.connect('clicked', self._on_test_clicked)
 
64
        self._button_push.connect('clicked', self._on_push_clicked)
 
65
        
 
66
        # Set properties
 
67
        self._image_test.set_from_stock(gtk.STOCK_DIALOG_INFO, gtk.ICON_SIZE_BUTTON)
 
68
        self._label_location.set_alignment(0, 0.5)
 
69
        self._label_test.set_alignment(0, 0.5)
 
70
        self._hbox_location.set_spacing(3)
 
71
        self._hbox_test.set_spacing(3)
 
72
        self.vbox.set_spacing(3)
 
73
        
 
74
        # Pack widgets
 
75
        self._hbox_location.pack_start(self._label_location, False, False)
 
76
        self._hbox_location.pack_start(self._combo, True, True)
 
77
        self._hbox_test.pack_start(self._image_test, False, False)
 
78
        self._hbox_test.pack_start(self._label_test, True, True)
 
79
        self.vbox.pack_start(self._hbox_location)
 
80
        self.vbox.pack_start(self._check_remember)
 
81
        self.vbox.pack_start(self._check_prefix)
 
82
        self.vbox.pack_start(self._check_overwrite)
 
83
        self.vbox.pack_start(self._hbox_test)
 
84
        self.action_area.pack_start(self._button_test)
 
85
        self.action_area.pack_end(self._button_push)
 
86
        
 
87
        # Show the dialog
 
88
        self.vbox.show_all()
 
89
        
 
90
        # Build location history
 
91
        self._history = UrlHistory(self.branch.get_config(), 'push_history')
 
92
        self._build_history()
 
93
        
 
94
    def _build_history(self):
 
95
        """ Build up the location history. """
 
96
        self._combo_model = gtk.ListStore(str)
 
97
        for item in self._history.get_entries():
 
98
            self._combo_model.append([ item ])
 
99
        self._combo.set_model(self._combo_model)
 
100
        self._combo.set_text_column(0)
 
101
        
 
102
        location = self.branch.get_push_location()
 
103
        if location:
 
104
            self._combo.get_child().set_text(location)
 
105
    
 
106
    def _on_test_clicked(self, widget):
 
107
        """ Test button clicked handler. """
141
108
        import re
142
109
        _urlRE = re.compile(r'^(?P<proto>[^:/\\]+)://(?P<path>.*)$')
143
110
        
144
 
        if self.radio_stored.get_active():
145
 
            url = self.entry_stored.get_text()
146
 
        elif self.radio_specific.get_active():
147
 
            url = self.entry_location.get_text()
 
111
        url = self._combo.get_child().get_text()
148
112
        
149
113
        m = _urlRE.match(url)
150
114
        if m:
151
115
            proto = m.groupdict()['proto']
152
116
            if (proto == 'sftp') or (proto == 'file') or (proto == 'ftp'):
153
117
                # have write acces (most probably)
154
 
                self.image_test.set_from_stock(gtk.STOCK_YES, 4)
155
 
                self.label_test.set_markup(_('<b>Write access is probably available</b>'))
 
118
                self._image_test.set_from_stock(gtk.STOCK_YES, 4)
 
119
                self._label_test.set_markup(_('<b>Write access is probably available</b>'))
156
120
            else:
157
121
                # no write access
158
 
                self.image_test.set_from_stock(gtk.STOCK_NO, 4)
159
 
                self.label_test.set_markup(_('<b>No write access</b>'))
 
122
                self._image_test.set_from_stock(gtk.STOCK_NO, 4)
 
123
                self._label_test.set_markup(_('<b>No write access</b>'))
160
124
        else:
161
125
            # couldn't determine
162
 
            self.image_test.set_from_stock(gtk.STOCK_DIALOG_QUESTION, 4)
163
 
            self.label_test.set_markup(_('<b>Could not determine</b>'))
 
126
            self._image_test.set_from_stock(gtk.STOCK_DIALOG_QUESTION, 4)
 
127
            self._label_test.set_markup(_('<b>Could not determine</b>'))
164
128
    
165
 
    def close(self, widget=None):
166
 
        self.window.destroy()
 
129
    @show_bzr_error
 
130
    def _on_push_clicked(self, widget):
 
131
        """ Push button clicked handler. """
 
132
        location = self._combo.get_child().get_text()
 
133
        revs = 0
 
134
        try:
 
135
            revs = do_push(self.branch,
 
136
                           location=location,
 
137
                           overwrite=self._check_overwrite.get_active(),
 
138
                           remember=self._check_remember.get_active(),
 
139
                           create_prefix=self._check_prefix.get_active())
 
140
        except errors.DivergedBranches:
 
141
            response = question_dialog(_('Branches have been diverged'),
 
142
                                       _('You cannot push if branches have diverged.\nOverwrite?'))
 
143
            if response == gtk.RESPONSE_OK:
 
144
                revs = do_push(self.branch, overwrite=True)
 
145
            return
 
146
        
 
147
        self._history.add_entry(location)
 
148
        info_dialog(_('Push successful'),
 
149
                    _("%d revision(s) pushed.") % revs)
 
150
        
 
151
        self.response(gtk.RESPONSE_OK)
167
152
 
168
153
def do_push(branch, location=None, remember=False, overwrite=False,
169
154
         create_prefix=False):
181
166
    
182
167
    :return: number of revisions pushed
183
168
    """
184
 
    from bzrlib.branch import Branch
185
169
    from bzrlib.bzrdir import BzrDir
186
170
    from bzrlib.transport import get_transport
187
171
        
188
 
    br_from = Branch.open_containing(branch)[0]
 
172
    br_from = branch
189
173
    
190
174
    stored_loc = br_from.get_push_location()
191
175
    if location is None:
192
176
        if stored_loc is None:
193
177
            error_dialog(_('Push location is unknown'),
194
 
                                     _('Please specify a location manually.'))
 
178
                         _('Please specify a location manually.'))
195
179
            return
196
180
        else:
197
181
            location = stored_loc
216
200
                transport.mkdir(relurl)
217
201
            except errors.NoSuchFile:
218
202
                error_dialog(_('Non existing parent directory'),
219
 
                                         _("The parent directory (%s)\ndoesn't exist.") % location)
 
203
                             _("The parent directory (%s)\ndoesn't exist.") % location)
220
204
                return
221
205
        else:
222
206
            current = transport.base
232
216
                                   new_transport.relpath(transport.base)))
233
217
                    if new_transport.base == transport.base:
234
218
                        error_dialog(_('Path prefix not created'),
235
 
                                                 _("The path leading up to the specified location couldn't\nbe created."))
 
219
                                     _("The path leading up to the specified location couldn't\nbe created."))
236
220
                        return
237
221
        dir_to = br_from.bzrdir.clone(location_url,
238
222
            revision_id=br_from.last_revision())