/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-05-17 16:12:27 UTC
  • mto: This revision was merged to the branch mainline in revision 201.
  • Revision ID: szilveszter.farkas@gmail.com-20070517161227-9e37lj2rm2t0cwj6
Some small modifications to Branch, Checkout and Info to support remote branches.

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:"))
 
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
55
        self._combo = gtk.ComboBoxEntry()
 
56
        self._button_test = gtk.Button(_("_Test"), use_underline=True)
54
57
        self._button_push = gtk.Button(_("_Push"), use_underline=True)
55
58
        self._hbox_location = gtk.HBox()
 
59
        self._hbox_test = gtk.HBox()
 
60
        self._image_test = gtk.Image()
56
61
        
57
62
        # Set callbacks
 
63
        self._button_test.connect('clicked', self._on_test_clicked)
58
64
        self._button_push.connect('clicked', self._on_push_clicked)
59
65
        
60
66
        # Set properties
 
67
        self._image_test.set_from_stock(gtk.STOCK_DIALOG_INFO, gtk.ICON_SIZE_BUTTON)
61
68
        self._label_location.set_alignment(0, 0.5)
 
69
        self._label_test.set_alignment(0, 0.5)
62
70
        self._hbox_location.set_spacing(3)
 
71
        self._hbox_test.set_spacing(3)
63
72
        self.vbox.set_spacing(3)
64
73
        
65
74
        # Pack widgets
66
75
        self._hbox_location.pack_start(self._label_location, False, False)
67
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)
68
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)
69
85
        self.action_area.pack_end(self._button_push)
70
86
        
71
87
        # Show the dialog
83
99
        self._combo.set_model(self._combo_model)
84
100
        self._combo.set_text_column(0)
85
101
        
86
 
        if self.branch is not None:
87
 
            location = self.branch.get_push_location()
88
 
            if location is not None:
89
 
                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)
 
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
            if (proto == 'sftp') or (proto == 'file') or (proto == 'ftp'):
 
117
                # have write acces (most probably)
 
118
                self._image_test.set_from_stock(gtk.STOCK_YES, 4)
 
119
                self._label_test.set_markup(_('<b>Write access is probably available</b>'))
 
120
            else:
 
121
                # no write access
 
122
                self._image_test.set_from_stock(gtk.STOCK_NO, 4)
 
123
                self._label_test.set_markup(_('<b>No write access</b>'))
 
124
        else:
 
125
            # couldn't determine
 
126
            self._image_test.set_from_stock(gtk.STOCK_DIALOG_QUESTION, 4)
 
127
            self._label_test.set_markup(_('<b>Could not determine</b>'))
90
128
    
91
129
    @show_bzr_error
92
130
    def _on_push_clicked(self, widget):
93
131
        """ Push button clicked handler. """
94
132
        location = self._combo.get_child().get_text()
95
133
        revs = 0
96
 
        if self.branch is not None and self.branch.get_push_location() is None:
97
 
            response = question_dialog(_('Set default push location'),
98
 
                                       _('There is no default push location set.\nSet %r as default now?') % location)
99
 
            if response == gtk.RESPONSE_OK:
100
 
                self.branch.set_push_location(location)
101
 
 
102
134
        try:
103
 
            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())
104
140
        except errors.DivergedBranches:
105
141
            response = question_dialog(_('Branches have been diverged'),
106
142
                                       _('You cannot push if branches have diverged.\nOverwrite?'))
107
 
            if response == gtk.RESPONSE_YES:
108
 
                revs = do_push(self.branch, location=location, overwrite=True)
 
143
            if response == gtk.RESPONSE_OK:
 
144
                revs = do_push(self.branch, overwrite=True)
 
145
            return
109
146
        
110
147
        self._history.add_entry(location)
111
148
        info_dialog(_('Push successful'),
113
150
        
114
151
        self.response(gtk.RESPONSE_OK)
115
152
 
116
 
def do_push(br_from, location, overwrite):
 
153
def do_push(branch, location=None, remember=False, overwrite=False,
 
154
         create_prefix=False):
117
155
    """ Update a mirror of a branch.
118
156
    
119
 
    :param br_from: the source branch
 
157
    :param branch: the source branch
120
158
    
121
159
    :param location: the location of the branch that you'd like to update
122
160
    
 
161
    :param remember: if set, the location will be stored
 
162
    
123
163
    :param overwrite: overwrite target location if it diverged
124
164
    
 
165
    :param create_prefix: create the path leading up to the branch if it doesn't exist
 
166
    
125
167
    :return: number of revisions pushed
126
168
    """
127
169
    from bzrlib.bzrdir import BzrDir
128
170
    from bzrlib.transport import get_transport
129
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
 
130
183
    transport = get_transport(location)
131
184
    location_url = transport.base
132
185
 
 
186
    if br_from.get_push_location() is None or remember:
 
187
        br_from.set_push_location(location_url)
 
188
 
133
189
    old_rh = []
134
190
 
135
191
    try:
138
194
    except errors.NotBranchError:
139
195
        # create a branch.
140
196
        transport = transport.clone('..')
141
 
        try:
142
 
            relurl = transport.relpath(location_url)
143
 
            transport.mkdir(relurl)
144
 
        except errors.NoSuchFile:
145
 
            response = question_dialog(_('Non existing parent directory'),
146
 
                         _("The parent directory (%s)\ndoesn't exist. Create?") % location)
147
 
            if response == gtk.RESPONSE_OK:
148
 
                _create_prefix(transport)
149
 
            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)
150
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
151
221
        dir_to = br_from.bzrdir.clone(location_url,
152
222
            revision_id=br_from.last_revision())
153
223
        br_to = dir_to.open_branch()
158
228
            tree_to = dir_to.open_workingtree()
159
229
        except errors.NotLocalUrl:
160
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,))
161
233
            count = br_to.pull(br_from, overwrite)
162
234
        except errors.NoWorkingTree:
163
235
            count = br_to.pull(br_from, overwrite)