Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 03 Oct 2009 23:38:10 +0200] rev 9535
merge with mpm
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sat, 03 Oct 2009 23:36:08 +0200] rev 9534
bdiff: gradually enable the popularity hack
Patch from Jason Orendorff
The lower the threshold, the stronger the popularity hack's
influence. So at 3999 lines, the hack is disabled; and at 4000 lines,
the hack is enabled at maximum strength (t=4).
No source file in mercurial/crew is over 4000 lines. But there are, oh,
a few such files in Mozilla. I can testify that this hack causes hg to
generate some correct but eyebrow-raising patches.
I think the hack should phase in gradually. The threshold should be high
for small files where we don't need it so much. Like this:
t = (bn < 31000) ? 1000000 / bn : bn / 1000;
That would leave the popularity hack disabled for small files, then
gradually phase it in:
bn < 1000 -- t > bn (popularity hack is completely disabled)
bn == 1000 -- t = 1000 (still effectively disabled)
bn == 2000 -- t = 500 (only hits unusual files)
bn == 10000 -- t = 100 (only hits especially common lines)
bn == 31000 -- t = 31 (hack is at maximum power)
bn == 32000 -- t = 32 (hack could backfire, ease off)
Matt Mackall <mpm@selenic.com> [Wed, 07 Oct 2009 23:45:30 -0500] rev 9533
Merge with -crew-stable
Patrick Mezard <pmezard@gmail.com> [Wed, 07 Oct 2009 18:52:01 +0200] rev 9532
convert/hg: handle bogus copy records (issue1843)
Patrick Mezard <pmezard@gmail.com> [Wed, 07 Oct 2009 10:13:04 +0200] rev 9531
convert/hg: make parents() return changectx, not nodes
Matt Mackall <mpm@selenic.com> [Wed, 07 Oct 2009 23:25:41 -0500] rev 9530
Merge with -crew-stable
Adrian Buehlmann <adrian@cadifra.com> [Tue, 06 Oct 2009 10:45:23 +0200] rev 9529
util.rename: do not abort if os.unlink fails (issue1840)
Patrick Mezard <pmezard@gmail.com> [Mon, 05 Oct 2009 22:01:08 +0200] rev 9528
convert: make mapfile handle LF and CRLF shamap (issue1846)
Patrick Mezard <pmezard@gmail.com> [Sun, 04 Oct 2009 23:06:14 +0200] rev 9527
convert/darcs: handle directory renaming
Patrick Mezard <pmezard@gmail.com> [Sun, 04 Oct 2009 22:23:11 +0200] rev 9526
convert/darcs: fix file renaming (issue1853)