This is an archive of the discontinued Mercurial Phabricator instance.

	copies,			copies,
	error,			error,
	extensions,			extensions,
	merge,			merge,
	util,			util,
	)			)

	def setup():			def setup():
	def _manifestmerge(orig, repo, wctx, p2, pa, branchmerge, force, partial,			def _manifestmerge(orig, repo, wctx, p2, pa, branchmerge, args, *kwargs):
	acceptremote, followcopies):
	"""Filter updates to only lay out files that match the narrow spec."""			"""Filter updates to only lay out files that match the narrow spec."""
	actions, diverge, renamedelete = orig(			actions, diverge, renamedelete = orig(
	repo, wctx, p2, pa, branchmerge, force, partial,			repo, wctx, p2, pa, branchmerge, args, *kwargs)
	acceptremote, followcopies)

	if not util.safehasattr(repo, 'narrowmatch'):			if not util.safehasattr(repo, 'narrowmatch'):
	return actions, diverge, renamedelete			return actions, diverge, renamedelete

	nooptypes = set(['k']) # TODO: handle with nonconflicttypes			nooptypes = set(['k']) # TODO: handle with nonconflicttypes
	nonconflicttypes = set('a am c cm f g r e'.split())			nonconflicttypes = set('a am c cm f g r e'.split())
	narrowmatch = repo.narrowmatch()			narrowmatch = repo.narrowmatch()
	for f, action in actions.items():			for f, action in actions.items():

merge: make manifestmerge() override more flexibleClosedPublic