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

[Augie Fackler]

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.

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