Patchwork exchange: pass bundlecaps through to changegroup

login
register
mail settings
Submitter Durham Goode
Date April 4, 2014, 11:42 p.m.
Message ID <dbf0fa39a5b81a226a89.1396654928@dev2000.prn2.facebook.com>
Download mbox | patch
Permalink /patch/4234/
State Accepted
Commit dbf0fa39a5b81a226a8953e91c7d5a151d453e06
Headers show

Comments

Durham Goode - April 4, 2014, 11:42 p.m.
# HG changeset patch
# User Durham Goode <durham@fb.com>
# Date 1396654911 25200
#      Fri Apr 04 16:41:51 2014 -0700
# Node ID dbf0fa39a5b81a226a8953e91c7d5a151d453e06
# Parent  12f161f08d744f0e4b6eef9c905670afb5c24dd4
exchange: pass bundlecaps through to changegroup

The bundlecaps passed to exchange.getbundle were being dropped completely. We
should pass them on through to the changegroup.

This affected the remotefilelog extension, since it relies on those bundlecaps.
Matt Mackall - April 5, 2014, 7:31 p.m.
On Fri, 2014-04-04 at 16:42 -0700, Durham Goode wrote:
> # HG changeset patch
> # User Durham Goode <durham@fb.com>
> # Date 1396654911 25200
> #      Fri Apr 04 16:41:51 2014 -0700
> # Node ID dbf0fa39a5b81a226a8953e91c7d5a151d453e06
> # Parent  12f161f08d744f0e4b6eef9c905670afb5c24dd4
> exchange: pass bundlecaps through to changegroup

Queued for default, thanks.

Patch

diff --git a/mercurial/exchange.py b/mercurial/exchange.py
--- a/mercurial/exchange.py
+++ b/mercurial/exchange.py
@@ -596,7 +596,7 @@ 
     """
     # build bundle here.
     cg = changegroup.getbundle(repo, source, heads=heads,
-                               common=common, bundlecaps=None)
+                               common=common, bundlecaps=bundlecaps)
     if bundlecaps is None or 'HG20' not in bundlecaps:
         return cg
     # very crude first implementation,