This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	pulkit	D858 py3: whitelist 15 more tests passing on Python 3
Abandoned	pulkit	D857 py3: add a test showing a normal `hg merge` works on Python 3
Closed	pulkit	D856 py3: use '%d' instead of '%s' for integers
Closed	pulkit	D855 py3: use pycompat.bytestr instead of str
Closed	pulkit	D854 py3: use pycompat.strkwargs() before passing a dict as keyword argument
Closed	pulkit	D853 py3: explicitly convert dict.keys() and dict.items() into a list
Closed	pulkit	D852 py3: return False early while checking whether None is a key in lazymanifest

Diff 2189

	cmdutil.bailifchanged(repo)			cmdutil.bailifchanged(repo)
	if not revs:			if not revs:
	raise error.Abort(_('no revisions specified'))			raise error.Abort(_('no revisions specified'))
	revs = scmutil.revrange(repo, revs)			revs = scmutil.revrange(repo, revs)

	skipped = set()			skipped = set()
	# check for merges			# check for merges
	for rev in repo.revs('%ld and merge()', revs):			for rev in repo.revs('%ld and merge()', revs):
	ui.warn(_('skipping ungraftable merge revision %s\n') % rev)			ui.warn(_('skipping ungraftable merge revision %d\n') % rev)
	skipped.add(rev)			skipped.add(rev)
	revs = [r for r in revs if r not in skipped]			revs = [r for r in revs if r not in skipped]
	if not revs:			if not revs:
	return -1			return -1

	# Don't check in the --continue case, in effect retaining --force across			# Don't check in the --continue case, in effect retaining --force across
	# --continues. That's because without --force, any revisions we decided to			# --continues. That's because without --force, any revisions we decided to
	# skip would have been filtered out here, so they wouldn't have made their			# skip would have been filtered out here, so they wouldn't have made their