restructure helptable When looking up a help topic, the key is now only matched against the short names for each topic, and not the header. So hg help 'Environment Variables' must be replaced with hg help env

Do not try to load extensions twice (issue811)

enhance the error output in case of failure during http push

tag: without a checkout, base the tag changeset on tip instead of nullid issue916

use Exception(args)-style raising consistently (py3k compatibility)

fetch: added support for named branches Previously, fetch didn't really work when there were multiple named branches in the repository. Now it tries to do the right thing(tm) in all situations.

branch: added more support for named branches hg branch now has a -C (--clean) option, to reset the current (dirstate) branch to the branch of the last commit (first parent).

do not pretend to lock static-http repositories (issue994)

c0bd7d8b69ef uses err() instead of warn() but prototype doesn't match we might want to make warn() look more like err() in the future to avoid this kind of problem.

i18n: mark command line for translation

i18n, mq: mark command line options for translation

i18n, imerge: mark command line for translation

i18n, hgk: mark command line options for translation

i18n, convert: mark command line options for translation

merge with -stable

inotify: workaround ENAMETOOLONG by using symlinks If we can't create the unix socket because the path is too long we create the socket in a temporary directory and symlink it into the repo. Fix issue1208

inotify: deactivate inotify status on failure workaround issue1208, add test fix traceback handling (socket.error is a singleton in this case)

inotify: fix traceback when the server has been already started

Use relative imports in inotify.server. Fixes an import failure I was getting under hgtk and hgweb: *** failed to import extension inotify: 'module' object has no attribute 'inotify'

a socket error might be a tuple or a singleton

merge with crew

merge with -stable

fix test-bisect error (because of set -e)

store: pathjoiner default value is os.path.join

Fix for Issue1260

highlight: only pygmentize for HTML mimetypes For non-html mimetypes it doesn't make much sense. This also fixes the issue that highlight unconditionally adds a <link/> tag for its CSS to the template's header (which is pointless in text/plain output).

merge with crew

show extensions loaded on traceback

merge with crew-stable

bisect: only complain when nothing can be done

imported patch test-check

hgweb: Serve raw non-binary files as text/plain Previously these were served as application/octet-stream usually making browsers download them as files though they can be displayed inline just fine. This is useful to refer to e.g. /project/raw-file/tip/README.