Patrick Mezard <pmezard@gmail.com> [Sun, 04 Oct 2009 23:16:54 +0200] rev 9541
Merge with crew-stable
Martin Geisler <mg@lazybytes.net> [Sun, 04 Oct 2009 12:18:43 +0200] rev 9540
help: un-indent help topics
The help topics are reused in the HTML documentation, and there it
looks odd that whole sections are indented. We now only indent it for
output on the terminal.
Martin Geisler <mg@lazybytes.net> [Sun, 04 Oct 2009 09:59:13 +0200] rev 9539
help: move help topics from mercurial/help.py to help/*.txt
The help topics are loaded on demand so we wont hit the disk unless we
really have to.
Martin Geisler <mg@lazybytes.net> [Sat, 03 Oct 2009 18:58:25 +0200] rev 9538
i18n: remove unnecessary os.path.normpath call
Martin Geisler <mg@lazybytes.net> [Sun, 04 Oct 2009 10:17:01 +0200] rev 9537
commands: simpler sort of help topic names
Mads Kiilerich <mads@kiilerich.com> [Sat, 03 Oct 2009 18:31:20 +0200] rev 9536
cmdutil: templating keywords latesttag and latesttagdistance
This can be used for referring to revisions in a reasonable
meaningful, stable and monotonically increasing way, suitable for
releases or builds directly from a repository.
The latest tag is found by searching through untagged ancestors and
finding the latest tagged ancestor based on tag date. The distance is
found from the length of the longest path to the tagged revision.
For example:
hg log -l1 --template '{latesttag}+{latesttagdistance}\n'
can return
1.3.1+197
This is mostly work by Gilles Moris <gilles.moris@free.fr>
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)