This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	pulkit	D2511 py3: add 14 new passing tests to whitelist
Closed	pulkit	D2510 py3: add b'' prefixes in tests/test-rollback.t
Closed	pulkit	D2509 py3: add b'' prefix in tests/test-revlog-v2.t
Closed	pulkit	D2508 py3: add b'' prefixes in tests/test-revlog.t
Closed	pulkit	D2507 py3: make sure we open the file in bytes mode
Closed	pulkit	D2506 py3: add b'' prefixes in tests/test-revlog-ancestry.py
Closed	pulkit	D2505 py3: port the markdirver extension in tests/test-resolve.t
Closed	pulkit	D2504 py3: backout changeset 56635c506608 which wrongly added couple of b''
Closed	pulkit	D2503 py3: add a missing b'' in tests/bruterebase.py
Closed	pulkit	D2502 py3: use '%d' for integers instead of b'%s'
Closed	pulkit	D2501 py3: make sure we write in mergestate in bytes mode
Closed	pulkit	D2500 py3: add b'' prefixes in tests/test-rebase-scenario-global.t
Closed	pulkit	D2499 py3: replace str() calls with their preferred bytes equivalent
Closed	pulkit	D2498 py3: use util.forcebytestr to convert str to bytes
Closed	pulkit	D2497 py3: convert error messages to bytes using util.forcebytestr()
Closed	pulkit	D2496 py3: slice over bytes or use startswith() to prevent getting ascii values

Diff 6229

	if not didwork and pats:			if not didwork and pats:
	hint = None			hint = None
	if not any([p for p in pats if p.find(':') >= 0]):			if not any([p for p in pats if p.find(':') >= 0]):
	pats = ['path:%s' % p for p in pats]			pats = ['path:%s' % p for p in pats]
	m = scmutil.match(wctx, pats, opts)			m = scmutil.match(wctx, pats, opts)
	for f in ms:			for f in ms:
	if not m(f):			if not m(f):
	continue			continue
	flags = ''.join(['-%s ' % o[0] for o in flaglist			flags = ''.join(['-%s ' % o[0:1] for o in flaglist
				yujaUnsubmitted Not Done Could be '-%c ', but I don't have preference. yuja: Could be '-%c ', but I don't have preference.
	if opts.get(o)])			if opts.get(o)])
	hint = _("(try: hg resolve %s%s)\n") % (			hint = _("(try: hg resolve %s%s)\n") % (
	flags,			flags,
	' '.join(pats))			' '.join(pats))
	break			break
	ui.warn(_("arguments do not match paths that need resolving\n"))			ui.warn(_("arguments do not match paths that need resolving\n"))
	if hint:			if hint:
	ui.warn(hint)			ui.warn(hint)

	a = util.sizetoint(expr[1:])			a = util.sizetoint(expr[1:])
	return lambda x: x < a			return lambda x: x < a
	elif expr.startswith(">="):			elif expr.startswith(">="):
	a = util.sizetoint(expr[2:])			a = util.sizetoint(expr[2:])
	return lambda x: x >= a			return lambda x: x >= a
	elif expr.startswith(">"):			elif expr.startswith(">"):
	a = util.sizetoint(expr[1:])			a = util.sizetoint(expr[1:])
	return lambda x: x > a			return lambda x: x > a
	elif expr[0].isdigit or expr[0] == '.':			elif expr[0:1].isdigit or expr.startswith('.'):
	a = util.sizetoint(expr)			a = util.sizetoint(expr)
	b = _sizetomax(expr)			b = _sizetomax(expr)
	return lambda x: x >= a and x <= b			return lambda x: x >= a and x <= b
	raise error.ParseError(_("couldn't parse size: %s") % expr)			raise error.ParseError(_("couldn't parse size: %s") % expr)

	@predicate('size(expression)', callexisting=True)			@predicate('size(expression)', callexisting=True)
	def size(mctx, x):			def size(mctx, x):
	"""File size matches the given expression. Examples:			"""File size matches the given expression. Examples: