/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: 2008-06-29 19:18:34 UTC
  • mto: This revision was merged to the branch mainline in revision 515.
  • Revision ID: jelmer@samba.org-20080629191834-ha2ecpv5szt96nge
Make sure signed testament matches repository data.

Show diffs side-by-side

added added

removed removed

Lines of Context:
push.py
1
1
# Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <szilveszter.farkas@gmail.com>
 
2
# Copyright (C) 2007 by Jelmer Vernooij <jelmer@samba.org>
2
3
#
3
4
# This program is free software; you can redistribute it and/or modify
4
5
# it under the terms of the GNU General Public License as published by
24
25
 
25
26
from errors import show_bzr_error
26
27
 
 
28
# FIXME: This needs to be public JRV 20070714
 
29
from bzrlib.builtins import _create_prefix
27
30
from bzrlib.config import LocationConfig
28
31
import bzrlib.errors as errors
29
32
 
 
33
from bzrlib.plugins.gtk import _i18n
30
34
from dialog import error_dialog, info_dialog, question_dialog
31
35
 
32
36
from history import UrlHistory
33
37
 
34
38
class PushDialog(gtk.Dialog):
35
39
    """ New implementation of the Push dialog. """
36
 
    def __init__(self, branch, parent=None):
 
40
    def __init__(self, repository, revid, branch=None, parent=None):
37
41
        """ Initialize the Push dialog. """
38
42
        gtk.Dialog.__init__(self, title="Push - Olive",
39
43
                                  parent=parent,
41
45
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
42
46
        
43
47
        # Get arguments
 
48
        self.repository = repository
 
49
        self.revid = revid
44
50
        self.branch = branch
45
51
        
46
52
        # 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)
 
53
        self._label_location = gtk.Label(_i18n("Location:"))
55
54
        self._combo = gtk.ComboBoxEntry()
56
 
        self._button_test = gtk.Button(_("_Test"), use_underline=True)
57
 
        self._button_push = gtk.Button(_("_Push"), use_underline=True)
 
55
        self._button_push = gtk.Button(_i18n("_Push"), use_underline=True)
58
56
        self._hbox_location = gtk.HBox()
59
 
        self._hbox_test = gtk.HBox()
60
 
        self._image_test = gtk.Image()
61
57
        
62
58
        # Set callbacks
63
 
        self._button_test.connect('clicked', self._on_test_clicked)
64
59
        self._button_push.connect('clicked', self._on_push_clicked)
65
60
        
66
61
        # Set properties
67
 
        self._image_test.set_from_stock(gtk.STOCK_DIALOG_INFO, gtk.ICON_SIZE_BUTTON)
68
62
        self._label_location.set_alignment(0, 0.5)
69
 
        self._label_test.set_alignment(0, 0.5)
70
63
        self._hbox_location.set_spacing(3)
71
 
        self._hbox_test.set_spacing(3)
72
64
        self.vbox.set_spacing(3)
73
65
        
74
66
        # Pack widgets
75
67
        self._hbox_location.pack_start(self._label_location, False, False)
76
68
        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
69
        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
70
        self.action_area.pack_end(self._button_push)
86
71
        
87
72
        # Show the dialog
99
84
        self._combo.set_model(self._combo_model)
100
85
        self._combo.set_text_column(0)
101
86
        
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. """
108
 
        import re
109
 
        _urlRE = re.compile(r'^(?P<proto>[^:/\\]+)://(?P<path>.*)$')
110
 
        
111
 
        url = self._combo.get_child().get_text()
112
 
        
113
 
        m = _urlRE.match(url)
114
 
        if m:
115
 
            proto = m.groupdict()['proto']
116
 
            # FIXME: This should ask the transport or branch rather than 
117
 
            # guessing using regular expressions. JRV 20070714
118
 
            if proto in ('sftp', 'file', 'ftp'):
119
 
                # have write access (most probably)
120
 
                self._image_test.set_from_stock(gtk.STOCK_YES, 4)
121
 
                self._label_test.set_markup(_('<b>Write access is probably available</b>'))
122
 
            else:
123
 
                # no write access
124
 
                self._image_test.set_from_stock(gtk.STOCK_NO, 4)
125
 
                self._label_test.set_markup(_('<b>No write access</b>'))
126
 
        else:
127
 
            # couldn't determine
128
 
            self._image_test.set_from_stock(gtk.STOCK_DIALOG_QUESTION, 4)
129
 
            self._label_test.set_markup(_('<b>Could not determine</b>'))
 
87
        if self.branch is not None:
 
88
            location = self.branch.get_push_location()
 
89
            if location is not None:
 
90
                self._combo.get_child().set_text(location)
130
91
    
131
92
    @show_bzr_error
132
93
    def _on_push_clicked(self, widget):
133
94
        """ Push button clicked handler. """
134
95
        location = self._combo.get_child().get_text()
135
96
        revs = 0
 
97
        if self.branch is not None and self.branch.get_push_location() is None:
 
98
            response = question_dialog(_i18n('Set default push location'),
 
99
                                       _i18n('There is no default push location set.\nSet %r as default now?') % location)
 
100
            if response == gtk.RESPONSE_OK:
 
101
                self.branch.set_push_location(location)
 
102
 
136
103
        try:
137
 
            revs = do_push(self.branch,
138
 
                           location=location,
139
 
                           overwrite=self._check_overwrite.get_active(),
140
 
                           remember=self._check_remember.get_active(),
141
 
                           create_prefix=self._check_prefix.get_active())
 
104
            revs = do_push(self.branch, location=location, overwrite=False)
142
105
        except errors.DivergedBranches:
143
 
            response = question_dialog(_('Branches have been diverged'),
144
 
                                       _('You cannot push if branches have diverged.\nOverwrite?'))
145
 
            if response == gtk.RESPONSE_OK:
146
 
                revs = do_push(self.branch, overwrite=True)
147
 
            return
 
106
            response = question_dialog(_i18n('Branches have been diverged'),
 
107
                                       _i18n('You cannot push if branches have diverged.\nOverwrite?'))
 
108
            if response == gtk.RESPONSE_YES:
 
109
                revs = do_push(self.branch, location=location, overwrite=True)
148
110
        
149
111
        self._history.add_entry(location)
150
 
        info_dialog(_('Push successful'),
151
 
                    _("%d revision(s) pushed.") % revs)
 
112
        info_dialog(_i18n('Push successful'),
 
113
                    _i18n("%d revision(s) pushed.") % revs)
152
114
        
153
115
        self.response(gtk.RESPONSE_OK)
154
116
 
155
 
def do_push(branch, location=None, remember=False, overwrite=False,
156
 
         create_prefix=False):
 
117
def do_push(br_from, location, overwrite):
157
118
    """ Update a mirror of a branch.
158
119
    
159
 
    :param branch: the source branch
 
120
    :param br_from: the source branch
160
121
    
161
122
    :param location: the location of the branch that you'd like to update
162
123
    
163
 
    :param remember: if set, the location will be stored
164
 
    
165
124
    :param overwrite: overwrite target location if it diverged
166
125
    
167
 
    :param create_prefix: create the path leading up to the branch if it doesn't exist
168
 
    
169
126
    :return: number of revisions pushed
170
127
    """
171
128
    from bzrlib.bzrdir import BzrDir
172
129
    from bzrlib.transport import get_transport
173
130
        
174
 
    br_from = branch
175
 
    
176
 
    stored_loc = br_from.get_push_location()
177
 
    if location is None:
178
 
        if stored_loc is None:
179
 
            error_dialog(_('Push location is unknown'),
180
 
                         _('Please specify a location manually.'))
181
 
            return
182
 
        else:
183
 
            location = stored_loc
184
 
 
185
131
    transport = get_transport(location)
186
132
    location_url = transport.base
187
133
 
188
 
    if br_from.get_push_location() is None or remember:
189
 
        br_from.set_push_location(location_url)
190
 
 
191
134
    old_rh = []
192
135
 
193
136
    try:
196
139
    except errors.NotBranchError:
197
140
        # create a branch.
198
141
        transport = transport.clone('..')
199
 
        if not create_prefix:
200
 
            try:
201
 
                relurl = transport.relpath(location_url)
202
 
                transport.mkdir(relurl)
203
 
            except errors.NoSuchFile:
204
 
                error_dialog(_('Non existing parent directory'),
205
 
                             _("The parent directory (%s)\ndoesn't exist.") % location)
 
142
        try:
 
143
            relurl = transport.relpath(location_url)
 
144
            transport.mkdir(relurl)
 
145
        except errors.NoSuchFile:
 
146
            response = question_dialog(_i18n('Non existing parent directory'),
 
147
                         _i18n("The parent directory (%s)\ndoesn't exist. Create?") % location)
 
148
            if response == gtk.RESPONSE_OK:
 
149
                _create_prefix(transport)
 
150
            else:
206
151
                return
207
 
        else:
208
 
            current = transport.base
209
 
            needed = [(transport, transport.relpath(location_url))]
210
 
            while needed:
211
 
                try:
212
 
                    transport, relpath = needed[-1]
213
 
                    transport.mkdir(relpath)
214
 
                    needed.pop()
215
 
                except errors.NoSuchFile:
216
 
                    new_transport = transport.clone('..')
217
 
                    needed.append((new_transport,
218
 
                                   new_transport.relpath(transport.base)))
219
 
                    if new_transport.base == transport.base:
220
 
                        error_dialog(_('Path prefix not created'),
221
 
                                     _("The path leading up to the specified location couldn't\nbe created."))
222
 
                        return
223
152
        dir_to = br_from.bzrdir.clone(location_url,
224
153
            revision_id=br_from.last_revision())
225
154
        br_to = dir_to.open_branch()
230
159
            tree_to = dir_to.open_workingtree()
231
160
        except errors.NotLocalUrl:
232
161
            # FIXME - what to do here? how should we warn the user?
233
 
            #warning('This transport does not update the working '
234
 
            #        'tree of: %s' % (br_to.base,))
235
162
            count = br_to.pull(br_from, overwrite)
236
163
        except errors.NoWorkingTree:
237
164
            count = br_to.pull(br_from, overwrite)