Extend test-branchmap to test c51494c53841 (encoding fallback in branchmap to maintain compatibility with 1.3.x)

branchmap: fix defective fallback fix 0262bb59016f The fix applied as 0262bb59016f doesn't work and is essentially a no-op. This fix also adds a comment about the nature of the problem, and a test.

Merge with stable

alias: improve help text for command aliases Displays the line "alias for: hg ..." with the original command including options, followed by the command's original help text.

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

i18n-sv: synchronized with a40ec11795c3

i18n-pt_BR: synchronized with a40ec11795c3

merge: fix changectx.ancestor(workingctx) (issue1327)

hgweb: don't choke when an inexistent style is requested (issue1901)

pager: provide a default attend list The default list includes commands which normally print large amounts of text. This should be more user-friendly than paging all commands by default, which can be confusing when the pager swallows input prompts (with, e.g., record, merge, HTTP/SSH authentication, etc.)

Add missing bash_completion for qfinish

help: don't show extension list on extension help

convert/svn: fix HTTP detection bug introduced by 1b2516a547d4 The probe expected response is a 404 with content, and while urllib returns the response body in this case, urllib2 raises an HTTP error.

record: handle translated prompt correctly The prompt function would return 'y' or 'n' untranslated. This should therefore not be compared to _('y') and _('n'). However, it turns out that prompt could just as well return a good old Boolean.

doc/style: add orange border color to notes

hgrc.5: mark some words as inline literals

hgignore.5: fix typo

doc/style: fix typo in comment (by timeless)

doc/style: use default font color specified by user * it's bad to specify only foreground color: http://www.w3.org/QA/Tips/color * some people prefer dark background * `color: #111' is mostly the same as `color: black', which is the default of almost all popular browsers. so it's preferable to delete `color: #111', rather than adding `background-color: white'.

help: improve wording of update help text

hgrc.5: oft-requested "hg update" hook example

convert/svn: delegate to svn bindings if HTTP probe fails convert extension tries to guess the remote repository type with HTTP probes. Unfortunately, it does not handle authentication or HTTPS handshakes, so regular svn repositories may be excluded. Instead, when a non-404 error is retrieved, we keep trying with the svn bindings. The drawback is missing svn bindings will make the conversion to fail even for non-svn targets. This can be avoided with --source.

test-rebase-newancestor: make executable

mdiff: fix diff -b/B/w on mixed whitespace hunks (issue127) Previous code was computing hunks then checking if these hunks could be ignored when taking whitespace/blank-lines options in accounts. This approach is simple but fails with hunks containing both whitespace and non-whitespace changes, the whole hunk is emitted while it can be mostly made of whitespace. The new version normalize the whitespaces before hunk generation, and test for blank-lines afterwards.

contrib/perf: profile diff of working directory changes

dispatch: better error message for --config option

mq: fix literal blocks in docstrings

convert/mtn: handle change in mtn 0.45 certs output

merge with crew

bundle: add test for Issue1704 Original version by Greg Ward.

bundle: don't send too many changesets (Issue1704) The fast path in changegroupsubset can send too many csets. This happens because it uses the parents of all bases as common nodes and then goes forward from this again. If a base has a parent that has another child, which is -not- a base, then this other child will nevertheless end up in the changegroup. The fix is to not use findmissing(), but use nodesbetween() instead, as do the slow path and incoming/outgoing. The change to test-notify.out is correct, because it actually hits this bug, as can be seen by glog'ing the two repos: @ 22c88 |\ | o 0a184 | | o | 0647d |/ o cb9a9 and o 0647d | @ cb9a9 It used to pull 0647d again, which is unnecessary.