This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	martinvonz	D9227 fix: only check for obsolete commits in the --rev case
Closed	martinvonz	D9226 fix: don't include obsolete descendants with -s
Closed	martinvonz	D9225 tests: add test showing how `hg fix -s` deals with obsolete and orphan nodes
Closed	martinvonz	D9224 fix: suggest --source instead of --rev on empty revset

Diff 23384

	cmdutil.checkunfinished(repo)			cmdutil.checkunfinished(repo)
	rewriteutil.precheck(repo, revs, b'fix')			rewriteutil.precheck(repo, revs, b'fix')
	if wdirrev in revs and list(			if wdirrev in revs and list(
	mergestatemod.mergestate.read(repo).unresolved()			mergestatemod.mergestate.read(repo).unresolved()
	):			):
	raise error.Abort(b'unresolved conflicts', hint=b"use 'hg resolve'")			raise error.Abort(b'unresolved conflicts', hint=b"use 'hg resolve'")
	if not revs:			if not revs:
	raise error.Abort(			raise error.Abort(
	b'no changesets specified', hint=b'use --rev or --working-dir'			b'no changesets specified', hint=b'use --source or --working-dir'
	)			)
	return revs			return revs


	def checkfixablectx(ui, repo, ctx):			def checkfixablectx(ui, repo, ctx):
	"""Aborts if the revision shouldn't be replaced with a fixed one."""			"""Aborts if the revision shouldn't be replaced with a fixed one."""
	if ctx.obsolete():			if ctx.obsolete():
	# It would be better to actually check if the revision has a successor.			# It would be better to actually check if the revision has a successor.


	There is no default behavior in the absence of --rev and --working-dir.			There is no default behavior in the absence of --rev and --working-dir.

	$ hg init badusage			$ hg init badusage
	$ cd badusage			$ cd badusage

	$ hg fix			$ hg fix
	abort: no changesets specified			abort: no changesets specified
	(use --rev or --working-dir)			(use --source or --working-dir)
	[255]			[255]
	$ hg fix --whole			$ hg fix --whole
	abort: no changesets specified			abort: no changesets specified
	(use --rev or --working-dir)			(use --source or --working-dir)
	[255]			[255]
	$ hg fix --base 0			$ hg fix --base 0
	abort: no changesets specified			abort: no changesets specified
	(use --rev or --working-dir)			(use --source or --working-dir)
	[255]			[255]

	Fixing a public revision isn't allowed. It should abort early enough that			Fixing a public revision isn't allowed. It should abort early enough that
	nothing happens, even to the working directory.			nothing happens, even to the working directory.

	$ printf "hello\n" > hello.whole			$ printf "hello\n" > hello.whole
	$ hg commit -Aqm "hello"			$ hg commit -Aqm "hello"
	$ hg phase -r 0 --public			$ hg phase -r 0 --public