Show More
@@ -310,12 +310,6 b' def _notransaction():' | |||
|
310 | 310 | to be created""" |
|
311 | 311 | raise TransactionUnavailable() |
|
312 | 312 | |
|
313 | def applybundle1(repo, cg, tr, source, url, **kwargs): | |
|
314 | # the transactiongetter won't be used, but we might as well set it | |
|
315 | op = bundleoperation(repo, lambda: tr) | |
|
316 | _processchangegroup(op, cg, tr, source, url, **kwargs) | |
|
317 | return op | |
|
318 | ||
|
319 | 313 | def applybundle(repo, unbundler, tr, source=None, url=None, **kwargs): |
|
320 | 314 | # transform me into unbundler.apply() as soon as the freeze is lifted |
|
321 | 315 | if isinstance(unbundler, unbundle20): |
@@ -326,7 +320,10 b' def applybundle(repo, unbundler, tr, sou' | |||
|
326 | 320 | tr.hookargs['url'] = url |
|
327 | 321 | return processbundle(repo, unbundler, lambda: tr) |
|
328 | 322 | else: |
|
329 | return applybundle1(repo, unbundler, tr, source, url, **kwargs) | |
|
323 | # the transactiongetter won't be used, but we might as well set it | |
|
324 | op = bundleoperation(repo, lambda: tr) | |
|
325 | _processchangegroup(op, unbundler, tr, source, url, **kwargs) | |
|
326 | return op | |
|
330 | 327 | |
|
331 | 328 | def processbundle(repo, unbundler, transactiongetter=None, op=None): |
|
332 | 329 | """This function process a bundle, apply effect to/from a repo |
General Comments 0
You need to be logged in to leave comments.
Login now