Christian Ebert <blacktrash@gmx.net> [Wed, 20 Oct 2010 22:46:09 +0100] rev 845
Merge with stable
Yuya Nishihara <yuya@tcha.org> [Sat, 02 Oct 2010 22:57:25 +0900] rev 844
tests: accept \-escaped test output
It changes tsttest to accept expected outputs in python-style \-escapes.
It aims to avoid trouble with outputs for non-ascii, color and progress
tests.
[ original upstream message ]
Christian Ebert <blacktrash@gmx.net> [Fri, 15 Oct 2010 00:36:45 +0200] rev 843
Merge with default
Christian Ebert <blacktrash@gmx.net> [Thu, 14 Oct 2010 22:53:17 +0200] rev 842
Only use expensive fctx.cmp when needed
Restrict expensive cmp to cases when:
- comparing against working directory
and
- encode filters active
or
- path is configured for keyword expansion
Christian Ebert <blacktrash@gmx.net> [Wed, 13 Oct 2010 09:21:19 +0100] rev 841
Merge with stable
Nicolas Dumazet <nicdumz.commits@gmail.com> [Tue, 27 Jul 2010 23:07:30 +0900] rev 840
filectx: use ctx.size comparisons to speed up ctx.cmp
Comparing sizes is cheaper than comparing file contents, as it does not
involve reading the file on disk or from the filelog.
It is however not always possible: some extensions, or encode filters,
change data when extracting it to the working directory.
[ original upstream description ]
Christian Ebert <blacktrash@gmx.net> [Wed, 13 Oct 2010 09:18:46 +0100] rev 839
Merge with stable