/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: Szilveszter Farkas (Phanatic)
  • Date: 2007-03-15 12:43:48 UTC
  • mto: (126.1.38 bzr-gtk)
  • mto: This revision was merged to the branch mainline in revision 172.
  • Revision ID: szilveszter.farkas@gmail.com-20070315124348-0nx0zb7fv4pa8xk6
Fix the indentation error in the TortoiseBZR test.

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>
3
2
#
4
3
# This program is free software; you can redistribute it and/or modify
5
4
# it under the terms of the GNU General Public License as published by
25
24
 
26
25
from errors import show_bzr_error
27
26
 
28
 
# FIXME: This needs to be public JRV 20070714
29
 
from bzrlib.builtins import _create_prefix
30
27
from bzrlib.config import LocationConfig
31
28
import bzrlib.errors as errors
32
29
 
36
33
 
37
34
class PushDialog(gtk.Dialog):
38
35
    """ New implementation of the Push dialog. """
39
 
    def __init__(self, repository, revid, branch=None, parent=None):
 
36
    def __init__(self, branch, parent=None):
40
37
        """ Initialize the Push dialog. """
41
38
        gtk.Dialog.__init__(self, title="Push - Olive",
42
39
                                  parent=parent,
44
41
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
45
42
        
46
43
        # Get arguments
47
 
        self.repository = repository
48
 
        self.revid = revid
49
44
        self.branch = branch
50
45
        
51
46
        # Create the widgets
52
47
        self._label_location = gtk.Label(_("Location:"))
53
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)
54
55
        self._combo = gtk.ComboBoxEntry()
55
56
        self._button_test = gtk.Button(_("_Test"), use_underline=True)
56
57
        self._button_push = gtk.Button(_("_Push"), use_underline=True)
76
77
        self._hbox_test.pack_start(self._image_test, False, False)
77
78
        self._hbox_test.pack_start(self._label_test, True, True)
78
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)
79
83
        self.vbox.pack_start(self._hbox_test)
80
84
        self.action_area.pack_start(self._button_test)
81
85
        self.action_area.pack_end(self._button_push)
95
99
        self._combo.set_model(self._combo_model)
96
100
        self._combo.set_text_column(0)
97
101
        
98
 
        if self.branch is not None:
99
 
            location = self.branch.get_push_location()
100
 
            if location is not None:
101
 
                self._combo.get_child().set_text(location)
 
102
        location = self.branch.get_push_location()
 
103
        if location:
 
104
            self._combo.get_child().set_text(location)
102
105
    
103
106
    def _on_test_clicked(self, widget):
104
107
        """ Test button clicked handler. """
110
113
        m = _urlRE.match(url)
111
114
        if m:
112
115
            proto = m.groupdict()['proto']
113
 
            # FIXME: This should ask the transport or branch rather than 
114
 
            # guessing using regular expressions. JRV 20070714
115
 
            if proto in ('sftp', 'file', 'ftp'):
116
 
                # have write access (most probably)
 
116
            if (proto == 'sftp') or (proto == 'file') or (proto == 'ftp'):
 
117
                # have write acces (most probably)
117
118
                self._image_test.set_from_stock(gtk.STOCK_YES, 4)
118
119
                self._label_test.set_markup(_('<b>Write access is probably available</b>'))
119
120
            else:
130
131
        """ Push button clicked handler. """
131
132
        location = self._combo.get_child().get_text()
132
133
        revs = 0
133
 
        if self.branch is not None and self.branch.get_push_location() is None:
134
 
            response = question_dialog(_('Set default push location'),
135
 
                                       _('There is no default push location set.\nSet %r as default now?') % location)
136
 
            if response == gtk.REPONSE_OK:
137
 
                self.branch.set_push_location(location)
138
 
 
139
134
        try:
140
 
            revs = do_push(self.branch, location=location, overwrite=False)
 
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())
141
140
        except errors.DivergedBranches:
142
141
            response = question_dialog(_('Branches have been diverged'),
143
142
                                       _('You cannot push if branches have diverged.\nOverwrite?'))
144
143
            if response == gtk.RESPONSE_OK:
145
 
                revs = do_push(self.branch, location=location, overwrite=True)
 
144
                revs = do_push(self.branch, overwrite=True)
146
145
            return
147
146
        
148
147
        self._history.add_entry(location)
151
150
        
152
151
        self.response(gtk.RESPONSE_OK)
153
152
 
154
 
def do_push(br_from, location, overwrite):
 
153
def do_push(branch, location=None, remember=False, overwrite=False,
 
154
         create_prefix=False):
155
155
    """ Update a mirror of a branch.
156
156
    
157
 
    :param br_from: the source branch
 
157
    :param branch: the source branch
158
158
    
159
159
    :param location: the location of the branch that you'd like to update
160
160
    
 
161
    :param remember: if set, the location will be stored
 
162
    
161
163
    :param overwrite: overwrite target location if it diverged
162
164
    
 
165
    :param create_prefix: create the path leading up to the branch if it doesn't exist
 
166
    
163
167
    :return: number of revisions pushed
164
168
    """
165
169
    from bzrlib.bzrdir import BzrDir
166
170
    from bzrlib.transport import get_transport
167
171
        
 
172
    br_from = branch
 
173
    
 
174
    stored_loc = br_from.get_push_location()
 
175
    if location is None:
 
176
        if stored_loc is None:
 
177
            error_dialog(_('Push location is unknown'),
 
178
                         _('Please specify a location manually.'))
 
179
            return
 
180
        else:
 
181
            location = stored_loc
 
182
 
168
183
    transport = get_transport(location)
169
184
    location_url = transport.base
170
185
 
 
186
    if br_from.get_push_location() is None or remember:
 
187
        br_from.set_push_location(location_url)
 
188
 
171
189
    old_rh = []
172
190
 
173
191
    try:
176
194
    except errors.NotBranchError:
177
195
        # create a branch.
178
196
        transport = transport.clone('..')
179
 
        try:
180
 
            relurl = transport.relpath(location_url)
181
 
            transport.mkdir(relurl)
182
 
        except errors.NoSuchFile:
183
 
            response = question_dialog(_('Non existing parent directory'),
184
 
                         _("The parent directory (%s)\ndoesn't exist. Create?") % location)
185
 
            if response == gtk.RESPONSE_OK:
186
 
                _create_prefix(transport)
187
 
            else:
 
197
        if not create_prefix:
 
198
            try:
 
199
                relurl = transport.relpath(location_url)
 
200
                transport.mkdir(relurl)
 
201
            except errors.NoSuchFile:
 
202
                error_dialog(_('Non existing parent directory'),
 
203
                             _("The parent directory (%s)\ndoesn't exist.") % location)
188
204
                return
 
205
        else:
 
206
            current = transport.base
 
207
            needed = [(transport, transport.relpath(location_url))]
 
208
            while needed:
 
209
                try:
 
210
                    transport, relpath = needed[-1]
 
211
                    transport.mkdir(relpath)
 
212
                    needed.pop()
 
213
                except errors.NoSuchFile:
 
214
                    new_transport = transport.clone('..')
 
215
                    needed.append((new_transport,
 
216
                                   new_transport.relpath(transport.base)))
 
217
                    if new_transport.base == transport.base:
 
218
                        error_dialog(_('Path prefix not created'),
 
219
                                     _("The path leading up to the specified location couldn't\nbe created."))
 
220
                        return
189
221
        dir_to = br_from.bzrdir.clone(location_url,
190
222
            revision_id=br_from.last_revision())
191
223
        br_to = dir_to.open_branch()
196
228
            tree_to = dir_to.open_workingtree()
197
229
        except errors.NotLocalUrl:
198
230
            # FIXME - what to do here? how should we warn the user?
 
231
            #warning('This transport does not update the working '
 
232
            #        'tree of: %s' % (br_to.base,))
199
233
            count = br_to.pull(br_from, overwrite)
200
234
        except errors.NoWorkingTree:
201
235
            count = br_to.pull(br_from, overwrite)