This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	durin42	D4989 py3: one more passing test
Closed	durin42	D4988 scmutil: wrap locker information in bytestr before repr()ing it
Closed	durin42	D4987 py3: more passing tests

Diff 11863

	return func()			return func()
	except: # re-raises			except: # re-raises
	ui.traceback()			ui.traceback()
	raise			raise
	# Global exception handling, alphabetically			# Global exception handling, alphabetically
	# Mercurial-specific first, followed by built-in and library exceptions			# Mercurial-specific first, followed by built-in and library exceptions
	except error.LockHeld as inst:			except error.LockHeld as inst:
	if inst.errno == errno.ETIMEDOUT:			if inst.errno == errno.ETIMEDOUT:
	reason = _('timed out waiting for lock held by %r') % inst.locker			reason = _('timed out waiting for lock held by %r') % (
				pycompat.bytestr(inst.locker))
	else:			else:
	reason = _('lock held by %r') % inst.locker			reason = _('lock held by %r') % inst.locker
	ui.error(_("abort: %s: %s\n") % (			ui.error(_("abort: %s: %s\n") % (
	inst.desc or stringutil.forcebytestr(inst.filename), reason))			inst.desc or stringutil.forcebytestr(inst.filename), reason))
	if not inst.locker:			if not inst.locker:
	ui.error(_("(lock might be very busy)\n"))			ui.error(_("(lock might be very busy)\n"))
	except error.LockUnavailable as inst:			except error.LockUnavailable as inst:
	ui.error(_("abort: could not lock %s: %s\n") %			ui.error(_("abort: could not lock %s: %s\n") %