This is an archive of the discontinued Mercurial Phabricator instance.

	Status	Author	Revision
	Closed	martinvonz	D5203 narrow: make copies.pathcopies() filter with narrowspec again
	Closed	martinvonz	D5202 tests: demonstrate broken copies.pathcopies()

Diff 12367

	if debug:			if debug:
	dbg('debug.copies: time: %f seconds\n'			dbg('debug.copies: time: %f seconds\n'
	% (util.timer() - start))			% (util.timer() - start))
	return cm			return cm

	def _forwardcopies(a, b, match=None):			def _forwardcopies(a, b, match=None):
	"""find {dst@b: src@a} copy mapping where a is an ancestor of b"""			"""find {dst@b: src@a} copy mapping where a is an ancestor of b"""

				match = a.repo().narrowmatch(match)
	# check for working copy			# check for working copy
	if b.rev() is None:			if b.rev() is None:
	if a == b.p1():			if a == b.p1():
	# short-circuit to avoid issues with merge states			# short-circuit to avoid issues with merge states
	return _dirstatecopies(b, match)			return _dirstatecopies(b, match)

	cm = _committedforwardcopies(a, b.p1(), match)			cm = _committedforwardcopies(a, b.p1(), match)
	# combine copies from dirstate if necessary			# combine copies from dirstate if necessary

	date: Thu Jan 01 00:00:00 1970 +0000			date: Thu Jan 01 00:00:00 1970 +0000
	summary: move f2 from outside			summary: move f2 from outside

	$ echo new > inside/f4			$ echo new > inside/f4
	$ hg ci -Aqm 'add inside/f4'			$ hg ci -Aqm 'add inside/f4'
	$ hg pull -q			$ hg pull -q
	$ hg --config extensions.rebase= rebase -d tip			$ hg --config extensions.rebase= rebase -d tip
	rebasing 3:4f84b666728c "add inside/f4"			rebasing 3:4f84b666728c "add inside/f4"
	abort: data/outside/f3.i@54e53435331b: no match found!			saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/4f84b666728c-4269b76e-rebase.hg
	[255]