Adrian Buehlmann <adrian@cadifra.com> [Wed, 03 Mar 2010 14:50:35 +0100] rev 10577
store: only add new entries to the fncache file
Newly added fncache entries were not added to the in-memory cache,
making it possible for 'hg convert' to cause duplicates in
.hg/store/fncache.
Duplicates in the fncache file are harmless, but excessive numbers
of duplicates from large converted repositories may slow down
execution speed considerably.
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 03 Mar 2010 16:00:02 +0100] rev 10576
Updated test output of test-convert-baz after f2618cacb485
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 03 Mar 2010 15:37:41 +0100] rev 10575
trailing spaces (and one stray tab)
Sune Foldager <cryo@cyanite.org> [Wed, 03 Mar 2010 14:59:39 +0100] rev 10574
Merge with default
Sune Foldager <cryo@cyanite.org> [Wed, 03 Mar 2010 14:43:27 +0100] rev 10573
Merge with stable
Sune Foldager <cryo@cyanite.org> [Wed, 03 Mar 2010 14:42:43 +0100] rev 10572
add wsgi script for Microsoft IIS with isapi-wsgi
Martin Geisler <mg@lazybytes.net> [Tue, 02 Mar 2010 21:34:24 +0100] rev 10571
doc/ja: remove old Japanese man page translations
They were added way back in 2005 and haven't been updated since. They
are no longer referenced by the Makefiles at upper levels and have not
been shipped with a recent version of Mercurial.
Martin Geisler <mg@lazybytes.net> [Tue, 02 Mar 2010 20:58:58 +0100] rev 10570
Merge with hg-i18n
Jens Bäckman <jens.backman@gmail.com> [Tue, 02 Mar 2010 18:36:37 +0100] rev 10569
i18n-sv: synchronized with f4f3a74ce832
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 02 Mar 2010 11:12:14 -0300] rev 10568
i18n-pt_BR: synchronized with b1339234080e
Yuya Nishihara <yuya@tcha.org> [Wed, 03 Mar 2010 00:12:05 +0900] rev 10567
ui: ignore ui.logtemplate and ui.style when HGPLAIN is set
HGPLAIN should suppress them because they change Mercurial's default
output.
Martin Geisler <mg@lazybytes.net> [Tue, 02 Mar 2010 10:40:58 +0100] rev 10566
Merge with hg-i18n
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Tue, 02 Mar 2010 12:41:27 +0900] rev 10565
i18n-ja: synchronized with bb4561401c84
Yuya Nishihara <yuya@tcha.org> [Mon, 01 Mar 2010 23:27:44 +0900] rev 10564
alias: fixes exception when displaying translated help text
__doc__ of aliased command shouldn't cointain non-ASCII characters,
because it'll be gettext-ed later by commands.help_().
Here gettext can raise UnicodeDecodeError.
Once concatenated two translatable strings into one, it become untranslatable.
So this patch moves 'alias for:' from dispatch.cmdalias to commands.help_,
where help texts are translated.
'alias for:' was introduced by 6e8a16dd3e30.
Martin Geisler <mg@lazybytes.net> [Mon, 01 Mar 2010 22:47:39 +0100] rev 10563
Merge with hg-i18n
Jens Bäckman <jens.backman@gmail.com> [Sun, 28 Feb 2010 19:37:56 +0100] rev 10562
i18n-sv: synchronized with d1bbf01c4a8e
Martin Geisler <mg@lazybytes.net> [Mon, 01 Mar 2010 22:44:02 +0100] rev 10561
tests: update output to match b1339234080e
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 01 Mar 2010 14:15:55 +0100] rev 10560
Add ElementPath to the list of package ignored by demand import
The bzrlib try to import the ElementPath module but had a fallback in
case the import fails. Lazy import of this module leads to later
failure.
The bzrlib is used by the convert extension.
Greg Ward <greg-hg@gerg.ca> [Mon, 01 Mar 2010 15:41:21 -0500] rev 10559
resolve: rewrite help to be clearer and more complete (issue2030).
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Sun, 28 Feb 2010 19:43:21 +0100] rev 10558
mq: simplify --mq handling / keep compatibility with other extensions
reported by edgimar on IRC
Martin Geisler <mg@lazybytes.net> [Sun, 28 Feb 2010 18:06:47 +0100] rev 10557
Merge with stable
Martin Geisler <mg@lazybytes.net> [Sun, 28 Feb 2010 18:02:20 +0100] rev 10556
i18n-da: synchronized with 091dddf05764
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 24 Feb 2010 13:47:59 -0300] rev 10555
doc/Makefile: fix doc generation when LANGUAGE is set
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sat, 27 Feb 2010 19:58:59 +0900] rev 10554
i18n-ja: synchronized with 4462760d6cfc
Wagner Bruna <wbruna@softwareexpress.com.br> [Fri, 26 Feb 2010 19:28:23 -0300] rev 10553
i18n-pt_BR: synchronized with dd3526162436
Adrian Buehlmann <adrian@cadifra.com> [Thu, 25 Feb 2010 14:56:09 +0100] rev 10552
contrib/wix: add COPYING.rtf
Moving the file from the misc directory of the thg-winbuild repo, which
uses mercurial's contrib/wix.
This file is displayed by the install UI sequence, so it belongs to the
WiX sources quite closely.
It happens to be installed by the msi installer, too.
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Fri, 26 Feb 2010 16:52:43 +0100] rev 10551
fix test-mq-eol under --pure (mimic diffhelper.c behaviour)
bug discovered by apycot (apycot.hg-scm.org)
Manpreet Singh <junkblocker@yahoo.com> [Wed, 24 Feb 2010 19:43:13 -0800] rev 10550
Updated contrib/vim/patchreview.* to version 0.2.2
- Security fixes by removing custom tempfile creation
- Removed need for DiffReviewCleanup/PatchReviewCleanup
- Better command execution error detection and display
- Improved diff view and folding by ignoring modelines
- Improved tab labels display
Martin Geisler <mg@lazybytes.net> [Thu, 25 Feb 2010 17:06:32 +0100] rev 10549
Merge with hg-i18n
Jens Bäckman <jens.backman@gmail.com> [Wed, 24 Feb 2010 19:47:51 +0100] rev 10548
i18n-sv: synchronized with fc5908d01ed7