This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	lothiraldan	D3694 shelve: use more accurate description in conflict marker
Closed	lothiraldan	D3693 shelve: directly handle the initial parent alignment
Closed	lothiraldan	D3692 merge: add a 'keepconflictparent' argument to graft
Closed	lothiraldan	D3691 shelve: stop testing missing rebase state file
Closed	lothiraldan	D3690 shelve: actually test corrupted shelve state
Closed	lothiraldan	D3689 shelve: directly handle `--continue`
Closed	lothiraldan	D3688 shelve: directly handle the abort process
Closed	lothiraldan	D3687 shelve: check the actual shelvestate in morestatus
Closed	lothiraldan	D3686 shelve: wider check for successful abort in test
Closed	lothiraldan	D3685 shelve: use full hash in tests

Diff 8975

	def _mergepredicate(repo):			def _mergepredicate(repo):
	return len(repo[None].parents()) > 1			return len(repo[None].parents()) > 1

	STATES = (			STATES = (
	# (state, predicate to detect states, helpful message function)			# (state, predicate to detect states, helpful message function)
	('histedit', fileexistspredicate('histedit-state'), _histeditmsg),			('histedit', fileexistspredicate('histedit-state'), _histeditmsg),
	('bisect', fileexistspredicate('bisect.state'), _bisectmsg),			('bisect', fileexistspredicate('bisect.state'), _bisectmsg),
	('graft', fileexistspredicate('graftstate'), _graftmsg),			('graft', fileexistspredicate('graftstate'), _graftmsg),
	('unshelve', fileexistspredicate('unshelverebasestate'), _unshelvemsg),			('unshelve', fileexistspredicate('shelvedstate'), _unshelvemsg),
	('rebase', fileexistspredicate('rebasestate'), _rebasemsg),			('rebase', fileexistspredicate('rebasestate'), _rebasemsg),
	# The merge state is part of a list that will be iterated over.			# The merge state is part of a list that will be iterated over.
	# They need to be last because some of the other unfinished states may also			# They need to be last because some of the other unfinished states may also
	# be in a merge or update state (eg. rebase, histedit, graft, etc).			# be in a merge or update state (eg. rebase, histedit, graft, etc).
	# We want those to have priority.			# We want those to have priority.
	('merge', _mergepredicate, _mergemsg),			('merge', _mergepredicate, _mergemsg),
	)			)