Added support for 'pretxncommit', so that one can call the ACL hook at pre-commit time too. This is useful because now it's possible to avoid violating ACL permissions much sooner, at commit time, instead of waiting for a PUSH to check if there were any invalid commits.

subrepo: fix repo root path handling in svn subrepo

remoteui: copy http_proxy settings http_proxy settings of current repo's .hg/hgrc should be available on remoteui, so that the httprepo can use them when pulling via http.

dispatch: ignore if signals can not be set This happens if the code is executed in a thread. This patch allows tortoisehg to start the inotify server again.

hgweb: fix attribute error in error response (issue2060)

cvs: skip bad tags If the CVS repo somehow has a symbolic name that references a revision consisting of a single number (e.g. BAD_TAG: 1), convert will fail when attempting to find the branches, preventing the initial import from working. This patch skips those symbolic names--without warning.

document missing template variables

diffstat: use ui.plain() instead of ui.interactive() Previously, a default width of 80 is used for non-interactive sessions. This behaviour was introduced before HGPLAIN was supported.

mq: Remove -f from qnew command syntax. In 1ebba857b371 the -f option was not completely removed from the help message.

mq: toggle truncating using ui.plain() rather than ui.interactive() This enables truncated messages when using `qseries' with the `pager' extension.

merge with stable

filemerge: use working dir parent as ancestor for backward wdir merge I checked the tests, they were bogus in the first place

merge with stable

filectx: _fileid isn't normalized, use _filenode instead _fileid can be anything the lookup accepts (hex(node), node, rev, etc.), we should use something stable for comparisons (like _filenode).

Merge with stable