convert: wrap docstrings at 70 characters

color: wrap docstrings at 70 characters

churn: wrap docstrings at 70 characters

children: wrap docstrings at 70 characters

bugzilla: wrap docstrings at 70 characters

bookmarks: wrap docstrings at 70 characters

acl: wrap docstrings at 70 characters

commands: wrap docstrings at 70 characters It is no longer necessary to wrap the docstrings at 70 characters in the source -- with the reST parser, they are re-formatted to fit the terminal when shown. However, wrapping the docstrings at 78 characters makes life harder for translators because it marks a lot of strings as fuzzy for no good reason. When un-marking them, the translators would have to examine each string again and determine if it is merely re-wrapped or if the content was also changed. The long lines also introduce very ugly linebreaks in the .po files if they are processed using the standard Gettext tools without using something like '--width 85' all the time.

Merge with crew

Merge with stable

email: Catch exceptions during send. Catch SMTPlib exceptions to avoid mercurial showing a backtrace during an e.g. authentication error.

update: make a naked except more specific (issue1766)

tests/hghave: bzr114 checks for bzr >= 1.14 Everything but the implementation indicated that bzr114 also should be true for "or higher".

fix issue 1763: strip chars from end of line when parsing gitpatch lines

issue1251: bail if darcs version is too old

Merge with crew-stable

gendoc: don't translate topic strings twice (issue1760)

dirstate: fold paths using the just added util.realpath() function. Using the one true canonical path of a directory entry allows equivalent paths to be treated gracefully. Equivalent means, in this case, differing directory entries resulting in the same, unique file system link to a file.

util: add realpath() for getting the 'true' path. The function is implemented for Mac OS X using the F_GETPATH fcntl, and a basic implementation for Windows is provided as well. On other POSIX systems, vanilla os.path.realpath() is used.

bookmarks: optimize update routine in case track.current is set

bookmarks: Teach addchangset to respect track.current addchangeset didn't respect track.current, resulting in hg pull to forward all bookmarks although track.current is set to True. Reported by Christos Trochalakis.

bookmarks: Wrap commictx instead of commit (issue 1515)

Merge with stable

Merge with i18n

i18n-de: fix indention

i18n-da: switch back to "rettelse" for "patch"

i18n-da: updates in gpg, highlight, inotify, and mq

i18n-da: synchronized with 78e54b9f3a62

i18n-fr: synchronized with 78e54b9f3a62

i18n-fr: translations for dispatch.py

i18n-fr: translation of various core messages

i18n-fr: translation for the archive command

i18n-fr: translation of bisect

i18n-pt_BR: synchronized with 78e54b9f3a62

merge with stable

i18n-pt_BR: synchronized with 196d40e7c885 (1.3)

transaction: document close(), abort() methods

merge with crew-stable

zeroconf: use reST syntax for literal blocks

win32text: use reST syntax for literal blocks

win32mbcs: fix formatting of lists with proper reST markup

purge: fix formatting of lists with proper reST markup

patchbomb: use reST syntax for literal blocks

parentrevspec: change list to a literal block

pager: use reST syntax for literal blocks

interhg: use reST syntax for literal block

highlight: use reST syntax for literal block

hgk: use reST syntax for literal blocks

hgcia: use reST syntax for literal block

extdiff: use reST syntax for literal block

color: use reST syntax for literal block

churn: use reST syntax for literal blocks

bugzilla: wrap example template line

bugzilla: reformat list of configuration options

bookmarks: use reST syntax for literal block

acl: use reST syntax for literal blocks