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 5903

	total = 0			total = 0
	for type, data in dagparser.parsedag(text):			for type, data in dagparser.parsedag(text):
	if type == 'n':			if type == 'n':
	total += 1			total += 1

	if mergeable_file:			if mergeable_file:
	linesperrev = 2			linesperrev = 2
	# make a file with k lines per rev			# make a file with k lines per rev
	initialmergedlines = [str(i) for i in xrange(0, total * linesperrev)]			initialmergedlines = ['%d' % i for i in xrange(0, total * linesperrev)]
	initialmergedlines.append("")			initialmergedlines.append("")

	tags = []			tags = []

	wlock = lock = tr = None			wlock = lock = tr = None
	try:			try:
	wlock = repo.wlock()			wlock = repo.wlock()
	lock = repo.lock()			lock = repo.lock()