merge with stable

mercurial/fileset.py

@@ -244,8 +244,7 b' def grep(mctx, x):'
     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 b' def size(mctx, x):'
     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)
     """
 
@@ -307,7 +305,7 b' def size(mctx, x):'
     elif expr[0].isdigit or expr[0] == '.':
         a = _sizetoint(expr)
         b = _sizetomax(expr)
-        m = lambda x: x >=a and x <= b
+        m = lambda x: x >= a and x <= b
     else:
         raise error.ParseError(_("couldn't parse size"), expr)
 

mercurial/help/config.txt

@@ -913,6 +913,11 b' using lsprof.'
     file exists, it is replaced. Default: None, data is printed on
     stderr
 
+``revsetalias``
+"""""""""""""""
+
+Alias definitions for revsets. See :hg:`help revsets` for details.
+
 ``server``
 """"""""""
 

mercurial/help/revsets.txt

@@ -42,7 +42,7 b' These are the supported infix operators:'
 
 ``x - y``
   Changesets in x but not in y.
-  
+
 ``x^n``
   The nth parent of x, n == 0, 1, or 2.
   For n == 0, x; for n == 1, the first parent of each changeset in x;
@@ -66,8 +66,9 b' existing predicates or other aliases. An'
 
   <alias> = <definition>
 
-in the ``revsetalias`` section of ``.hgrc``. Arguments of the form `$1`, `$2`,
-etc. are substituted from the alias into the definition.
+in the ``revsetalias`` section of a Mercurial configuration file. Arguments
+of the form `$1`, `$2`, etc. are substituted from the alias into the
+definition.
 
 For example,