Martin Geisler <mg@lazybytes.net> [Thu, 26 Nov 2009 20:59:35 +0100] rev 9944
Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 26 Nov 2009 10:51:17 +0100] rev 9943
keyword: the CVS keyword is $RCSfile$, not $RCSFile$
http://cvsbook.red-bean.com/cvsbook.html#List%20Of%20Keywords
Fix default keyword map accordingly.
Keep $RCSFile$ for Mercurial backwards compatibility.
Martin Geisler <mg@lazybytes.net> [Thu, 26 Nov 2009 20:50:16 +0100] rev 9942
keyword: sort demo output to ensure deterministic output
Martin Geisler <mg@lazybytes.net> [Thu, 26 Nov 2009 20:06:45 +0100] rev 9941
extdiff: prevent exception on double-translation
The docstring is translated twice: once when used as a format string,
and once on display. The second translation fails when the first
translation introduces non-ASCII characters in the string.
The problem is that the gettext module calls unicode(message) on the
string, i.e., it decodes it to a Unicode string using the ASCII
encoding (the default encoding). By translating it into a Unicode
string here, the unicode() call becomes a noop.
Matt Mackall <mpm@selenic.com> [Wed, 25 Nov 2009 21:54:47 -0600] rev 9940
Merge with stable again
Matt Mackall <mpm@selenic.com> [Wed, 25 Nov 2009 21:54:18 -0600] rev 9939
Merge stable heads
Matt Mackall <mpm@selenic.com> [Wed, 25 Nov 2009 21:52:39 -0600] rev 9938
Fix changelog test
Matt Mackall <mpm@selenic.com> [Wed, 25 Nov 2009 21:44:19 -0600] rev 9937
Merge with stable