/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: Curtis Hovey
  • Date: 2012-03-11 18:24:06 UTC
  • mto: This revision was merged to the branch mainline in revision 785.
  • Revision ID: sinzui.is@verizon.net-20120311182406-f4jqpff65b30g3al
Create the mnemonic for the button label.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2006 by Szilveszter Farkas (Phanatic) <szilveszter.farkas@gmail.com>
 
1
# Copyright (C) 2006 by Szilveszter Farkas (Phanatic)
 
2
#                       <szilveszter.farkas@gmail.com>
 
3
# Copyright (C) 2007 by Jelmer Vernooij <jelmer@samba.org>
2
4
#
3
5
# This program is free software; you can redistribute it and/or modify
4
6
# it under the terms of the GNU General Public License as published by
14
16
# along with this program; if not, write to the Free Software
15
17
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
18
 
17
 
import sys
18
 
 
19
 
try:
20
 
    import pygtk
21
 
    pygtk.require("2.0")
22
 
except:
23
 
    pass
24
 
    
25
 
import gtk
26
 
import gtk.gdk
27
 
import gtk.glade
28
 
 
29
 
import bzrlib.errors as errors
30
 
 
31
 
from olive import gladefile
32
 
 
33
 
class OlivePush:
34
 
    """ Display Push dialog and perform the needed actions. """
35
 
    def __init__(self, branch):
36
 
        """ Initialize the Push dialog. """
37
 
        self.glade = gtk.glade.XML(gladefile, 'window_push')
38
 
        
39
 
        self.window = self.glade.get_widget('window_push')
40
 
 
 
19
from gi.repository import Gtk
 
20
 
 
21
from errors import show_bzr_error
 
22
 
 
23
from bzrlib import (
 
24
    errors,
 
25
    ui,
 
26
    )
 
27
from bzrlib.bzrdir import BzrDir
 
28
from bzrlib.transport import get_transport
 
29
 
 
30
from bzrlib.plugins.gtk.dialog import (
 
31
    question_dialog,
 
32
    )
 
33
from bzrlib.plugins.gtk.history import UrlHistory
 
34
from bzrlib.plugins.gtk.i18n import _i18n
 
35
from bzrlib.plugins.gtk.ui import ProgressPanel
 
36
 
 
37
 
 
38
class PushDialog(Gtk.Dialog):
 
39
    """New implementation of the Push dialog."""
 
40
 
 
41
    def __init__(self, repository, revid, branch=None, parent=None):
 
42
        """Initialize the Push dialog. """
 
43
        super(PushDialog, self).__init__(
 
44
            title="Push", parent=parent, flags=0, border_width=6,
 
45
            buttons=(Gtk.STOCK_CLOSE, Gtk.ResponseType.CLOSE))
41
46
        self.branch = branch
42
 
        
43
 
        # Dictionary for signal_autoconnect
44
 
        dic = { "on_button_push_push_clicked": self.push,
45
 
                "on_button_push_cancel_clicked": self.close,
46
 
                "on_button_push_test_clicked": self.test,
47
 
                "on_radiobutton_push_stored_toggled": self.stored_toggled,
48
 
                "on_radiobutton_push_specific_toggled": self.specific_toggled, }
49
 
        
50
 
        # Connect the signals to the handlers
51
 
        self.glade.signal_autoconnect(dic)
52
 
        
53
 
        # Get some useful widgets
54
 
        self.radio_stored = self.glade.get_widget('radiobutton_push_stored')
55
 
        self.radio_specific = self.glade.get_widget('radiobutton_push_specific')
56
 
        self.entry_stored = self.glade.get_widget('entry_push_stored')
57
 
        self.entry_location = self.glade.get_widget('entry_push_location')
58
 
        self.check_remember = self.glade.get_widget('checkbutton_push_remember')
59
 
        self.check_overwrite = self.glade.get_widget('checkbutton_push_overwrite')
60
 
        self.check_create = self.glade.get_widget('checkbutton_push_create')
61
 
        self.label_test = self.glade.get_widget('label_push_test')
62
 
        self.image_test = self.glade.get_widget('image_push_test')
63
 
        
64
 
        # Set initial state
65
 
        self.entry_location.set_sensitive(0)
66
 
        self.check_remember.set_sensitive(0)
67
 
        self.check_create.set_sensitive(0)
68
 
        
69
 
        self.entry_stored.set_text(branch.get_push_location())
70
 
    
71
 
    def display(self):
72
 
        """ Display the Push dialog. """
73
 
        self.window.show()
74
 
        self.width, self.height = self.window.get_size()
75
 
    
76
 
    def stored_toggled(self, widget):
77
 
        if widget.get_active():
78
 
            self.entry_stored.set_sensitive(1)
79
 
            self.entry_location.set_sensitive(0)
80
 
            self.check_remember.set_sensitive(0)
81
 
            self.check_create.set_sensitive(0)
82
 
        else:
83
 
            self.entry_stored.set_sensitive(0)
84
 
            self.entry_location.set_sensitive(1)
85
 
            self.check_remember.set_sensitive(1)
86
 
            self.check_create.set_sensitive(1)
87
 
    
88
 
    def specific_toggled(self, widget):
89
 
        if widget.get_active():
90
 
            self.entry_stored.set_sensitive(0)
91
 
            self.entry_location.set_sensitive(1)
92
 
            self.check_remember.set_sensitive(1)
93
 
            self.check_create.set_sensitive(1)
94
 
        else:
95
 
            self.entry_stored.set_sensitive(1)
96
 
            self.entry_location.set_sensitive(0)
97
 
            self.check_remember.set_sensitive(0)
98
 
            self.check_create.set_sensitive(0)
99
 
    
100
 
    def push(self, widget):
101
 
        revs = 0
102
 
        if self.radio_stored.get_active():
103
 
            try:
104
 
                revs = do_push(self.branch,
105
 
                               overwrite=self.check_overwrite.get_active())
106
 
            except errors.NotBranchError:
107
 
                error_dialog(_('Directory is not a branch'),
108
 
                                         _('You can perform this action only in a branch.'))
109
 
                return
110
 
            except errors.DivergedBranches:
111
 
                error_dialog(_('Branches have been diverged'),
112
 
                                         _('You cannot push if branches have diverged. Use the\noverwrite option if you want to push anyway.'))
113
 
                return
114
 
        elif self.radio_specific.get_active():
115
 
            location = self.entry_location.get_text()
116
 
            if location == '':
117
 
                error_dialog(_('No location specified'),
118
 
                                         _('Please specify a location or use the default.'))
119
 
                return
120
 
            
121
 
            try:
122
 
                revs = do_push(self.branch, location,
123
 
                               self.check_remember.get_active(),
124
 
                               self.check_overwrite.get_active(),
125
 
                               self.check_create.get_active())
126
 
            except errors.NotBranchError:
127
 
                error_dialog(_('Directory is not a branch'),
128
 
                                         _('You can perform this action only in a branch.'))
129
 
                return
130
 
            except errors.DivergedBranches:
131
 
                error_dialog(_('Branches have been diverged'),
132
 
                                         _('You cannot push if branches have diverged. Use the\noverwrite option if you want to push anyway.'))
133
 
                return
134
 
        
135
 
        self.close()
136
 
        info_dialog(_('Push successful'),
137
 
                                _('%d revision(s) pushed.') % revs)
138
 
    
139
 
    def test(self, widget):
140
 
        """ Test if write access possible. """
141
 
        import re
142
 
        _urlRE = re.compile(r'^(?P<proto>[^:/\\]+)://(?P<path>.*)$')
143
 
        
144
 
        if self.radio_stored.get_active():
145
 
            url = self.entry_stored.get_text()
146
 
        elif self.radio_specific.get_active():
147
 
            url = self.entry_location.get_text()
148
 
        
149
 
        m = _urlRE.match(url)
150
 
        if m:
151
 
            proto = m.groupdict()['proto']
152
 
            if (proto == 'sftp') or (proto == 'file') or (proto == 'ftp'):
153
 
                # have write acces (most probably)
154
 
                self.image_test.set_from_stock(gtk.STOCK_YES, 4)
155
 
                self.label_test.set_markup(_('<b>Write access is probably available</b>'))
 
47
 
 
48
        # Unused arguments
 
49
        self.repository = repository
 
50
        self.revid = revid
 
51
 
 
52
        # Create the widgets
 
53
        self._label_location = Gtk.Label(label=_i18n("Location:"))
 
54
        self._combo = Gtk.ComboBox.new_with_entry()
 
55
        self._button_push = Gtk.Button(_i18n("_Push"), use_underline=True)
 
56
        self._hbox_location = Gtk.Box(Gtk.Orientation.HORIZONTAL, 6)
 
57
        self._push_message = Gtk.Label(xalign=0)
 
58
        self._progress_widget = ProgressPanel()
 
59
 
 
60
        # Set callbacks
 
61
        ui.ui_factory.set_progress_bar_widget(self._progress_widget)
 
62
        self.connect('close', self._on_close_clicked)
 
63
        self._button_push.connect('clicked', self._on_push_clicked)
 
64
 
 
65
        # Set properties
 
66
        content_area = self.get_content_area()
 
67
        content_area.set_spacing(6)
 
68
 
 
69
        # Pack widgets
 
70
        self._hbox_location.pack_start(self._label_location, False, False, 0)
 
71
        self._hbox_location.pack_start(self._combo, False, False, 0)
 
72
        content_area.pack_start(self._hbox_location, True, True, 0)
 
73
        content_area.pack_start(self._progress_widget, True, True, 0)
 
74
        content_area.pack_start(self._push_message, True, True, 0)
 
75
        self.get_action_area().pack_end(self._button_push, True, True, 0)
 
76
 
 
77
        # Show the dialog
 
78
        content_area.show_all()
 
79
        self._progress_widget.hide()
 
80
        self._push_message.hide()
 
81
 
 
82
        # Build location history
 
83
        self._history = UrlHistory(self.branch.get_config(), 'push_history')
 
84
        self._build_history()
 
85
 
 
86
    def _build_history(self):
 
87
        """Build up the location history. """
 
88
        self._combo_model = Gtk.ListStore(str)
 
89
        for item in self._history.get_entries():
 
90
            self._combo_model.append([item])
 
91
        self._combo.set_model(self._combo_model)
 
92
        self._combo.set_entry_text_column(0)
 
93
 
 
94
        if self.branch is not None:
 
95
            location = self.branch.get_push_location()
 
96
            if location is not None:
 
97
                self._combo.get_child().set_text(location)
 
98
 
 
99
    def _on_close_clicked(self, widget):
 
100
        """Close dialog handler."""
 
101
        ui.ui_factory.set_progress_bar_widget(None)
 
102
 
 
103
    @show_bzr_error
 
104
    def _on_push_clicked(self, widget):
 
105
        """Push button clicked handler. """
 
106
        self._push_message.hide()
 
107
        self._progress_widget.tick()
 
108
        location = self._combo.get_child().get_text()
 
109
 
 
110
        try:
 
111
            message = do_push(self.branch, location, overwrite=False)
 
112
        except errors.DivergedBranches:
 
113
            response = question_dialog(
 
114
                _i18n('Branches have been diverged'),
 
115
                _i18n('You cannot push if branches have diverged.\n'
 
116
                      'Overwrite?'))
 
117
            if response == Gtk.ResponseType.YES:
 
118
                message = do_push(self.branch, location, overwrite=True)
156
119
            else:
157
 
                # no write access
158
 
                self.image_test.set_from_stock(gtk.STOCK_NO, 4)
159
 
                self.label_test.set_markup(_('<b>No write access</b>'))
160
 
        else:
161
 
            # couldn't determine
162
 
            self.image_test.set_from_stock(gtk.STOCK_DIALOG_QUESTION, 4)
163
 
            self.label_test.set_markup(_('<b>Could not determine</b>'))
164
 
    
165
 
    def close(self, widget=None):
166
 
        self.window.destroy()
167
 
 
168
 
def do_push(branch, location=None, remember=False, overwrite=False,
169
 
         create_prefix=False):
170
 
    """ Update a mirror of a branch.
171
 
    
172
 
    :param branch: the source branch
173
 
    
 
120
                return
 
121
        self._history.add_entry(location)
 
122
        if (self.branch is not None
 
123
            and self.branch.get_push_location() is None):
 
124
            self.branch.set_push_location(location)
 
125
        if message:
 
126
            self._progress_widget.finished()
 
127
            self._push_message.props.label = message
 
128
            self._push_message.show()
 
129
 
 
130
 
 
131
def do_push(br_from, location, overwrite):
 
132
    """Update a mirror of a branch.
 
133
 
 
134
    :param br_from: the source branch
174
135
    :param location: the location of the branch that you'd like to update
175
 
    
176
 
    :param remember: if set, the location will be stored
177
 
    
178
136
    :param overwrite: overwrite target location if it diverged
179
 
    
180
 
    :param create_prefix: create the path leading up to the branch if it doesn't exist
181
 
    
182
137
    :return: number of revisions pushed
183
138
    """
184
 
    from bzrlib.branch import Branch
185
 
    from bzrlib.bzrdir import BzrDir
186
 
    from bzrlib.transport import get_transport
187
 
        
188
 
    br_from = Branch.open_containing(branch)[0]
189
 
    
190
 
    stored_loc = br_from.get_push_location()
191
 
    if location is None:
192
 
        if stored_loc is None:
193
 
            error_dialog(_('Push location is unknown'),
194
 
                                     _('Please specify a location manually.'))
195
 
            return
196
 
        else:
197
 
            location = stored_loc
198
 
 
199
139
    transport = get_transport(location)
200
140
    location_url = transport.base
201
141
 
202
 
    if br_from.get_push_location() is None or remember:
203
 
        br_from.set_push_location(location_url)
204
 
 
205
 
    old_rh = []
206
 
 
207
142
    try:
208
143
        dir_to = BzrDir.open(location_url)
209
144
        br_to = dir_to.open_branch()
210
145
    except errors.NotBranchError:
211
146
        # create a branch.
212
147
        transport = transport.clone('..')
213
 
        if not create_prefix:
214
 
            try:
215
 
                relurl = transport.relpath(location_url)
216
 
                transport.mkdir(relurl)
217
 
            except errors.NoSuchFile:
218
 
                error_dialog(_('Non existing parent directory'),
219
 
                                         _("The parent directory (%s)\ndoesn't exist.") % location)
 
148
        try:
 
149
            relurl = transport.relpath(location_url)
 
150
            transport.mkdir(relurl)
 
151
        except errors.NoSuchFile:
 
152
            response = question_dialog(
 
153
                _i18n('Non existing parent directory'),
 
154
                _i18n("The parent directory (%s)\ndoesn't exist. Create?") %
 
155
                location)
 
156
            if response == Gtk.ResponseType.OK:
 
157
                transport.create_prefix()
 
158
            else:
220
159
                return
221
 
        else:
222
 
            current = transport.base
223
 
            needed = [(transport, transport.relpath(location_url))]
224
 
            while needed:
225
 
                try:
226
 
                    transport, relpath = needed[-1]
227
 
                    transport.mkdir(relpath)
228
 
                    needed.pop()
229
 
                except errors.NoSuchFile:
230
 
                    new_transport = transport.clone('..')
231
 
                    needed.append((new_transport,
232
 
                                   new_transport.relpath(transport.base)))
233
 
                    if new_transport.base == transport.base:
234
 
                        error_dialog(_('Path prefix not created'),
235
 
                                                 _("The path leading up to the specified location couldn't\nbe created."))
236
 
                        return
237
160
        dir_to = br_from.bzrdir.clone(location_url,
238
161
            revision_id=br_from.last_revision())
239
162
        br_to = dir_to.open_branch()
240
163
        count = len(br_to.revision_history())
241
164
    else:
242
 
        old_rh = br_to.revision_history()
 
165
        br_to.revision_history()
243
166
        try:
244
167
            tree_to = dir_to.open_workingtree()
245
168
        except errors.NotLocalUrl:
246
169
            # FIXME - what to do here? how should we warn the user?
247
 
            #warning('This transport does not update the working '
248
 
            #        'tree of: %s' % (br_to.base,))
249
170
            count = br_to.pull(br_from, overwrite)
250
171
        except errors.NoWorkingTree:
251
172
            count = br_to.pull(br_from, overwrite)
252
173
        else:
253
174
            count = tree_to.pull(br_from, overwrite)
254
175
 
255
 
    return count
 
176
    # The count var is either an int or a PushResult. PushResult is being
 
177
    # coerced into an int, but the method is deprecated.
 
178
    return _i18n("%d revision(s) pushed.") % int(count)