Mercurial > hg-stable
changeset 14689:25e4d2f35965 stable
fileset: drop backwards SI size units
- the power of 2 ones should be kiB, MiB, etc.
- the power of 10 ones (SI standard) should be kB, MB, but we're currently
using the industry traditional units elsewhere
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sat, 18 Jun 2011 20:49:07 -0500 |
parents | e2da6eee7950 |
children | 15faf0e66909 e6a6e7ebd585 |
files | mercurial/fileset.py |
diffstat | 1 files changed, 2 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/fileset.py Sat Jun 18 20:36:39 2011 -0500 +++ b/mercurial/fileset.py Sat Jun 18 20:49:07 2011 -0500 @@ -244,8 +244,7 @@ return [f for f in mctx.subset if r.search(mctx.ctx[f].data())] _units = dict(k=2**10, K=2**10, kB=2**10, KB=2**10, - M=2**20, MB=2**20, G=2**30, GB=2**30, - kiB=10**3, MiB=10**6, GiB=10**9) + M=2**20, MB=2**20, G=2**30, GB=2**30) def _sizetoint(s): try: @@ -280,9 +279,8 @@ File size matches the given expression. Examples: - 1k (files from 1024 to 2047 bytes) - - 1.0kiB (files from 1000 to 1100 bytes) - < 20k (files less than 20480 bytes) - - >= .5MiB (files at least 500000 bytes) + - >= .5MB (files at least 524288 bytes) - 4k - 1MB (files from 4096 bytes to 1048576 bytes) """