remotefilelogserver: add a matcher argument to _walkstreamfiles()
authorPulkit Goyal <pulkit@yandex-team.ru>
Wed, 24 Oct 2018 17:51:49 +0300
changeset 40515 1c34b31a6c9c
parent 40514 6f0b6905ef6f
child 40516 67e35dceab9b
remotefilelogserver: add a matcher argument to _walkstreamfiles() Implementing narrow stream clones in core, I added an optional matcher argument. The function in remotefilelogserver.py does not know about that argument and does not accept that and hence some tests fails. Differential Revision: https://phab.mercurial-scm.org/D5191
hgext/remotefilelog/remotefilelogserver.py
--- a/hgext/remotefilelog/remotefilelogserver.py	Mon Nov 05 11:52:10 2018 -0800
+++ b/hgext/remotefilelog/remotefilelogserver.py	Wed Oct 24 17:51:49 2018 +0300
@@ -129,7 +129,7 @@
     wireprotov1server.commands['stream_out_shallow'] = (stream_out_shallow, '*')
 
     # don't clone filelogs to shallow clients
-    def _walkstreamfiles(orig, repo):
+    def _walkstreamfiles(orig, repo, matcher=None):
         if state.shallowremote:
             # if we are shallow ourselves, stream our local commits
             if shallowutil.isenabled(repo):
@@ -173,7 +173,7 @@
             raise error.Abort(_("Cannot clone from a shallow repo "
                                 "to a full repo."))
         else:
-            for x in orig(repo):
+            for x in orig(repo, matcher):
                 yield x
 
     extensions.wrapfunction(streamclone, '_walkstreamfiles', _walkstreamfiles)