This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	martinvonz	D1698 copies: group wdir-handling in one place
Closed	martinvonz	D1697 copies: extract method for getting non-wdir forward copies
Closed	martinvonz	D1696 copies: consistently use """ for docstrings
Closed	martinvonz	D1695 copies: always respect matcher arg to _forwardcopies()

Diff 4479

mercurial/copies.py

	if ofctx:			if ofctx:
	cm[f] = ofctx.path()			cm[f] = ofctx.path()
	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"""

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

	cm = _committedforwardcopies(a, b, match)

				cm = _committedforwardcopies(a, b.p1(), match)
	# combine copies from dirstate if necessary			# combine copies from dirstate if necessary
	if w is not None:			return _chain(a, b, cm, _dirstatecopies(b, match))
	cm = _chain(a, w, cm, _dirstatecopies(w, match))			else:
				krbullockUnsubmitted Not Done Post-queue nitpick: unnecessary `else:`. krbullock: Post-queue nitpick: unnecessary `else:`.
				martinvonzAuthorUnsubmitted Not Done Feel free to update martinvonz: Feel free to update
				return _committedforwardcopies(a, b, match)
	return cm

	def _backwardrenames(a, b):			def _backwardrenames(a, b):
	if a._repo.ui.config('experimental', 'copytrace') == 'off':			if a._repo.ui.config('experimental', 'copytrace') == 'off':
	return {}			return {}

	# Even though we're not taking copies into account, 1:n rename situations			# Even though we're not taking copies into account, 1:n rename situations
	# can still exist (e.g. hg cp a b; hg mv a c). In those cases we			# can still exist (e.g. hg cp a b; hg mv a c). In those cases we
	# arbitrarily pick one of the renames.			# arbitrarily pick one of the renames.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	4447		Dec 14 2017, 8:01 PM	★	★
Diff 2	4479	rHG143f09cfc80fb451602f87113dc5f156bc8b7ffb	Dec 14 2017, 3:25 AM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

copies: group wdir-handling in one placeClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 4479

mercurial/copies.py

copies: group wdir-handling in one place
ClosedPublic

Revision Contents
Changeset List