hgext/narrow/narrowwirepeer.py
86	I swapped diffmatch and oldmatch here while testing because that's how widen_bundle() accepts them

mercurial/changegroup.py
1059–1068	Also, I think this is not the right place to case this because not yielding these deltas will prevent the lookupfn being called and will result in tmfnodes being not updated correctly.

mercurial/changegroup.py
1059–1068	The name "_oldfilematcher" is a little ironic since it's not used for file (only directories). The reason that we don't consult it for files is that we get passed a differenecematcher when widening and the subtraction of files the client already has is done by that. If we're making changegroup.generate() aware of widening like this patch does, perhaps we should make the caller not pass a differencematcher and we should instead check _oldfilematcher for files too. That would be more consistent and easier to understand. I guess there's not much reason not to do that, so I'll work on that (I'll update this patch).
1059–1068	Fixed. I had not realized that `deltas` is a generator. Thanks for point that out.

mercurial/changegroup.py
1065	maybe, we can prevent walking the deltas in case of trees because if the root does not match, the rest of tree won't match. I will try to test this and send a patch if that works.

hgext/narrow/narrowwirepeer.py
15	removed this in flight to make pyflakes happy.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	11714		Oct 5 2018, 4:49 PM	★	★
Diff 2	12129		Oct 14 2018, 8:20 AM	★	★
Diff 3	12175		Oct 16 2018, 3:02 PM	★	★
Diff 4	12184		Oct 16 2018, 5:08 PM	★	★
Diff 5	12217		Oct 17 2018, 12:52 PM	★	★
Diff 6	12237	rHG89cba88e95ed84b6e5e49ecc51ebf7119cfaa6b4	Oct 5 2018, 2:07 PM	★	★

Commit	Parents	Author	Summary	Date
		Martin von Zweigbergk		Oct 5 2018, 2:07 PM

	Status	Author	Revision
	Closed	martinvonz	D4895 narrow: when widening, don't include manifests the client already has
	Closed	martinvonz	D5143 tests: add test for widening from an empty clone

Diff 12217

hgext/narrow/narrowbundle2.py

	yield _KILLNODESIGNAL			yield _KILLNODESIGNAL
	yield repo.changelog.node(r)			yield repo.changelog.node(r)
	yield _DONESIGNAL			yield _DONESIGNAL
	bundler.newpart(_CHANGESPECPART, data=genkills())			bundler.newpart(_CHANGESPECPART, data=genkills())
	newvisit, newfull, newellipsis = exchange._computeellipsis(			newvisit, newfull, newellipsis = exchange._computeellipsis(
	repo, set(), common, known, newmatch)			repo, set(), common, known, newmatch)
	if newvisit:			if newvisit:
	packer = changegroup.getbundler(version, repo,			packer = changegroup.getbundler(version, repo,
	filematcher=newmatch,			matcher=newmatch,
	ellipses=True,			ellipses=True,
	shallow=depth is not None,			shallow=depth is not None,
	ellipsisroots=newellipsis,			ellipsisroots=newellipsis,
	fullnodes=newfull)			fullnodes=newfull)
	cgdata = packer.generate(common, newvisit, False, 'narrow_widen')			cgdata = packer.generate(common, newvisit, False, 'narrow_widen')

	part = bundler.newpart('changegroup', data=cgdata)			part = bundler.newpart('changegroup', data=cgdata)
	part.addparam('version', version)			part.addparam('version', version)
	if 'treemanifest' in repo.requirements:			if 'treemanifest' in repo.requirements:
	part.addparam('treemanifest', '1')			part.addparam('treemanifest', '1')

	visitnodes, relevant_nodes, ellipsisroots = exchange._computeellipsis(			visitnodes, relevant_nodes, ellipsisroots = exchange._computeellipsis(
	repo, common, heads, set(), newmatch, depth=depth)			repo, common, heads, set(), newmatch, depth=depth)

	repo.ui.debug('Found %d relevant revs\n' % len(relevant_nodes))			repo.ui.debug('Found %d relevant revs\n' % len(relevant_nodes))
	if visitnodes:			if visitnodes:
	packer = changegroup.getbundler(version, repo,			packer = changegroup.getbundler(version, repo,
	filematcher=newmatch,			matcher=newmatch,
	ellipses=True,			ellipses=True,
	shallow=depth is not None,			shallow=depth is not None,
	ellipsisroots=ellipsisroots,			ellipsisroots=ellipsisroots,
	fullnodes=relevant_nodes)			fullnodes=relevant_nodes)
	cgdata = packer.generate(common, visitnodes, False, 'narrow_widen')			cgdata = packer.generate(common, visitnodes, False, 'narrow_widen')

	part = bundler.newpart('changegroup', data=cgdata)			part = bundler.newpart('changegroup', data=cgdata)
	part.addparam('version', version)			part.addparam('version', version)

hgext/narrow/narrowwirepeer.py

	# narrowwirepeer.py - passes narrow spec with unbundle command			# narrowwirepeer.py - passes narrow spec with unbundle command
	#			#
	# Copyright 2017 Google, Inc.			# Copyright 2017 Google, Inc.
	#			#
	# This software may be used and distributed according to the terms of the			# This software may be used and distributed according to the terms of the
	# GNU General Public License version 2 or any later version.			# GNU General Public License version 2 or any later version.

	from __future__ import absolute_import			from __future__ import absolute_import

	from mercurial import (			from mercurial import (
	bundle2,			bundle2,
	error,			error,
	extensions,			extensions,
	hg,			hg,
	match as matchmod,			match as matchmod,
	pulkitUnsubmitted Not Done removed this in flight to make pyflakes happy. pulkit: removed this in flight to make pyflakes happy.
	narrowspec,			narrowspec,
	pycompat,			pycompat,
	wireprototypes,			wireprototypes,
	wireprotov1peer,			wireprotov1peer,
	wireprotov1server,			wireprotov1server,
	)			)

	def uisetup():			def uisetup():
	ellipses = False			ellipses = False
	else:			else:
	ellipses = bool(ellipses)			ellipses = bool(ellipses)
	cgversion = cgversion			cgversion = cgversion
	newmatch = narrowspec.match(repo.root, include=newincludes,			newmatch = narrowspec.match(repo.root, include=newincludes,
	exclude=newexcludes)			exclude=newexcludes)
	oldmatch = narrowspec.match(repo.root, include=oldincludes,			oldmatch = narrowspec.match(repo.root, include=oldincludes,
	exclude=oldexcludes)			exclude=oldexcludes)
	diffmatch = matchmod.differencematcher(newmatch, oldmatch)

	bundler = bundle2.widen_bundle(repo, diffmatch, common, known,			bundler = bundle2.widen_bundle(repo, oldmatch, newmatch, common, known,
				pulkitUnsubmitted Not Done I swapped diffmatch and oldmatch here while testing because that's how widen_bundle() accepts them pulkit: I swapped diffmatch and oldmatch here while testing because that's how widen_bundle() accepts…
	cgversion, ellipses)			cgversion, ellipses)
	except error.Abort as exc:			except error.Abort as exc:
	bundler = bundle2.bundle20(repo.ui)			bundler = bundle2.bundle20(repo.ui)
	manargs = [('message', pycompat.bytestr(exc))]			manargs = [('message', pycompat.bytestr(exc))]
	advargs = []			advargs = []
	if exc.hint is not None:			if exc.hint is not None:
	advargs.append(('hint', exc.hint))			advargs.append(('hint', exc.hint))
	bundler.addpart(bundle2.bundlepart('error:abort', manargs, advargs))			bundler.addpart(bundle2.bundlepart('error:abort', manargs, advargs))

mercurial/bundle2.py

	if len(repo):			if len(repo):
	msg = _('cannot apply stream clone to non empty repository')			msg = _('cannot apply stream clone to non empty repository')
	raise error.Abort(msg)			raise error.Abort(msg)

	repo.ui.debug('applying stream bundle\n')			repo.ui.debug('applying stream bundle\n')
	streamclone.applybundlev2(repo, part, filecount, bytecount,			streamclone.applybundlev2(repo, part, filecount, bytecount,
	requirements)			requirements)

	def widen_bundle(repo, diffmatcher, common, known, cgversion, ellipses):			def widen_bundle(repo, oldmatcher, newmatcher, common, known, cgversion,
				ellipses):
	"""generates bundle2 for widening a narrow clone			"""generates bundle2 for widening a narrow clone

	repo is the localrepository instance			repo is the localrepository instance
	diffmatcher is a differencemacther of '(newincludes, newexcludes) -			oldmatcher matches what the client already has
	(oldincludes, oldexcludes)'			newmatcher matches what the client needs (including what it already has)
	common is set of common heads between server and client			common is set of common heads between server and client
	known is a set of revs known on the client side (used in ellipses)			known is a set of revs known on the client side (used in ellipses)
	cgversion is the changegroup version to send			cgversion is the changegroup version to send
	ellipses is boolean value telling whether to send ellipses data or not			ellipses is boolean value telling whether to send ellipses data or not

	returns bundle2 of the data required for extending			returns bundle2 of the data required for extending
	"""			"""
	bundler = bundle20(repo.ui)			bundler = bundle20(repo.ui)
	commonnodes = set()			commonnodes = set()
	cl = repo.changelog			cl = repo.changelog
	for r in repo.revs("::%ln", common):			for r in repo.revs("::%ln", common):
	commonnodes.add(cl.node(r))			commonnodes.add(cl.node(r))
	if commonnodes:			if commonnodes:
	# XXX: we should only send the filelogs (and treemanifest). user			# XXX: we should only send the filelogs (and treemanifest). user
	# already has the changelog and manifest			# already has the changelog and manifest
	packer = changegroup.getbundler(cgversion, repo,			packer = changegroup.getbundler(cgversion, repo,
	filematcher=diffmatcher,			oldmatcher=oldmatcher,
				matcher=newmatcher,
	fullnodes=commonnodes)			fullnodes=commonnodes)
	cgdata = packer.generate(set([nodemod.nullid]), list(commonnodes),			cgdata = packer.generate(set([nodemod.nullid]), list(commonnodes),
	False, 'narrow_widen', changelog=False)			False, 'narrow_widen', changelog=False)

	part = bundler.newpart('changegroup', data=cgdata)			part = bundler.newpart('changegroup', data=cgdata)
	part.addparam('version', cgversion)			part.addparam('version', cgversion)
	if 'treemanifest' in repo.requirements:			if 'treemanifest' in repo.requirements:
	part.addparam('treemanifest', '1')			part.addparam('treemanifest', '1')

	return bundler			return bundler

mercurial/changegroup.py


	revision.linknode = linknode			revision.linknode = linknode
	yield revision			yield revision

	if progress:			if progress:
	progress.complete()			progress.complete()

	class cgpacker(object):			class cgpacker(object):
	def __init__(self, repo, filematcher, version,			def __init__(self, repo, oldmatcher, matcher, version,
	builddeltaheader, manifestsend,			builddeltaheader, manifestsend,
	forcedeltaparentprev=False,			forcedeltaparentprev=False,
	bundlecaps=None, ellipses=False,			bundlecaps=None, ellipses=False,
	shallow=False, ellipsisroots=None, fullnodes=None):			shallow=False, ellipsisroots=None, fullnodes=None):
	"""Given a source repo, construct a bundler.			"""Given a source repo, construct a bundler.

	filematcher is a matcher that matches on files to include in the			oldmatcher is a matcher that matches on files the client already has.
				These will not be included in the changegroup.

				matcher is a matcher that matches on files to include in the
	changegroup. Used to facilitate sparse changegroups.			changegroup. Used to facilitate sparse changegroups.

	forcedeltaparentprev indicates whether delta parents must be against			forcedeltaparentprev indicates whether delta parents must be against
	the previous revision in a delta group. This should only be used for			the previous revision in a delta group. This should only be used for
	compatibility with changegroup version 1.			compatibility with changegroup version 1.

	builddeltaheader is a callable that constructs the header for a group			builddeltaheader is a callable that constructs the header for a group
	delta.			delta.
	shallow indicates whether shallow data might be sent. The packer may			shallow indicates whether shallow data might be sent. The packer may
	need to pack file contents not introduced by the changes being packed.			need to pack file contents not introduced by the changes being packed.

	fullnodes is the set of changelog nodes which should not be ellipsis			fullnodes is the set of changelog nodes which should not be ellipsis
	nodes. We store this rather than the set of nodes that should be			nodes. We store this rather than the set of nodes that should be
	ellipsis because for very large histories we expect this to be			ellipsis because for very large histories we expect this to be
	significantly smaller.			significantly smaller.
	"""			"""
	assert filematcher			assert oldmatcher
	self._filematcher = filematcher			assert matcher
				self._oldmatcher = oldmatcher
				self._matcher = matcher

	self.version = version			self.version = version
	self._forcedeltaparentprev = forcedeltaparentprev			self._forcedeltaparentprev = forcedeltaparentprev
	self._builddeltaheader = builddeltaheader			self._builddeltaheader = builddeltaheader
	self._manifestsend = manifestsend			self._manifestsend = manifestsend
	self._ellipses = ellipses			self._ellipses = ellipses

	# Set of capabilities we can use to build the bundle.			# Set of capabilities we can use to build the bundle.
	fclnodes[n] = clnode			fclnodes[n] = clnode
	return clnode			return clnode
	return lookupmflinknode			return lookupmflinknode

	while tmfnodes:			while tmfnodes:
	tree, nodes = tmfnodes.popitem()			tree, nodes = tmfnodes.popitem()
	store = mfl.getstorage(tree)			store = mfl.getstorage(tree)

	if not self._filematcher.visitdir(store.tree[:-1] or '.'):			if not self._matcher.visitdir(store.tree[:-1] or '.'):
	# No nodes to send because this directory is out of			# No nodes to send because this directory is out of
	# the client's view of the repository (probably			# the client's view of the repository (probably
	# because of narrow clones).			# because of narrow clones).
	prunednodes = []			prunednodes = []
	else:			else:
	# Avoid sending any manifest nodes we can prove the			# Avoid sending any manifest nodes we can prove the
	# client already has by checking linkrevs. See the			# client already has by checking linkrevs. See the
	# related comment in generatefiles().			# related comment in generatefiles().
	prunednodes = self._prunemanifests(store, nodes, commonrevs)			prunednodes = self._prunemanifests(store, nodes, commonrevs)
	if tree and not prunednodes:			if tree and not prunednodes:
	continue			continue

	lookupfn = makelookupmflinknode(tree, nodes)			lookupfn = makelookupmflinknode(tree, nodes)

	deltas = deltagroup(			deltas = deltagroup(
	self._repo, store, prunednodes, False, lookupfn,			self._repo, store, prunednodes, False, lookupfn,
	self._forcedeltaparentprev,			self._forcedeltaparentprev,
	ellipses=self._ellipses,			ellipses=self._ellipses,
	topic=_('manifests'),			topic=_('manifests'),
	clrevtolocalrev=clrevtolocalrev,			clrevtolocalrev=clrevtolocalrev,
	fullclnodes=self._fullclnodes,			fullclnodes=self._fullclnodes,
	precomputedellipsis=self._precomputedellipsis)			precomputedellipsis=self._precomputedellipsis)

				if not self._oldmatcher.visitdir(store.tree[:-1] or '.'):
	yield tree, deltas			yield tree, deltas
				else:
				# 'deltas' is a generator and we need to consume it even if
				# we are not going to send it because a side-effect is that
				# it updates tmdnodes (via lookupfn)
				for d in deltas:
				pulkitUnsubmitted Not Done maybe, we can prevent walking the deltas in case of trees because if the root does not match, the rest of tree won't match. I will try to test this and send a patch if that works. pulkit: maybe, we can prevent walking the deltas in case of trees because if the root does not match…
				pass
				if not tree:
				yield tree, []
				pulkitUnsubmitted Done Also, I think this is not the right place to case this because not yielding these deltas will prevent the lookupfn being called and will result in tmfnodes being not updated correctly. pulkit: Also, I think this is not the right place to case this because not yielding these deltas will…
				martinvonzAuthorUnsubmitted Not Done Fixed. I had not realized that `deltas` is a generator. Thanks for point that out. martinvonz: Fixed. I had not realized that `deltas` is a generator. Thanks for point that out.
				martinvonzAuthorUnsubmitted Not Done The name "_oldfilematcher" is a little ironic since it's not used for file (only directories). The reason that we don't consult it for files is that we get passed a differenecematcher when widening and the subtraction of files the client already has is done by that. If we're making changegroup.generate() aware of widening like this patch does, perhaps we should make the caller not pass a differencematcher and we should instead check _oldfilematcher for files too. That would be more consistent and easier to understand. I guess there's not much reason not to do that, so I'll work on that (I'll update this patch). martinvonz: The name "_oldfilematcher" is a little ironic since it's not used for file (only directories).

	def _prunemanifests(self, store, nodes, commonrevs):			def _prunemanifests(self, store, nodes, commonrevs):
	# This is split out as a separate method to allow filtering			# This is split out as a separate method to allow filtering
	# commonrevs in extension code.			# commonrevs in extension code.
	#			#
	# TODO(augie): this shouldn't be required, instead we should			# TODO(augie): this shouldn't be required, instead we should
	# make filtering of revisions to send delegated to the store			# make filtering of revisions to send delegated to the store
	# layer.			# layer.
	frev, flr = store.rev, store.linkrev			frev, flr = store.rev, store.linkrev
	return [n for n in nodes if flr(frev(n)) not in commonrevs]			return [n for n in nodes if flr(frev(n)) not in commonrevs]

	# The 'source' parameter is useful for extensions			# The 'source' parameter is useful for extensions
	def generatefiles(self, changedfiles, commonrevs, source,			def generatefiles(self, changedfiles, commonrevs, source,
	mfdicts, fastpathlinkrev, fnodes, clrevs):			mfdicts, fastpathlinkrev, fnodes, clrevs):
	changedfiles = list(filter(self._filematcher, changedfiles))			changedfiles = [f for f in changedfiles
				if self._matcher(f) and not self._oldmatcher(f)]

	if not fastpathlinkrev:			if not fastpathlinkrev:
	def normallinknodes(unused, fname):			def normallinknodes(unused, fname):
	return fnodes.get(fname, {})			return fnodes.get(fname, {})
	else:			else:
	cln = self._repo.changelog.node			cln = self._repo.changelog.node

	def normallinknodes(store, fname):			def normallinknodes(store, fname):
	clrevtolocalrev=clrevtolocalrev,			clrevtolocalrev=clrevtolocalrev,
	fullclnodes=self._fullclnodes,			fullclnodes=self._fullclnodes,
	precomputedellipsis=self._precomputedellipsis)			precomputedellipsis=self._precomputedellipsis)

	yield fname, deltas			yield fname, deltas

	progress.complete()			progress.complete()

	def _makecg1packer(repo, filematcher, bundlecaps, ellipses=False,			def _makecg1packer(repo, oldmatcher, matcher, bundlecaps,
	shallow=False, ellipsisroots=None, fullnodes=None):			ellipses=False, shallow=False, ellipsisroots=None,
				fullnodes=None):
	builddeltaheader = lambda d: _CHANGEGROUPV1_DELTA_HEADER.pack(			builddeltaheader = lambda d: _CHANGEGROUPV1_DELTA_HEADER.pack(
	d.node, d.p1node, d.p2node, d.linknode)			d.node, d.p1node, d.p2node, d.linknode)

	return cgpacker(repo, filematcher, b'01',			return cgpacker(repo, oldmatcher, matcher, b'01',
	builddeltaheader=builddeltaheader,			builddeltaheader=builddeltaheader,
	manifestsend=b'',			manifestsend=b'',
	forcedeltaparentprev=True,			forcedeltaparentprev=True,
	bundlecaps=bundlecaps,			bundlecaps=bundlecaps,
	ellipses=ellipses,			ellipses=ellipses,
	shallow=shallow,			shallow=shallow,
	ellipsisroots=ellipsisroots,			ellipsisroots=ellipsisroots,
	fullnodes=fullnodes)			fullnodes=fullnodes)

	def _makecg2packer(repo, filematcher, bundlecaps, ellipses=False,			def _makecg2packer(repo, oldmatcher, matcher, bundlecaps,
	shallow=False, ellipsisroots=None, fullnodes=None):			ellipses=False, shallow=False, ellipsisroots=None,
				fullnodes=None):
	builddeltaheader = lambda d: _CHANGEGROUPV2_DELTA_HEADER.pack(			builddeltaheader = lambda d: _CHANGEGROUPV2_DELTA_HEADER.pack(
	d.node, d.p1node, d.p2node, d.basenode, d.linknode)			d.node, d.p1node, d.p2node, d.basenode, d.linknode)

	return cgpacker(repo, filematcher, b'02',			return cgpacker(repo, oldmatcher, matcher, b'02',
	builddeltaheader=builddeltaheader,			builddeltaheader=builddeltaheader,
	manifestsend=b'',			manifestsend=b'',
	bundlecaps=bundlecaps,			bundlecaps=bundlecaps,
	ellipses=ellipses,			ellipses=ellipses,
	shallow=shallow,			shallow=shallow,
	ellipsisroots=ellipsisroots,			ellipsisroots=ellipsisroots,
	fullnodes=fullnodes)			fullnodes=fullnodes)

	def _makecg3packer(repo, filematcher, bundlecaps, ellipses=False,			def _makecg3packer(repo, oldmatcher, matcher, bundlecaps,
	shallow=False, ellipsisroots=None, fullnodes=None):			ellipses=False, shallow=False, ellipsisroots=None,
				fullnodes=None):
	builddeltaheader = lambda d: _CHANGEGROUPV3_DELTA_HEADER.pack(			builddeltaheader = lambda d: _CHANGEGROUPV3_DELTA_HEADER.pack(
	d.node, d.p1node, d.p2node, d.basenode, d.linknode, d.flags)			d.node, d.p1node, d.p2node, d.basenode, d.linknode, d.flags)

	return cgpacker(repo, filematcher, b'03',			return cgpacker(repo, oldmatcher, matcher, b'03',
	builddeltaheader=builddeltaheader,			builddeltaheader=builddeltaheader,
	manifestsend=closechunk(),			manifestsend=closechunk(),
	bundlecaps=bundlecaps,			bundlecaps=bundlecaps,
	ellipses=ellipses,			ellipses=ellipses,
	shallow=shallow,			shallow=shallow,
	ellipsisroots=ellipsisroots,			ellipsisroots=ellipsisroots,
	fullnodes=fullnodes)			fullnodes=fullnodes)

	# will support. For example, all hg versions that support generaldelta also			# will support. For example, all hg versions that support generaldelta also
	# support changegroup 02.			# support changegroup 02.
	versions = supportedoutgoingversions(repo)			versions = supportedoutgoingversions(repo)
	if 'generaldelta' in repo.requirements:			if 'generaldelta' in repo.requirements:
	versions.discard('01')			versions.discard('01')
	assert versions			assert versions
	return min(versions)			return min(versions)

	def getbundler(version, repo, bundlecaps=None, filematcher=None,			def getbundler(version, repo, bundlecaps=None, oldmatcher=None,
	ellipses=False, shallow=False, ellipsisroots=None,			matcher=None, ellipses=False, shallow=False,
	fullnodes=None):			ellipsisroots=None, fullnodes=None):
	assert version in supportedoutgoingversions(repo)			assert version in supportedoutgoingversions(repo)

	if filematcher is None:			if matcher is None:
	filematcher = matchmod.alwaysmatcher(repo.root, '')			matcher = matchmod.alwaysmatcher(repo.root, '')
				if oldmatcher is None:
				oldmatcher = matchmod.nevermatcher(repo.root, '')

	if version == '01' and not filematcher.always():			if version == '01' and not matcher.always():
	raise error.ProgrammingError('version 01 changegroups do not support '			raise error.ProgrammingError('version 01 changegroups do not support '
	'sparse file matchers')			'sparse file matchers')

	if ellipses and version in (b'01', b'02'):			if ellipses and version in (b'01', b'02'):
	raise error.Abort(			raise error.Abort(
	_('ellipsis nodes require at least cg3 on client and server, '			_('ellipsis nodes require at least cg3 on client and server, '
	'but negotiated version %s') % version)			'but negotiated version %s') % version)

	# Requested files could include files not in the local store. So			# Requested files could include files not in the local store. So
	# filter those out.			# filter those out.
	filematcher = repo.narrowmatch(filematcher)			matcher = repo.narrowmatch(matcher)

	fn = _packermap[version][0]			fn = _packermap[version][0]
	return fn(repo, filematcher, bundlecaps, ellipses=ellipses,			return fn(repo, oldmatcher, matcher, bundlecaps, ellipses=ellipses,
	shallow=shallow, ellipsisroots=ellipsisroots,			shallow=shallow, ellipsisroots=ellipsisroots,
	fullnodes=fullnodes)			fullnodes=fullnodes)

	def getunbundler(version, fh, alg, extras=None):			def getunbundler(version, fh, alg, extras=None):
	return _packermap[version][1](fh, alg, extras=extras)			return _packermap[version][1](fh, alg, extras=extras)

	def _changegroupinfo(repo, nodes, source):			def _changegroupinfo(repo, nodes, source):
	if repo.ui.verbose or source == 'bundle':			if repo.ui.verbose or source == 'bundle':
	repo.ui.status(_("%d changesets found\n") % len(nodes))			repo.ui.status(_("%d changesets found\n") % len(nodes))
	if repo.ui.debugflag:			if repo.ui.debugflag:
	repo.ui.debug("list of changesets:\n")			repo.ui.debug("list of changesets:\n")
	for node in nodes:			for node in nodes:
	repo.ui.debug("%s\n" % hex(node))			repo.ui.debug("%s\n" % hex(node))

	def makechangegroup(repo, outgoing, version, source, fastpath=False,			def makechangegroup(repo, outgoing, version, source, fastpath=False,
	bundlecaps=None):			bundlecaps=None):
	cgstream = makestream(repo, outgoing, version, source,			cgstream = makestream(repo, outgoing, version, source,
	fastpath=fastpath, bundlecaps=bundlecaps)			fastpath=fastpath, bundlecaps=bundlecaps)
	return getunbundler(version, util.chunkbuffer(cgstream), None,			return getunbundler(version, util.chunkbuffer(cgstream), None,
	{'clcount': len(outgoing.missing) })			{'clcount': len(outgoing.missing) })

	def makestream(repo, outgoing, version, source, fastpath=False,			def makestream(repo, outgoing, version, source, fastpath=False,
	bundlecaps=None, filematcher=None):			bundlecaps=None, matcher=None):
	bundler = getbundler(version, repo, bundlecaps=bundlecaps,			bundler = getbundler(version, repo, bundlecaps=bundlecaps,
	filematcher=filematcher)			matcher=matcher)

	repo = repo.unfiltered()			repo = repo.unfiltered()
	commonrevs = outgoing.common			commonrevs = outgoing.common
	csets = outgoing.missing			csets = outgoing.missing
	heads = outgoing.missingheads			heads = outgoing.missingheads
	# We go through the fast path if we get told to, or if all (unfiltered			# We go through the fast path if we get told to, or if all (unfiltered
	# heads have been requested (since we then know there all linkrevs will			# heads have been requested (since we then know there all linkrevs will
	# be pulled by the client).			# be pulled by the client).

mercurial/exchange.py


	outgoing = _computeoutgoing(repo, heads, common)			outgoing = _computeoutgoing(repo, heads, common)
	if not outgoing.missing:			if not outgoing.missing:
	return			return

	if kwargs.get(r'narrow', False):			if kwargs.get(r'narrow', False):
	include = sorted(filter(bool, kwargs.get(r'includepats', [])))			include = sorted(filter(bool, kwargs.get(r'includepats', [])))
	exclude = sorted(filter(bool, kwargs.get(r'excludepats', [])))			exclude = sorted(filter(bool, kwargs.get(r'excludepats', [])))
	filematcher = narrowspec.match(repo.root, include=include,			matcher = narrowspec.match(repo.root, include=include, exclude=exclude)
	exclude=exclude)
	else:			else:
	filematcher = None			matcher = None

	cgstream = changegroup.makestream(repo, outgoing, version, source,			cgstream = changegroup.makestream(repo, outgoing, version, source,
	bundlecaps=bundlecaps,			bundlecaps=bundlecaps, matcher=matcher)
	filematcher=filematcher)

	part = bundler.newpart('changegroup', data=cgstream)			part = bundler.newpart('changegroup', data=cgstream)
	if cgversions:			if cgversions:
	part.addparam('version', version)			part.addparam('version', version)

	part.addparam('nbchanges', '%d' % len(outgoing.missing),			part.addparam('nbchanges', '%d' % len(outgoing.missing),
	mandatory=False)			mandatory=False)

			Path	Packages
M			hgext/narrow/narrowbundle2.py (4 lines)
M			hgext/narrow/narrowwirepeer.py (3 lines)
M			mercurial/bundle2.py (10 lines)
M			mercurial/changegroup.py (72 lines)
M			mercurial/exchange.py (8 lines)

This is an archive of the discontinued Mercurial Phabricator instance.

narrow: when widening, don't include manifests the client already has
ClosedPublic

Details

Diff Detail

Event Timeline

Revision Contents
Changeset List

Diff 12217

hgext/narrow/narrowbundle2.py

hgext/narrow/narrowwirepeer.py

mercurial/bundle2.py

mercurial/changegroup.py

mercurial/exchange.py

This is an archive of the discontinued Mercurial Phabricator instance.

narrow: when widening, don't include manifests the client already hasClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 12217

hgext/narrow/narrowbundle2.py

hgext/narrow/narrowwirepeer.py

mercurial/bundle2.py

mercurial/changegroup.py

mercurial/exchange.py

narrow: when widening, don't include manifests the client already has
ClosedPublic

Revision Contents
Changeset List