This is an archive of the discontinued Mercurial Phabricator instance.

	# (Or if it is run within a transaction, since the restart logic can			# (Or if it is run within a transaction, since the restart logic can
	# fail the entire transaction.)			# fail the entire transaction.)
	inmemory = False			inmemory = False

	if opts.get(r'auto_orphans'):			if opts.get(r'auto_orphans'):
	for key in opts:			for key in opts:
	if key != r'auto_orphans' and opts.get(key):			if key != r'auto_orphans' and opts.get(key):
	raise error.Abort(_('--auto-orphans is incompatible with %s') %			raise error.Abort(_('--auto-orphans is incompatible with %s') %
	('--' + key))			('--' + pycompat.bytestr(key)))
	userrevs = list(repo.revs(opts.get(r'auto_orphans')))			userrevs = list(repo.revs(opts.get(r'auto_orphans')))
	opts[r'rev'] = [revsetlang.formatspec('%ld and orphan()', userrevs)]			opts[r'rev'] = [revsetlang.formatspec('%ld and orphan()', userrevs)]
	opts[r'dest'] = '_destautoorphanrebase(SRC)'			opts[r'dest'] = '_destautoorphanrebase(SRC)'

	if inmemory:			if inmemory:
	try:			try:
	# in-memory merge doesn't support conflicts, so if we hit any, abort			# in-memory merge doesn't support conflicts, so if we hit any, abort
	# and re-run as an on-disk merge.			# and re-run as an on-disk merge.

py3: use pycompat.bytestr() to convert str into bytesClosedPublic