# HG changeset patch
# User Martin Geisler <mg@aragost.com>
# Date 1308559339 -7200
# Node ID c67c41af264ccee43cbae2b830ebb1f9c4007253
# Parent  6ab8b17adc03c423b53fb50951058915edc4ca60# Parent  f9c056f48018611504f8e08e83cefcb42c8a2641
merge with stable

diff -r 6ab8b17adc03 -r c67c41af264c hg2
--- a/hg2	Sat Jun 18 16:53:49 2011 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-#!/usr/bin/env python
-#
-# mercurial - scalable distributed SCM
-#
-# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
-#
-# This software may be used and distributed according to the terms of the
-# GNU General Public License version 2 or any later version.
-
-import os
-import sys
-
-libdir = '@LIBDIR@'
-
-if libdir != '@' 'LIBDIR' '@':
-    if not os.path.isabs(libdir):
-        libdir = os.path.join(os.path.dirname(os.path.realpath(__file__)),
-                              libdir)
-        libdir = os.path.abspath(libdir)
-    sys.path.insert(0, libdir)
-
-# enable importing on demand to reduce startup time
-try:
-    from mercurial import demandimport; demandimport.enable()
-except ImportError:
-    import sys
-    sys.stderr.write("abort: couldn't find mercurial libraries in [%s]\n" %
-                     ' '.join(sys.path))
-    sys.stderr.write("(check your install and PYTHONPATH)\n")
-    sys.exit(-1)
-
-import mercurial.util
-import mercurial.dispatch
-
-for fp in (sys.stdin, sys.stdout, sys.stderr):
-    mercurial.util.setbinary(fp)
-
-mercurial.dispatch.run()
diff -r 6ab8b17adc03 -r c67c41af264c mercurial/fileset.py
--- a/mercurial/fileset.py	Sat Jun 18 16:53:49 2011 -0500
+++ b/mercurial/fileset.py	Mon Jun 20 10:42:19 2011 +0200
@@ -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)
     """
 
@@ -307,7 +305,7 @@
     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)
 
diff -r 6ab8b17adc03 -r c67c41af264c mercurial/help/config.txt
--- a/mercurial/help/config.txt	Sat Jun 18 16:53:49 2011 -0500
+++ b/mercurial/help/config.txt	Mon Jun 20 10:42:19 2011 +0200
@@ -913,6 +913,11 @@
     file exists, it is replaced. Default: None, data is printed on
     stderr
 
+``revsetalias``
+"""""""""""""""
+
+Alias definitions for revsets. See :hg:`help revsets` for details.
+
 ``server``
 """"""""""
 
diff -r 6ab8b17adc03 -r c67c41af264c mercurial/help/revsets.txt
--- a/mercurial/help/revsets.txt	Sat Jun 18 16:53:49 2011 -0500
+++ b/mercurial/help/revsets.txt	Mon Jun 20 10:42:19 2011 +0200
@@ -42,7 +42,7 @@
 
 ``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 @@
 
   <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,