[PATCH 3 of 4] destupdate: also include bookmark related logic
Pierre-Yves David
pierre-yves.david at ens-lyon.org
Fri Oct 9 14:52:10 CDT 2015
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
This is how bookmark have been doing it for the last 4 years and it is
not related to the goal to this series so I did not looked into clearing
this up.
I tried to stay simple in the description so I describe something
sensible with a (more or less) tune.
--
Pierre-Yves David
More information about the Mercurial-devel
mailing list