Show More
@@ -302,11 +302,13 b' def _notransaction():' | |||||
302 | to be created""" |
|
302 | to be created""" | |
303 | raise TransactionUnavailable() |
|
303 | raise TransactionUnavailable() | |
304 |
|
304 | |||
305 | def applybundle(repo, unbundler, tr, source=None, op=None): |
|
305 | def applybundle(repo, unbundler, tr, source=None, url=None, op=None): | |
306 | # transform me into unbundler.apply() as soon as the freeze is lifted |
|
306 | # transform me into unbundler.apply() as soon as the freeze is lifted | |
307 | tr.hookargs['bundle2'] = '1' |
|
307 | tr.hookargs['bundle2'] = '1' | |
308 | if source is not None and 'source' not in tr.hookargs: |
|
308 | if source is not None and 'source' not in tr.hookargs: | |
309 | tr.hookargs['source'] = source |
|
309 | tr.hookargs['source'] = source | |
|
310 | if url is not None and 'url' not in tr.hookargs: | |||
|
311 | tr.hookargs['url'] = url | |||
310 | return processbundle(repo, unbundler, lambda: tr, op=op) |
|
312 | return processbundle(repo, unbundler, lambda: tr, op=op) | |
311 |
|
313 | |||
312 | def processbundle(repo, unbundler, transactiongetter=None, op=None): |
|
314 | def processbundle(repo, unbundler, transactiongetter=None, op=None): |
General Comments 0
You need to be logged in to leave comments.
Login now