hghave: detect cvs and cvsps availability "cvsps -h" was returning 1 in cygwin, probably because CVSROOT was unset, which does not prevent it to work correctly.

hghave: wrap command output matching

Merge with crew-stable

Test parents behaviour with files.

parents: make it match the doc when called on a file parents used to return the parent revision of the last revision updating selected file, instead of the updating revision itself.

Merge with crew-stable

Document pseudo-tags "null" and ".".

Merge with crew

mq: fix regression in 6fd953d5faea It caused qrefresh; qrefresh -X addedfile to leave the file as normal in dirstate. It should be marked added on the second pass.

Merge with crew-stable

sshrepo: fix Windows command quoting

extdiff: avoid repr() doubling paths backslashes under Windows

merge with crew-stable

Prevent WSGI apps from touching sys.stdin by setting ui.interactive to False.

interhg: allow more flexible pattern specification (fixes 2/3 of issue699) - something else than "pat" followed by a number can be used as key - something else than "/" can be used as delimiter - "ilmsux" flags (e.g. "i" for case insensitive) can be used

Don't decode unicode strings. This does not work with python2.3 and is probably not useful anyway with 2.4.

Update test-record for 3ef190234b55

record: change wording of initial per-file prompt

hgk: add repo root to window title

Forgot to quote "6^" in test-parentrevspec (see 94e77a174f55)

test-convert-hg-source: enforce conversion order with --date

convert: rename a class and a function

convert: mercurial_source: also search for copies in modified files There are some corner cases where we may have a copy in a file that isn't in the added list: - the result of a hg copy --after --force - after a merge across a (local) rename

convert: clear the dirstate before a conversion, invalidate it afterwards Clearing it before the conversion protects us from whatever data were there (file copies in particular). Invalidating it after the conversion avoids writing a possibly inconsistent dirstate to disk.

convert: avoid dirstate checks; add a test During a conversion, the dirstate contents are not consistent - there are files that may be missing from the dirstate and there may be files that shouldn't be in the dirstate. While this is not fixed, don't mark files as added - put them directly in state 'n'ormal.

merge with crew

convert/subversion: Use util.set() instead of set() for python2.3 compatibility

Fix \ inside ` problem in test-convert-svn (avoids code duplication, too)

merge with crew-stable

hgweb: Show date of last change for each file in manifest

remove unneeded statement

kill lonely docstring

Atom support: replaced xhtml namespace prefix with default namespace

Added support for the Atom syndication format

Include . in PYTHONPATH (makes testing unbundled extensions easier)

Make run-tests.py work when invoked outside of tests. This makes it usable for unbundled extensions.

Merge with crew-stable

Avoid a working dir walk while trying to detect copies for diff --git

Make hg diff --git -r revA:revB detect (inverted) copies if revA > revB

bundle: fix up lazy reads

Make bundlerepo lazier This allows the localbranch extension to override sopener in time.

Merge with crew

convert: new config variable hg.tagsbranch controls which branch tags are committed to

Push capability checking into protocol-level code.

Turn capabilities into a mutable set, instead of a fixed tuple.

Automated merge with http://hg.intevation.org/mercurial/crew

convert: document filemap.

Test svn repository conversion

hghave: detect subversion bindings availability

hghave: detect subversion client and admin tools availability

hghave: wrap command output matching

run-tests: append PYTHONPATH instead of overwriting it Optional dependencies like svn bindings not necessarily live in site-packages.

convert: svn: check for branch movement in any log entry, not just the first. This fixes, for example, r4151 D /branches A /project/branches (from /branches:4150) A /project/tags (from /tags:4150) A /project/trunk (from /trunk:4150) D /tags D /trunk

Merge with crew-stable.

Merge with crew-stable

Merge with crew-stable

Merge with crew-stable

Improve extdiff configuration. In addition to the old cmd.foo, opts.foo hgrc entries, allow a more simple alias = command [opts]... form. For example: [extdiff] cdiff = colordiff -uprN

cgi: sys.path.insert should be before importing mercurial thanks to R. Burke

merge with crew