Matt Mackall <mpm@selenic.com> [Mon, 08 Nov 2010 17:16:29 -0600] rev 12954
merge with crew
Matt Mackall <mpm@selenic.com> [Mon, 08 Nov 2010 17:16:17 -0600] rev 12953
merge with crew
Nicolas Dumazet <nicdumz.commits@gmail.com> [Tue, 09 Nov 2010 01:33:48 +0900] rev 12952
merge with stable
Nicolas Dumazet <nicdumz.commits@gmail.com> [Mon, 08 Nov 2010 22:45:56 +0900] rev 12951
graphmod: safer code when a changeset has two identical parents
While this situation should never under normal use, some real
life repos sometimes contain such changesets (older hg versions,
broken rebases, etc...)
hgweb was displaying an "Internal error" in this case, and graphlog
displayed a redundant branch all the way to null: it does not cost us
much to just ignore this extra parent when constructing the DAG.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sun, 07 Nov 2010 18:23:48 +0900] rev 12950
revlog: fix descendants() if nullrev is in revs
We were not returning the correct result if nullrev was in revs, as we
are checking parent(currentrev) != nullrev before yielding currentrev
test-convert-hg-startrev was wrong: if we start converting from rev -1 and
onwards, all the descendants of -1 (full repo) should be converted.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sun, 07 Nov 2010 18:16:07 +0900] rev 12949
revlog: if start is nullrev, end is always a descendant
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sun, 07 Nov 2010 22:03:28 +0900] rev 12948
mq: use sets instead of lists for speed
The code eventually converts data through sets to ensure unicity:
do it earlier to allow faster __contains__ lookups and avoid
`del l[l.index(x)]` kind of code.
Nicolas Dumazet <nicdumz.commits@gmail.com> [Sun, 07 Nov 2010 18:59:27 +0900] rev 12947
context: add __repr__ methods to workingfilectx and workingctx
Matt Mackall <mpm@selenic.com> [Sun, 07 Nov 2010 19:42:42 -0600] rev 12946
merge with crew
Mads Kiilerich <mads@kiilerich.com> [Mon, 08 Nov 2010 01:55:32 +0100] rev 12945
test-import: workaround for missing newline is no longer needed
Mads Kiilerich <mads@kiilerich.com> [Mon, 08 Nov 2010 01:44:46 +0100] rev 12944
merge with stable
Mads Kiilerich <mads@kiilerich.com> [Mon, 08 Nov 2010 01:41:42 +0100] rev 12943
tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com> [Mon, 08 Nov 2010 01:41:41 +0100] rev 12942
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com> [Mon, 08 Nov 2010 01:35:41 +0100] rev 12941
tests: use (esc) markup for string-escape
This makes test output less ambiguous.
Failing test output will be escaped and marked up if necessary. A Python
string-escape compatible encoding is used, but not everything is encoded -
especially not \n and \t and '.
Mads Kiilerich <mads@kiilerich.com> [Mon, 08 Nov 2010 01:35:40 +0100] rev 12940
tests: (no-eol) markup for command output without trailing LF
Output chunks without a trailing LF will now work but get (no-eol) appended.
This change mostly moves code around so we can handle that an output line
starts with data from previous command, followed by salt and the next command.
Matt Mackall <mpm@selenic.com> [Sun, 07 Nov 2010 16:01:57 -0600] rev 12939
merge with stable