This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	durin42	D6879 merge: check argument value with if/raise instead of an assert
Closed	durin42	D6878 hg: have `updatetotally` more thoroughly check updatecheck argument (API)
Closed	durin42	D6877 merge: replace magic strings with NAMED_CONSTANTS (API)

Diff 16607

	# that's now in destutil.py.			# that's now in destutil.py.
	assert node is not None			assert node is not None
	if not branchmerge and not force:			if not branchmerge and not force:
	# TODO: remove the default once all callers that pass branchmerge=False			# TODO: remove the default once all callers that pass branchmerge=False
	# and force=False pass a value for updatecheck. We may want to allow			# and force=False pass a value for updatecheck. We may want to allow
	# updatecheck='abort' to better suppport some of these callers.			# updatecheck='abort' to better suppport some of these callers.
	if updatecheck is None:			if updatecheck is None:
	updatecheck = UPDATECHECK_LINEAR			updatecheck = UPDATECHECK_LINEAR
	assert updatecheck in (UPDATECHECK_NONE,			if updatecheck not in (UPDATECHECK_NONE,
	UPDATECHECK_LINEAR,			UPDATECHECK_LINEAR,
	UPDATECHECK_NO_CONFLICT,			UPDATECHECK_NO_CONFLICT,
	)			):
				raise ValueError(r'Invalid updatecheck %r (can accept %r)' % (
				updatecheck, (UPDATECHECK_NONE,
				UPDATECHECK_LINEAR,
				UPDATECHECK_NO_CONFLICT,
				)))
	# If we're doing a partial update, we need to skip updating			# If we're doing a partial update, we need to skip updating
	# the dirstate, so make a note of any partial-ness to the			# the dirstate, so make a note of any partial-ness to the
	# update here.			# update here.
	if matcher is None or matcher.always():			if matcher is None or matcher.always():
	partial = False			partial = False
	else:			else:
	partial = True			partial = True
	with repo.wlock():			with repo.wlock():