inotify: server: move split() out of server split() has nothing to do with the server logic, it does not need to be in the class. Move it on top, next to join() which does the opposite.

inotify: remove unused variables

atomictempfile: fix exception in __del__ if mktempcopy fails (self._fp is None) Make what is going on more obvious by explicitely getting the 'closed' attribute from _fp, instead of from the gettatr proxy.

Merge with crew-stable

bzr convert: restore paths to source encoding. Closes issue1692.

doc: wrap man pages after fixing quoting

hgrc.5: fix quoting of literal strings The quotes would go wrong in many places due to differences between asciidoc version 8.2.7 used by Benoit and 8.4.5 used by me. Between those versions asciidoc stopped interpreting the content of `quoted strings`, and so `*` would start bold text in the old version, but do nothing in the new version. To complicate things further, `\*` would escape the bold tag in the old version, but in the new version the backslash was inserted literally into the output (because the backtick quotes it). I've now replaced backticks with non-quoting plusses and escaped backslashes as appropriate.

hgignore.5: remove extra quotes The so-called "unconstrained quotes" didn't really work, so I reverted them to normal quotes. Tested with asciidoc version 8.2.7 and 8.4.5.

Improve English for help text of many core hg commands. co-author: Greg Ward <greg-hg@gerg.ca>

use new style classes

doc: correctly escape *

doc: correctly escape *

hg.1: highlight references to commands and man pages

hg.1: simplify synopsis Now that arguments can be mixed with options we can simplify the synopsis considerably. Also, highlighting the command name in bold (instead of italics) seem to be the standard convention.

hgrc.5: spell check

man pages: add meta data This removes the fixme's that were otherwise inserted.

man pages: updated copyright years

hgrc.5: use NOTE admonition paragraph

hgrc.5: reformatted to avoid big chunks of monospaced text The man page used to have lines longer than 80 characters, even though all lines in the hgrc.5.txt file were wrapped nicely. The problem turned out to be that the indented paragraphs started literal blocks instead of normal paragraphs. The literal blocks were of course not wrapped when displayed by man. In short, the asciidoc rules require lists to be formatted like this: foo:: Some description of foo. + Another paragraph in the description of foo. It *must* start flush left and the plus is necessary to indicate that this is a list item continuation. Lists with nested lists can be formatted correctly using something called "open blocks". These blocks are used to group the list items and are marked by a line above and below with two dashes. See the asciidoc user guide for the gory details...

hgrc.5: mark filename patterns as monospaced text

hgrc.5: single quotes means italic in asciidoc Use double quotes instead and mark the * as monospaced text.

man pages: mark filenames and env vars as fixed text

test-convert-svn-*: no longer need the url building code

convert: default to file protocol when no :// found for svn repo url Edited by pmezard: add path separator normalization

keyword: improve English

bookmarks: improve English

Generally replace "file name" with "filename" in help and comments.

Spell Mercurial as a proper noun

win32text: drop disabling portion of test disabling extension leaves dirstate confused about whether affected files are clean or not, not much point testing it.

i18n-de: Synchronised with hg.pot translated by Fabian Kreutz <fabian.kreutz@qvantel.com> Tobias Bell <tobias.bell@gmail.com>