config: allow including other config files

showconfig: show source file and line with --debug

util: kill configparser wrapper

hgweb: use config.config

clone: config escaping no longer needed

Merge with stable

Merge with crew-stable

transplant: forbid transplant to nonempty repositories with no working directory. Partially undoes d3fb413667e5.

ui.isatty() accesses sys.stdin, causing mod_wsgi to throw IOError.

hg: allow hg.parseurl(url, None) In many places hg.parseurl is called with a url and "opts.get('rev')", suggesting the second, optional argument can be None. Because opts['rev'] usually defaults to [] this never happens in practice. However, extensions don't necessarily behave the same, but do copy this pattern. Also, include wider hg.parseurl tests, beyond a demonstration of the problem.

transplant: remove the restriction that the destination be nonempty. Test fixed by Patrick Mezard <pmezard@gmail.com>

Fix subversion convert not detecting empty changesets. Need to check for the empty as list as well as None.

cvsps: fix crash when log message refers to non-existent branch (issue1615).

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

localrepo: use sets in findcommonincoming

strutil: removed rsplit

notify: turned a set-like dict into a real set