##// END OF EJS Templates
bundleoperation: pass the source argument from all the users...
Pulkit Goyal -
r37254:f7d3915d default
parent child Browse files
Show More
@@ -353,7 +353,7 b' def applybundle(repo, unbundler, tr, sou'
353 return processbundle(repo, unbundler, lambda: tr, source=source)
353 return processbundle(repo, unbundler, lambda: tr, source=source)
354 else:
354 else:
355 # the transactiongetter won't be used, but we might as well set it
355 # the transactiongetter won't be used, but we might as well set it
356 op = bundleoperation(repo, lambda: tr)
356 op = bundleoperation(repo, lambda: tr, source=source)
357 _processchangegroup(op, unbundler, tr, source, url, **kwargs)
357 _processchangegroup(op, unbundler, tr, source, url, **kwargs)
358 return op
358 return op
359
359
@@ -441,7 +441,7 b' def processbundle(repo, unbundler, trans'
441 if op is None:
441 if op is None:
442 if transactiongetter is None:
442 if transactiongetter is None:
443 transactiongetter = _notransaction
443 transactiongetter = _notransaction
444 op = bundleoperation(repo, transactiongetter)
444 op = bundleoperation(repo, transactiongetter, source=source)
445 # todo:
445 # todo:
446 # - replace this is a init function soon.
446 # - replace this is a init function soon.
447 # - exception catching
447 # - exception catching
@@ -1595,7 +1595,8 b' def _pullbundle2(pullop):'
1595 _pullbundle2extraprepare(pullop, kwargs)
1595 _pullbundle2extraprepare(pullop, kwargs)
1596 bundle = pullop.remote.getbundle('pull', **pycompat.strkwargs(kwargs))
1596 bundle = pullop.remote.getbundle('pull', **pycompat.strkwargs(kwargs))
1597 try:
1597 try:
1598 op = bundle2.bundleoperation(pullop.repo, pullop.gettransaction)
1598 op = bundle2.bundleoperation(pullop.repo, pullop.gettransaction,
1599 source='pull')
1599 op.modes['bookmarks'] = 'records'
1600 op.modes['bookmarks'] = 'records'
1600 bundle2.processbundle(pullop.repo, bundle, op=op)
1601 bundle2.processbundle(pullop.repo, bundle, op=op)
1601 except bundle2.AbortFromPart as exc:
1602 except bundle2.AbortFromPart as exc:
@@ -2052,7 +2053,8 b' def unbundle(repo, cg, heads, source, ur'
2052 gettransaction()
2053 gettransaction()
2053
2054
2054 op = bundle2.bundleoperation(repo, gettransaction,
2055 op = bundle2.bundleoperation(repo, gettransaction,
2055 captureoutput=captureoutput)
2056 captureoutput=captureoutput,
2057 source='push')
2056 try:
2058 try:
2057 op = bundle2.processbundle(repo, cg, op=op)
2059 op = bundle2.processbundle(repo, cg, op=op)
2058 finally:
2060 finally:
General Comments 0
You need to be logged in to leave comments. Login now