cvsps: add test for merge detection (issue1615). Currently only testing convert.cvsps.mergefrom; this script should also probably test convert.cvsps.mergeto.

convert/cvs: add an option to disable remote log caching Useful for debugging or testing when using --tmpdir.

tests: removed redundant "-u test" from test scripts The tests are executed with a .hgrc file which adds "-u test" by default.

tests: removed redundant "-d '0 0'" from test scripts The tests are executed with a .hgrc file which adds "-d '0 0'" by default.

Merge with crew-stable

convert/bzr: make it work with filemaps (issue1631) The bzr converter maintains a child -> parents mapping and drop entries whenever a child is read. It does not work with filemaps, getchangedfiles() may be called more than once when filtered files belong to merge revisions. getchanges() still works that way but it is not clear whether a similar issue can arise when interacting with merges.

verify: combine sets instead of concatenating lists

rebase, revlog: use set(x) instead of set(x.keys()) The latter is both unnecessary and slower.

monoblue: Fix indentation and other styling in the annotation view.

run-tests: cosmetics

patchbomb: add user agent header to mails

help: document stripdir template filter

templatefilters: add new stripdir filter Adds a new template filter for removing directory levels from a string. Examples: {foo|stripdir} -> 'foo' {foo/bar|stripdir} -> 'foo' {foo/bar/more|stripdir} -> 'foo/bar' {foo/bar/more|stripdir|stripdir} -> 'foo'

context: use Python 2.4 decorator syntax