convert/cvs: do not compare None with int

use repr() instead of backticks

use repr() instead of backticks

Merge with crew-stable

rebase: add support to keep branch names Callback on extra fields added by Patrick Mezard <pmezard@gmail.com>.

Merge with crew

Update zsh completion for new help format

tests: allow cvs import to reorder its filename list Also fix script to generate non-zero length test file b.

re-add +x bit for test-convert-darcs (was missing from 14ed6662af48)

Added signature for changeset 2a67430f92f1

Added tag 1.1 for changeset 2a67430f92f1

encoding: normalize some silly encoding names

push: use the fast changegroup() path on push The race doesn't happen on push (because the discovery is done in the same hg process), so use the fast path instead.

color: replace effect-specific reset control codes with general purpose one

color: Add tests for colorized diff and status output.

diff colorization: finish highlighting trailing whitespace

color: diff colorization This colorizes diff, qdiff, log -p, outgoing -p, incoming -p, and tip -p.

color: add --color switch --color works like GNU grep --color. --color=auto only colorizes output for non-dumb terminals that are TTYs.

mq: filter out empty commit messages in qfold

mq: drop copy sources removed during qfold (see issue1405)

inotify: do not complain that inotify is not running if autostart is False

inotify: close most file descriptors when autostarting Otherwise, operations that autostart while talking to an SSH repository prevent SSH stderr from closing normally. This causes hangs at the end of hg clone or hg pull -u.

hgweb: extend [paths] syntax to match repositories recursively (issue852) This feature somehow duplicates [collections] but it is simpler to use and has less issues under Windows where using absolute path as configuration file key is not supported. Suggested by Dirkjan Ochtman <dirkjan@ochtman.nl>

help: try topics before commands to avoid "diffs" showing help for diffstat

Fix non-empty $CDPATH causing failed tests. If CDPATH contains '.', every cd command prints the target path, which causes additional output in tests and makes them fail.

convert: improve reporting of invalid svn bindings

convert: work around svn.ra.get_files() not releasing input buffer

gitweb: fix graph again after previous faulty commit (1e0677756f60)

Improvement to 14ce129cfcd: Use try/except and pass filename on errors Without the second part, the error message would be abort: Is a directory instead of abort: Is a directory: /home/user/.cvspass

gitweb: fix graph display in IE