/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 olive/push.py

  • Committer: Jelmer Vernooij
  • Date: 2006-09-27 19:52:46 UTC
  • mto: (0.12.2 olive)
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: jelmer@samba.org-20060927195246-9354d7ccf56127f5
Don't pass around gladefile all the time. 
Fix bug in status information when files have been removed.

Show diffs side-by-side

added added

removed removed

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