[PATCH 5 of 9 V6] bookmarks: add srchex param to updatefromremote
Stanislau Hlebik
stash at fb.com
Tue Oct 11 16:25:47 UTC 2016
# 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
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
More information about the Mercurial-devel
mailing list