Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bundleoperation: pass the source argument from all the users
authorPulkit Goyal <7895pulkit@gmail.com>
Sat, 31 Mar 2018 14:51:34 +0530
changeset 37237 f7d3915d5b3a
parent 37236 9041c91561fc
child 37238 684a6a261f30
bundleoperation: pass the source argument from all the users We now have a source attribute to the bundle2.bundleoperation class which stores the operation which leads to the current bundling/unbundling. Let's make sure we pass source argument from all the users of the command. Differential Revision: https://phab.mercurial-scm.org/D2995
mercurial/bundle2.py file | annotate | diff | comparison | revisions
mercurial/exchange.py file | annotate | diff | comparison | revisions 
--- a/mercurial/bundle2.py	Sat Mar 31 14:49:16 2018 +0530
+++ b/mercurial/bundle2.py	Sat Mar 31 14:51:34 2018 +0530
@@ -353,7 +353,7 @@
         return processbundle(repo, unbundler, lambda: tr, source=source)
     else:
         # the transactiongetter won't be used, but we might as well set it
-        op = bundleoperation(repo, lambda: tr)
+        op = bundleoperation(repo, lambda: tr, source=source)
         _processchangegroup(op, unbundler, tr, source, url, **kwargs)
         return op
 
@@ -441,7 +441,7 @@
     if op is None:
         if transactiongetter is None:
             transactiongetter = _notransaction
-        op = bundleoperation(repo, transactiongetter)
+        op = bundleoperation(repo, transactiongetter, source=source)
     # todo:
     # - replace this is a init function soon.
     # - exception catching
--- a/mercurial/exchange.py	Sat Mar 31 14:49:16 2018 +0530
+++ b/mercurial/exchange.py	Sat Mar 31 14:51:34 2018 +0530
@@ -1595,7 +1595,8 @@
     _pullbundle2extraprepare(pullop, kwargs)
     bundle = pullop.remote.getbundle('pull', **pycompat.strkwargs(kwargs))
     try:
-        op = bundle2.bundleoperation(pullop.repo, pullop.gettransaction)
+        op = bundle2.bundleoperation(pullop.repo, pullop.gettransaction,
+                                     source='pull')
         op.modes['bookmarks'] = 'records'
         bundle2.processbundle(pullop.repo, bundle, op=op)
     except bundle2.AbortFromPart as exc:
@@ -2052,7 +2053,8 @@
                     gettransaction()
 
                 op = bundle2.bundleoperation(repo, gettransaction,
-                                             captureoutput=captureoutput)
+                                             captureoutput=captureoutput,
+                                             source='push')
                 try:
                     op = bundle2.processbundle(repo, cg, op=op)
                 finally:
mercurial