gendoc: do not wrap encoded string - it breaks multi-byte characters - it is not needed since Docutils will take care of wrapping the strings as necessary

test-encoding: make test output easier to follow

Merge with crew-stable

test-extension: update test output to match a4f6e4427b65

util: do not corrupt multi-byte characters in wrap

push: fix subtle bug in prepush logic A test case demonstrating the bug has been added. Contributed by Henrik Stuart and Sune Foldager.

color: mark --no-color as deprecated (--color=never has the same effect) This should've been marked deprecated when --color was first introduced, but it was something I overlooked.

mention overlay bundle file in global --repository option see http://mercurial.selenic.com/wiki/LookingIntoBundles Drop mentioning symbolic path names for the sake of brevity. This is a common feature of path options anyway.

merge with crew-stable

localrepo: fix bugs in branchheads and add docstring - The call to reverse() reversed the list in place in the global branchmap. - The nodesbetween function doesn't preserve ordering.

convert: fix marshalling in P4 convert extension to use a binary stream The Perforce convert extension uses the p4 -G command line option and marshal.load to obtain information about the history of a Perforce depot. The method marshal.load must be provided with a binary stream (mode='rb') in order to function reliably. Certain changelist descriptions or other elements in a depot history could trigger a premature EOFError, causing the conversion process to fail. This may resolve the issue discussed in the following thread: http://www.selenic.com/pipermail/mercurial/2009-July/026813.html

merge with mpm

convert/cvs: update debugcvsps documentation

Merge with crew-stable

dispatch: catch ConfigError while constructing ui

config: abort on indented non-continuation lines (issue1829) Previously, as soon as a continuation would be met, "cont" would stay forever set to True, but "item" was set back to "None". This caused the continuation code bits to run every time, until the next "self.get(section, item) + '\n'" which would crash.

hg: say 'hg update' instead of 'hg up' in merge status message Includes the change to the message itself, along with several test output files that also had to change.

do not attempt to translate ui.debug output

Merge with crew-stable (again) I had pulled 661bc51f09b7 into my local clone and accidentially rebased it after pulling a new changeset from crew.

win32mbcs: util.normpath should be wrapped. It is because util.normpath() finally calls windows.pconvert() which is not wrapped (by changeset:25c41ddb3978).

Merge with crew-stable

win32mbcs: util.normpath should be wrapped. It is because util.normpath() finally calls windows.pconvert() which is not wrapped (by changeset:25c41ddb3978).

test-keyword: run kwdemo before setting up [keyword] files kwdemo would pass the test without uisetup otherwise. Also no need to specify --default option.

record: remove superfluous space

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>

Merge with crew-stable

merge: exclude common ancestor from --preview (issue1818)