This is an archive of the discontinued Mercurial Phabricator instance.

			Path	Packages
M			hgext/infinitepush/__init__.py (34 lines)
M			hgext/narrow/narrowcommands.py (140 lines)
M			mercurial/commands.py (391 lines)
M			mercurial/debugcommands.py (115 lines)
M			mercurial/hg.py (309 lines)
M			mercurial/revset.py (9 lines)
M			mercurial/sshpeer.py (5 lines)
M			mercurial/subrepo.py (49 lines)
M			tests/remotefilelog-getflogheads.py (5 lines)
M			tests/test-acl.t (9 lines)
M			tests/test-http.t (1 line)
M			tests/test-lfs-serve.t (1 line)

Status	Author	Revision
Closed	valentin.gatienbaron	D9999 sshpeer: enable+fix warning about sshpeers not being closed explicitly
Closed	valentin.gatienbaron	D9998 sshpeer: add a develwarning if an sshpeer is not closed explicitly
Closed	valentin.gatienbaron	D9997 remotefilelog: rework workaround for sshpeer deadlocks
Closed	valentin.gatienbaron	D9996 sshpeer: add a method to check if a doublepipe is closed
Closed	valentin.gatienbaron	D9995 sshpeer: make sshpeer.close() close the underlying connection

Diff 26153

hgext/infinitepush/init.py

	# rev is not known yet			# rev is not known yet
	# it will be fetched with listkeyspatterns next			# it will be fetched with listkeyspatterns next
	scratchbookmarks[bookmark] = b'REVTOFETCH'			scratchbookmarks[bookmark] = b'REVTOFETCH'
	else:			else:
	bookmarks.append(bookmark)			bookmarks.append(bookmark)

	if scratchbookmarks:			if scratchbookmarks:
	other = hg.peer(repo, opts, source)			other = hg.peer(repo, opts, source)
				try:
	fetchedbookmarks = other.listkeyspatterns(			fetchedbookmarks = other.listkeyspatterns(
	b'bookmarks', patterns=scratchbookmarks			b'bookmarks', patterns=scratchbookmarks
	)			)
	for bookmark in scratchbookmarks:			for bookmark in scratchbookmarks:
	if bookmark not in fetchedbookmarks:			if bookmark not in fetchedbookmarks:
	raise error.Abort(			raise error.Abort(
	b'remote bookmark %s not found!' % bookmark			b'remote bookmark %s not found!' % bookmark
	)			)
	scratchbookmarks[bookmark] = fetchedbookmarks[bookmark]			scratchbookmarks[bookmark] = fetchedbookmarks[bookmark]
	revs.append(fetchedbookmarks[bookmark])			revs.append(fetchedbookmarks[bookmark])
				finally:
				other.close()
	opts[b'bookmark'] = bookmarks			opts[b'bookmark'] = bookmarks
	opts[b'rev'] = revs			opts[b'rev'] = revs

	if scratchbookmarks or unknownnodes:			if scratchbookmarks or unknownnodes:
	# Set anyincoming to True			# Set anyincoming to True
	extensions.wrapfunction(			extensions.wrapfunction(
	discovery, b'findcommonincoming', _findcommonincoming			discovery, b'findcommonincoming', _findcommonincoming
	)			)
	destpath = path.pushloc or path.loc			destpath = path.pushloc or path.loc
	# Remote scratch bookmarks will be deleted because remotenames doesn't			# Remote scratch bookmarks will be deleted because remotenames doesn't
	# know about them. Let's save it before push and restore after			# know about them. Let's save it before push and restore after
	remotescratchbookmarks = _readscratchremotebookmarks(ui, repo, destpath)			remotescratchbookmarks = _readscratchremotebookmarks(ui, repo, destpath)
	result = orig(ui, repo, dest, args, *pycompat.strkwargs(opts))			result = orig(ui, repo, dest, args, *pycompat.strkwargs(opts))
	if common.isremotebooksenabled(ui):			if common.isremotebooksenabled(ui):
	if bookmark and scratchpush:			if bookmark and scratchpush:
	other = hg.peer(repo, opts, destpath)			other = hg.peer(repo, opts, destpath)
				try:
	fetchedbookmarks = other.listkeyspatterns(			fetchedbookmarks = other.listkeyspatterns(
	b'bookmarks', patterns=[bookmark]			b'bookmarks', patterns=[bookmark]
	)			)
	remotescratchbookmarks.update(fetchedbookmarks)			remotescratchbookmarks.update(fetchedbookmarks)
				finally:
				other.close()
	_saveremotebookmarks(repo, remotescratchbookmarks, destpath)			_saveremotebookmarks(repo, remotescratchbookmarks, destpath)
	if oldphasemove:			if oldphasemove:
	exchange._localphasemove = oldphasemove			exchange._localphasemove = oldphasemove
	return result			return result


	def _deleteinfinitepushbookmarks(ui, repo, path, names):			def _deleteinfinitepushbookmarks(ui, repo, path, names):
	"""Prune remote names by removing the bookmarks we don't want anymore,			"""Prune remote names by removing the bookmarks we don't want anymore,

hgext/narrow/narrowcommands.py

	# Find the revisions we have in common with the remote. These will			# Find the revisions we have in common with the remote. These will
	# be used for finding local-only changes for narrowing. They will			# be used for finding local-only changes for narrowing. They will
	# also define the set of revisions to update for widening.			# also define the set of revisions to update for widening.
	remotepath = ui.expandpath(remotepath or b'default')			remotepath = ui.expandpath(remotepath or b'default')
	url, branches = hg.parseurl(remotepath)			url, branches = hg.parseurl(remotepath)
	ui.status(_(b'comparing with %s\n') % util.hidepassword(url))			ui.status(_(b'comparing with %s\n') % util.hidepassword(url))
	remote = hg.peer(repo, opts, url)			remote = hg.peer(repo, opts, url)

				try:
	# check narrow support before doing anything if widening needs to be			# check narrow support before doing anything if widening needs to be
	# performed. In future we should also abort if client is ellipses and			# performed. In future we should also abort if client is ellipses and
	# server does not support ellipses			# server does not support ellipses
	if widening and wireprototypes.NARROWCAP not in remote.capabilities():			if (
				widening
				and wireprototypes.NARROWCAP not in remote.capabilities()
				):
	raise error.Abort(_(b"server does not support narrow clones"))			raise error.Abort(_(b"server does not support narrow clones"))

	commoninc = discovery.findcommonincoming(repo, remote)			commoninc = discovery.findcommonincoming(repo, remote)

	if autoremoveincludes:			if autoremoveincludes:
	outgoing = discovery.findcommonoutgoing(			outgoing = discovery.findcommonoutgoing(
	repo, remote, commoninc=commoninc			repo, remote, commoninc=commoninc
	)			)
	ui.status(_(b'looking for unused includes to remove\n'))			ui.status(_(b'looking for unused includes to remove\n'))
	localfiles = set()			localfiles = set()
	for n in itertools.chain(outgoing.missing, outgoing.excluded):			for n in itertools.chain(outgoing.missing, outgoing.excluded):
	localfiles.update(repo[n].files())			localfiles.update(repo[n].files())
	suggestedremovals = []			suggestedremovals = []
	for include in sorted(oldincludes):			for include in sorted(oldincludes):
	match = narrowspec.match(repo.root, [include], oldexcludes)			match = narrowspec.match(repo.root, [include], oldexcludes)
	if not any(match(f) for f in localfiles):			if not any(match(f) for f in localfiles):
	suggestedremovals.append(include)			suggestedremovals.append(include)
	if suggestedremovals:			if suggestedremovals:
	for s in suggestedremovals:			for s in suggestedremovals:
	ui.status(b'%s\n' % s)			ui.status(b'%s\n' % s)
	if (			if (
	ui.promptchoice(			ui.promptchoice(
	_(			_(
	b'remove these unused includes (yn)?'			b'remove these unused includes (yn)?'
	b'$$ &Yes $$ &No'			b'$$ &Yes $$ &No'
	)			)
	)			)
	== 0			== 0
	):			):
	removedincludes.update(suggestedremovals)			removedincludes.update(suggestedremovals)
	narrowing = True			narrowing = True
	else:			else:
	ui.status(_(b'found no unused includes\n'))			ui.status(_(b'found no unused includes\n'))

	if narrowing:			if narrowing:
	newincludes = oldincludes - removedincludes			newincludes = oldincludes - removedincludes
	newexcludes = oldexcludes \| addedexcludes			newexcludes = oldexcludes \| addedexcludes
	_narrow(			_narrow(
	ui,			ui,
	repo,			repo,
	remote,			remote,
	commoninc,			commoninc,
	oldincludes,			oldincludes,
	oldexcludes,			oldexcludes,
	newincludes,			newincludes,
	newexcludes,			newexcludes,
	opts[b'force_delete_local_changes'],			opts[b'force_delete_local_changes'],
	opts[b'backup'],			opts[b'backup'],
	)			)
	# _narrow() updated the narrowspec and _widen() below needs to			# _narrow() updated the narrowspec and _widen() below needs to
	# use the updated values as its base (otherwise removed includes			# use the updated values as its base (otherwise removed includes
	# and addedexcludes will be lost in the resulting narrowspec)			# and addedexcludes will be lost in the resulting narrowspec)
	oldincludes = newincludes			oldincludes = newincludes
	oldexcludes = newexcludes			oldexcludes = newexcludes

	if widening:			if widening:
	newincludes = oldincludes \| addedincludes			newincludes = oldincludes \| addedincludes
	newexcludes = oldexcludes - removedexcludes			newexcludes = oldexcludes - removedexcludes
	_widen(			_widen(
	ui,			ui,
	repo,			repo,
	remote,			remote,
	commoninc,			commoninc,
	oldincludes,			oldincludes,
	oldexcludes,			oldexcludes,
	newincludes,			newincludes,
	newexcludes,			newexcludes,
	)			)
				finally:
				remote.close()

	return 0			return 0

mercurial/commands.py

	raise error.InputError(			raise error.InputError(
	_(b"there is no Mercurial repository here (.hg not found)")			_(b"there is no Mercurial repository here (.hg not found)")
	)			)

	default = not (num or id or branch or tags or bookmarks)			default = not (num or id or branch or tags or bookmarks)
	output = []			output = []
	revs = []			revs = []

				peer = None
				try:
	if source:			if source:
	source, branches = hg.parseurl(ui.expandpath(source))			source, branches = hg.parseurl(ui.expandpath(source))
	peer = hg.peer(repo or ui, opts, source) # only pass ui when no repo			# only pass ui when no repo
				peer = hg.peer(repo or ui, opts, source)
	repo = peer.local()			repo = peer.local()
	revs, checkout = hg.addbranchrevs(repo, peer, branches, None)			revs, checkout = hg.addbranchrevs(repo, peer, branches, None)

	fm = ui.formatter(b'identify', opts)			fm = ui.formatter(b'identify', opts)
	fm.startitem()			fm.startitem()

	if not repo:			if not repo:
	if num or branch or tags:			if num or branch or tags:
	raise error.InputError(			raise error.InputError(
	_(b"can't query remote revision number, branch, or tags")			_(b"can't query remote revision number, branch, or tags")
	)			)
	if not rev and revs:			if not rev and revs:
	rev = revs[0]			rev = revs[0]
	if not rev:			if not rev:
	rev = b"tip"			rev = b"tip"

	remoterev = peer.lookup(rev)			remoterev = peer.lookup(rev)
	hexrev = fm.hexfunc(remoterev)			hexrev = fm.hexfunc(remoterev)
	if default or id:			if default or id:
	output = [hexrev]			output = [hexrev]
	fm.data(id=hexrev)			fm.data(id=hexrev)

	@util.cachefunc			@util.cachefunc
	def getbms():			def getbms():
	bms = []			bms = []

	if b'bookmarks' in peer.listkeys(b'namespaces'):			if b'bookmarks' in peer.listkeys(b'namespaces'):
	hexremoterev = hex(remoterev)			hexremoterev = hex(remoterev)
	bms = [			bms = [
	bm			bm
	for bm, bmr in pycompat.iteritems(			for bm, bmr in pycompat.iteritems(
	peer.listkeys(b'bookmarks')			peer.listkeys(b'bookmarks')
	)			)
	if bmr == hexremoterev			if bmr == hexremoterev
	]			]

	return sorted(bms)			return sorted(bms)

	if fm.isplain():			if fm.isplain():
	if bookmarks:			if bookmarks:
	output.extend(getbms())			output.extend(getbms())
	elif default and not ui.quiet:			elif default and not ui.quiet:
	# multiple bookmarks for a single parent separated by '/'			# multiple bookmarks for a single parent separated by '/'
	bm = b'/'.join(getbms())			bm = b'/'.join(getbms())
	if bm:			if bm:
	output.append(bm)			output.append(bm)
	else:			else:
	fm.data(node=hex(remoterev))			fm.data(node=hex(remoterev))
	if bookmarks or b'bookmarks' in fm.datahint():			if bookmarks or b'bookmarks' in fm.datahint():
	fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))			fm.data(bookmarks=fm.formatlist(getbms(), name=b'bookmark'))
	else:			else:
	if rev:			if rev:
	repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')			repo = scmutil.unhidehashlikerevs(repo, [rev], b'nowarn')
	ctx = scmutil.revsingle(repo, rev, None)			ctx = scmutil.revsingle(repo, rev, None)

	if ctx.rev() is None:			if ctx.rev() is None:
	ctx = repo[None]			ctx = repo[None]
	parents = ctx.parents()			parents = ctx.parents()
	taglist = []			taglist = []
	for p in parents:			for p in parents:
	taglist.extend(p.tags())			taglist.extend(p.tags())

	dirty = b""			dirty = b""
	if ctx.dirty(missing=True, merge=False, branch=False):			if ctx.dirty(missing=True, merge=False, branch=False):
	dirty = b'+'			dirty = b'+'
	fm.data(dirty=dirty)			fm.data(dirty=dirty)

	hexoutput = [fm.hexfunc(p.node()) for p in parents]			hexoutput = [fm.hexfunc(p.node()) for p in parents]
	if default or id:			if default or id:
	output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]			output = [b"%s%s" % (b'+'.join(hexoutput), dirty)]
	fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))			fm.data(id=b"%s%s" % (b'+'.join(hexoutput), dirty))

	if num:			if num:
	numoutput = [b"%d" % p.rev() for p in parents]			numoutput = [b"%d" % p.rev() for p in parents]
	output.append(b"%s%s" % (b'+'.join(numoutput), dirty))			output.append(b"%s%s" % (b'+'.join(numoutput), dirty))

	fm.data(			fm.data(
	parents=fm.formatlist(			parents=fm.formatlist(
	[fm.hexfunc(p.node()) for p in parents], name=b'node'			[fm.hexfunc(p.node()) for p in parents], name=b'node'
	)			)
	)			)
	else:			else:
	hexoutput = fm.hexfunc(ctx.node())			hexoutput = fm.hexfunc(ctx.node())
	if default or id:			if default or id:
	output = [hexoutput]			output = [hexoutput]
	fm.data(id=hexoutput)			fm.data(id=hexoutput)

	if num:			if num:
	output.append(pycompat.bytestr(ctx.rev()))			output.append(pycompat.bytestr(ctx.rev()))
	taglist = ctx.tags()			taglist = ctx.tags()

	if default and not ui.quiet:			if default and not ui.quiet:
	b = ctx.branch()			b = ctx.branch()
	if b != b'default':			if b != b'default':
	output.append(b"(%s)" % b)			output.append(b"(%s)" % b)

	# multiple tags for a single parent separated by '/'			# multiple tags for a single parent separated by '/'
	t = b'/'.join(taglist)			t = b'/'.join(taglist)
	if t:			if t:
	output.append(t)			output.append(t)

	# multiple bookmarks for a single parent separated by '/'			# multiple bookmarks for a single parent separated by '/'
	bm = b'/'.join(ctx.bookmarks())			bm = b'/'.join(ctx.bookmarks())
	if bm:			if bm:
	output.append(bm)			output.append(bm)
	else:			else:
	if branch:			if branch:
	output.append(ctx.branch())			output.append(ctx.branch())

	if tags:			if tags:
	output.extend(taglist)			output.extend(taglist)

	if bookmarks:			if bookmarks:
	output.extend(ctx.bookmarks())			output.extend(ctx.bookmarks())

	fm.data(node=ctx.hex())			fm.data(node=ctx.hex())
	fm.data(branch=ctx.branch())			fm.data(branch=ctx.branch())
	fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))			fm.data(tags=fm.formatlist(taglist, name=b'tag', sep=b':'))
	fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))			fm.data(bookmarks=fm.formatlist(ctx.bookmarks(), name=b'bookmark'))
	fm.context(ctx=ctx)			fm.context(ctx=ctx)

	fm.plain(b"%s\n" % b' '.join(output))			fm.plain(b"%s\n" % b' '.join(output))
	fm.end()			fm.end()
				finally:
				if peer:
				peer.close()


	@command(			@command(
	b'import\|patch',			b'import\|patch',
	[			[
	(			(
	b'p',			b'p',
	b'strip',			b'strip',

	cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'bundle'])			cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'bundle'])

	if opts.get(b'bookmarks'):			if opts.get(b'bookmarks'):
	source, branches = hg.parseurl(			source, branches = hg.parseurl(
	ui.expandpath(source), opts.get(b'branch')			ui.expandpath(source), opts.get(b'branch')
	)			)
	other = hg.peer(repo, opts, source)			other = hg.peer(repo, opts, source)
				try:
	if b'bookmarks' not in other.listkeys(b'namespaces'):			if b'bookmarks' not in other.listkeys(b'namespaces'):
	ui.warn(_(b"remote doesn't support bookmarks\n"))			ui.warn(_(b"remote doesn't support bookmarks\n"))
	return 0			return 0
	ui.pager(b'incoming')			ui.pager(b'incoming')
	ui.status(_(b'comparing with %s\n') % util.hidepassword(source))			ui.status(_(b'comparing with %s\n') % util.hidepassword(source))
	return bookmarks.incoming(ui, repo, other)			return bookmarks.incoming(ui, repo, other)
				finally:
				other.close()

	repo._subtoppath = ui.expandpath(source)			repo._subtoppath = ui.expandpath(source)
	try:			try:
	return hg.incoming(ui, repo, source, opts)			return hg.incoming(ui, repo, source, opts)
	finally:			finally:
	del repo._subtoppath			del repo._subtoppath


	If no directory is given, the current directory is used.			If no directory is given, the current directory is used.

	It is possible to specify an ``ssh://`` URL as the destination.			It is possible to specify an ``ssh://`` URL as the destination.
	See :hg:`help urls` for more information.			See :hg:`help urls` for more information.

	Returns 0 on success.			Returns 0 on success.
	"""			"""
	opts = pycompat.byteskwargs(opts)			opts = pycompat.byteskwargs(opts)
	hg.peer(ui, opts, ui.expandpath(dest), create=True)			peer = hg.peer(ui, opts, ui.expandpath(dest), create=True)
				peer.close()


	@command(			@command(
	b'locate',			b'locate',
	[			[
	(			(
	b'r',			b'r',
	b'rev',			b'rev',
	ui, repo, revdag, displayer, graphmod.asciiedges			ui, repo, revdag, displayer, graphmod.asciiedges
	)			)
	cmdutil.outgoinghooks(ui, repo, other, opts, o)			cmdutil.outgoinghooks(ui, repo, other, opts, o)
	return 0			return 0

	if opts.get(b'bookmarks'):			if opts.get(b'bookmarks'):
	dest = path.pushloc or path.loc			dest = path.pushloc or path.loc
	other = hg.peer(repo, opts, dest)			other = hg.peer(repo, opts, dest)
				try:
	if b'bookmarks' not in other.listkeys(b'namespaces'):			if b'bookmarks' not in other.listkeys(b'namespaces'):
	ui.warn(_(b"remote doesn't support bookmarks\n"))			ui.warn(_(b"remote doesn't support bookmarks\n"))
	return 0			return 0
	ui.status(_(b'comparing with %s\n') % util.hidepassword(dest))			ui.status(_(b'comparing with %s\n') % util.hidepassword(dest))
	ui.pager(b'outgoing')			ui.pager(b'outgoing')
	return bookmarks.outgoing(ui, repo, other)			return bookmarks.outgoing(ui, repo, other)
				finally:
				other.close()

	repo._subtoppath = path.pushloc or path.loc			repo._subtoppath = path.pushloc or path.loc
	try:			try:
	return hg.outgoing(ui, repo, dest, opts)			return hg.outgoing(ui, repo, dest, opts)
	finally:			finally:
	del repo._subtoppath			del repo._subtoppath


	hint=_(b"see 'hg help config.paths'"),			hint=_(b"see 'hg help config.paths'"),
	)			)
	dest = path.pushloc or path.loc			dest = path.pushloc or path.loc
	branches = (path.branch, opts.get(b'branch') or [])			branches = (path.branch, opts.get(b'branch') or [])
	ui.status(_(b'pushing to %s\n') % util.hidepassword(dest))			ui.status(_(b'pushing to %s\n') % util.hidepassword(dest))
	revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get(b'rev'))			revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get(b'rev'))
	other = hg.peer(repo, opts, dest)			other = hg.peer(repo, opts, dest)

				try:
	if revs:			if revs:
	revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]			revs = [repo[r].node() for r in scmutil.revrange(repo, revs)]
	if not revs:			if not revs:
	raise error.InputError(			raise error.InputError(
	_(b"specified revisions evaluate to an empty set"),			_(b"specified revisions evaluate to an empty set"),
	hint=_(b"use different revision arguments"),			hint=_(b"use different revision arguments"),
	)			)
	elif path.pushrev:			elif path.pushrev:
	# It doesn't make any sense to specify ancestor revisions. So limit			# It doesn't make any sense to specify ancestor revisions. So limit
	# to DAG heads to make discovery simpler.			# to DAG heads to make discovery simpler.
	expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)			expr = revsetlang.formatspec(b'heads(%r)', path.pushrev)
	revs = scmutil.revrange(repo, [expr])			revs = scmutil.revrange(repo, [expr])
	revs = [repo[rev].node() for rev in revs]			revs = [repo[rev].node() for rev in revs]
	if not revs:			if not revs:
	raise error.InputError(			raise error.InputError(
	_(b'default push revset for path evaluates to an empty set')			_(b'default push revset for path evaluates to an empty set')
	)			)
	elif ui.configbool(b'commands', b'push.require-revs'):			elif ui.configbool(b'commands', b'push.require-revs'):
	raise error.InputError(			raise error.InputError(
	_(b'no revisions specified to push'),			_(b'no revisions specified to push'),
	hint=_(b'did you mean "hg push -r ."?'),			hint=_(b'did you mean "hg push -r ."?'),
	)			)

	repo._subtoppath = dest			repo._subtoppath = dest
	try:			try:
	# push subrepos depth-first for coherent ordering			# push subrepos depth-first for coherent ordering
	c = repo[b'.']			c = repo[b'.']
	subs = c.substate # only repos that are committed			subs = c.substate # only repos that are committed
	for s in sorted(subs):			for s in sorted(subs):
	result = c.sub(s).push(opts)			result = c.sub(s).push(opts)
	if result == 0:			if result == 0:
	return not result			return not result
	finally:			finally:
	del repo._subtoppath			del repo._subtoppath

	opargs = dict(opts.get(b'opargs', {})) # copy opargs since we may mutate it			opargs = dict(
				opts.get(b'opargs', {})
				) # copy opargs since we may mutate it
	opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))			opargs.setdefault(b'pushvars', []).extend(opts.get(b'pushvars', []))

	pushop = exchange.push(			pushop = exchange.push(
	repo,			repo,
	other,			other,
	opts.get(b'force'),			opts.get(b'force'),
	revs=revs,			revs=revs,
	newbranch=opts.get(b'new_branch'),			newbranch=opts.get(b'new_branch'),
	bookmarks=opts.get(b'bookmark', ()),			bookmarks=opts.get(b'bookmark', ()),
	publish=opts.get(b'publish'),			publish=opts.get(b'publish'),
	opargs=opargs,			opargs=opargs,
	)			)

	result = not pushop.cgresult			result = not pushop.cgresult

	if pushop.bkresult is not None:			if pushop.bkresult is not None:
	if pushop.bkresult == 2:			if pushop.bkresult == 2:
	result = 2			result = 2
	elif not result and pushop.bkresult:			elif not result and pushop.bkresult:
	result = 2			result = 2
				finally:
				other.close()
	return result			return result


	@command(			@command(
	b'recover',			b'recover',
	[			[
	(b'', b'verify', False, b"run `hg verify` after successful recover"),			(b'', b'verify', False, b"run `hg verify` after successful recover"),
	],			],

mercurial/debugcommands.py

	_debugchangegroup(ui, gen, all=all, **opts)			_debugchangegroup(ui, gen, all=all, **opts)


	@command(b'debugcapabilities', [], _(b'PATH'), norepo=True)			@command(b'debugcapabilities', [], _(b'PATH'), norepo=True)
	def debugcapabilities(ui, path, **opts):			def debugcapabilities(ui, path, **opts):
	"""lists the capabilities of a remote peer"""			"""lists the capabilities of a remote peer"""
	opts = pycompat.byteskwargs(opts)			opts = pycompat.byteskwargs(opts)
	peer = hg.peer(ui, opts, path)			peer = hg.peer(ui, opts, path)
				try:
	caps = peer.capabilities()			caps = peer.capabilities()
	ui.writenoi18n(b'Main capabilities:\n')			ui.writenoi18n(b'Main capabilities:\n')
	for c in sorted(caps):			for c in sorted(caps):
	ui.write(b' %s\n' % c)			ui.write(b' %s\n' % c)
	b2caps = bundle2.bundle2caps(peer)			b2caps = bundle2.bundle2caps(peer)
	if b2caps:			if b2caps:
	ui.writenoi18n(b'Bundle2 capabilities:\n')			ui.writenoi18n(b'Bundle2 capabilities:\n')
	for key, values in sorted(pycompat.iteritems(b2caps)):			for key, values in sorted(pycompat.iteritems(b2caps)):
	ui.write(b' %s\n' % key)			ui.write(b' %s\n' % key)
	for v in values:			for v in values:
	ui.write(b' %s\n' % v)			ui.write(b' %s\n' % v)
				finally:
				peer.close()


	@command(			@command(
	b'debugchangedfiles',			b'debugchangedfiles',
	[			[
	(			(
	b'',			b'',
	b'compute',			b'compute',
	# though.			# though.
	overrides = {			overrides = {
	(b'devel', b'debug.peer-request'): True,			(b'devel', b'debug.peer-request'): True,
	}			}

	with ui.configoverride(overrides):			with ui.configoverride(overrides):
	peer = hg.peer(ui, {}, path)			peer = hg.peer(ui, {}, path)

				try:
	local = peer.local() is not None			local = peer.local() is not None
	canpush = peer.canpush()			canpush = peer.canpush()

	ui.write(_(b'url: %s\n') % peer.url())			ui.write(_(b'url: %s\n') % peer.url())
	ui.write(_(b'local: %s\n') % (_(b'yes') if local else _(b'no')))			ui.write(_(b'local: %s\n') % (_(b'yes') if local else _(b'no')))
	ui.write(_(b'pushable: %s\n') % (_(b'yes') if canpush else _(b'no')))			ui.write(
				_(b'pushable: %s\n') % (_(b'yes') if canpush else _(b'no'))
				)
				finally:
				peer.close()


	@command(			@command(
	b'debugpickmergetool',			b'debugpickmergetool',
	[			[
	(b'r', b'rev', b'', _(b'check for files in this revision'), _(b'REV')),			(b'r', b'rev', b'', _(b'check for files in this revision'), _(b'REV')),
	(b'', b'changedelete', None, _(b'emulate merging change and delete')),			(b'', b'changedelete', None, _(b'emulate merging change and delete')),
	]			]

	With two args, list the keys in the given namespace.			With two args, list the keys in the given namespace.

	With five args, set a key to new if it currently is set to old.			With five args, set a key to new if it currently is set to old.
	Reports success or failure.			Reports success or failure.
	"""			"""

	target = hg.peer(ui, {}, repopath)			target = hg.peer(ui, {}, repopath)
				try:
	if keyinfo:			if keyinfo:
	key, old, new = keyinfo			key, old, new = keyinfo
	with target.commandexecutor() as e:			with target.commandexecutor() as e:
	r = e.callcommand(			r = e.callcommand(
	b'pushkey',			b'pushkey',
	{			{
	b'namespace': namespace,			b'namespace': namespace,
	b'key': key,			b'key': key,
	b'old': old,			b'old': old,
	b'new': new,			b'new': new,
	},			},
	).result()			).result()

	ui.status(pycompat.bytestr(r) + b'\n')			ui.status(pycompat.bytestr(r) + b'\n')
	return not r			return not r
	else:			else:
	for k, v in sorted(pycompat.iteritems(target.listkeys(namespace))):			for k, v in sorted(pycompat.iteritems(target.listkeys(namespace))):
	ui.write(			ui.write(
	b"%s\t%s\n" % (stringutil.escapestr(k), stringutil.escapestr(v))			b"%s\t%s\n"
				% (stringutil.escapestr(k), stringutil.escapestr(v))
	)			)
				finally:
				target.close()


	@command(b'debugpvec', [], _(b'A B'))			@command(b'debugpvec', [], _(b'A B'))
	def debugpvec(ui, repo, a, b=None):			def debugpvec(ui, repo, a, b=None):
	ca = scmutil.revsingle(repo, a)			ca = scmutil.revsingle(repo, a)
	cb = scmutil.revsingle(repo, b)			cb = scmutil.revsingle(repo, b)
	pa = pvec.ctxpvec(ca)			pa = pvec.ctxpvec(ca)
	pb = pvec.ctxpvec(cb)			pb = pvec.ctxpvec(cb)
	]			]
	+ cmdutil.remoteopts,			+ cmdutil.remoteopts,
	_(b'REPO [OPTIONS]... [ONE [TWO]]'),			_(b'REPO [OPTIONS]... [ONE [TWO]]'),
	norepo=True,			norepo=True,
	)			)
	def debugwireargs(ui, repopath, vals, *opts):			def debugwireargs(ui, repopath, vals, *opts):
	opts = pycompat.byteskwargs(opts)			opts = pycompat.byteskwargs(opts)
	repo = hg.peer(ui, opts, repopath)			repo = hg.peer(ui, opts, repopath)
				try:
	for opt in cmdutil.remoteopts:			for opt in cmdutil.remoteopts:
	del opts[opt[1]]			del opts[opt[1]]
	args = {}			args = {}
	for k, v in pycompat.iteritems(opts):			for k, v in pycompat.iteritems(opts):
	if v:			if v:
	args[k] = v			args[k] = v
	args = pycompat.strkwargs(args)			args = pycompat.strkwargs(args)
	# run twice to check that we don't mess up the stream for the next command			# run twice to check that we don't mess up the stream for the next command
	res1 = repo.debugwireargs(vals, *args)			res1 = repo.debugwireargs(vals, *args)
	res2 = repo.debugwireargs(vals, *args)			res2 = repo.debugwireargs(vals, *args)
	ui.write(b"%s\n" % res1)			ui.write(b"%s\n" % res1)
	if res1 != res2:			if res1 != res2:
	ui.warn(b"%s\n" % res2)			ui.warn(b"%s\n" % res2)
				finally:
				repo.close()


	def _parsewirelangblocks(fh):			def _parsewirelangblocks(fh):
	activeaction = None			activeaction = None
	blocklines = []			blocklines = []
	lastindent = 0			lastindent = 0

	for line in fh:			for line in fh:

mercurial/hg.py

	if isinstance(source, bytes):			if isinstance(source, bytes):
	origsource = ui.expandpath(source)			origsource = ui.expandpath(source)
	source, branches = parseurl(origsource, branch)			source, branches = parseurl(origsource, branch)
	srcpeer = peer(ui, peeropts, source)			srcpeer = peer(ui, peeropts, source)
	else:			else:
	srcpeer = source.peer() # in case we were called with a localrepo			srcpeer = source.peer() # in case we were called with a localrepo
	branches = (None, branch or [])			branches = (None, branch or [])
	origsource = source = srcpeer.url()			origsource = source = srcpeer.url()
				srclock = destlock = cleandir = None
				destpeer = None
				try:
	revs, checkout = addbranchrevs(srcpeer, srcpeer, branches, revs)			revs, checkout = addbranchrevs(srcpeer, srcpeer, branches, revs)

	if dest is None:			if dest is None:
	dest = defaultdest(source)			dest = defaultdest(source)
	if dest:			if dest:
	ui.status(_(b"destination directory: %s\n") % dest)			ui.status(_(b"destination directory: %s\n") % dest)
	else:			else:
	dest = ui.expandpath(dest)			dest = ui.expandpath(dest)

	dest = util.urllocalpath(dest)			dest = util.urllocalpath(dest)
	source = util.urllocalpath(source)			source = util.urllocalpath(source)

	if not dest:			if not dest:
	raise error.InputError(_(b"empty destination path is not valid"))			raise error.InputError(_(b"empty destination path is not valid"))

	destvfs = vfsmod.vfs(dest, expandpath=True)			destvfs = vfsmod.vfs(dest, expandpath=True)
	if destvfs.lexists():			if destvfs.lexists():
	if not destvfs.isdir():			if not destvfs.isdir():
	raise error.InputError(_(b"destination '%s' already exists") % dest)			raise error.InputError(
				_(b"destination '%s' already exists") % dest
				)
	elif destvfs.listdir():			elif destvfs.listdir():
	raise error.InputError(_(b"destination '%s' is not empty") % dest)			raise error.InputError(
				_(b"destination '%s' is not empty") % dest
				)

	createopts = {}			createopts = {}
	narrow = False			narrow = False

	if storeincludepats is not None:			if storeincludepats is not None:
	narrowspec.validatepatterns(storeincludepats)			narrowspec.validatepatterns(storeincludepats)
	narrow = True			narrow = True

	if storeexcludepats is not None:			if storeexcludepats is not None:
	narrowspec.validatepatterns(storeexcludepats)			narrowspec.validatepatterns(storeexcludepats)
	narrow = True			narrow = True

	if narrow:			if narrow:
	# Include everything by default if only exclusion patterns defined.			# Include everything by default if only exclusion patterns defined.
	if storeexcludepats and not storeincludepats:			if storeexcludepats and not storeincludepats:
	storeincludepats = {b'path:.'}			storeincludepats = {b'path:.'}

	createopts[b'narrowfiles'] = True			createopts[b'narrowfiles'] = True

	if depth:			if depth:
	createopts[b'shallowfilestore'] = True			createopts[b'shallowfilestore'] = True

	if srcpeer.capable(b'lfs-serve'):			if srcpeer.capable(b'lfs-serve'):
	# Repository creation honors the config if it disabled the extension, so			# Repository creation honors the config if it disabled the extension, so
	# we can't just announce that lfs will be enabled. This check avoids			# we can't just announce that lfs will be enabled. This check avoids
	# saying that lfs will be enabled, and then saying it's an unknown			# saying that lfs will be enabled, and then saying it's an unknown
	# feature. The lfs creation option is set in either case so that a			# feature. The lfs creation option is set in either case so that a
	# requirement is added. If the extension is explicitly disabled but the			# requirement is added. If the extension is explicitly disabled but the
	# requirement is set, the clone aborts early, before transferring any			# requirement is set, the clone aborts early, before transferring any
	# data.			# data.
	createopts[b'lfs'] = True			createopts[b'lfs'] = True

	if extensions.disabled_help(b'lfs'):			if extensions.disabled_help(b'lfs'):
	ui.status(			ui.status(
	_(			_(
	b'(remote is using large file support (lfs), but it is '			b'(remote is using large file support (lfs), but it is '
	b'explicitly disabled in the local configuration)\n'			b'explicitly disabled in the local configuration)\n'
	)			)
	)			)
	else:			else:
	ui.status(			ui.status(
	_(			_(
	b'(remote is using large file support (lfs); lfs will '			b'(remote is using large file support (lfs); lfs will '
	b'be enabled for this repository)\n'			b'be enabled for this repository)\n'
	)			)
	)			)

	shareopts = shareopts or {}			shareopts = shareopts or {}
	sharepool = shareopts.get(b'pool')			sharepool = shareopts.get(b'pool')
	sharenamemode = shareopts.get(b'mode')			sharenamemode = shareopts.get(b'mode')
	if sharepool and islocal(dest):			if sharepool and islocal(dest):
	sharepath = None			sharepath = None
	if sharenamemode == b'identity':			if sharenamemode == b'identity':
	# Resolve the name from the initial changeset in the remote			# Resolve the name from the initial changeset in the remote
	# repository. This returns nullid when the remote is empty. It			# repository. This returns nullid when the remote is empty. It
	# raises RepoLookupError if revision 0 is filtered or otherwise			# raises RepoLookupError if revision 0 is filtered or otherwise
	# not available. If we fail to resolve, sharing is not enabled.			# not available. If we fail to resolve, sharing is not enabled.
	try:			try:
	with srcpeer.commandexecutor() as e:			with srcpeer.commandexecutor() as e:
	rootnode = e.callcommand(			rootnode = e.callcommand(
	b'lookup',			b'lookup',
	{			{
	b'key': b'0',			b'key': b'0',
	},			},
	).result()			).result()

	if rootnode != nullid:			if rootnode != nullid:
	sharepath = os.path.join(sharepool, hex(rootnode))			sharepath = os.path.join(sharepool, hex(rootnode))
	else:			else:
	ui.status(			ui.status(
	_(			_(
	b'(not using pooled storage: '			b'(not using pooled storage: '
	b'remote appears to be empty)\n'			b'remote appears to be empty)\n'
	)			)
	)			)
	except error.RepoLookupError:			except error.RepoLookupError:
	ui.status(			ui.status(
	_(			_(
	b'(not using pooled storage: '			b'(not using pooled storage: '
	b'unable to resolve identity of remote)\n'			b'unable to resolve identity of remote)\n'
	)			)
	)			)
	elif sharenamemode == b'remote':			elif sharenamemode == b'remote':
	sharepath = os.path.join(			sharepath = os.path.join(
	sharepool, hex(hashutil.sha1(source).digest())			sharepool, hex(hashutil.sha1(source).digest())
	)			)
	else:			else:
	raise error.Abort(			raise error.Abort(
	_(b'unknown share naming mode: %s') % sharenamemode			_(b'unknown share naming mode: %s') % sharenamemode
	)			)

	# TODO this is a somewhat arbitrary restriction.			# TODO this is a somewhat arbitrary restriction.
	if narrow:			if narrow:
	ui.status(_(b'(pooled storage not supported for narrow clones)\n'))			ui.status(
				_(b'(pooled storage not supported for narrow clones)\n')
				)
	sharepath = None			sharepath = None

	if sharepath:			if sharepath:
	return clonewithshare(			return clonewithshare(
	ui,			ui,
	peeropts,			peeropts,
	sharepath,			sharepath,
	source,			source,
	srcpeer,			srcpeer,
	dest,			dest,
	pull=pull,			pull=pull,
	rev=revs,			rev=revs,
	update=update,			update=update,
	stream=stream,			stream=stream,
	)			)

	srclock = destlock = cleandir = None
	srcrepo = srcpeer.local()			srcrepo = srcpeer.local()
	try:
	abspath = origsource			abspath = origsource
	if islocal(origsource):			if islocal(origsource):
	abspath = os.path.abspath(util.urllocalpath(origsource))			abspath = os.path.abspath(util.urllocalpath(origsource))

	if islocal(dest):			if islocal(dest):
	cleandir = dest			cleandir = dest

	copy = False			copy = False
	with destrepo.lock():			with destrepo.lock():
	destrepo.updatecaches(full=True)			destrepo.updatecaches(full=True)
	finally:			finally:
	release(srclock, destlock)			release(srclock, destlock)
	if cleandir is not None:			if cleandir is not None:
	shutil.rmtree(cleandir, True)			shutil.rmtree(cleandir, True)
	if srcpeer is not None:			if srcpeer is not None:
	srcpeer.close()			srcpeer.close()
				if destpeer and destpeer.local() is None:
				destpeer.close()
	return srcpeer, destpeer			return srcpeer, destpeer


	def _showstats(repo, stats, quietempty=False):			def _showstats(repo, stats, quietempty=False):
	if quietempty and stats.isempty():			if quietempty and stats.isempty():
	return			return
	repo.ui.status(			repo.ui.status(
	_(			_(
	"""			"""
	Helper for incoming / gincoming.			Helper for incoming / gincoming.
	displaychlist gets called with			displaychlist gets called with
	(remoterepo, incomingchangesetlist, displayer) parameters,			(remoterepo, incomingchangesetlist, displayer) parameters,
	and is supposed to contain only code that can't be unified.			and is supposed to contain only code that can't be unified.
	"""			"""
	source, branches = parseurl(ui.expandpath(source), opts.get(b'branch'))			source, branches = parseurl(ui.expandpath(source), opts.get(b'branch'))
	other = peer(repo, opts, source)			other = peer(repo, opts, source)
				cleanupfn = other.close
				try:
	ui.status(_(b'comparing with %s\n') % util.hidepassword(source))			ui.status(_(b'comparing with %s\n') % util.hidepassword(source))
	revs, checkout = addbranchrevs(repo, other, branches, opts.get(b'rev'))			revs, checkout = addbranchrevs(repo, other, branches, opts.get(b'rev'))

	if revs:			if revs:
	revs = [other.lookup(rev) for rev in revs]			revs = [other.lookup(rev) for rev in revs]
	other, chlist, cleanupfn = bundlerepo.getremotechanges(			other, chlist, cleanupfn = bundlerepo.getremotechanges(
	ui, repo, other, revs, opts[b"bundle"], opts[b"force"]			ui, repo, other, revs, opts[b"bundle"], opts[b"force"]
	)			)
	try:
	if not chlist:			if not chlist:
	ui.status(_(b"no changes found\n"))			ui.status(_(b"no changes found\n"))
	return subreporecurse()			return subreporecurse()
	ui.pager(b'incoming')			ui.pager(b'incoming')
	displayer = logcmdutil.changesetdisplayer(			displayer = logcmdutil.changesetdisplayer(
	ui, other, opts, buffered=buffered			ui, other, opts, buffered=buffered
	)			)
	displaychlist(other, chlist, displayer)			displaychlist(other, chlist, displayer)
	branches = path.branch, opts.get(b'branch') or []			branches = path.branch, opts.get(b'branch') or []

	ui.status(_(b'comparing with %s\n') % util.hidepassword(dest))			ui.status(_(b'comparing with %s\n') % util.hidepassword(dest))
	revs, checkout = addbranchrevs(repo, repo, branches, opts.get(b'rev'))			revs, checkout = addbranchrevs(repo, repo, branches, opts.get(b'rev'))
	if revs:			if revs:
	revs = [repo[rev].node() for rev in scmutil.revrange(repo, revs)]			revs = [repo[rev].node() for rev in scmutil.revrange(repo, revs)]

	other = peer(repo, opts, dest)			other = peer(repo, opts, dest)
				try:
	outgoing = discovery.findcommonoutgoing(			outgoing = discovery.findcommonoutgoing(
	repo, other, revs, force=opts.get(b'force')			repo, other, revs, force=opts.get(b'force')
	)			)
	o = outgoing.missing			o = outgoing.missing
	if not o:			if not o:
	scmutil.nochangesfound(repo.ui, repo, outgoing.excluded)			scmutil.nochangesfound(repo.ui, repo, outgoing.excluded)
	return o, other			return o, other
				except: # re-raises
				other.close()
				raise


	def outgoing(ui, repo, dest, opts):			def outgoing(ui, repo, dest, opts):
	def recurse():			def recurse():
	ret = 1			ret = 1
	if opts.get(b'subrepos'):			if opts.get(b'subrepos'):
	ctx = repo[None]			ctx = repo[None]
	for subpath in sorted(ctx.substate):			for subpath in sorted(ctx.substate):
	sub = ctx.sub(subpath)			sub = ctx.sub(subpath)
	ret = min(ret, sub.outgoing(ui, dest, opts))			ret = min(ret, sub.outgoing(ui, dest, opts))
	return ret			return ret

	limit = logcmdutil.getlimit(opts)			limit = logcmdutil.getlimit(opts)
	o, other = _outgoing(ui, repo, dest, opts)			o, other = _outgoing(ui, repo, dest, opts)
				try:
	if not o:			if not o:
	cmdutil.outgoinghooks(ui, repo, other, opts, o)			cmdutil.outgoinghooks(ui, repo, other, opts, o)
	return recurse()			return recurse()

	if opts.get(b'newest_first'):			if opts.get(b'newest_first'):
	o.reverse()			o.reverse()
	ui.pager(b'outgoing')			ui.pager(b'outgoing')
	displayer = logcmdutil.changesetdisplayer(ui, repo, opts)			displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
	count = 0			count = 0
	for n in o:			for n in o:
	if limit is not None and count >= limit:			if limit is not None and count >= limit:
	break			break
	parents = [p for p in repo.changelog.parents(n) if p != nullid]			parents = [p for p in repo.changelog.parents(n) if p != nullid]
	if opts.get(b'no_merges') and len(parents) == 2:			if opts.get(b'no_merges') and len(parents) == 2:
	continue			continue
	count += 1			count += 1
	displayer.show(repo[n])			displayer.show(repo[n])
	displayer.close()			displayer.close()
	cmdutil.outgoinghooks(ui, repo, other, opts, o)			cmdutil.outgoinghooks(ui, repo, other, opts, o)
	recurse()			recurse()
	return 0 # exit code is zero since we found outgoing changes			return 0 # exit code is zero since we found outgoing changes
				finally:
				other.close()


	def verify(repo, level=None):			def verify(repo, level=None):
	"""verify the consistency of a repository"""			"""verify the consistency of a repository"""
	ret = verifymod.verify(repo, level=level)			ret = verifymod.verify(repo, level=level)

	# Broken subrepo references in hidden csets don't seem worth worrying about,			# Broken subrepo references in hidden csets don't seem worth worrying about,
	# since they can't be pushed/pulled, and --hidden can be used if they are a			# since they can't be pushed/pulled, and --hidden can be used if they are a

mercurial/revset.py

	)			)
	dest = path.pushloc or path.loc			dest = path.pushloc or path.loc
	branches = path.branch, []			branches = path.branch, []

	revs, checkout = hg.addbranchrevs(repo, repo, branches, [])			revs, checkout = hg.addbranchrevs(repo, repo, branches, [])
	if revs:			if revs:
	revs = [repo.lookup(rev) for rev in revs]			revs = [repo.lookup(rev) for rev in revs]
	other = hg.peer(repo, {}, dest)			other = hg.peer(repo, {}, dest)
				try:
	repo.ui.pushbuffer()			repo.ui.pushbuffer()
	outgoing = discovery.findcommonoutgoing(repo, other, onlyheads=revs)			outgoing = discovery.findcommonoutgoing(repo, other, onlyheads=revs)
	repo.ui.popbuffer()			repo.ui.popbuffer()
				finally:
				other.close()
	cl = repo.changelog			cl = repo.changelog
	o = {cl.rev(r) for r in outgoing.missing}			o = {cl.rev(r) for r in outgoing.missing}
	return subset & o			return subset & o


	@predicate(b'p1([set])', safe=True)			@predicate(b'p1([set])', safe=True)
	def p1(repo, subset, x):			def p1(repo, subset, x):
	"""First parent of changesets in set, or the working directory."""			"""First parent of changesets in set, or the working directory."""

mercurial/sshpeer.py

	pipee.close()			pipee.close()

	if didsomething and warn is not None:			if didsomething and warn is not None:
	# Encourage explicit close of sshpeers. Closing via __del__ is			# Encourage explicit close of sshpeers. Closing via __del__ is
	# not very predictable when exceptions are thrown, which has led			# not very predictable when exceptions are thrown, which has led
	# to deadlocks due to a peer get gc'ed in a fork			# to deadlocks due to a peer get gc'ed in a fork
	# We add our own stack trace, because the stacktrace when called			# We add our own stack trace, because the stacktrace when called
	# from __del__ is useless.			# from __del__ is useless.
	if False: # enabled in next commit			ui.develwarn(b'missing close on SSH connection created at:\n%s' % warn)
	ui.develwarn(
	b'missing close on SSH connection created at:\n%s' % warn
	)


	def _makeconnection(ui, sshcmd, args, remotecmd, path, sshenv=None):			def _makeconnection(ui, sshcmd, args, remotecmd, path, sshenv=None):
	"""Create an SSH connection to a server.			"""Create an SSH connection to a server.

	Returns a tuple of (process, stdin, stdout, stderr) for the			Returns a tuple of (process, stdin, stdout, stderr) for the
	spawned process.			spawned process.
	"""			"""

mercurial/subrepo.py

	# assemble the repos in a tree, so that can't be consistently done.			# assemble the repos in a tree, so that can't be consistently done.
	# A simpler option is for the user to configure clone pooling, and			# A simpler option is for the user to configure clone pooling, and
	# work with that.			# work with that.
	if parentrepo.shared() and hg.islocal(srcurl):			if parentrepo.shared() and hg.islocal(srcurl):
	self.ui.status(			self.ui.status(
	_(b'sharing subrepo %s from %s\n')			_(b'sharing subrepo %s from %s\n')
	% (subrelpath(self), srcurl)			% (subrelpath(self), srcurl)
	)			)
				peer = getpeer()
				try:
	shared = hg.share(			shared = hg.share(
	self._repo._subparent.baseui,			self._repo._subparent.baseui,
	getpeer(),			peer,
	self._repo.root,			self._repo.root,
	update=False,			update=False,
	bookmarks=False,			bookmarks=False,
	)			)
				finally:
				peer.close()
	self._repo = shared.local()			self._repo = shared.local()
	else:			else:
	# TODO: find a common place for this and this code in the			# TODO: find a common place for this and this code in the
	# share.py wrap of the clone command.			# share.py wrap of the clone command.
	if parentrepo.shared():			if parentrepo.shared():
	pool = self.ui.config(b'share', b'pool')			pool = self.ui.config(b'share', b'pool')
	if pool:			if pool:
	pool = util.expandpath(pool)			pool = util.expandpath(pool)

	shareopts = {			shareopts = {
	b'pool': pool,			b'pool': pool,
	b'mode': self.ui.config(b'share', b'poolnaming'),			b'mode': self.ui.config(b'share', b'poolnaming'),
	}			}
	else:			else:
	shareopts = {}			shareopts = {}

	self.ui.status(			self.ui.status(
	_(b'cloning subrepo %s from %s\n')			_(b'cloning subrepo %s from %s\n')
	% (subrelpath(self), util.hidepassword(srcurl))			% (subrelpath(self), util.hidepassword(srcurl))
	)			)
				peer = getpeer()
				try:
	other, cloned = hg.clone(			other, cloned = hg.clone(
	self._repo._subparent.baseui,			self._repo._subparent.baseui,
	{},			{},
	getpeer(),			peer,
	self._repo.root,			self._repo.root,
	update=False,			update=False,
	shareopts=shareopts,			shareopts=shareopts,
	)			)
				finally:
				peer.close()
	self._repo = cloned.local()			self._repo = cloned.local()
	self._initrepo(parentrepo, source, create=True)			self._initrepo(parentrepo, source, create=True)
	self._cachestorehash(srcurl)			self._cachestorehash(srcurl)
	else:			else:
	self.ui.status(			self.ui.status(
	_(b'pulling subrepo %s from %s\n')			_(b'pulling subrepo %s from %s\n')
	% (subrelpath(self), util.hidepassword(srcurl))			% (subrelpath(self), util.hidepassword(srcurl))
	)			)
	cleansub = self.storeclean(srcurl)			cleansub = self.storeclean(srcurl)
	exchange.pull(self._repo, getpeer())			peer = getpeer()
				try:
				exchange.pull(self._repo, peer)
				finally:
				peer.close()
	if cleansub:			if cleansub:
	# keep the repo clean after pull			# keep the repo clean after pull
	self._cachestorehash(srcurl)			self._cachestorehash(srcurl)
	return False			return False

	@annotatesubrepoerror			@annotatesubrepoerror
	def get(self, state, overwrite=False):			def get(self, state, overwrite=False):
	inrepo = self._get(state)			inrepo = self._get(state)
	% (subrelpath(self), util.hidepassword(dsturl))			% (subrelpath(self), util.hidepassword(dsturl))
	)			)
	return None			return None
	self.ui.status(			self.ui.status(
	_(b'pushing subrepo %s to %s\n')			_(b'pushing subrepo %s to %s\n')
	% (subrelpath(self), util.hidepassword(dsturl))			% (subrelpath(self), util.hidepassword(dsturl))
	)			)
	other = hg.peer(self._repo, {b'ssh': ssh}, dsturl)			other = hg.peer(self._repo, {b'ssh': ssh}, dsturl)
				try:
	res = exchange.push(self._repo, other, force, newbranch=newbranch)			res = exchange.push(self._repo, other, force, newbranch=newbranch)
				finally:
				other.close()

	# the repo is now clean			# the repo is now clean
	self._cachestorehash(dsturl)			self._cachestorehash(dsturl)
	return res.cgresult			return res.cgresult

	@annotatesubrepoerror			@annotatesubrepoerror
	def outgoing(self, ui, dest, opts):			def outgoing(self, ui, dest, opts):
	if b'rev' in opts or b'branch' in opts:			if b'rev' in opts or b'branch' in opts:

tests/remotefilelog-getflogheads.py

	Extension printing a remotefilelog's heads			Extension printing a remotefilelog's heads

	Used for testing purpose			Used for testing purpose
	"""			"""

	dest = repo.ui.expandpath(b'default')			dest = repo.ui.expandpath(b'default')
	peer = hg.peer(repo, {}, dest)			peer = hg.peer(repo, {}, dest)

				try:
	flogheads = peer.x_rfl_getflogheads(path)			flogheads = peer.x_rfl_getflogheads(path)
				finally:
				peer.close()

	if flogheads:			if flogheads:
	for head in flogheads:			for head in flogheads:
	ui.write(head + b'\n')			ui.write(head + b'\n')
	else:			else:
	ui.write(_(b'EMPTY\n'))			ui.write(_(b'EMPTY\n'))

tests/test-acl.t

	acl: acl.deny not enabled			acl: acl.deny not enabled
	acl: branch access granted: "ef1ea85a6374" on branch "default"			acl: branch access granted: "ef1ea85a6374" on branch "default"
	error: pretxnchangegroup.acl hook failed: acl: user "fred" not allowed on "foo/file.txt" (changeset "ef1ea85a6374")			error: pretxnchangegroup.acl hook failed: acl: user "fred" not allowed on "foo/file.txt" (changeset "ef1ea85a6374")
	bundle2-input-part: total payload size 1553			bundle2-input-part: total payload size 1553
	bundle2-input-part: total payload size 24			bundle2-input-part: total payload size 24
	bundle2-input-bundle: 5 parts total			bundle2-input-bundle: 5 parts total
	transaction abort!			transaction abort!
	rollback completed			rollback completed
				truncating cache/rbc-revs-v1 to 8
	abort: acl: user "fred" not allowed on "foo/file.txt" (changeset "ef1ea85a6374")			abort: acl: user "fred" not allowed on "foo/file.txt" (changeset "ef1ea85a6374")
	no rollback information available			no rollback information available
	0:6675d58eff77			0:6675d58eff77


	fred is allowed inside foo/			fred is allowed inside foo/

	$ echo 'foo/** = fred' >> $config			$ echo 'foo/** = fred' >> $config
	bundle2-input-part: "bookmarks" supported			bundle2-input-part: "bookmarks" supported
	bundle2-input-part: total payload size 37			bundle2-input-part: total payload size 37
	calling hook prepushkey.acl: hgext.acl.hook			calling hook prepushkey.acl: hgext.acl.hook
	acl: checking access for user "fred"			acl: checking access for user "fred"
	acl: acl.allow.bookmarks not enabled			acl: acl.allow.bookmarks not enabled
	acl: acl.deny.bookmarks not enabled			acl: acl.deny.bookmarks not enabled
	acl: bookmark access granted: "ef1ea85a6374b77d6da9dcda9541f498f2d17df7" on bookmark "moving-bookmark"			acl: bookmark access granted: "ef1ea85a6374b77d6da9dcda9541f498f2d17df7" on bookmark "moving-bookmark"
	bundle2-input-bundle: 7 parts total			bundle2-input-bundle: 7 parts total
	truncating cache/rbc-revs-v1 to 8
	updating the branch cache			updating the branch cache
	invalid branch cache (served.hidden): tip differs			invalid branch cache (served.hidden): tip differs
	added 1 changesets with 1 changes to 1 files			added 1 changesets with 1 changes to 1 files
	bundle2-output-bundle: "HG20", 1 parts total			bundle2-output-bundle: "HG20", 1 parts total
	bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload			bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload
	bundle2-input-bundle: no-transaction			bundle2-input-bundle: no-transaction
	bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported			bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
	bundle2-input-bundle: 1 parts total			bundle2-input-bundle: 1 parts total
	calling hook prepushkey.acl: hgext.acl.hook			calling hook prepushkey.acl: hgext.acl.hook
	acl: checking access for user "fred"			acl: checking access for user "fred"
	acl: acl.allow.bookmarks not enabled			acl: acl.allow.bookmarks not enabled
	acl: acl.deny.bookmarks enabled, 1 entries for user fred			acl: acl.deny.bookmarks enabled, 1 entries for user fred
	error: prepushkey.acl hook failed: acl: user "fred" denied on bookmark "moving-bookmark" (changeset "ef1ea85a6374b77d6da9dcda9541f498f2d17df7")			error: prepushkey.acl hook failed: acl: user "fred" denied on bookmark "moving-bookmark" (changeset "ef1ea85a6374b77d6da9dcda9541f498f2d17df7")
	bundle2-input-bundle: 7 parts total			bundle2-input-bundle: 7 parts total
	transaction abort!			transaction abort!
	rollback completed			rollback completed
				truncating cache/rbc-revs-v1 to 8
	abort: acl: user "fred" denied on bookmark "moving-bookmark" (changeset "ef1ea85a6374b77d6da9dcda9541f498f2d17df7")			abort: acl: user "fred" denied on bookmark "moving-bookmark" (changeset "ef1ea85a6374b77d6da9dcda9541f498f2d17df7")
	no rollback information available			no rollback information available
	0:6675d58eff77			0:6675d58eff77


	cleanup bookmark stuff			cleanup bookmark stuff

	$ hg book -R a -d moving-bookmark			$ hg book -R a -d moving-bookmark
	acl: branch access granted: "f9cafe1212c8" on branch "default"			acl: branch access granted: "f9cafe1212c8" on branch "default"
	acl: path access granted: "f9cafe1212c8"			acl: path access granted: "f9cafe1212c8"
	acl: branch access granted: "911600dab2ae" on branch "default"			acl: branch access granted: "911600dab2ae" on branch "default"
	acl: path access granted: "911600dab2ae"			acl: path access granted: "911600dab2ae"
	bundle2-input-part: total payload size 1553			bundle2-input-part: total payload size 1553
	bundle2-input-part: "phase-heads" supported			bundle2-input-part: "phase-heads" supported
	bundle2-input-part: total payload size 24			bundle2-input-part: total payload size 24
	bundle2-input-bundle: 5 parts total			bundle2-input-bundle: 5 parts total
	truncating cache/rbc-revs-v1 to 8
	updating the branch cache			updating the branch cache
	added 3 changesets with 3 changes to 3 files			added 3 changesets with 3 changes to 3 files
	bundle2-output-bundle: "HG20", 1 parts total			bundle2-output-bundle: "HG20", 1 parts total
	bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload			bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload
	bundle2-input-bundle: no-transaction			bundle2-input-bundle: no-transaction
	bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported			bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
	bundle2-input-bundle: 1 parts total			bundle2-input-bundle: 1 parts total
	listing keys for "phases"			listing keys for "phases"
	acl: path access granted: "f9cafe1212c8"			acl: path access granted: "f9cafe1212c8"
	acl: branch access granted: "911600dab2ae" on branch "default"			acl: branch access granted: "911600dab2ae" on branch "default"
	error: pretxnchangegroup.acl hook failed: acl: user "wilma" not allowed on "quux/file.py" (changeset "911600dab2ae")			error: pretxnchangegroup.acl hook failed: acl: user "wilma" not allowed on "quux/file.py" (changeset "911600dab2ae")
	bundle2-input-part: total payload size 1553			bundle2-input-part: total payload size 1553
	bundle2-input-part: total payload size 24			bundle2-input-part: total payload size 24
	bundle2-input-bundle: 5 parts total			bundle2-input-bundle: 5 parts total
	transaction abort!			transaction abort!
	rollback completed			rollback completed
				truncating cache/rbc-revs-v1 to 8
	abort: acl: user "wilma" not allowed on "quux/file.py" (changeset "911600dab2ae")			abort: acl: user "wilma" not allowed on "quux/file.py" (changeset "911600dab2ae")
	no rollback information available			no rollback information available
	0:6675d58eff77			0:6675d58eff77


	file specified by acl.config does not exist			file specified by acl.config does not exist

	$ echo '[acl]' >> $config			$ echo '[acl]' >> $config
	acl: branch access granted: "f9cafe1212c8" on branch "default"			acl: branch access granted: "f9cafe1212c8" on branch "default"
	acl: path access granted: "f9cafe1212c8"			acl: path access granted: "f9cafe1212c8"
	acl: branch access granted: "911600dab2ae" on branch "default"			acl: branch access granted: "911600dab2ae" on branch "default"
	acl: path access granted: "911600dab2ae"			acl: path access granted: "911600dab2ae"
	bundle2-input-part: total payload size 1553			bundle2-input-part: total payload size 1553
	bundle2-input-part: "phase-heads" supported			bundle2-input-part: "phase-heads" supported
	bundle2-input-part: total payload size 24			bundle2-input-part: total payload size 24
	bundle2-input-bundle: 5 parts total			bundle2-input-bundle: 5 parts total
	truncating cache/rbc-revs-v1 to 8
	updating the branch cache			updating the branch cache
	added 3 changesets with 3 changes to 3 files			added 3 changesets with 3 changes to 3 files
	bundle2-output-bundle: "HG20", 1 parts total			bundle2-output-bundle: "HG20", 1 parts total
	bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload			bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload
	bundle2-input-bundle: no-transaction			bundle2-input-bundle: no-transaction
	bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported			bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
	bundle2-input-bundle: 1 parts total			bundle2-input-bundle: 1 parts total
	listing keys for "phases"			listing keys for "phases"
	acl: path access granted: "ef1ea85a6374"			acl: path access granted: "ef1ea85a6374"
	acl: branch access granted: "f9cafe1212c8" on branch "default"			acl: branch access granted: "f9cafe1212c8" on branch "default"
	error: pretxnchangegroup.acl hook failed: acl: user "fred" denied on "foo/Bar/file.txt" (changeset "f9cafe1212c8")			error: pretxnchangegroup.acl hook failed: acl: user "fred" denied on "foo/Bar/file.txt" (changeset "f9cafe1212c8")
	bundle2-input-part: total payload size 1553			bundle2-input-part: total payload size 1553
	bundle2-input-part: total payload size 24			bundle2-input-part: total payload size 24
	bundle2-input-bundle: 5 parts total			bundle2-input-bundle: 5 parts total
	transaction abort!			transaction abort!
	rollback completed			rollback completed
				truncating cache/rbc-revs-v1 to 8
	abort: acl: user "fred" denied on "foo/Bar/file.txt" (changeset "f9cafe1212c8")			abort: acl: user "fred" denied on "foo/Bar/file.txt" (changeset "f9cafe1212c8")
	no rollback information available			no rollback information available
	0:6675d58eff77			0:6675d58eff77


	Groups			Groups

	$ init_config			$ init_config
	acl: branch access granted: "f9cafe1212c8" on branch "default"			acl: branch access granted: "f9cafe1212c8" on branch "default"
	acl: path access granted: "f9cafe1212c8"			acl: path access granted: "f9cafe1212c8"
	acl: branch access granted: "911600dab2ae" on branch "default"			acl: branch access granted: "911600dab2ae" on branch "default"
	acl: path access granted: "911600dab2ae"			acl: path access granted: "911600dab2ae"
	bundle2-input-part: total payload size 1553			bundle2-input-part: total payload size 1553
	bundle2-input-part: "phase-heads" supported			bundle2-input-part: "phase-heads" supported
	bundle2-input-part: total payload size 24			bundle2-input-part: total payload size 24
	bundle2-input-bundle: 5 parts total			bundle2-input-bundle: 5 parts total
	truncating cache/rbc-revs-v1 to 8
	updating the branch cache			updating the branch cache
	added 3 changesets with 3 changes to 3 files			added 3 changesets with 3 changes to 3 files
	bundle2-output-bundle: "HG20", 1 parts total			bundle2-output-bundle: "HG20", 1 parts total
	bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload			bundle2-output-part: "reply:changegroup" (advisory) (params: 0 advisory) empty payload
	bundle2-input-bundle: no-transaction			bundle2-input-bundle: no-transaction
	bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported			bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported
	bundle2-input-bundle: 1 parts total			bundle2-input-bundle: 1 parts total
	listing keys for "phases"			listing keys for "phases"
	acl: path access granted: "ef1ea85a6374"			acl: path access granted: "ef1ea85a6374"
	acl: branch access granted: "f9cafe1212c8" on branch "default"			acl: branch access granted: "f9cafe1212c8" on branch "default"
	error: pretxnchangegroup.acl hook failed: acl: user "fred" denied on "foo/Bar/file.txt" (changeset "f9cafe1212c8")			error: pretxnchangegroup.acl hook failed: acl: user "fred" denied on "foo/Bar/file.txt" (changeset "f9cafe1212c8")
	bundle2-input-part: total payload size 1553			bundle2-input-part: total payload size 1553
	bundle2-input-part: total payload size 24			bundle2-input-part: total payload size 24
	bundle2-input-bundle: 5 parts total			bundle2-input-bundle: 5 parts total
	transaction abort!			transaction abort!
	rollback completed			rollback completed
				truncating cache/rbc-revs-v1 to 8
	abort: acl: user "fred" denied on "foo/Bar/file.txt" (changeset "f9cafe1212c8")			abort: acl: user "fred" denied on "foo/Bar/file.txt" (changeset "f9cafe1212c8")
	no rollback information available			no rollback information available
	0:6675d58eff77			0:6675d58eff77


	Invalid group			Invalid group

	Disable the fakegroups trick to get real failures			Disable the fakegroups trick to get real failures

tests/test-http.t

	preparing listkeys for "phases"			preparing listkeys for "phases"
	sending listkeys command			sending listkeys command
	devel-peer-request: GET http://localhost:$HGPORT2/?cmd=listkeys			devel-peer-request: GET http://localhost:$HGPORT2/?cmd=listkeys
	devel-peer-request: Vary X-HgArg-1,X-HgProto-1			devel-peer-request: Vary X-HgArg-1,X-HgProto-1
	devel-peer-request: X-hgproto-1 0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull			devel-peer-request: X-hgproto-1 0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
	devel-peer-request: 16 bytes of commands arguments in headers			devel-peer-request: 16 bytes of commands arguments in headers
	devel-peer-request: finished in *.???? seconds (200) (glob)			devel-peer-request: finished in *.???? seconds (200) (glob)
	received listkey for "phases": 15 bytes			received listkey for "phases": 15 bytes
				(sent 9 HTTP requests and 3898 bytes; received 920 bytes in responses)
	$ hg rollback -q			$ hg rollback -q

	$ sed 's/.*] "/"/' < ../access.log			$ sed 's/.*] "/"/' < ../access.log
	"GET /?cmd=capabilities HTTP/1.1" 401 -			"GET /?cmd=capabilities HTTP/1.1" 401 -
	"GET /?cmd=capabilities HTTP/1.1" 401 -			"GET /?cmd=capabilities HTTP/1.1" 401 -
	"GET /?cmd=capabilities HTTP/1.1" 401 -			"GET /?cmd=capabilities HTTP/1.1" 401 -
	"GET /?cmd=capabilities HTTP/1.1" 401 -			"GET /?cmd=capabilities HTTP/1.1" 401 -
	"GET /?cmd=capabilities HTTP/1.1" 401 -			"GET /?cmd=capabilities HTTP/1.1" 401 -

tests/test-lfs-serve.t

	uncompressed size of bundle content:			uncompressed size of bundle content:
	206 (changelog)			206 (changelog)
	172 (manifests)			172 (manifests)
	275 lfs2.txt			275 lfs2.txt
	remote: adding changesets			remote: adding changesets
	remote: adding manifests			remote: adding manifests
	remote: adding file changes			remote: adding file changes
	remote: added 1 changesets with 1 changes to 1 files			remote: added 1 changesets with 1 changes to 1 files
				(sent 8 HTTP requests and 3526 bytes; received 961 bytes in responses) (?)
	$ grep 'lfs' .hg/requires $SERVER_REQUIRES			$ grep 'lfs' .hg/requires $SERVER_REQUIRES
	.hg/requires:lfs			.hg/requires:lfs
	$TESTTMP/server/.hg/requires:lfs			$TESTTMP/server/.hg/requires:lfs

	$ hg clone -q http://localhost:$HGPORT $TESTTMP/client6_clone			$ hg clone -q http://localhost:$HGPORT $TESTTMP/client6_clone
	$ grep 'lfs' $TESTTMP/client6_clone/.hg/requires $SERVER_REQUIRES			$ grep 'lfs' $TESTTMP/client6_clone/.hg/requires $SERVER_REQUIRES
	$TESTTMP/client6_clone/.hg/requires:lfs			$TESTTMP/client6_clone/.hg/requires:lfs
	$TESTTMP/server/.hg/requires:lfs			$TESTTMP/server/.hg/requires:lfs

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	25635		Feb 15 2021, 4:42 PM	★	★
Diff 2	26153	rHGebfa20e62518d7441b5c61320bc9eb01d2060ddf	Feb 15 2021, 2:48 PM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

sshpeer: enable+fix warning about sshpeers not being closed explicitlyClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 26153

hgext/infinitepush/__init__.py

hgext/narrow/narrowcommands.py

mercurial/commands.py

mercurial/debugcommands.py

mercurial/hg.py

mercurial/revset.py

mercurial/sshpeer.py

mercurial/subrepo.py

tests/remotefilelog-getflogheads.py

tests/test-acl.t

tests/test-http.t

tests/test-lfs-serve.t

sshpeer: enable+fix warning about sshpeers not being closed explicitly
ClosedPublic

Revision Contents
Changeset List

hgext/infinitepush/init.py