Mercurial > public > mercurial-scm > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 29053:61463b8fcef8 | 29064:9dc27a334fb1 |
|---|---|
| 1288 | 1288 |
| 1289 kwargs['common'] = pullop.common | 1289 kwargs['common'] = pullop.common |
| 1290 kwargs['heads'] = pullop.heads or pullop.rheads | 1290 kwargs['heads'] = pullop.heads or pullop.rheads |
| 1291 kwargs['cg'] = pullop.fetch | 1291 kwargs['cg'] = pullop.fetch |
| 1292 if 'listkeys' in pullop.remotebundle2caps: | 1292 if 'listkeys' in pullop.remotebundle2caps: |
| 1293 kwargs['listkeys'] = ['phase'] | 1293 kwargs['listkeys'] = ['phases'] |
| 1294 if pullop.remotebookmarks is None: | 1294 if pullop.remotebookmarks is None: |
| 1295 # make sure to always includes bookmark data when migrating | 1295 # make sure to always includes bookmark data when migrating |
| 1296 # `hg incoming --bundle` to using this function. | 1296 # `hg incoming --bundle` to using this function. |
| 1297 kwargs['listkeys'].append('bookmarks') | 1297 kwargs['listkeys'].append('bookmarks') |
| 1298 | 1298 |