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

dirstate.walk: fold in _supported - inline tests for regular or link files - simplify bad type reporting

dirstate.walk: build a dict rather than yield Since we're already building a seen dict, we might as well put our results in it to go slightly faster.

dirstate.walk: minor cleanups - add dirkind - simplify loop structure - avoid pconvert and join on directory entries (big speed bump) - remove redundant seen set in step 3

dirstate.walk: push sorting up

dirstate.walk: pull directory scanning into top-level loop

dirstate.walk: unify match.dir logic

dirstate.walk: simplify .hg scan bisect logic

dirstate.walk: track normalized directory names

dirstate: simplify normalize logic

dirstate.walk: change names for dc and known known -> seen dc -> dmap

dirstate.walk: fold findfiles into main walk loop

dirstate.walk: eliminate filter function - remove _filter and delete original - improve some filtering logic

dirstate.walk: eliminate src from yield - restructure 'step two' to stat unseen files - remove extra stat logic in status - remove redundant src

minor status fixups

Merge with crew-stable

test-branches: add a test for long branch name (issue 1230)

branches unparseable output fix (issue1230)

Bug:1201 hg convert on CVS working copy produces Traceback Fix identified by frank@kingswood-consulting.co.uk Changed usage fron os.environ["HOME"] to expanduser("~/.cvspass") as this is the only usage of this construct in mercurial sources.

Merge with main test-remove is still failing for status() does not return removed files in a sorted list. We can live with this for now, a fix is coming soon.

dirstate: remove superfluous normalize() call in walk()

localrepo: fix status() typos from 854b907527e5a and 97c12b1ed1e0

context: trigger missing username warning only when necessary