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.

allow committing a removed directory fix issue1089

notify: fix diffstat printing notify.diff() keeps line breaks in the diff buffer before calling patch.diffstat(). patch.diffstat() however adds another line break when feeding diffstat input. The added extra empty line leads to erroneous diffstat output. This fix removes the line breaks in notify.diff() and adds it back to print them.

merge with crew

make normalize() work when cwd != repo.root

convert: document source and sink identifiers, fix error message

Fix normalize fail on non-lowercase filename (Issue1273) regression introduced in 1e2850ed8171

fix changegroup.notify hook broken by fb42030d79d6

dirstate: explain why appending instead of os.path.join() is safe

performance: normalize self._root, avoid calling os.path.join() in dirstate In dirstate, self._join() might get called a lot. Instead of calling it we create self._rootdir and we then only need to append the filename.