/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 18:12:29 UTC
  • mto: This revision was merged to the branch mainline in revision 519.
  • Revision ID: jelmer@samba.org-20080629181229-1l2m4cf7vvbyh8qg
Simplify progress bar code, use embedded progress bar inside viz window.

Show diffs side-by-side

added added

removed removed

Lines of Context:
push.py
25
25
 
26
26
from errors import show_bzr_error
27
27
 
 
28
# FIXME: This needs to be public JRV 20070714
 
29
from bzrlib.builtins import _create_prefix
28
30
from bzrlib.config import LocationConfig
29
31
import bzrlib.errors as errors
30
32
 
 
33
from bzrlib.plugins.gtk import _i18n
31
34
from dialog import error_dialog, info_dialog, question_dialog
32
35
 
33
36
from history import UrlHistory
47
50
        self.branch = branch
48
51
        
49
52
        # Create the widgets
50
 
        self._label_location = gtk.Label(_("Location:"))
51
 
        self._label_test = gtk.Label(_("(click the Test button to check write access)"))
52
 
        self._check_prefix = gtk.CheckButton(_("Create the path _leading up to the location"),
53
 
                                             use_underline=True)
 
53
        self._label_location = gtk.Label(_i18n("Location:"))
54
54
        self._combo = gtk.ComboBoxEntry()
55
 
        self._button_test = gtk.Button(_("_Test"), use_underline=True)
56
 
        self._button_push = gtk.Button(_("_Push"), use_underline=True)
 
55
        self._button_push = gtk.Button(_i18n("_Push"), use_underline=True)
57
56
        self._hbox_location = gtk.HBox()
58
 
        self._hbox_test = gtk.HBox()
59
 
        self._image_test = gtk.Image()
60
57
        
61
58
        # Set callbacks
62
 
        self._button_test.connect('clicked', self._on_test_clicked)
63
59
        self._button_push.connect('clicked', self._on_push_clicked)
64
60
        
65
61
        # Set properties
66
 
        self._image_test.set_from_stock(gtk.STOCK_DIALOG_INFO, gtk.ICON_SIZE_BUTTON)
67
62
        self._label_location.set_alignment(0, 0.5)
68
 
        self._label_test.set_alignment(0, 0.5)
69
63
        self._hbox_location.set_spacing(3)
70
 
        self._hbox_test.set_spacing(3)
71
64
        self.vbox.set_spacing(3)
72
65
        
73
66
        # Pack widgets
74
67
        self._hbox_location.pack_start(self._label_location, False, False)
75
68
        self._hbox_location.pack_start(self._combo, True, True)
76
 
        self._hbox_test.pack_start(self._image_test, False, False)
77
 
        self._hbox_test.pack_start(self._label_test, True, True)
78
69
        self.vbox.pack_start(self._hbox_location)
79
 
        self.vbox.pack_start(self._check_prefix)
80
 
        self.vbox.pack_start(self._hbox_test)
81
 
        self.action_area.pack_start(self._button_test)
82
70
        self.action_area.pack_end(self._button_push)
83
71
        
84
72
        # Show the dialog
101
89
            if location is not None:
102
90
                self._combo.get_child().set_text(location)
103
91
    
104
 
    def _on_test_clicked(self, widget):
105
 
        """ Test button clicked handler. """
106
 
        import re
107
 
        _urlRE = re.compile(r'^(?P<proto>[^:/\\]+)://(?P<path>.*)$')
108
 
        
109
 
        url = self._combo.get_child().get_text()
110
 
        
111
 
        m = _urlRE.match(url)
112
 
        if m:
113
 
            proto = m.groupdict()['proto']
114
 
            # FIXME: This should ask the transport or branch rather than 
115
 
            # guessing using regular expressions. JRV 20070714
116
 
            if proto in ('sftp', 'file', 'ftp'):
117
 
                # have write access (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>'))
128
 
    
129
92
    @show_bzr_error
130
93
    def _on_push_clicked(self, widget):
131
94
        """ Push button clicked handler. """
132
95
        location = self._combo.get_child().get_text()
133
96
        revs = 0
134
97
        if self.branch is not None and self.branch.get_push_location() is None:
135
 
            response = question_dialog(_('Set default push location'),
136
 
                                       _('There is no default push location set.\nSet %r as default now?') % location)
137
 
            if response == gtk.REPONSE_OK:
 
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:
138
101
                self.branch.set_push_location(location)
139
102
 
140
103
        try:
141
 
            revs = do_push(self.branch,
142
 
                           location=location,
143
 
                           overwrite=False,
144
 
                           create_prefix=self._check_prefix.get_active())
 
104
            revs = do_push(self.branch, location=location, overwrite=False)
145
105
        except errors.DivergedBranches:
146
 
            response = question_dialog(_('Branches have been diverged'),
147
 
                                       _('You cannot push if branches have diverged.\nOverwrite?'))
148
 
            if response == gtk.RESPONSE_OK:
149
 
                revs = do_push(self.branch, location=location,
150
 
                               overwrite=True,
151
 
                               create_prefix=self._check_prefix.get_active()
152
 
                               )
153
 
            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)
154
110
        
155
111
        self._history.add_entry(location)
156
 
        info_dialog(_('Push successful'),
157
 
                    _("%d revision(s) pushed.") % revs)
 
112
        info_dialog(_i18n('Push successful'),
 
113
                    _i18n("%d revision(s) pushed.") % revs)
158
114
        
159
115
        self.response(gtk.RESPONSE_OK)
160
116
 
161
 
def do_push(branch, location, overwrite, create_prefix):
 
117
def do_push(br_from, location, overwrite):
162
118
    """ Update a mirror of a branch.
163
119
    
164
 
    :param branch: the source branch
 
120
    :param br_from: the source branch
165
121
    
166
122
    :param location: the location of the branch that you'd like to update
167
123
    
168
124
    :param overwrite: overwrite target location if it diverged
169
125
    
170
 
    :param create_prefix: create the path leading up to the branch if it doesn't exist
171
 
    
172
126
    :return: number of revisions pushed
173
127
    """
174
128
    from bzrlib.bzrdir import BzrDir
185
139
    except errors.NotBranchError:
186
140
        # create a branch.
187
141
        transport = transport.clone('..')
188
 
        if not create_prefix:
189
 
            try:
190
 
                relurl = transport.relpath(location_url)
191
 
                transport.mkdir(relurl)
192
 
            except errors.NoSuchFile:
193
 
                error_dialog(_('Non existing parent directory'),
194
 
                             _("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:
195
151
                return
196
 
        else:
197
 
            current = transport.base
198
 
            needed = [(transport, transport.relpath(location_url))]
199
 
            while needed:
200
 
                try:
201
 
                    transport, relpath = needed[-1]
202
 
                    transport.mkdir(relpath)
203
 
                    needed.pop()
204
 
                except errors.NoSuchFile:
205
 
                    new_transport = transport.clone('..')
206
 
                    needed.append((new_transport,
207
 
                                   new_transport.relpath(transport.base)))
208
 
                    if new_transport.base == transport.base:
209
 
                        error_dialog(_('Path prefix not created'),
210
 
                                     _("The path leading up to the specified location couldn't\nbe created."))
211
 
                        return
212
152
        dir_to = br_from.bzrdir.clone(location_url,
213
153
            revision_id=br_from.last_revision())
214
154
        br_to = dir_to.open_branch()