dispatch: minor refactoring Renamed local variable i to entry in _dispatch.

qseries: don't truncate the patch name (issue1912) Instead of truncating the entire output line of `qseries', only the summary is truncated.

summary: note non-default branches with -q

Add stable branch

Added signature for changeset 31ec469f9b55

Added tag 1.4 for changeset 31ec469f9b55

i18n-ja: fixed bad indentation

Merge with crew

Allow import --no-commit over an applied MQ patch. Since it only changes the working directory, it does not matter whether a patch is applied. This change makes it easier to use hg import --no-commit instead of patch.

Merge with i18n

i18n-pt_BR: synchronized with crew 9c43089b372a

i18n-de: messages for 9e7b2c49d25d and translation of patchbomb

i18n-pt_BR: messages for 9e7b2c49d25d and cleanup

i18n-ja: synchronized with 004bf1d6e6af

support encoding fallback in branchmap to maintain compatibility with 1.3.x

convert/svn: fix warning when repo detection failed

inotify: workaround test-inotify-dirty-dirstate failures - disable inotify during clone - record inotify daemon PID, in order to have them properly killed

lock: the correct way to do a trylock() is to use a timeout of 0

diff: change --inverse to --reverse This fixes an incompatibility with patch(1), which also uses --reverse for reversed diffs. The --inverse flag was added in 3f522d2fa633. That name was chosen over --reverse since it was thought that --reverse would make --rev ambiguous. It turns out that both flags can co-exist, with the cost that --rev can no longer be shortened to --r and --re. Since one can always use the short -r option, this is not a real problem.

setup: pass LD_LIBRARY_PATH to subprocess when determining version.

inotify: Do not access inotify when dirstate is dirty (issue1811) Original patch was provided by Simon Heimberg It delegates dirstate computation to dirstate.status when dirstate is dirty: better be slow from time to time instead of using wrong data. This solves issue1719. As the last component, issue1810, is still not solved, test-inotify-dirty-dirstate will fail for now. It emphasizes a regression due to 7c01599dd340: changeset: 9515:7c01599dd340 user: Nicolas Dumazet <nicdumz.commits@gmail.com> date: Sun Aug 16 11:11:37 2009 +0900 summary: inotify: use cmdutil.service instead of local daemonizing code Ancestors of 7c01599dd30 are passing the test, when applied this patch. Regression has to be investigated, but this patch is important since it affects often mq operations.

inotify: mark directories visited during lookup (issue1844) Emulate the match.dir calls that are made in dirstate.walk: * first mark the visited directories on the server side * then extend the transmitted response to include this directory list * and lastly call match.dir on each directory

Merge with crew-stable

url: generalise HTTPS proxy handling to accomodate Python changes Python 2.6.3 introduced HTTPS proxy tunnelling in a way that interferes with the way HTTPS proxying is handled in Mercurial. This fix generalises it to work on Python 2.4 to 2.6.

Make it possible to debug failed hook imports via use of --traceback Prior to this change, if a Python hook module failed to load (e.g. due to an import error or path problem), it was impossible to figure out why the error occurred, because the ImportErrors that got raised were caught but never displayed. If run with --traceback or ui.traceback=True, hg now prints tracebacks of both of the ImportError instances that get raised before it bails.

Merge with i18n

i18n-pt_BR: synchronized with crew d3dbdca92458 messages for a40ec11795c3 still included

i18n-da: translate parentrevspec and record

i18n-da: translations in color, graphlog, mq

i18n-da: synchronized with a40ec11795c3