/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: Daniel Schierbeck
  • Date: 2008-01-13 14:12:49 UTC
  • mto: (423.1.2 trunk)
  • mto: This revision was merged to the branch mainline in revision 429.
  • Revision ID: daniel.schierbeck@gmail.com-20080113141249-gd0i2lknr3yik55r
Moved branch view to its own package.

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
36
 
34
37
class PushDialog(gtk.Dialog):
35
38
    """ New implementation of the Push dialog. """
36
 
    def __init__(self, branch, parent=None):
 
39
    def __init__(self, repository, revid, branch=None, parent=None):
37
40
        """ Initialize the Push dialog. """
38
41
        gtk.Dialog.__init__(self, title="Push - Olive",
39
42
                                  parent=parent,
41
44
                                  buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL))
42
45
        
43
46
        # Get arguments
 
47
        self.repository = repository
 
48
        self.revid = revid
44
49
        self.branch = branch
45
50
        
46
51
        # Create the widgets
47
52
        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
53
        self._combo = gtk.ComboBoxEntry()
56
 
        self._button_test = gtk.Button(_("_Test"), use_underline=True)
57
54
        self._button_push = gtk.Button(_("_Push"), use_underline=True)
58
55
        self._hbox_location = gtk.HBox()
59
 
        self._hbox_test = gtk.HBox()
60
 
        self._image_test = gtk.Image()
61
56
        
62
57
        # Set callbacks
63
 
        self._button_test.connect('clicked', self._on_test_clicked)
64
58
        self._button_push.connect('clicked', self._on_push_clicked)
65
59
        
66
60
        # Set properties
67
 
        self._image_test.set_from_stock(gtk.STOCK_DIALOG_INFO, gtk.ICON_SIZE_BUTTON)
68
61
        self._label_location.set_alignment(0, 0.5)
69
 
        self._label_test.set_alignment(0, 0.5)
70
62
        self._hbox_location.set_spacing(3)
71
 
        self._hbox_test.set_spacing(3)
72
63
        self.vbox.set_spacing(3)
73
64
        
74
65
        # Pack widgets
75
66
        self._hbox_location.pack_start(self._label_location, False, False)
76
67
        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
68
        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
69
        self.action_area.pack_end(self._button_push)
86
70
        
87
71
        # Show the dialog
99
83
        self._combo.set_model(self._combo_model)
100
84
        self._combo.set_text_column(0)
101
85
        
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>'))
 
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)
128
90
    
129
91
    @show_bzr_error
130
92
    def _on_push_clicked(self, widget):
131
93
        """ Push button clicked handler. """
132
94
        location = self._combo.get_child().get_text()
133
95
        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
 
134
102
        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())
 
103
            revs = do_push(self.branch, location=location, overwrite=False)
140
104
        except errors.DivergedBranches:
141
105
            response = question_dialog(_('Branches have been diverged'),
142
106
                                       _('You cannot push if branches have diverged.\nOverwrite?'))
143
 
            if response == gtk.RESPONSE_OK:
144
 
                revs = do_push(self.branch, overwrite=True)
145
 
            return
 
107
            if response == gtk.RESPONSE_YES:
 
108
                revs = do_push(self.branch, location=location, overwrite=True)
146
109
        
147
110
        self._history.add_entry(location)
148
111
        info_dialog(_('Push successful'),
150
113
        
151
114
        self.response(gtk.RESPONSE_OK)
152
115
 
153
 
def do_push(branch, location=None, remember=False, overwrite=False,
154
 
         create_prefix=False):
 
116
def do_push(br_from, location, overwrite):
155
117
    """ Update a mirror of a branch.
156
118
    
157
 
    :param branch: the source branch
 
119
    :param br_from: the source branch
158
120
    
159
121
    :param location: the location of the branch that you'd like to update
160
122
    
161
 
    :param remember: if set, the location will be stored
162
 
    
163
123
    :param overwrite: overwrite target location if it diverged
164
124
    
165
 
    :param create_prefix: create the path leading up to the branch if it doesn't exist
166
 
    
167
125
    :return: number of revisions pushed
168
126
    """
169
127
    from bzrlib.bzrdir import BzrDir
170
128
    from bzrlib.transport import get_transport
171
129
        
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
 
 
183
130
    transport = get_transport(location)
184
131
    location_url = transport.base
185
132
 
186
 
    if br_from.get_push_location() is None or remember:
187
 
        br_from.set_push_location(location_url)
188
 
 
189
133
    old_rh = []
190
134
 
191
135
    try:
194
138
    except errors.NotBranchError:
195
139
        # create a branch.
196
140
        transport = transport.clone('..')
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)
 
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:
204
150
                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
221
151
        dir_to = br_from.bzrdir.clone(location_url,
222
152
            revision_id=br_from.last_revision())
223
153
        br_to = dir_to.open_branch()
228
158
            tree_to = dir_to.open_workingtree()
229
159
        except errors.NotLocalUrl:
230
160
            # 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,))
233
161
            count = br_to.pull(br_from, overwrite)
234
162
        except errors.NoWorkingTree:
235
163
            count = br_to.pull(br_from, overwrite)