[PATCH 5 of 9 V6] bookmarks: add srchex param to updatefromremote
Pierre-Yves David
pierre-yves.david at ens-lyon.org
Thu Oct 13 21:28:25 EDT 2016
On 10/11/2016 06:25 PM, Stanislau Hlebik wrote:
> # HG changeset patch
> # User Stanislau Hlebik <stash at fb.com>
> # Date 1476197429 25200
> # Tue Oct 11 07:50:29 2016 -0700
> # Node ID f781756b8de11a6f3e7dd5fd6354e9778defd8c3
> # Parent 718ed86a3698631077a087efaf668d70513056f5
> bookmarks: add srchex param to updatefromremote
I do not understand what the purpose and effect of this changeset is.
Can you elaborate a little ?
>
> diff --git a/mercurial/bookmarks.py b/mercurial/bookmarks.py
> --- a/mercurial/bookmarks.py
> +++ b/mercurial/bookmarks.py
> @@ -508,11 +508,12 @@
>
> return None
>
> -def updatefromremote(ui, repo, remotemarks, path, trfunc, explicit=()):
> +def updatefromremote(ui, repo, remotemarks, path, trfunc, explicit=(),
> + srchex=None):
> ui.debug("checking for updated bookmarks\n")
> localmarks = repo._bookmarks
> (addsrc, adddst, advsrc, advdst, diverge, differ, invalid, same
> - ) = compare(repo, remotemarks, localmarks, dsthex=hex)
> + ) = compare(repo, remotemarks, localmarks, srchex=srchex, dsthex=hex)
>
> status = ui.status
> warn = ui.warn
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
>
--
Pierre-Yves David
More information about the Mercurial-devel
mailing list