Backed out changeset 3d54cf97598d (see issue916 for details)

i18n, record: improve use of translated docstring in prompts The old code would confuse the user if the translator actually translated the letters "Ynsfdaq?" in the prompt, since the user input would be matched against the English string, despite the translation. The new code fixes this, but the translator must be 100% consistent. Also, the translation of single character strings is problematic if they are used differently by different pieces of code.

i18n: use gettext instead of _ Both gettext and _ trigger a translation at runtime, but _ can only be used with a string argument since it also triggers string extraction.

i18n: mark help strings for translation The gettext function is just another name for the normal _ function and it is used for translating docstrings when using _ would make pygettext.py output a warning.

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