/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-07-15 15:13:34 UTC
  • Revision ID: jelmer@samba.org-20070715151334-2t0g8fmpgj6vnqa7
Add icon for Bazaar preferences.

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