equal
deleted
inserted
replaced
307 """default method to get a transaction while processing a bundle |
307 """default method to get a transaction while processing a bundle |
308 |
308 |
309 Raise an exception to highlight the fact that no transaction was expected |
309 Raise an exception to highlight the fact that no transaction was expected |
310 to be created""" |
310 to be created""" |
311 raise TransactionUnavailable() |
311 raise TransactionUnavailable() |
|
312 |
|
313 def applybundle1(repo, cg, tr, source, url, **kwargs): |
|
314 ret, addednodes = cg.apply(repo, tr, source, url, **kwargs) |
|
315 return ret |
312 |
316 |
313 def applybundle(repo, unbundler, tr, source=None, url=None): |
317 def applybundle(repo, unbundler, tr, source=None, url=None): |
314 # transform me into unbundler.apply() as soon as the freeze is lifted |
318 # transform me into unbundler.apply() as soon as the freeze is lifted |
315 tr.hookargs['bundle2'] = '1' |
319 tr.hookargs['bundle2'] = '1' |
316 if source is not None and 'source' not in tr.hookargs: |
320 if source is not None and 'source' not in tr.hookargs: |