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

transplant: better reST formatting

Merge with crew-stable

coding style: use a space after comma I left a cases like 'lambda x,y:' alone -- the lack of a space does not bother me as much when the variables are single letters.

commands: remove ineffective parenthesis

merge with crew-stable

keyword: reformat kwfiles help for minirst parser

hgignore.5: mark file names and cmdline options as literal text

merge with crew-stable

Added signature for changeset 3ef6c14a1e8e

Added tag 1.3.1 for changeset 3ef6c14a1e8e

keyword: argument to "kwdemo --rcfile" must be string (bugfix)

heads: more clarity for --closed

Merge with crew-stable

update: allow -c to jump branches if clean

subrepo: use '/' for joining non-local paths

fetch: drop force arg for commit (issue1752) This appears to be unneeded and forces fetch commits to examine clean files.

Fix issue1679: path reconstruction in hgwebdir was mangling things badly

do not translate commit messages It is not very helpful to have 'Added tag %s for changeset %s' and similar messages translated into different languages when people work together using different locales. We now use English strings without support for translations. If needed, the user can still supply a custom string for most commands.

hgignore.5: expanded description - explain that .hgignore must be created manually - hint that it is typically put under revision control

Merge with stable