This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	durin42	D2348 py3: whitelist another six passing tests
Closed	durin42	D2347 lock: delay is numeric, use %d for formatting
Closed	durin42	D2346 debugbuilddag: use '%d' instead of str() to get numbered lines
Closed	durin42	D2345 tests: add missing b prefixes in test-pending.t
Closed	durin42	D2344 merge: make a copy of dict.items() before mutating the dict during iteration
Closed	durin42	D2343 largefiles: give some **opts some strkwargs love
Closed	durin42	D2342 wireproto: fix lingering str(exception) with util.forcebytestr(exception)
Closed	durin42	D2341 scmutil: fix requires-file isalnum() check on first byte
Closed	durin42	D2340 largefiles: mark headre as bytes regex
Closed	durin42	D2339 largfiles: replace filter() with listcomp when result needs to be a list
Closed	durin42	D2338 largefiles: make scheme regex a bytes regex

Diff 5915

	raise error.LockHeld(errno.ETIMEDOUT, inst.filename,			raise error.LockHeld(errno.ETIMEDOUT, inst.filename,
	l.desc, inst.locker)			l.desc, inst.locker)
	time.sleep(1)			time.sleep(1)
	delay += 1			delay += 1

	l.delay = delay			l.delay = delay
	if l.delay:			if l.delay:
	if 0 <= warningidx <= l.delay:			if 0 <= warningidx <= l.delay:
	ui.warn(_("got lock after %s seconds\n") % l.delay)			ui.warn(_("got lock after %d seconds\n") % l.delay)
	else:			else:
	ui.debug("got lock after %s seconds\n" % l.delay)			ui.debug("got lock after %d seconds\n" % l.delay)
	if l.acquirefn:			if l.acquirefn:
	l.acquirefn()			l.acquirefn()
	return l			return l

	class lock(object):			class lock(object):
	'''An advisory lock held by one process to control access to a set			'''An advisory lock held by one process to control access to a set
	of files. Non-cooperating processes or incorrectly written scripts			of files. Non-cooperating processes or incorrectly written scripts
	can ignore Mercurial's locking scheme and stomp all over the			can ignore Mercurial's locking scheme and stomp all over the