[PATCH 6 of 7 bundle2] pull: use 'phase-heads' to retrieve phase information

Pulkit Goyal 7895pulkit at gmail.com
Sat Sep 30 10:22:48 UTC 2017


On Sat, Sep 30, 2017 at 10:49 AM, Yuya Nishihara <yuya at tcha.org> wrote:
> On Thu, 28 Sep 2017 07:08:41 +0200, Boris Feld wrote:
>> # HG changeset patch
>> # User Boris Feld <boris.feld at octobus.net>
>> # Date 1506281238 -7200
>> #      Sun Sep 24 21:27:18 2017 +0200
>> # Node ID dca2166f424196e9b4b6ef9c6b0925f249c54682
>> # Parent  7079b5aaf647e041e2dc8bc6526b9c7a2efbdc71
>> # EXP-Topic b2.phases
>> pull: use 'phase-heads' to retrieve phase information
>
>> @@ -1349,12 +1350,20 @@
>>      kwargs['common'] = pullop.common
>>      kwargs['heads'] = pullop.heads or pullop.rheads
>>      kwargs['cg'] = pullop.fetch
>> +
>> +    ui = pullop.repo.ui
>> +    legacyphase = 'phases' in ui.configlist('devel', 'legacy.exchange')
>> +    if (not legacyphase and 'heads' in pullop.remotebundle2caps.get('phases')):
>> +        kwargs['phases'] = True
>> +        pullop.stepsdone.add('phases')
>
> Got the following exception while pulling. The local draft head would be
> replaced with the remote public head if pull succeeded.

Breaks my local hg pull. :(



More information about the Mercurial-devel mailing list