hgext/narrow/narrowcommands.py
149	Also need to check old capability here
257–258	nit: `any(cap in remotecap for cap in wireprototypes.SUPPORTED_ELLIPSESCAP)`
282	Should keep this in the "old" case
303–305	Is the `known` set needed when not using ellipses? Conversely, `commonheads` shouldn't be needed when using ellipses, but perhaps it's still useful to have it there (it's usually way smaller, so it's much less of a concern). These things can be fixed in a separate patch, of course.

hgext/narrow/narrowcommands.py
306	Being nosy here: does this mean that it'll download the whole bundle into memory before it starts applying it, rather than streaming it into the store? Bundles, especially in repos using narrow, can be very large, so that would not be ideal.

hgext/narrow/narrowcommands.py
149	Only need to check the old capability here. Will update.
282	We don't need this in old cases. This is only required when widening non-ellipses cases as that will end us in a situation with an empty changegroup.
303–305	No, the known set is not needed in non-ellipses cases. We should not compute that also as in non-ellipses repos, computing known just adding all local commits which can be in millions. The server logic completely rely on common in non-ellipses cases.

hgext/narrow/narrowcommands.py
306	I believe it streams rather than downloading the whole bundle into memory. `getbundle()` uses the same function and I think we do streaming there. https://www.mercurial-scm.org/repo/hg-committed/file/127937874395/mercurial/exchange.py#l1757 I also asked @marmoute and he also think that it does streaming.

hgext/narrow/narrowcommands.py
306	The difference from the code you're pointing too is that you're calling .result() here, which blocks until the results are fully streamed in (see httppeer.py) - so I really think this is NOT streaming.

hgext/narrow/narrowcommands.py
306	I see a `.result()` there too https://www.mercurial-scm.org/repo/hg-committed/file/127937874395/mercurial/exchange.py#l1751 I spent some time understanding whether this is streaming or not, it looks like it is not. I will try to understand more the related code path and update about my findings.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	15238		May 22 2019, 5:47 PM	★	★
Diff 2	15271		May 28 2019, 9:42 AM	★	★
Diff 3	15334		Jun 4 2019, 11:23 AM	★	★
Diff 4	15336		Jun 4 2019, 1:52 PM	★	★
Diff 5	15338	rHGc767e655ffda406b203dd31d5aa390031a01fa74	May 21 2019, 5:29 PM	★	★

Commit	Parents	Author	Summary	Date
fb78e7ba1b39	127937874395	Pulkit Goyal		May 21 2019, 5:29 PM

Status	Author	Revision
Closed	pulkit	D6438 narrow: pass the bundle to bundle2.widen_bundle() instead of generating there
Closed	pulkit	D6437 narrow: refactor code around widening complicated by previous patch
Closed	pulkit	D6436 narrow: use narrow_widen wireproto command to widen in case of ellipses
Closed	pulkit	D6435 narrow: factor out logic to build ellipses related b2parts in separate fn
Closed	pulkit	D6434 narrow: remove unrequired compat code for old versions of hg

Diff 15334

hgext/narrow/narrowcommands.py

	kwargs['oldincludepats'] = include			kwargs['oldincludepats'] = include
	kwargs['oldexcludepats'] = exclude			kwargs['oldexcludepats'] = exclude
	if include:			if include:
	kwargs['includepats'] = include			kwargs['includepats'] = include
	if exclude:			if exclude:
	kwargs['excludepats'] = exclude			kwargs['excludepats'] = exclude
	# calculate known nodes only in ellipses cases because in non-ellipses cases			# calculate known nodes only in ellipses cases because in non-ellipses cases
	# we have all the nodes			# we have all the nodes
	if wireprototypes.ELLIPSESCAP in pullop.remote.capabilities():			if wireprototypes.ELLIPSESCAP1 in pullop.remote.capabilities():
				martinvonzUnsubmitted Not Done Also need to check old capability here martinvonz: Also need to check old capability here
				pulkitAuthorUnsubmitted Not Done Only need to check the old capability here. Will update. pulkit: Only need to check the old capability here. Will update.
	kwargs['known'] = [node.hex(ctx.node()) for ctx in			kwargs['known'] = [node.hex(ctx.node()) for ctx in
	repo.set('::%ln', pullop.common)			repo.set('::%ln', pullop.common)
	if ctx.node() != node.nullid]			if ctx.node() != node.nullid]
	if not kwargs['known']:			if not kwargs['known']:
	# Mercurial serializes an empty list as '' and deserializes it as			# Mercurial serializes an empty list as '' and deserializes it as
	# [''], so delete it instead to avoid handling the empty string on			# [''], so delete it instead to avoid handling the empty string on
	# the server.			# the server.
	del kwargs['known']			del kwargs['known']
	def _widen(ui, repo, remote, commoninc, oldincludes, oldexcludes,			def _widen(ui, repo, remote, commoninc, oldincludes, oldexcludes,
	newincludes, newexcludes):			newincludes, newexcludes):
	# for now we assume that if a server has ellipses enabled, we will be			# for now we assume that if a server has ellipses enabled, we will be
	# exchanging ellipses nodes. In future we should add ellipses as a client			# exchanging ellipses nodes. In future we should add ellipses as a client
	# side requirement (maybe) to distinguish a client is shallow or not and			# side requirement (maybe) to distinguish a client is shallow or not and
	# then send that information to server whether we want ellipses or not.			# then send that information to server whether we want ellipses or not.
	# Theoretically a non-ellipses repo should be able to use narrow			# Theoretically a non-ellipses repo should be able to use narrow
	# functionality from an ellipses enabled server			# functionality from an ellipses enabled server
	ellipsesremote = wireprototypes.ELLIPSESCAP in remote.capabilities()			remotecap = remote.capabilities()
				ellipsesremote = any(True for cap in wireprototypes.SUPPORTED_ELLIPSESCAP
				if cap in remotecap)
				martinvonzUnsubmitted Not Done nit: `any(cap in remotecap for cap in wireprototypes.SUPPORTED_ELLIPSESCAP)` martinvonz: nit: `any(cap in remotecap for cap in wireprototypes.SUPPORTED_ELLIPSESCAP)`

				# check whether we are talking to a server which supports old version of
				# ellipses capabilities
				isoldellipses = (ellipsesremote and wireprototypes.ELLIPSESCAP1 in
				remotecap and wireprototypes.ELLIPSESCAP not in remotecap)

	def pullbundle2extraprepare_widen(orig, pullop, kwargs):			def pullbundle2extraprepare_widen(orig, pullop, kwargs):
	orig(pullop, kwargs)			orig(pullop, kwargs)
	# The old{in,ex}cludepats have already been set by orig()			# The old{in,ex}cludepats have already been set by orig()
	kwargs['includepats'] = newincludes			kwargs['includepats'] = newincludes
	kwargs['excludepats'] = newexcludes			kwargs['excludepats'] = newexcludes
	wrappedextraprepare = extensions.wrappedfunction(exchange,			wrappedextraprepare = extensions.wrappedfunction(exchange,
	'_pullbundle2extraprepare', pullbundle2extraprepare_widen)			'_pullbundle2extraprepare', pullbundle2extraprepare_widen)
	with ui.uninterruptible():			with ui.uninterruptible():
	common = commoninc[0]			common = commoninc[0]
	if ellipsesremote:			if ellipsesremote:
	ds = repo.dirstate			ds = repo.dirstate
	p1, p2 = ds.p1(), ds.p2()			p1, p2 = ds.p1(), ds.p2()
	with ds.parentchange():			with ds.parentchange():
	ds.setparents(node.nullid, node.nullid)			ds.setparents(node.nullid, node.nullid)
	with wrappedextraprepare:			with wrappedextraprepare:
	with repo.ui.configoverride(overrides, 'widen'):			if isoldellipses:
	martinvonzUnsubmitted Not Done Should keep this in the "old" case martinvonz: Should keep this in the "old" case
	pulkitAuthorUnsubmitted Not Done We don't need this in old cases. This is only required when widening non-ellipses cases as that will end us in a situation with an empty changegroup. pulkit: We don't need this in old cases. This is only required when widening non-ellipses cases as that…
	exchange.pull(repo, remote, heads=common)			exchange.pull(repo, remote, heads=common)
				else:
				known = [node.hex(ctx.node()) for ctx in
				repo.set('::%ln', common)
				if ctx.node() != node.nullid]

				with remote.commandexecutor() as e:
				bundle = e.callcommand('narrow_widen', {
				'oldincludes': oldincludes,
				'oldexcludes': oldexcludes,
				'newincludes': newincludes,
				'newexcludes': newexcludes,
				'cgversion': '03',
				'commonheads': common,
				'known': known,
				'ellipses': True,
				martinvonzUnsubmitted Not Done Is the `known` set needed when not using ellipses? Conversely, `commonheads` shouldn't be needed when using ellipses, but perhaps it's still useful to have it there (it's usually way smaller, so it's much less of a concern). These things can be fixed in a separate patch, of course. martinvonz: Is the `known` set needed when not using ellipses? Conversely, `commonheads` shouldn't be…
				pulkitAuthorUnsubmitted Not Done No, the known set is not needed in non-ellipses cases. We should not compute that also as in non-ellipses repos, computing known just adding all local commits which can be in millions. The server logic completely rely on common in non-ellipses cases. pulkit: No, the known set is not needed in non-ellipses cases. We should not compute that also as in…
				}).result()
				rdamazioUnsubmitted Not Done Being nosy here: does this mean that it'll download the whole bundle into memory before it starts applying it, rather than streaming it into the store? Bundles, especially in repos using narrow, can be very large, so that would not be ideal. rdamazio: Being nosy here: does this mean that it'll download the whole bundle into memory before it…
				pulkitAuthorUnsubmitted Not Done I believe it streams rather than downloading the whole bundle into memory. `getbundle()` uses the same function and I think we do streaming there. https://www.mercurial-scm.org/repo/hg-committed/file/127937874395/mercurial/exchange.py#l1757 I also asked @marmoute and he also think that it does streaming. pulkit: I believe it streams rather than downloading the whole bundle into memory. `getbundle()` uses…
				rdamazioUnsubmitted Not Done The difference from the code you're pointing too is that you're calling .result() here, which blocks until the results are fully streamed in (see httppeer.py) - so I really think this is NOT streaming. rdamazio: The difference from the code you're pointing too is that you're calling .result() here, which…
				pulkitAuthorUnsubmitted Not Done I see a `.result()` there too https://www.mercurial-scm.org/repo/hg-committed/file/127937874395/mercurial/exchange.py#l1751 I spent some time understanding whether this is streaming or not, it looks like it is not. I will try to understand more the related code path and update about my findings. pulkit: 1) I see a `.result()` there too https://www.mercurial-scm.org/repo/hg…
				trmanager = exchange.transactionmanager(repo, 'widen',
				remote.url())
				with trmanager:
				op = bundle2.bundleoperation(repo,
				trmanager.transaction, source='widen')
				bundle2.processbundle(repo, bundle, op=op)

	with ds.parentchange():			with ds.parentchange():
	ds.setparents(p1, p2)			ds.setparents(p1, p2)
	else:			else:
	with remote.commandexecutor() as e:			with remote.commandexecutor() as e:
	bundle = e.callcommand('narrow_widen', {			bundle = e.callcommand('narrow_widen', {
	'oldincludes': oldincludes,			'oldincludes': oldincludes,
	'oldexcludes': oldexcludes,			'oldexcludes': oldexcludes,
	'newincludes': newincludes,			'newincludes': newincludes,

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,
	narrowspec,			narrowspec,
				node as nodemod,
	pycompat,			pycompat,
	wireprototypes,			wireprototypes,
	wireprotov1peer,			wireprotov1peer,
	wireprotov1server,			wireprotov1server,
	)			)

				from . import narrowbundle2

	def uisetup():			def uisetup():
	wireprotov1peer.wirepeer.narrow_widen = peernarrowwiden			wireprotov1peer.wirepeer.narrow_widen = peernarrowwiden

	def reposetup(repo):			def reposetup(repo):
	def wirereposetup(ui, peer):			def wirereposetup(ui, peer):
	def wrapped(orig, cmd, args, *kwargs):			def wrapped(orig, cmd, args, *kwargs):
	if cmd == 'unbundle':			if cmd == 'unbundle':
	# TODO: don't blindly add include/exclude wireproto			# TODO: don't blindly add include/exclude wireproto
	newexcludes = wireprototypes.decodelist(newexcludes)			newexcludes = wireprototypes.decodelist(newexcludes)
	# validate the patterns			# validate the patterns
	narrowspec.validatepatterns(set(oldincludes))			narrowspec.validatepatterns(set(oldincludes))
	narrowspec.validatepatterns(set(newincludes))			narrowspec.validatepatterns(set(newincludes))
	narrowspec.validatepatterns(set(oldexcludes))			narrowspec.validatepatterns(set(oldexcludes))
	narrowspec.validatepatterns(set(newexcludes))			narrowspec.validatepatterns(set(newexcludes))

	common = wireprototypes.decodelist(commonheads)			common = wireprototypes.decodelist(commonheads)
	known = None
	if known:
	known = wireprototypes.decodelist(known)			known = wireprototypes.decodelist(known)
				known = {nodemod.bin(n) for n in known}
	if ellipses == '0':			if ellipses == '0':
	ellipses = False			ellipses = False
	else:			else:
	ellipses = bool(ellipses)			ellipses = bool(ellipses)
	cgversion = cgversion			cgversion = cgversion

				if not ellipses:
	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)
				bundler = bundle2.widen_bundle(repo, oldmatch, newmatch, common,
	bundler = bundle2.widen_bundle(repo, oldmatch, newmatch, common, known,			known, cgversion, ellipses)
	cgversion, ellipses)			else:
				bundler = bundle2.bundle20(repo.ui)
				narrowbundle2.generateellipsesbundle2(bundler, repo, oldincludes,
				oldexcludes, newincludes, newexcludes, cgversion, common,
				list(common), known, None)
	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))
	preferuncompressed = True			preferuncompressed = True

mercurial/wireprototypes.py

	# Names of the SSH protocol implementations.			# Names of the SSH protocol implementations.
	SSHV1 = 'ssh-v1'			SSHV1 = 'ssh-v1'
	# These are advertised over the wire. Increment the counters at the end			# These are advertised over the wire. Increment the counters at the end
	# to reflect BC breakages.			# to reflect BC breakages.
	SSHV2 = 'exp-ssh-v2-0003'			SSHV2 = 'exp-ssh-v2-0003'
	HTTP_WIREPROTO_V2 = 'exp-http-v2-0003'			HTTP_WIREPROTO_V2 = 'exp-http-v2-0003'

	NARROWCAP = 'exp-narrow-1'			NARROWCAP = 'exp-narrow-1'
	ELLIPSESCAP = 'exp-ellipses-1'			ELLIPSESCAP1 = 'exp-ellipses-1'
				ELLIPSESCAP = 'exp-ellipses-2'
				SUPPORTED_ELLIPSESCAP = (ELLIPSESCAP1, ELLIPSESCAP)

	# All available wire protocol transports.			# All available wire protocol transports.
	TRANSPORTS = {			TRANSPORTS = {
	SSHV1: {			SSHV1: {
	'transport': 'ssh',			'transport': 'ssh',
	'version': 1,			'version': 1,
	},			},
	SSHV2: {			SSHV2: {

tests/test-narrow-patterns.t

	o 0 2a4f0c3b67da... root			o 0 2a4f0c3b67da... root


	widen the narrow checkout			widen the narrow checkout

	$ hg tracked --removeexclude dir1/dirA			$ hg tracked --removeexclude dir1/dirA
	comparing with ssh://user@dummy/master			comparing with ssh://user@dummy/master
	searching for changes			searching for changes
	no changes found
	saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)			saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)
	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	added 9 changesets with 6 changes to 6 files			added 9 changesets with 6 changes to 6 files
	new changesets : (glob)
	$ hg tracked			$ hg tracked
	I path:dir1			I path:dir1
	I path:dir2			I path:dir2
	X path:dir1/dirB			X path:dir1/dirB
	X path:dir2/dirA			X path:dir2/dirA
	X path:dir2/dirB			X path:dir2/dirB
	$ find * \| sort			$ find * \| sort
	dir1			dir1

	$ hg tracked --removeexclude dir2/dirB --addexclude dir1/dirA/bar			$ hg tracked --removeexclude dir2/dirB --addexclude dir1/dirA/bar
	comparing with ssh://user@dummy/master			comparing with ssh://user@dummy/master
	searching for changes			searching for changes
	looking for local changes to affected paths			looking for local changes to affected paths
	deleting data/dir1/dirA/bar.i (reporevlogstore !)			deleting data/dir1/dirA/bar.i (reporevlogstore !)
	deleting data/dir1/dirA/bar/0eca1d0cbdaea4651d1d04d71976a6d2d9bfaae5 (reposimplestore !)			deleting data/dir1/dirA/bar/0eca1d0cbdaea4651d1d04d71976a6d2d9bfaae5 (reposimplestore !)
	deleting data/dir1/dirA/bar/index (reposimplestore !)			deleting data/dir1/dirA/bar/index (reposimplestore !)
	no changes found
	saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)			saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)
	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	added 11 changesets with 7 changes to 7 files			added 11 changesets with 7 changes to 7 files
	new changesets : (glob)
	$ hg tracked			$ hg tracked
	I path:dir1			I path:dir1
	I path:dir2			I path:dir2
	X path:dir1/dirA/bar			X path:dir1/dirA/bar
	X path:dir1/dirB			X path:dir1/dirB
	X path:dir2/dirA			X path:dir2/dirA
	$ find * \| sort			$ find * \| sort
	dir1			dir1

	$ hg tracked --removeexclude dir2/dirA --addexclude dir1/dirA			$ hg tracked --removeexclude dir2/dirA --addexclude dir1/dirA
	comparing with ssh://user@dummy/master			comparing with ssh://user@dummy/master
	searching for changes			searching for changes
	looking for local changes to affected paths			looking for local changes to affected paths
	deleting data/dir1/dirA/foo.i (reporevlogstore !)			deleting data/dir1/dirA/foo.i (reporevlogstore !)
	deleting data/dir1/dirA/foo/162caeb3d55dceb1fee793aa631ac8c73fcb8b5e (reposimplestore !)			deleting data/dir1/dirA/foo/162caeb3d55dceb1fee793aa631ac8c73fcb8b5e (reposimplestore !)
	deleting data/dir1/dirA/foo/index (reposimplestore !)			deleting data/dir1/dirA/foo/index (reposimplestore !)
	no changes found
	saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)			saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)
	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	added 13 changesets with 8 changes to 8 files			added 13 changesets with 8 changes to 8 files
	new changesets : (glob)
	$ hg tracked			$ hg tracked
	I path:dir1			I path:dir1
	I path:dir2			I path:dir2
	X path:dir1/dirA			X path:dir1/dirA
	X path:dir1/dirA/bar			X path:dir1/dirA/bar
	X path:dir1/dirB			X path:dir1/dirB
	$ find * \| sort			$ find * \| sort
	dir1			dir1
	o 0 2a4f0c3b67da... root			o 0 2a4f0c3b67da... root


	include a directory that was previously explicitly excluded			include a directory that was previously explicitly excluded

	$ hg tracked --removeexclude dir1/dirA			$ hg tracked --removeexclude dir1/dirA
	comparing with ssh://user@dummy/master			comparing with ssh://user@dummy/master
	searching for changes			searching for changes
	no changes found
	saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)			saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)
	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	added 13 changesets with 9 changes to 9 files			added 13 changesets with 9 changes to 9 files
	new changesets : (glob)
	$ hg tracked			$ hg tracked
	I path:dir1			I path:dir1
	I path:dir2			I path:dir2
	X path:dir1/dirA/bar			X path:dir1/dirA/bar
	X path:dir1/dirB			X path:dir1/dirB
	$ find * \| sort			$ find * \| sort
	dir1			dir1
	dir1/bar			dir1/bar
	$ find * \| sort			$ find * \| sort
	dir1			dir1
	dir1/dirA			dir1/dirA
	dir1/dirA/bar			dir1/dirA/bar
	dir1/dirA/foo			dir1/dirA/foo
	$ hg tracked --addinclude dir1			$ hg tracked --addinclude dir1
	comparing with ssh://user@dummy/master			comparing with ssh://user@dummy/master
	searching for changes			searching for changes
	no changes found
	saved backup bundle to $TESTTMP/narrow2/.hg/strip-backup/*-widen.hg (glob)			saved backup bundle to $TESTTMP/narrow2/.hg/strip-backup/*-widen.hg (glob)
	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	added 10 changesets with 6 changes to 6 files			added 10 changesets with 6 changes to 6 files
	new changesets : (glob)
	$ find * \| sort			$ find * \| sort
	dir1			dir1
	dir1/bar			dir1/bar
	dir1/dirA			dir1/dirA
	dir1/dirA/bar			dir1/dirA/bar
	dir1/dirA/foo			dir1/dirA/foo
	dir1/dirB			dir1/dirB
	dir1/dirB/bar			dir1/dirB/bar

tests/test-narrow-trackedcmd.t

	> EOF			> EOF

	$ hg tracked --import-rules specs			$ hg tracked --import-rules specs
	comparing with ssh://user@dummy/master			comparing with ssh://user@dummy/master
	searching for changes			searching for changes
	looking for local changes to affected paths			looking for local changes to affected paths
	deleting data/inside/f.i			deleting data/inside/f.i
	deleting meta/inside/00manifest.i (tree !)			deleting meta/inside/00manifest.i (tree !)
	no changes found
	saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)			saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)
	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	added 2 changesets with 0 changes to 0 files			added 2 changesets with 0 changes to 0 files
	new changesets : (glob)
	$ hg tracked			$ hg tracked
	I path:outisde			I path:outisde
	X path:inside			X path:inside

	Testing the --import-rules flag with --addinclude and --addexclude			Testing the --import-rules flag with --addinclude and --addexclude

	$ cat > specs <<EOF			$ cat > specs <<EOF
	> [include]			> [include]
	> widest			> widest
	> EOF			> EOF

	$ hg tracked --import-rules specs --addinclude 'wider/'			$ hg tracked --import-rules specs --addinclude 'wider/'
	comparing with ssh://user@dummy/master			comparing with ssh://user@dummy/master
	searching for changes			searching for changes
	no changes found
	saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)			saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)
	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	added 3 changesets with 1 changes to 1 files			added 3 changesets with 1 changes to 1 files
	new changesets : (glob)
	$ hg tracked			$ hg tracked
	I path:outisde			I path:outisde
	I path:wider			I path:wider
	I path:widest			I path:widest
	X path:inside			X path:inside

	$ cat > specs <<EOF			$ cat > specs <<EOF
	> [exclude]			> [exclude]
	$ cat > ../nspecs <<EOF			$ cat > ../nspecs <<EOF
	> [include]			> [include]
	> widest			> widest
	> EOF			> EOF

	$ hg tracked --import-rules ../nspecs			$ hg tracked --import-rules ../nspecs
	comparing with ssh://user@dummy/master			comparing with ssh://user@dummy/master
	searching for changes			searching for changes
	no changes found
	saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)			saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)
	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	added 3 changesets with 0 changes to 0 files			added 3 changesets with 0 changes to 0 files
	new changesets : (glob)

	$ cd ..			$ cd ..

	Testing tracked command on a non-narrow repo			Testing tracked command on a non-narrow repo

	$ hg init non-narrow			$ hg init non-narrow
	$ cd non-narrow			$ cd non-narrow
	$ hg tracked --addinclude foobar			$ hg tracked --addinclude foobar
	abort: the tracked command is only supported on respositories cloned with --narrow			abort: the tracked command is only supported on respositories cloned with --narrow
	[255]			[255]

tests/test-narrow-widen.t


	Widen the narrow spec to see the widest file. This should not get the newly			Widen the narrow spec to see the widest file. This should not get the newly
	added upstream revisions.			added upstream revisions.

	$ cd narrow			$ cd narrow
	$ hg tracked --addinclude widest/f			$ hg tracked --addinclude widest/f
	comparing with ssh://user@dummy/master			comparing with ssh://user@dummy/master
	searching for changes			searching for changes
	no changes found
	saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)			saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)
	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	added 3 changesets with 2 changes to 2 files			added 3 changesets with 2 changes to 2 files
	new changesets : (glob)
	$ hg tracked			$ hg tracked
	I path:inside			I path:inside
	I path:widest/f			I path:widest/f

	$ cat widest/f			$ cat widest/f
	widest			widest

	Pull down the newly added upstream revision.			Pull down the newly added upstream revision.
	abort: newlines are not allowed in narrowspec paths			abort: newlines are not allowed in narrowspec paths
	[255]			[255]

	widen the narrow spec to include the wider file			widen the narrow spec to include the wider file

	$ hg tracked --addinclude wider			$ hg tracked --addinclude wider
	comparing with ssh://user@dummy/master			comparing with ssh://user@dummy/master
	searching for changes			searching for changes
	no changes found
	saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)			saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-widen.hg (glob)
	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	added 8 changesets with 7 changes to 3 files			added 8 changesets with 7 changes to 3 files
	new changesets : (glob)
	$ hg tracked			$ hg tracked
	I path:inside			I path:inside
	I path:wider			I path:wider
	I path:widest/f			I path:widest/f
	$ hg update 'desc("add widest")'			$ hg update 'desc("add widest")'
	2 files updated, 0 files merged, 1 files removed, 0 files unresolved			2 files updated, 0 files merged, 1 files removed, 0 files unresolved
	$ cat widest/f			$ cat widest/f
	widest			widest
	4: add d6/f			4: add d6/f
	...3: add d5/f			...3: add d5/f
	2: add d3/f			2: add d3/f
	...1: add d2/f			...1: add d2/f
	0: add d0/f			0: add d0/f
	$ hg tracked --addinclude d1			$ hg tracked --addinclude d1
	comparing with ssh://user@dummy/upstream			comparing with ssh://user@dummy/upstream
	searching for changes			searching for changes
	no changes found
	saved backup bundle to $TESTTMP/narrow2/.hg/strip-backup/*-widen.hg (glob)			saved backup bundle to $TESTTMP/narrow2/.hg/strip-backup/*-widen.hg (glob)
	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	added 9 changesets with 5 changes to 5 files			added 9 changesets with 5 changes to 5 files
	new changesets : (glob)
	$ hg tracked			$ hg tracked
	I path:d0			I path:d0
	I path:d1			I path:d1
	I path:d3			I path:d3
	I path:d6			I path:d6
	I path:d9			I path:d9
	$ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"			$ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
	...8: add d10/f			...8: add d10/f
	$ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"			$ hg log -T "{if(ellipsis, '...')}{rev}: {desc}\n"
	2: local			2: local
	...1: add d10/f			...1: add d10/f
	0: add d0/f			0: add d0/f
	$ hg bookmarks bookmark			$ hg bookmarks bookmark
	$ hg --config hooks.pretxnchangegroup.bad=false tracked --addinclude d1			$ hg --config hooks.pretxnchangegroup.bad=false tracked --addinclude d1
	comparing with ssh://user@dummy/upstream			comparing with ssh://user@dummy/upstream
	searching for changes			searching for changes
	no changes found
	saved backup bundle to $TESTTMP/interrupted/.hg/strip-backup/*-widen.hg (glob)			saved backup bundle to $TESTTMP/interrupted/.hg/strip-backup/*-widen.hg (glob)
	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	added 3 changesets with 2 changes to 2 files			added 3 changesets with 2 changes to 2 files
	transaction abort!			transaction abort!
	rollback completed			rollback completed
	abort: pretxnchangegroup.bad hook exited with status 1			abort: pretxnchangegroup.bad hook exited with status 1

tests/test-narrow.t

	2: empty			2: empty
	1: add d5/f outsidenarrow			1: add d5/f outsidenarrow
	0: add d0/f outsidenarrow			0: add d0/f outsidenarrow
	$ hg pull -q			$ hg pull -q
	Can widen the empty clone			Can widen the empty clone
	$ hg tracked --addinclude d0			$ hg tracked --addinclude d0
	comparing with ssh://user@dummy/master			comparing with ssh://user@dummy/master
	searching for changes			searching for changes
	no changes found
	saved backup bundle to $TESTTMP/narrow-empty/.hg/strip-backup/*-widen.hg (glob)			saved backup bundle to $TESTTMP/narrow-empty/.hg/strip-backup/*-widen.hg (glob)
	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	added 3 changesets with 1 changes to 1 files			added 3 changesets with 1 changes to 1 files
	new changesets : (glob)
	$ hg tracked			$ hg tracked
	I path:d0			I path:d0
	$ hg files			$ hg files
	d0/f			d0/f
	$ find *			$ find *
	d0			d0
	d0/f			d0/f
	$ cd ..			$ cd ..

			Path	Packages
M			hgext/narrow/narrowcommands.py (36 lines)
M			hgext/narrow/narrowwirepeer.py (26 lines)
M			mercurial/wireprototypes.py (4 lines)
M			tests/test-narrow-patterns.t (10 lines)
M			tests/test-narrow-trackedcmd.t (6 lines)
M			tests/test-narrow-widen.t (7 lines)
M			tests/test-narrow.t (2 lines)

This is an archive of the discontinued Mercurial Phabricator instance.

narrow: use narrow_widen wireproto command to widen in case of ellipses
ClosedPublic

Details

Diff Detail

Event Timeline

Revision Contents
Changeset List

Diff 15334

hgext/narrow/narrowcommands.py

hgext/narrow/narrowwirepeer.py

mercurial/wireprototypes.py

tests/test-narrow-patterns.t

tests/test-narrow-trackedcmd.t

tests/test-narrow-widen.t

tests/test-narrow.t

This is an archive of the discontinued Mercurial Phabricator instance.

narrow: use narrow_widen wireproto command to widen in case of ellipsesClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 15334

hgext/narrow/narrowcommands.py

hgext/narrow/narrowwirepeer.py

mercurial/wireprototypes.py

tests/test-narrow-patterns.t

tests/test-narrow-trackedcmd.t

tests/test-narrow-widen.t

tests/test-narrow.t

narrow: use narrow_widen wireproto command to widen in case of ellipses
ClosedPublic

Revision Contents
Changeset List