Patchwork [3,of,8,V7] bookmarks: add srchex param to updatefromremote

login
register
mail settings
Submitter Stanislau Hlebik
Date Nov. 2, 2016, 2:06 p.m.
Message ID <d752daa2b736f0336a18.1478095605@dev1918.lla1.facebook.com>
Download mbox | patch
Permalink /patch/17279/
State Superseded
Headers show

Comments

Stanislau Hlebik - Nov. 2, 2016, 2:06 p.m.
# HG changeset patch
# User Stanislau Hlebik <stash@fb.com>
# Date 1478016027 25200
#      Tue Nov 01 09:00:27 2016 -0700
# Branch stable
# Node ID d752daa2b736f0336a18760940104c59d6bd1a5c
# Parent  f3da841e3d47ccbb0be3892b521607c09fdeab13
bookmarks: add srchex param to updatefromremote

Patch

diff --git a/mercurial/bookmarks.py b/mercurial/bookmarks.py
--- a/mercurial/bookmarks.py
+++ b/mercurial/bookmarks.py
@@ -501,11 +501,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