##// END OF EJS Templates
py3: slice over bytes or use startswith() to prevent getting ascii values...
Pulkit Goyal -
r36491:ab5f18a9 default
parent child Browse files
Show More
@@ -4482,7 +4482,7 b' def resolve(ui, repo, *pats, **opts):'
4482 for f in ms:
4482 for f in ms:
4483 if not m(f):
4483 if not m(f):
4484 continue
4484 continue
4485 flags = ''.join(['-%s ' % o[0] for o in flaglist
4485 flags = ''.join(['-%s ' % o[0:1] for o in flaglist
4486 if opts.get(o)])
4486 if opts.get(o)])
4487 hint = _("(try: hg resolve %s%s)\n") % (
4487 hint = _("(try: hg resolve %s%s)\n") % (
4488 flags,
4488 flags,
@@ -392,7 +392,7 b' def sizematcher(x):'
392 elif expr.startswith(">"):
392 elif expr.startswith(">"):
393 a = util.sizetoint(expr[1:])
393 a = util.sizetoint(expr[1:])
394 return lambda x: x > a
394 return lambda x: x > a
395 elif expr[0].isdigit or expr[0] == '.':
395 elif expr[0:1].isdigit or expr.startswith('.'):
396 a = util.sizetoint(expr)
396 a = util.sizetoint(expr)
397 b = _sizetomax(expr)
397 b = _sizetomax(expr)
398 return lambda x: x >= a and x <= b
398 return lambda x: x >= a and x <= b
General Comments 0
You need to be logged in to leave comments. Login now