comparison mercurial/fileset.py @ 25998:a7527c5769bb

merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 10 Aug 2015 15:30:28 -0500
parents e194ada8d45f 23c4589fc678
children fc65d63ef3b9
comparison
equal deleted inserted replaced
25994:d6beeb618700 25998:a7527c5769bb
293 raise error.ParseError(_('invalid match pattern: %s') % e) 293 raise error.ParseError(_('invalid match pattern: %s') % e)
294 return [f for f in mctx.existing() if r.search(mctx.ctx[f].data())] 294 return [f for f in mctx.existing() if r.search(mctx.ctx[f].data())]
295 295
296 def _sizetomax(s): 296 def _sizetomax(s):
297 try: 297 try:
298 s = s.strip() 298 s = s.strip().lower()
299 for k, v in util._sizeunits: 299 for k, v in util._sizeunits:
300 if s.endswith(k): 300 if s.endswith(k):
301 # max(4k) = 5k - 1, max(4.5k) = 4.6k - 1 301 # max(4k) = 5k - 1, max(4.5k) = 4.6k - 1
302 n = s[:-len(k)] 302 n = s[:-len(k)]
303 inc = 1.0 303 inc = 1.0