contrib/bash_completion: add tab completion for some bookmark commands

bookmarks: support --quiet

demandimport: blacklist gtk Demandimport breaks gtk. You get a meaningless error about 'failed loading gobject\_gobject.pyd'. Mercurial does not use gtk, but this trips up many extension writers.

convert: disable SVN support due to library license incompatibility

Merge with crew-stable

Merge with main

hg: avoid combining translated strings Combining translated string fragments into bigger strings is bad practice because it removes context from the fragments. The translator sees the fragments in isolation and might not jump back to the source to see how a string like "%d files %s" is actually used.

merge with mpm (temporarily undo qprev/qnext/qtop removal)

Merge with crew-stable

commands: expand -c and -C in update error message

commands: forbid 'hg update --check --clean'

Merge with stable

windows: provide filename in IOError exceptions This brings the Windows posixfile errors in line with the errors on other platforms.

Merge with crew

test-gendoc: test documentation generation

doc/Makefile: make rst2html and rst2man halt on warnings

doc/Makefile: do not create files in case of errors When stdout is redirected to the target file directly, the file is created as an empty file even when an error occurs. Since the file is there, 'make' wont try to re-create it in subsequent runs. This fix is similar to the one in a6747ba27d22, but it also takes care of rst2html and gendoc.py.

Merge with crew-stable

zeroconf: fix hgweb published URLs (issue1819)

win32mbcs: wrap util.pconvert, not windows.pconvert (issue1828)

Merge qprev/qnext backout

Backed out premature qprev/qnext removal

Add new flag [-1] to synopsis of qapplied/qunapplied

Improve some docstrings relating to changegroups and prepush().

improve code readability

Merge with crew-stable

test-convert-git: Use ~ instead of ^ Solaris sh interprets ^ as pipe symbol and the test thus failed in strange ways. git can however use of HEAD~ instead of HEAD^.

transplant: Add trailing LF in tmp file for filtering Transplant filtering used a tmp file ending with the (stripped) commit message and thus no final LF. Text files not ending with LF is usually not used on Unix and is thus wrong ;-) The missing LF had bad consequences because Solaris sed chokes on unterminated input lines, so echo -n foo|sed 's,o,0,g' doesn't output anything, and the filter used in tests/test-transplant thus stripped the last (and only) line in the message away on solaris.

Merge with crew-stable

convert: fix history topology when using hg.tagsbranch When using hg.tagsbranch, all conversions fail at transcribing the source repo topology with conversion scenarios interleaving: - initial repo conversion, - then upstream tag - then later incremental conversion The problem is caused by the usage of the last source revid as source revid for the tagnode in the revision map. On a later incremental conversion, when resolving some child commit of the true last source revid, convert will parent the nodes to the tag node. If using tagsbranch you get a bad topology where all incremental commit nodes end up in the tag branch. Analysis and test by Edouard Gomez <ed.gomez@free.fr>