Martin Geisler <mg@lazybytes.net> [Wed, 16 Sep 2009 23:46:06 +0200] rev 9562
Merge with main
Martin Geisler <mg@lazybytes.net> [Wed, 16 Sep 2009 16:11:44 +0200] rev 9561
i18n-de: correct indentation of verbatim blocks
Martin Geisler <mg@lazybytes.net> [Wed, 16 Sep 2009 15:41:39 +0200] rev 9560
i18n-de: correct errors reported by msgfmt
Fabian Kreutz <fabian.kreutz@starnet.fi> [Wed, 16 Sep 2009 14:14:06 +0300] rev 9559
i18n-de: Translation of convert + more syntax fixes
Fabian Kreutz <fabian.kreutz@starnet.fi> [Mon, 14 Sep 2009 09:14:36 +0300] rev 9558
i18n-de: redid latest translations
Originally by Simon H., Tobias and myself.
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 08 Sep 2009 19:46:20 -0300] rev 9557
merge with i18n-stable
Jens Bäckman <jens.backman@gmail.com> [Tue, 18 Aug 2009 08:49:41 +0200] rev 9556
i18n-sv: Start Swedish translation
This is the starting point for the Swedish translation efforts. It
currently contains only the help of the first 17 basic commands.
Martin Geisler <mg@lazybytes.net> [Thu, 13 Aug 2009 20:12:34 +0200] rev 9555
i18n: merge with pt_BR
Wagner Bruna <wbruna@yahoo.com> [Wed, 12 Aug 2009 11:45:47 -0300] rev 9554
i18n-pt_BR: synchronized with 4e7149ed98e8
Wagner Bruna <wbruna@yahoo.com> [Wed, 12 Aug 2009 11:42:21 -0300] rev 9553
merge with i18n-stable
Matt Mackall <mpm@selenic.com> [Thu, 08 Oct 2009 00:59:46 -0500] rev 9552
Merge with -stable
Kevin Bullock <kbullock@ringworld.org> [Wed, 07 Oct 2009 14:01:20 -0500] rev 9551
color: allow multiple args to ui.write()
TK Soh <teekaysoh@gmail.com> [Thu, 08 Oct 2009 09:27:22 +0800] rev 9550
color: add support for record extension
Adrian Buehlmann <adrian@cadifra.com> [Wed, 07 Oct 2009 20:32:07 +0200] rev 9549
util: move rename into posix.py and windows.py
Adrian Buehlmann <adrian@cadifra.com> [Wed, 07 Oct 2009 20:16:43 +0200] rev 9548
util: state docstring of rename more precisely
Greg Ward <greg-hg@gerg.ca> [Mon, 05 Oct 2009 18:17:13 -0400] rev 9547
cmdutil: changeset_printer: use methods of filectx/changectx.
This allows extensions that modify changeset metadata (e.g.
description) by overriding methods of changectx to get consistent
behavior from all log-like commands, regardless of whether templates
or styles are used. Without this, overriding changectx methods works
if you use styles or templates, but not with default log format.
This meant adding filectx.extra() for consistency with changectx.
Patrick Mezard <pmezard@gmail.com> [Wed, 07 Oct 2009 22:50:20 +0200] rev 9546
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Tue, 06 Oct 2009 22:46:31 +0200] rev 9545
verify: detect file copy sources not in parents with --verbose
Steve Borho <steve@borho.org> [Tue, 06 Oct 2009 16:08:38 -0500] rev 9544
Merge with crew-stable
Patrick Mezard <pmezard@gmail.com> [Mon, 05 Oct 2009 22:57:15 +0200] rev 9543
convert/cvs: stop supporting external cvsps
Patrick Mezard <pmezard@gmail.com> [Mon, 05 Oct 2009 22:17:39 +0200] rev 9542
Merge with crew-stable
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