Nicolas Dumazet <nicdumz.commits@gmail.com> [Sun, 15 Aug 2010 23:38:00 +0900] rev 11901
cmdutil: code simplification
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sun, 15 Aug 2010 23:34:46 +0900] rev 11900
tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sun, 15 Aug 2010 23:17:53 +0900] rev 11899
log: do not --follow file that is deleted and recreated later (issue732)
== What ==
issue732 is only one example of a buggy behaviour, but there are in fact many
intricated cases. For example:
( "o" contains an alive version of the tracked file, "x" does not)
tip - o - o - x - o - o - x ...
\
o - o - o - o - x ...
\ /
o - o
This repository contains at least two instances of the tracked file, but
when calling "hg log -f file" only the latest one (the one alive in tip)
matters to us.
== How ==
We must extract from the filelog the history of the file instance we're
interested in and discard changes related to other instances of that file.
We see that we're only interested in ancestors(node), and that all
other nodes in the filelog should not be considered.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sun, 15 Aug 2010 22:44:15 +0900] rev 11898
tests: unify test-mq-safety
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.