/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: Szilveszter Farkas (Phanatic)
  • Date: 2006-09-27 19:11:59 UTC
  • mfrom: (0.8.90 merge)
  • mto: (93.1.1 win32.bialix)
  • mto: This revision was merged to the branch mainline in revision 103.
  • Revision ID: Szilveszter.Farkas@gmail.com-20060927191159-cc4e54f613575779
Merge all changes. Release 0.11.0.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/push.py
28
28
except:
29
29
    sys.exit(1)
30
30
 
31
 
import olive.backend.commit as commit
32
 
import olive.backend.errors as errors
33
 
import olive.backend.info as info
 
31
import bzrlib.errors as errors
34
32
 
35
33
class OlivePush:
36
34
    """ Display Push dialog and perform the needed actions. """
75
73
        # Get stored location
76
74
        self.notbranch = False
77
75
        try:
78
 
            loc = info.get_push_location(self.comm.get_path())
 
76
            from bzrlib.branch import Branch
 
77
    
 
78
            branch = Branch.open_containing(self.comm.get_path())[0]
 
79
    
 
80
            self.entry_stored.set_text(branch.get_push_location())
79
81
        except errors.NotBranchError:
80
82
            self.notbranch = True
81
83
            return
82
 
 
83
 
        if loc is not None:
84
 
            self.entry_stored.set_text(loc)
85
84
    
86
85
    def display(self):
87
86
        """ Display the Push dialog. """
122
121
        self.comm.set_busy(self.window)
123
122
        if self.radio_stored.get_active():
124
123
            try:
125
 
                revs = commit.push(self.comm.get_path(),
126
 
                                   overwrite=self.check_overwrite.get_active())
 
124
                revs = do_push(self.comm.get_path(),
 
125
                               overwrite=self.check_overwrite.get_active())
127
126
            except errors.NotBranchError:
128
127
                self.dialog.error_dialog(_('Directory is not a branch'),
129
128
                                         _('You can perform this action only in a branch.'))
130
129
                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:
 
130
            except errors.DivergedBranches:
140
131
                self.dialog.error_dialog(_('Branches have been diverged'),
141
132
                                         _('You cannot push if branches have diverged. Use the\noverwrite option if you want to push anyway.'))
142
133
                return
150
141
                return
151
142
            
152
143
            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())
 
144
                revs = do_push(self.comm.get_path(), location,
 
145
                               self.check_remember.get_active(),
 
146
                               self.check_overwrite.get_active(),
 
147
                               self.check_create.get_active())
157
148
            except errors.NotBranchError:
158
149
                self.dialog.error_dialog(_('Directory is not a branch'),
159
150
                                         _('You can perform this action only in a branch.'))
160
151
                self.comm.set_busy(self.window, False)
161
152
                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:
 
153
            except errors.DivergedBranches:
168
154
                self.dialog.error_dialog(_('Branches have been diverged'),
169
155
                                         _('You cannot push if branches have diverged. Use the\noverwrite option if you want to push anyway.'))
170
156
                self.comm.set_busy(self.window, False)
171
157
                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
158
            except:
178
159
                raise
179
160
        else:
212
193
    
213
194
    def close(self, widget=None):
214
195
        self.window.destroy()
 
196
 
 
197
def do_push(branch, location=None, remember=False, overwrite=False,
 
198
         create_prefix=False):
 
199
    """ Update a mirror of a branch.
 
200
    
 
201
    :param branch: the source branch
 
202
    
 
203
    :param location: the location of the branch that you'd like to update
 
204
    
 
205
    :param remember: if set, the location will be stored
 
206
    
 
207
    :param overwrite: overwrite target location if it diverged
 
208
    
 
209
    :param create_prefix: create the path leading up to the branch if it doesn't exist
 
210
    
 
211
    :return: number of revisions pushed
 
212
    """
 
213
    from bzrlib.branch import Branch
 
214
    from bzrlib.bzrdir import BzrDir
 
215
    from bzrlib.transport import get_transport
 
216
        
 
217
    br_from = Branch.open_containing(branch)[0]
 
218
    
 
219
    stored_loc = br_from.get_push_location()
 
220
    if location is None:
 
221
        if stored_loc is None:
 
222
            self.dialog.error_dialog(_('Push location is unknown'),
 
223
                                     _('Please specify a location manually.'))
 
224
            return
 
225
        else:
 
226
            location = stored_loc
 
227
 
 
228
    transport = get_transport(location)
 
229
    location_url = transport.base
 
230
 
 
231
    if br_from.get_push_location() is None or remember:
 
232
        br_from.set_push_location(location_url)
 
233
 
 
234
    old_rh = []
 
235
 
 
236
    try:
 
237
        dir_to = BzrDir.open(location_url)
 
238
        br_to = dir_to.open_branch()
 
239
    except errors.NotBranchError:
 
240
        # create a branch.
 
241
        transport = transport.clone('..')
 
242
        if not create_prefix:
 
243
            try:
 
244
                relurl = transport.relpath(location_url)
 
245
                transport.mkdir(relurl)
 
246
            except errors.NoSuchFile:
 
247
                self.dialog.error_dialog(_('Non existing parent directory'),
 
248
                                         _("The parent directory (%s)\ndoesn't exist.") % location)
 
249
                return
 
250
        else:
 
251
            current = transport.base
 
252
            needed = [(transport, transport.relpath(location_url))]
 
253
            while needed:
 
254
                try:
 
255
                    transport, relpath = needed[-1]
 
256
                    transport.mkdir(relpath)
 
257
                    needed.pop()
 
258
                except errors.NoSuchFile:
 
259
                    new_transport = transport.clone('..')
 
260
                    needed.append((new_transport,
 
261
                                   new_transport.relpath(transport.base)))
 
262
                    if new_transport.base == transport.base:
 
263
                        self.dialog.error_dialog(_('Path prefix not created'),
 
264
                                                 _("The path leading up to the specified location couldn't\nbe created."))
 
265
                        return
 
266
        dir_to = br_from.bzrdir.clone(location_url,
 
267
            revision_id=br_from.last_revision())
 
268
        br_to = dir_to.open_branch()
 
269
        count = len(br_to.revision_history())
 
270
    else:
 
271
        old_rh = br_to.revision_history()
 
272
        try:
 
273
            try:
 
274
                tree_to = dir_to.open_workingtree()
 
275
            except errors.NotLocalUrl:
 
276
                # FIXME - what to do here? how should we warn the user?
 
277
                #warning('This transport does not update the working '
 
278
                #        'tree of: %s' % (br_to.base,))
 
279
                count = br_to.pull(br_from, overwrite)
 
280
            except errors.NoWorkingTree:
 
281
                count = br_to.pull(br_from, overwrite)
 
282
            else:
 
283
                count = tree_to.pull(br_from, overwrite)
 
284
        except errors.DivergedBranches:
 
285
            raise
 
286
    
 
287
    return count