Patchwork [2,of,4,STABLE] exchange: propagate arguments to the _getbundleextrapart function

login
register
mail settings
Submitter Pierre-Yves David
Date May 15, 2014, 5:50 a.m.
Message ID <3ec47738fec4dd9567a2.1400133014@marginatus.alto.octopoid.net>
Download mbox | patch
Permalink /patch/4749/
State Accepted
Commit 7f6d99a79411720e90a8bd5f429c0b6503e6f172
Headers show

Comments

Pierre-Yves David - May 15, 2014, 5:50 a.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1399516097 25200
#      Wed May 07 19:28:17 2014 -0700
# Branch stable
# Node ID 3ec47738fec4dd9567a26bbaf56c822378d8e09c
# Parent  4a4efce2dc1350fc85c4e4807c0b92e94b8e82f0
exchange: propagate arguments to the _getbundleextrapart function

The arguments was wrongly propagated (again).

This a backport of 0055b5b3eb9c

Patch

diff --git a/mercurial/exchange.py b/mercurial/exchange.py
--- a/mercurial/exchange.py
+++ b/mercurial/exchange.py
@@ -697,12 +697,12 @@  def getbundle(repo, source, heads=None, 
             blob = urllib.unquote(bcaps[len('bundle2='):])
             b2caps.update(bundle2.decodecaps(blob))
     bundler = bundle2.bundle20(repo.ui, b2caps)
     part = bundle2.bundlepart('b2x:changegroup', data=cg.getchunks())
     bundler.addpart(part)
-    _getbundleextrapart(bundler, repo, source, heads=None, common=None,
-                        bundlecaps=None, **kwargs)
+    _getbundleextrapart(bundler, repo, source, heads=heads, common=common,
+                        bundlecaps=bundlecaps, **kwargs)
     return util.chunkbuffer(bundler.getchunks())
 
 def _getbundleextrapart(bundler, repo, source, heads=None, common=None,
                         bundlecaps=None, **kwargs):
     """hook function to let extensions add parts to the requested bundle"""