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

Augie Fackler raf at durin42.com
Tue Oct 13 13:24:45 CDT 2015


On Tue, Oct 13, 2015 at 1:33 PM, Pierre-Yves David
<pierre-yves.david at ens-lyon.org> wrote:
>
>
> On 10/13/2015 10:10 AM, Augie Fackler wrote:
>>
>> On Tue, Oct 13, 2015 at 08:58:51AM -0700, Pierre-Yves David wrote:
>>>
>>>
>>>
>>> On 10/13/2015 08:28 AM, Augie Fackler wrote:
>>>>
>>>> On Mon, Oct 12, 2015 at 10:22:55AM -0700, Pierre-Yves David wrote:
>>
>>
>> [snip]
>>
>>>>>   def destupdate(repo, clean=False, check=False):
>>>>>       """destination for bare update operation
>>>>> +
>>>>> +    return (rev, ancestor, movemark, activemark)
>>>>> +
>>>>> +    - rev: the revision to update to,
>>>>> +    - a node to move the active bookmark from if it is there,
>>>>> +    - a bookmark to activate at the end of the update.
>>>>
>>>>
>>>> You've documented this as returning a 4-tuple, but it returns a 3-tuple.
>>>>
>>>> I think, based on skimming the code, what should be here is this:
>>>>
>>>> """Destination for bare update operations.
>>>>
>>>> Returns a tuple of (rev, movemark, activemark), where
>>>>    rev is the revision to update to
>>>>    movemark is ????
>>>>    activemark is always None
>>>> """
>>>
>>>
>>> Ha yes, the ancestors is the remain of an old memory.
>>>
>>> I've documented movemark in this patch
>>> (second item), not sure what you want more. You can check
>>> m.bookmarks.calculate update for more details about movemark.
>>> I would be happy to be able to move forward here.
>>
>>
>> I have no idea how to interpret what you wrote. Please try again in
>> this thread so we can work it out before you do a v3. Perhaps the text
>> in the docstring should include a reference to whatever
>> m.bookmarks.calculate is.
>
>
> return (rev, ancestor, movemark, activemark)

You return a 3-tuple, not a 4-tuple. What is ancestor doing here?
Where is it coming from?

> - rev: the revision to update to,
> - movemark: node to move the active bookmark from
>            (cf bookmark.calculate update),
> - activemark: a bookmark to activate at the end of the update.

This looks fine.

> #Iamjustmovingcodearound

And you get to leave the campsite cleaner than you found it!

>
>
>
> --
> Pierre-Yves David
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> https://selenic.com/mailman/listinfo/mercurial-devel


More information about the Mercurial-devel mailing list