add additional bisect tests

add additional complex bisect tests (with non-linear history)

Add support for multiple possible bisect results (issue1228, issue1182) The real reason for both issue is that bisect can not handle cases where there are multiple possibilities for the result. Example (from issue1228): rev 0 -> good rev 1 -> skipped rev 2 -> skipped rev 3 -> skipped rev 4 -> bad Note that this patch does not only fix the reported Assertion Error but also the problem of a non converging bisect: hg init for i in `seq 3`; do echo $i > $i; hg add $i; hg ci -m$i; done hg bisect -b 2 hg bisect -g 0 hg bisect -s From this state on, you can: a) mark as bad forever (non converging!) b) mark as good to get an inconsistent state c) skip for the Assertion Error Minor description and code edits by pmezard.

Merge with crew-stable

Add a reset before and after colorized output This is how GNU's ls --color works, and it clears up problems in xterm and Windows command prompt windows.

Apply color to output of qseries --verbose Fixes issue 1173.

color: improve mq extension detection

hgweb: do not use unassigned variables in exception handling

Merge with crew-stable

Fix subversion tests with svn 1.5

convert: normalize paths sent to svn get_log (issue 1219)

Merge with crew-stable

convert: remove leading slash from ra.check_path inputs (issue 1236)

convert: restore previous svn transport parent correctly

context: get rid of unused changectx.filectxs() method

context: fix workingctx's __contains__ method

merge: use correct branch name for counting heads

merge with crew-stable

add note about updating one file to update help

churn: fix documentation for churn options

introduce store classes move store walking from streamclone.py into store.py

move filename encoding functions from util.py to new store.py

Merge with crew-stable

convert: use git executable only, with subcommands The latest GIT has some changes in the way it is installed. Only the 'git' executable need to be in the path. All other commands are treated as sub commands of 'git'.

merge with -stable

make mq and tags hardlink safe The code didn't check for modes like "r+" or "rb+". Many thanks to agriffis for noticing it.

dirstate.walk: speed up calling match function

dirstate.walk: reduce sorting in step 3

dirstate.walk: inline imatch This lets us carefully avoid calling ignore and match where possible in the fast path.

dirstate.walk: more cleanups - group internal functions - simplify imatch - rename _join to join - use nf in step 3 - use .hg in results