# HG changeset patch # User Pulkit Goyal # Date 2018-10-03 14:59:05 # Node ID f0e8f27768eb61af8d632c841ad80d67494a64de # Parent af62936c25081e4d4ca932db9fcad48923d317a1 streamclone: pass narrowing related info in _walkstreamfiles() This patch build a matcher using the include and exclude arguments we have in generatev2() and pass that matcher into _walkstreamfiles(). This will help us in filtering files we stream depending on the includes and excludes passed in by the user. Differential Revision: https://phab.mercurial-scm.org/D4851 diff --git a/mercurial/streamclone.py b/mercurial/streamclone.py --- a/mercurial/streamclone.py +++ b/mercurial/streamclone.py @@ -16,6 +16,7 @@ from . import ( branchmap, cacheutil, error, + narrowspec, phases, pycompat, repository, @@ -194,8 +195,8 @@ def allowservergeneration(repo): return True # This is it's own function so extensions can override it. -def _walkstreamfiles(repo): - return repo.store.walk() +def _walkstreamfiles(repo, matcher=None): + return repo.store.walk(matcher) def generatev1(repo): """Emit content for version 1 of a streaming clone. @@ -553,8 +554,12 @@ def generatev2(repo, includes, excludes) entries = [] totalfilesize = 0 + matcher = None + if includes or excludes: + matcher = narrowspec.match(repo.root, includes, excludes) + repo.ui.debug('scanning\n') - for name, ename, size in _walkstreamfiles(repo): + for name, ename, size in _walkstreamfiles(repo, matcher): if size: entries.append((_srcstore, name, _fileappend, size)) totalfilesize += size