This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	martinvonz	D8000 mq: don't tell user to commit merge that we already committed
Closed	martinvonz	D7999 merge: make hg.merge() take a context instead of a node
Closed	martinvonz	D7998 merge: replace a repo.lookup('.') by more typical repo['.'].node()
Closed	martinvonz	D7997 merge: drop now-unused "abort" argument from hg.merge()
Closed	martinvonz	D7996 merge: don't auto-pick destination with `hg merge 'wdir()'`
Closed	martinvonz	D7995 merge: call hg.abortmerge() directly and return early
Closed	martinvonz	D7994 merge: check that there are no conflicts after --abort
Closed	martinvonz	D7993 merge: use check_incompatible_arguments() for --abort

Diff 19613

	# there were conflicts			# there were conflicts
	node = ms.localctx.hex()			node = ms.localctx.hex()
	else:			else:
	# there were no conficts, mergestate was not stored			# there were no conficts, mergestate was not stored
	node = repo[b'.'].hex()			node = repo[b'.'].hex()

	repo.ui.status(_(b"aborting the merge, updating back to %s\n") % node[:12])			repo.ui.status(_(b"aborting the merge, updating back to %s\n") % node[:12])
	stats = mergemod.update(repo, node, branchmerge=False, force=True)			stats = mergemod.update(repo, node, branchmerge=False, force=True)
				assert stats.unresolvedcount == 0
	_showstats(repo, stats)			_showstats(repo, stats)
	return stats.unresolvedcount > 0


	def _incoming(			def _incoming(
	displaychlist, subreporecurse, ui, repo, source, opts, buffered=False			displaychlist, subreporecurse, ui, repo, source, opts, buffered=False
	):			):
	"""			"""
	Helper for incoming / gincoming.			Helper for incoming / gincoming.
	displaychlist gets called with			displaychlist gets called with