[PATCH 3 of 4] destupdate: also include bookmark related logic

Pierre-Yves David pierre-yves.david at ens-lyon.org
Mon Oct 12 12:22:14 CDT 2015



On 10/12/2015 10:02 AM, Augie Fackler wrote:
> On Fri, Oct 9, 2015 at 3:52 PM, Pierre-Yves David
> <pierre-yves.david at ens-lyon.org> wrote:
>>
>>
>> On 10/09/2015 08:06 AM, Augie Fackler wrote:
>>>
>>> On Thu, Oct 08, 2015 at 02:42:17PM -0700, Pierre-Yves David wrote:
>>>>
>>>> # HG changeset patch
>>>> # User Pierre-Yves David <pierre-yves.david at fb.com>
>>>> # Date 1443513806 25200
>>>> #      Tue Sep 29 01:03:26 2015 -0700
>>>> # Node ID 725812283ac94ac10c38ba1112b0857191a1f621
>>>> # Parent  18cba2544597d954fde95ee36f6450faab57fcbc
>>>> destupdate: also include bookmark related logic
>>>>
>>>> For the same reason, we move the bookmark related update logic into the
>>>> 'destupdate' function.
>>>
>>>
>>>
>>>> This requires to extend the returns of the function to
>>>> include the bookmark that needs to move (more or less) and the bookmark
>>>> to
>>>> activate at the end of the function.
>>>
>>>
>>> I'm not sure what this sentence is trying to say (the "more or less"
>>> is confusing me). I think what you mean is:
>>>
>>> This requires destupdate also returning the name of any bookmark that
>>> needs to move, and the bookmark to activiate after the function.
>>>
>>> Is that right?
>>
>>
>> No, What we actually return here is:
>>
>> 1) A node
>> 2) A bookmark name
>>
>> If after the update, the active bookmark is on the node (1), we move it to
>> the new location.
>>
>> And if after the update the bookmark name is under the current location, it
>> should be activated.
>>
>> Or in summary: http://imgur.com/ES8wIja
>
> Please document this madness for future readers.

I've updated the function docstring and pointed to it in the changesets 
description. V2 coming.

-- 
Pierre-Yves David


More information about the Mercurial-devel mailing list