Merge with crew-stable

subrepo: make sure that the source path is stripped Test by Patrick Mézard <pmezard@gmail.com>

1.5 code freeze: merge default into stable

ui: add HGPLAIN environment variable for easier scripting If HGPLAIN is set, the following settings are ignored when read from hgrc files: - ui.debug - ui.fallbackencoding - ui.quiet - ui.traceback - ui.verbose - defaults.* Localization is also disabled. Equivalent options set via command line are honored.

tests: update help for add

progress: make determinate bar more like wget progress bar foo [ ] 0/58 foo [> ] 1/58 foo [=> ] 2/58 ... foo [=======================================================> ] 56/58 foo [========================================================> ] 57/58 foo [=========================================================>] 58/58 The bar now has a '>' character at the end. This indicates the direction, is consistent with the indeterminate '<=>' bar, and looks much nicer.

progress: simplify spacejoin()

check-code: two more rules - no plain Exceptions - complain about unmarked ui messages

progress: fix description

parsers: fix some signed comparison issues (spotted by Steve Borho)

commands: correct example in add help text

minirst: support line blocks

commands: add verbose example to help text for add

commands: support verbose help

minirst: report pruned container types

minirst: support containers Text can be grouped into generic containers in reStructuredText: .. container:: foo This is text inside a "foo" container. .. container:: bar This is nested inside two containers. The minirst parser now recognizes these containers. The containers are either pruned completely from the output (included all nested blocks) or they are simply un-indented. So if 'foo' and 'bar' containers are kept, the above example will result in: This is text inside a "foo" container. This is nested inside two containers. If only 'foo' containers are kept, we get: This is text inside a "foo" container. No output is made if only 'bar' containers are kept. This feature will come in handy for implementing different levels of help output (e.g., verbose and debug level help texts).

test-mq-qclone-http: hide port number

progress: only reset state if finishing progress for the current topic This prevents some visual glitches when doing a clone --pull locally.

shrink: use progress API

progress: correctly handle empty progress topic

util: add any() and all() functions for Python 2.4 compatibility This patch adds these two very useful functions to the mercurial.util module, because they are not present in Python 2.4.

merge with mpm

rebase: split line longer than 80 chars

progress: add progress calls to changeset discovery

Progress bar extension

verify: call ui.progress()

localrepo: provide indeterminate progress information while bundling

update: make calls to ui.progress()

localrepo: show indeterminate progress for incoming data This has some quirks, like showing progress bars for importing bundles, including during rebase.

Merge with crew-stable

convert: differentiate between IOError and OSError on commitctx() The IOError exception is overloaded to mean 'this file was deleted in the current commit'. Separate the code that handles IOError and file deletion from general OSError exceptions. The latter are real errors, but IOError is not always a throwable error. This solves the accidental marking of files as 'deleted' in commits that try to write for example in .hg/store/data revlogs that the current user has no permission to modify (a normal OSError that should abort the current commit). Changed by pmezard: use getattr() to be on the safe side.

test-mq-qclone: test --mq option

merge with crew

ui.progress: clarify termination requirement

relink: properly use the progress API

test-subrepo-svn: handle svn output changes gracefully

util: fix trailing whitespace found by check-code

ui: look before you leap on sys.stderr.closed (and look nicer) f83291e5643e introduced a fix if sys.stdout.closed does not exist. This change uses a getattr with default instead of hasattr (which just calls getattr) and accessing the attribute. Additionally it applies the same fix for sys.stderr.closed as this is not available in the bpython shell (reported by Roger Gammans).

Merge with stable

hgrc: update docs for the server section

localrepo: add optional validation (defaults to off) for incoming changes This verifies that all manifests are present for incoming changes, and all files for those manifests are also present. This is a simple first-pass, and could be better, but seems like a valuable thing to have, as I've seen pushes in the past that propagated revlog corruption.

branch: avoid using reserved tag names Reported as Debian bug #552423.

doc: add missing documentation for http_proxy.always

url: proxy handling, simplify and correctly deal with IPv6 Thanks to Henrik for testing.

streaming: actually change default

fix up a bunch of check-code warnings

check-code: import some pylint checks

ssl: fix compatibility with pre-2.6 Python