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

When reverting a file which was renamed, also revert the old name

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.

correctly record file-level history when the local side renames a directory

Fix theoretical issue in filecommit. If the file was copied, we don't want to reuse the original entry. I think this is mostly a theoretical issue - when there are copies, fp1 == nullid, so it's very unlikely that the fl.cmp(fp1, t) would think the file was unmodified. In any case, if there was a copy, we should forcefully create a new entry.

Avoid adding to the changelog executable files added by the second parent. This was a regression introduced by b51a8138292a.

Merge with crew-stable

avoid double slash problem mentioned in issue695

clone: remove "file://" before making the path absolute This avoids writing bogus paths to .hgrc. Fixes issue695.

pull -u: if "url#rev" was given, update to rev

clone: if "url#rev" was given, update to rev

parseurl: also return the revision after the "#"; add a test

pull -r: pass the revisions as the heads argument of findincoming This can make a hg pull -r faster if the remote repo has many heads, and fixes an "abort: received changelog group is empty".

Merge with crew-stable

convert: fix /dev/null redirections under Windows

Merge with crew-stable

Test git repository conversion

hghave: detect git availability

convert: fix issue702 about GIT_DIR= construct unsupported under Windows.

convert: gitcmd wrapper for os.popen

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

improve error message for 'hg merge' when repo already at branchtip

imerge: add automerge flag to attempt to batch merge all conflicts