This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	mharbison72	D10215 typing: rewrite a conditional assignment to unconfuse pytype
Closed	mharbison72	D10214 typing: add assertions to localrepo.py to appease pytype
Closed	mharbison72	D10213 obsutil: maintain a homogenous list when computing successors
Closed	mharbison72	D10212 typing: add an assertion to verify.py to appease pytype
Closed	mharbison72	D10211 typing: add an assertion to mercurial/hgweb/webcommands.py to help pytype
Closed	mharbison72	D10210 crecord: null out the curses attribute with `None` on failure to import
Closed	mharbison72	D10209 typing: fix directives mangled by black
Closed	mharbison72	D10208 typing: disable module attribute warnings for properly conditionalized code
Closed	mharbison72	D10207 typing: disable import error warnings that are already handled
Closed	mharbison72	D10206 typing: disable a few errors when accessing Windows specific attributes
Closed	mharbison72	D10205 typing: disable a few errors calling py3.7+ functions in resourceutil.py
Closed	mharbison72	D10204 wsgicgi: switch the default PATH_INFO back to str
Closed	mharbison72	D10203 crecord: convert an instance of bytes to str
Closed	mharbison72	D10202 crecord: change str literals to byte literals
Closed	mharbison72	D10201 bisect: replace a missing method on the list primitive
Closed	mharbison72	D10183 typing: disable a module-attr warning in the worker module's py2 code
Closed	mharbison72	D10182 wireprotoserver: convert ErrorResponse to bytes
Closed	mharbison72	D10181 verify: convert an exception to bytes before logging
Closed	mharbison72	D10180 typing: add an assertion to the upgrade engine to help pytype
Closed	mharbison72	D10179 subrepo: handle unexpected file types from git gracefully
Closed	mharbison72	D10178 patch: convert a UI message to bytes when editing a patch
Closed	mharbison72	D10177 merge: force an exception message to bytes before printing as a warning
Closed	mharbison72	D10176 hg: convert an exception to bytes in the repo creation exception handler
Closed	mharbison72	D10175 typing: add an assertion instead of blacklisting mercurial/extensions.py
Closed	mharbison72	D10174 debug: convert a few exceptions to bytes before wrapping in another error
Closed	mharbison72	D10173 grep: convert an exception to bytes for a warning message
Closed	mharbison72	D10172 morestatus: convert a UI message about merge conflicts to bytes
Closed	mharbison72	D10171 changegroup: convert a warning message to bytes
Closed	mharbison72	D10170 branchmap: force Exception to bytes before logging
Closed	mharbison72	D10169 nodemap: convert error message to bytes
Closed	mharbison72	D10168 mail: convert SMTPException to bytes before passing to error.Abort()
Closed	mharbison72	D10167 typing: switch an argument type to the generic form
Closed	mharbison72	D10166 typing: ensure that error.Abort is given bytes
Closed	mharbison72	D10165 typing: fix a suppression directive that was mangled by black formatting

Diff 26269

mercurial/cmdutil.py

	[			[
	b' %s'			b' %s'
	% util.pathto(self.reporoot, encoding.getcwd(), path)			% util.pathto(self.reporoot, encoding.getcwd(), path)
	for path in self.unresolvedpaths			for path in self.unresolvedpaths
	]			]
	)			)
	msg = (			msg = (
	_(			_(
	'''Unresolved merge conflicts:			b'''Unresolved merge conflicts:

	%s			%s

	To mark files as resolved: hg resolve --mark FILE'''			To mark files as resolved: hg resolve --mark FILE'''
	)			)
	% mergeliststr			% mergeliststr
	)			)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	26269		Mar 12 2021, 1:08 PM	★	★
Diff 2	26462	rHG83ffc49f7e48c2d4e5217aca932b39208269c0bd	Mar 11 2021, 5:14 PM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

morestatus: convert a UI message about merge conflicts to bytesClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 26269

mercurial/cmdutil.py

morestatus: convert a UI message about merge conflicts to bytes
ClosedPublic

Revision Contents
Changeset List