This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	pulkit	D2046 py3: add b'' to literals in check-config.py
Closed	pulkit	D2045 check-config: specify the mode 'rb' to open the file
Closed	pulkit	D2044 py3: use open() instead of file()
Closed	pulkit	D2043 py3: use pycompat.strkwargs() to convert kwargs' key to str
Closed	pulkit	D2042 py3: add __bytes__() for mq.patchheader and make sure __str__ returns str
Closed	pulkit	D2041 py3: use "%d" to convert integer to bytes
Closed	pulkit	D2040 py3: use .startswith() instead of bytes[0]
Closed	pulkit	D2039 py3: slice on bytes to prevent getting the ascii values
Closed	pulkit	D2038 py3: add r'' to convert keys to keyword arguments to str
Closed	pulkit	D2037 py3: add b'' to tweakdefualts config string

Diff 5214

	raise error.InterventionRequired(			raise error.InterventionRequired(
	_('unresolved conflicts (see hg '			_('unresolved conflicts (see hg '
	'resolve, then hg rebase --continue)'))			'resolve, then hg rebase --continue)'))
	finally:			finally:
	ui.setconfig('ui', 'forcemerge', '', 'rebase')			ui.setconfig('ui', 'forcemerge', '', 'rebase')
	if not self.collapsef:			if not self.collapsef:
	merging = p2 != nullrev			merging = p2 != nullrev
	editform = cmdutil.mergeeditform(merging, 'rebase')			editform = cmdutil.mergeeditform(merging, 'rebase')
	editor = cmdutil.getcommiteditor(editform=editform, **opts)			editor = cmdutil.getcommiteditor(editform=editform,
				**pycompat.strkwargs(opts))
	if self.wctx.isinmemory():			if self.wctx.isinmemory():
	newnode = concludememorynode(repo, rev, p1, p2,			newnode = concludememorynode(repo, rev, p1, p2,
	wctx=self.wctx,			wctx=self.wctx,
	extrafn=_makeextrafn(self.extrafns),			extrafn=_makeextrafn(self.extrafns),
	editor=editor,			editor=editor,
	keepbranches=self.keepbranchesf,			keepbranches=self.keepbranchesf,
	date=self.date)			date=self.date)
	mergemod.mergestate.clean(repo)			mergemod.mergestate.clean(repo)