This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	mharbison72	D7677 typing: suppress a warning that mercurial.windows.checkosfilename is missing
Closed	mharbison72	D7676 typing: add an assertion to util.versiontuple
Closed	mharbison72	D7675 util: move common proxyobserver attributes to the base class
Closed	mharbison72	D7674 typing: add a couple of assertions to lrucachedict to help pytype
Closed	mharbison72	D7673 util: rename a variable to avoid confusing pytype
Closed	mharbison72	D7672 pytype: suppress the import-error in util.py when importing re2
Closed	mharbison72	D7671 debugcommands: finish moving `extendeddateformats` from util to dateutil
Closed	mharbison72	D7670 ui: convert exception data to bytes when printing chained exception info
Closed	mharbison72	D7669 ui: use a context manager to handle file streams in edit()

Diff 18745


	rdir = None			rdir = None
	if self.configbool(b'experimental', b'editortmpinhg'):			if self.configbool(b'experimental', b'editortmpinhg'):
	rdir = repopath			rdir = repopath
	(fd, name) = pycompat.mkstemp(			(fd, name) = pycompat.mkstemp(
	prefix=b'hg-' + extra[b'prefix'] + b'-', suffix=suffix, dir=rdir			prefix=b'hg-' + extra[b'prefix'] + b'-', suffix=suffix, dir=rdir
	)			)
	try:			try:
	f = os.fdopen(fd, 'wb')			with os.fdopen(fd, 'wb') as f:
	f.write(util.tonativeeol(text))			f.write(util.tonativeeol(text))
	f.close()

	environ = {b'HGUSER': user}			environ = {b'HGUSER': user}
	if b'transplant_source' in extra:			if b'transplant_source' in extra:
	environ.update(			environ.update(
	{b'HGREVISION': hex(extra[b'transplant_source'])}			{b'HGREVISION': hex(extra[b'transplant_source'])}
	)			)
	for label in (b'intermediate-source', b'source', b'rebase_source'):			for label in (b'intermediate-source', b'source', b'rebase_source'):
	if label in extra:			if label in extra:
	self.system(			self.system(
	b"%s \"%s\"" % (editor, name),			b"%s \"%s\"" % (editor, name),
	environ=environ,			environ=environ,
	onerr=error.Abort,			onerr=error.Abort,
	errprefix=_(b"edit failed"),			errprefix=_(b"edit failed"),
	blockedtag=b'editor',			blockedtag=b'editor',
	)			)

	f = open(name, 'rb')			with open(name, 'rb') as f:
	t = util.fromnativeeol(f.read())			t = util.fromnativeeol(f.read())
	f.close()
	finally:			finally:
	os.unlink(name)			os.unlink(name)

	return t			return t

	def system(			def system(
	self,			self,
	cmd,			cmd,