Mercurial > public > mercurial-scm > hg-stable
diff mercurial/exchange.py @ 29064:9dc27a334fb1 stable
bundle2: properly request phases during getbundle
getbundle was requesting the "phase" namespace instead of the "phases"
namespace, which led to the client still requesting the phases
separately after getbundle finished.
| author | Mike Hommey <mh@glandium.org> |
|---|---|
| date | Thu, 05 May 2016 20:57:38 +0900 |
| parents | 032c4c2f802a |
| children | 0d83ad967bf8 |
line wrap: on
line diff
--- a/mercurial/exchange.py Sun May 01 14:36:12 2016 -0500 +++ b/mercurial/exchange.py Thu May 05 20:57:38 2016 +0900 @@ -1290,7 +1290,7 @@ kwargs['heads'] = pullop.heads or pullop.rheads kwargs['cg'] = pullop.fetch if 'listkeys' in pullop.remotebundle2caps: - kwargs['listkeys'] = ['phase'] + kwargs['listkeys'] = ['phases'] if pullop.remotebookmarks is None: # make sure to always includes bookmark data when migrating # `hg incoming --bundle` to using this function.