merge with stable

mercurial/revlog.py

@@ -31,9 +31,11 b' REVLOG_DEFAULT_FLAGS = REVLOGNGINLINEDAT'
 REVLOG_DEFAULT_FORMAT = REVLOGNG
 REVLOG_DEFAULT_VERSION = REVLOG_DEFAULT_FORMAT | REVLOG_DEFAULT_FLAGS
 
+# amount of data read unconditionally, should be >= 4
+# when not inline: threshold for using lazy index
 _prereadsize = 1048576
-
-_maxinline = 131072                     # max size of revlog with inline data
+# max size of revlog with inline data
+_maxinline = 131072
 
 RevlogError = error.RevlogError
 LookupError = error.LookupError

tests/test-issue2137

@@ -22,8 +22,8 b' def reposetup(ui, repo):'
     extensions.wrapfunction(repo, 'commit', wrapcommit)
 
 def extsetup(ui):
-    revlog._maxinline = 128             # split out 00changelog.d early
-    revlog._prereadsize = 128           # use revlog.lazyparser
+    revlog._maxinline = 8             # split out 00changelog.d early
+    revlog._prereadsize = 8           # use revlog.lazyparser
 EOF
 
 cat >> $HGRCPATH <<EOF
@@ -31,20 +31,11 b' cat >> $HGRCPATH <<EOF'
 commitwrapper = $PWD/commitwrapper.py
 EOF
 
-# use a long username to make sure the changelog is bigger than 128 bytes
-export HGUSER='test test test test test test test test test test test'
-
 hg init repo1
 cd repo1
 echo a > a
 hg commit -A -m'add a with a long commit message to make the changelog a bit bigger'
 
-# This commit puts 00changelog.i over the 128-byte threshold to split
-# out 00changelog.d, which is a precondition for reproducing the bug
-# with the next commit.
-echo b > b
-hg commit -A -m'add b and ramble on a bit here too for the same reason'
-
 echo ""
 echo "% test that new changesets are visible to repo.lookup()"
 echo a >> a

tests/test-issue2137.out

@@ -1,14 +1,12 b''
 % setup
 adding a
-new tip: 685c8b50a4fa
-adding b
-new tip: 0dc3f194257e
+new tip: 553596fad57b
 
 % test that new changesets are visible to repo.lookup()
-new tip: 76721648e605
-changeset:   2:76721648e605
+new tip: 799ae3599e0e
+changeset:   1:799ae3599e0e
 tag:         tip
-user:        test test test test test test test test test test test
+user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     one more commit to demonstrate the bug