/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-28 06:35:56 UTC
  • mto: (0.12.2 olive)
  • mto: This revision was merged to the branch mainline in revision 83.
  • Revision ID: jelmer@samba.org-20060928063556-62ec354cb06ba38c
Update TODO
integrate the handle and communicator functions into a main class.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/push.py
21
21
    pygtk.require("2.0")
22
22
except:
23
23
    pass
24
 
try:
25
 
    import gtk
26
 
    import gtk.gdk
27
 
    import gtk.glade
28
 
except:
29
 
    sys.exit(1)
30
 
 
31
 
import olive.backend.commit as commit
32
 
import olive.backend.errors as errors
33
 
import olive.backend.info as info
 
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
34
32
 
35
33
class OlivePush:
36
34
    """ Display Push dialog and perform the needed actions. """
37
 
    def __init__(self, gladefile, comm, dialog):
 
35
    def __init__(self, branch):
38
36
        """ Initialize the Push dialog. """
39
 
        self.gladefile = gladefile
40
 
        self.glade = gtk.glade.XML(self.gladefile, 'window_push')
41
 
        
42
 
        # Communication object
43
 
        self.comm = comm
44
 
        # Dialog object
45
 
        self.dialog = dialog
 
37
        self.glade = gtk.glade.XML(gladefile, 'window_push')
46
38
        
47
39
        self.window = self.glade.get_widget('window_push')
 
40
 
 
41
        self.branch = branch
48
42
        
49
43
        # Dictionary for signal_autoconnect
50
44
        dic = { "on_button_push_push_clicked": self.push,
71
65
        self.entry_location.set_sensitive(0)
72
66
        self.check_remember.set_sensitive(0)
73
67
        self.check_create.set_sensitive(0)
74
 
                
75
 
        # Get stored location
76
 
        self.notbranch = False
77
 
        try:
78
 
            loc = info.get_push_location(self.comm.get_path())
79
 
        except errors.NotBranchError:
80
 
            self.notbranch = True
81
 
            return
82
 
 
83
 
        if loc is not None:
84
 
            self.entry_stored.set_text(loc)
 
68
        
 
69
        self.entry_stored.set_text(branch.get_push_location())
85
70
    
86
71
    def display(self):
87
72
        """ Display the Push dialog. """
88
 
        if self.notbranch:
89
 
            self.dialog.error_dialog(_('Directory is not a branch'),
90
 
                                     _('You can perform this action only in a branch.'))
91
 
            self.close()
92
 
        else:
93
 
            self.window.show()
94
 
            self.width, self.height = self.window.get_size()
 
73
        self.window.show()
 
74
        self.width, self.height = self.window.get_size()
95
75
    
96
76
    def stored_toggled(self, widget):
97
77
        if widget.get_active():
119
99
    
120
100
    def push(self, widget):
121
101
        revs = 0
122
 
        self.comm.set_busy(self.window)
123
102
        if self.radio_stored.get_active():
124
103
            try:
125
 
                revs = commit.push(self.comm.get_path(),
126
 
                                   overwrite=self.check_overwrite.get_active())
 
104
                revs = do_push(self.branch,
 
105
                               overwrite=self.check_overwrite.get_active())
127
106
            except errors.NotBranchError:
128
 
                self.dialog.error_dialog(_('Directory is not a branch'),
 
107
                error_dialog(_('Directory is not a branch'),
129
108
                                         _('You can perform this action only in a branch.'))
130
109
                return
131
 
            except errors.NoLocationKnown:
132
 
                self.dialog.error_dialog(_('Push location is unknown'),
133
 
                                         _('Please specify a location manually.'))
134
 
                return
135
 
            except errors.NonExistingParent, errmsg:
136
 
                self.dialog.error_dialog(_('Non existing parent directory'),
137
 
                                         _("The parent directory (%s)\ndoesn't exist.") % errmsg)
138
 
                return
139
 
            except errors.DivergedBranchesError:
140
 
                self.dialog.error_dialog(_('Branches have been diverged'),
 
110
            except errors.DivergedBranches:
 
111
                error_dialog(_('Branches have been diverged'),
141
112
                                         _('You cannot push if branches have diverged. Use the\noverwrite option if you want to push anyway.'))
142
113
                return
143
 
            except:
144
 
                raise
145
114
        elif self.radio_specific.get_active():
146
115
            location = self.entry_location.get_text()
147
116
            if location == '':
148
 
                self.dialog.error_dialog(_('No location specified'),
 
117
                error_dialog(_('No location specified'),
149
118
                                         _('Please specify a location or use the default.'))
150
119
                return
151
120
            
152
121
            try:
153
 
                revs = commit.push(self.comm.get_path(), location,
154
 
                                   self.check_remember.get_active(),
155
 
                                   self.check_overwrite.get_active(),
156
 
                                   self.check_create.get_active())
 
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())
157
126
            except errors.NotBranchError:
158
 
                self.dialog.error_dialog(_('Directory is not a branch'),
 
127
                error_dialog(_('Directory is not a branch'),
159
128
                                         _('You can perform this action only in a branch.'))
160
 
                self.comm.set_busy(self.window, False)
161
 
                return
162
 
            except errors.NonExistingParent, errmsg:
163
 
                self.dialog.error_dialog(_('Non existing parent directory'),
164
 
                                         _("The parent directory (%s)\ndoesn't exist.") % errmsg)
165
 
                self.comm.set_busy(self.window, False)
166
 
                return
167
 
            except errors.DivergedBranchesError:
168
 
                self.dialog.error_dialog(_('Branches have been diverged'),
 
129
                return
 
130
            except errors.DivergedBranches:
 
131
                error_dialog(_('Branches have been diverged'),
169
132
                                         _('You cannot push if branches have diverged. Use the\noverwrite option if you want to push anyway.'))
170
 
                self.comm.set_busy(self.window, False)
171
 
                return
172
 
            except errors.PathPrefixNotCreated:
173
 
                self.dialog.error_dialog(_('Path prefix not created'),
174
 
                                         _("The path leading up to the specified location couldn't\nbe created."))
175
 
                self.comm.set_busy(self.window, False)
176
 
                return
177
 
            except:
178
 
                raise
179
 
        else:
180
 
            # This should really never happen
181
 
            pass
 
133
                return
182
134
        
183
135
        self.close()
184
 
        self.dialog.info_dialog(_('Push successful'),
 
136
        info_dialog(_('Push successful'),
185
137
                                _('%d revision(s) pushed.') % revs)
186
138
    
187
139
    def test(self, widget):
212
164
    
213
165
    def close(self, widget=None):
214
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
    
 
174
    :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
    :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
    :return: number of revisions pushed
 
183
    """
 
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
    transport = get_transport(location)
 
200
    location_url = transport.base
 
201
 
 
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
    try:
 
208
        dir_to = BzrDir.open(location_url)
 
209
        br_to = dir_to.open_branch()
 
210
    except errors.NotBranchError:
 
211
        # create a branch.
 
212
        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)
 
220
                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
        dir_to = br_from.bzrdir.clone(location_url,
 
238
            revision_id=br_from.last_revision())
 
239
        br_to = dir_to.open_branch()
 
240
        count = len(br_to.revision_history())
 
241
    else:
 
242
        old_rh = br_to.revision_history()
 
243
        try:
 
244
            tree_to = dir_to.open_workingtree()
 
245
        except errors.NotLocalUrl:
 
246
            # 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
            count = br_to.pull(br_from, overwrite)
 
250
        except errors.NoWorkingTree:
 
251
            count = br_to.pull(br_from, overwrite)
 
252
        else:
 
253
            count = tree_to.pull(br_from, overwrite)
 
254
 
 
255
    return count