Nicolas Dumazet <nicdumz.commits@gmail.com> [Sun, 15 Aug 2010 22:07:23 +0900] rev 11897
tests: unify test-mq-caches
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sun, 15 Aug 2010 21:58:43 +0900] rev 11896
tests: unify test-mq-guards
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sun, 15 Aug 2010 21:45:31 +0900] rev 11895
tests: unify test-mq-eol
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sun, 15 Aug 2010 21:41:45 +0900] rev 11894
tests: unify test-mq
Patrick Mezard <pmezard@gmail.com> [Sun, 15 Aug 2010 18:50:19 +0200] rev 11893
Merge with stable
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Sat, 14 Aug 2010 01:30:54 +0200] rev 11892
encoding: improve handling of buggy getpreferredencoding() on Mac OS X
Prior to version 2.7, calling locale.getpreferredencoding() would
always return 'mac-roman' on Mac OS X. Previously, this was handled by
a call to locale.setlocale(). Unfortunately, Python 2.6.5 and older
have a bug where isspace() would incorrectly report True for 0x85 and
0xa0 after such a call.
In order to fix this, we replace the previous _encodingfixup mapping
to an _encodingfixers mapping. Rather than mapping encodings to their
replacement, it maps them to a function returning the
replacement. This allows us to provide an simplified implementation of
getpreferredencoding() which extracts the expected encoding and
restores the locale.
This fix is based on a patch originally submitted by Martijn Pieters
as well as feedback from Brodie Rao.
Patrick Mezard <pmezard@gmail.com> [Sun, 15 Aug 2010 17:50:52 +0200] rev 11891
templatefilters: unnest uescape()
Yuya Nishihara <yuya@tcha.org> [Wed, 11 Aug 2010 01:06:21 +0900] rev 11890
templatefilters: use \uxxxx style escape for JSON string
It's embeddable in plain javascript, and also conforms to JSON standard.
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Fri, 13 Aug 2010 17:21:06 +0200] rev 11889
test-notify: make it pass on Mac OS X (again)
Changeset 25e74cd3f023 (from 2008) introduced a hack to handle the
very long values of $TMPDIR typically seen on Mac OS X. This hack
expected continuation lines to begin with a tab. However, as a result
of a change in Python 2.7, changeset 594b98846ce1 made it so
continuation lines began with a tab. Since then, `test-notify' has
been broken on Mac OS X.
Merely replacing the tab in the regular expression with a space will
not work: not only do tab continuations still occur in the message, but
other lines -- in the body of the message -- also start with a
space. Luckily, all broken up lines appear to end with either a colon
or an n, so we can match those, and reinsert them in the replacement.
Adrian Buehlmann <adrian@cadifra.com> [Sun, 15 Aug 2010 18:25:29 +0200] rev 11888
tests: combine test-dirstate-future.t
into test-dirstate.t