diff -r 6e0ecb9a2e19 -r 743736fc7c41 mercurial/bundle2.py --- a/mercurial/bundle2.py Mon Nov 24 16:04:44 2014 -0800 +++ b/mercurial/bundle2.py Fri Nov 21 15:50:38 2014 -0800 @@ -877,7 +877,7 @@ 'b2x:remote-changegroup': ('http', 'https'), } -def getrepocaps(repo): +def getrepocaps(repo, allowpushback=False): """return the bundle2 capabilities for a given repo Exists to allow extensions (like evolution) to mutate the capabilities. @@ -887,6 +887,8 @@ if obsolete.isenabled(repo, obsolete.exchangeopt): supportedformat = tuple('V%i' % v for v in obsolete.formats) caps['b2x:obsmarkers'] = supportedformat + if allowpushback: + caps['b2x:pushback'] = () return caps def bundle2caps(remote):