setup: fix f51d1822d6fd refactoring, propagate env to runcmd

clone: simplify help text

Merge with main

i18n-zh: updated Chinese translation

i18n-da: synchronized with 6cb1808e5ae7

test-extension: Solaris grep don't know [[:digit:]]

merge with hg-stable

fix test-patchbomb on solaris

fix test-diffstat on solaris

doc: uppercase first letter in HTML man pages

Merge with crew

merge with crew

merge with stable

doc: styles for man page, which suit with the mercurial website designed loosely based on: http://mercurial.selenic.com/css/styles.css with some modifications by intention: * visited links are colored differently * no fixed size * works without typeface.js we keep most styles, which is from docutils, untouched. tested with: * MSIE 6.0 on Windows * Firefox 3.5 on Linux

rst2man: more robust uppercasing of section titles This handles section titles with child elements such as emphasis or inline literals.

doc: use titlecase in man page section titles

rst2man: automatically write sections in uppercase Man pages have uppercased section titles but other formats do not. Letting rst2man handle the tranformation allows better reuse of text between man pages and other formats.

relink: do not translate format string with no text

Use utf-8 encoding in test-branchmap's clone call After 75520c24feda it is printed in local encoding, i.e. "C" if not set otherwise.

Branch name printed since a3d73b3e1f8a now in local encoding.

Make test-branchmap executable and adjust output after a3d73b3e1f8a

ui: refer to "hg help config" when no username is set

help: add "hg help config" topic This is a condensed version of the first two sections of hgrc.5.txt. After a slight upgrade of minirst, we can move the whole of hgrc.5.txt into the config help topic and just let the man page include it.

hgrc.5: do not mention "name: value" syntax This was supported in versions prior to 1.3 where we used the standard Python ConfigParser. The new config parser never supported it.

submerge: properly deal with overwrites also pull .hgsubstate check out of inner loop

subrepo: add more debugging output, lose _ markers

subrepo: do a linear update when appropriate

subrepo: notice dirty subrepo states when merging

subrepo: add some debug output to submerge

Merge with i18n

i18n-sv: add missing newlines to translations

i18n-sv: simple translation fixes Fixed the fuzzy translations. Also took care of a few really simple strings, and translated the 'summary' command.

i18n-de: Update msgids, remove .txt linespecs + few small translations

i18n-pt_BR: synchronized with d942e06d7b14

Merge with main

i18n-da: synchronized with e06c940d554d plus some new translations

i18n-pt_BR: synchronized with e06c940d554d

i18n-zh_TW: synchronized with e06c940d554d

i18n-zh_CN: synchronized with e06c940d554d

i18n-sv: synchronized with e06c940d554d

i18n-ja: synchronized with e06c940d554d

i18n-it: synchronized with e06c940d554d

i18n-fr: synchronized with e06c940d554d

i18n-el: synchronized with e06c940d554d

Merge with main

i18n-da: synchronized

i18n-pt_BR: translate 'changeset' like 'revision' On Mercurial, 'changeset' and 'revision' may be used interchangeably, but the first is more or less untranslatable to a single word.

i18n: merge de and pt_BR translations

i18n-de: fixed inline emphasis The test-gendoc test said: gendoc-de.txt:1385: (WARNING/2) Inline emphasis start-string without end-string

i18n-pt_BR: fixed bullet list The test-gendoc test said: gendoc-pt_BR.txt:1475: (WARNING/2) Bullet list ends without a blank line; unexpected unindent.

i18n-pt_BR: synchronized with fc493cb90bb1

i18n-pt_BR: synchronized with 5287de171d74

i18n-de: Removed all fuzzies and translated small alphaend-extensions

i18n-pt_BR: synchronized with 02c43e8e0835

Fix up import test

subrepo: more robust split for .hgsubstate parsing

filectx: shortcut unrelated files in ancestor() (issue1327)

merge: first part of fix for issue1327 When there are no renames involved, we shortcut to the changeset ancestor. This resolves most cases. Note that Mercurial's rename philosophy elsewhere is that a file's name is signficant and rename data is only consulted when a file of the same name is absent.

Related to Issue919: ui.progress, apparently unused before now, is busted.

Sometimes pushing to an HTTP repo fails with a useless message. abort: 'https://.../.../' does not appear to be an hg repository! Ought to produce a better diagnostics on the client. With patched 1.3.1, observed to produce an Apache HTML error message (from cgitb) including the vital text: File ".../hgwebdir.cgi", line 70, in ? wsgicgi.launch(application) File "mercurial/hgweb/wsgicgi.py", line 68, in launch File "mercurial/hgweb/hgwebdir_mod.py", line 91, in __call__ File "mercurial/hgweb/hgwebdir_mod.py", line 148, in run_wsgi File "mercurial/hgweb/hgweb_mod.py", line 100, in run_wsgi File "mercurial/hgweb/protocol.py", line 156, in unbundle File "mercurial/localrepo.py", line 2031, in addchangegroup File "mercurial/revlog.py", line 1204, in addgroup LookupError: 00manifest.i@......: unknown parent Might also be helpful if server's hgweb_mod.run_wsgi caught unexpected errors and returned a well-formed error response including the stack trace. The client patch would still be useful in this case, because it would let you diagnose issues with HTTP proxy servers and so on.