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