This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4851

streamclone: pass narrowing related info in _walkstreamfiles()
ClosedPublic

Authored by pulkit on Oct 3 2018, 11:02 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGf0e8f27768eb: streamclone: pass narrowing related info in _walkstreamfiles()
Summary

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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Oct 3 2018, 11:02 AM
pulkit edited the summary of this revision. (Show Details)Oct 17 2018, 10:52 AM
pulkit retitled this revision from streamclone: pass narrowing related info in generatev2() and _walkstreamfiles() to streamclone: pass narrowing related info in _walkstreamfiles().
pulkit updated this revision to Diff 12209.
Closed by commit rHGf0e8f27768eb: streamclone: pass narrowing related info in _walkstreamfiles() (authored by pulkit). · Explain WhyOct 17 2018, 7:25 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/streamclone.py (11 lines)

Diff 12228

mercurial/streamclone.py

import os import os
import struct import struct
from .i18n import _ from .i18n import _
from . import ( from . import (
branchmap, branchmap,
cacheutil, cacheutil,
error, error,
narrowspec,
phases, phases,
pycompat, pycompat,
repository, repository,
store, store,
util, util,
) )
def canperformstreamclone(pullop, bundle2=False): def canperformstreamclone(pullop, bundle2=False):
# So don't allow this by default. # So don't allow this by default.
secret = phases.hassecret(repo) secret = phases.hassecret(repo)
if secret: if secret:
return repo.ui.configbool('server', 'uncompressedallowsecret') return repo.ui.configbool('server', 'uncompressedallowsecret')
return True return True
# This is it's own function so extensions can override it. # This is it's own function so extensions can override it.
def _walkstreamfiles(repo): def _walkstreamfiles(repo, matcher=None):
return repo.store.walk() return repo.store.walk(matcher)
def generatev1(repo): def generatev1(repo):
"""Emit content for version 1 of a streaming clone. """Emit content for version 1 of a streaming clone.
This returns a 3-tuple of (file count, byte size, data iterator). This returns a 3-tuple of (file count, byte size, data iterator).
The data iterator consists of N entries for each file being transferred. The data iterator consists of N entries for each file being transferred.
Each file entry starts as a line with the file name and integer size Each file entry starts as a line with the file name and integer size
if includes or excludes: if includes or excludes:
raise error.Abort(_("server does not support narrow stream clones")) raise error.Abort(_("server does not support narrow stream clones"))
with repo.lock(): with repo.lock():
entries = [] entries = []
totalfilesize = 0 totalfilesize = 0
matcher = None
if includes or excludes:
matcher = narrowspec.match(repo.root, includes, excludes)
repo.ui.debug('scanning\n') repo.ui.debug('scanning\n')
for name, ename, size in _walkstreamfiles(repo): for name, ename, size in _walkstreamfiles(repo, matcher):
if size: if size:
entries.append((_srcstore, name, _fileappend, size)) entries.append((_srcstore, name, _fileappend, size))
totalfilesize += size totalfilesize += size
for name in _walkstreamfullstorefiles(repo): for name in _walkstreamfullstorefiles(repo):
if repo.svfs.exists(name): if repo.svfs.exists(name):
totalfilesize += repo.svfs.lstat(name).st_size totalfilesize += repo.svfs.lstat(name).st_size
entries.append((_srcstore, name, _filefull, None)) entries.append((_srcstore, name, _filefull, None))
for name in cacheutil.cachetocopy(repo): for name in cacheutil.cachetocopy(repo):