backout e7167007c083 This may have allowed unbounded I/O sizes with the current chunk retrieval code.

merge with crew-stable

revert: use term "uncommitted merge" in help text to make sure users can't possibly be mislead to try this for canceling a *merge changeset*.

histedit: use cmdutil.command decorator

hgweb: show help with verbose sections included This makes sure we see the same help info as with 'hg help <command> --verbose' on the command line, that is, with verbose sections included.

merge with crew-stable

update: mention how update can be used to cancel an uncommitted merge

update: move help text about parent revision higher up emphasizing how important the parent revision is

rollback: move examples and --force note in help into verbose section Plain 'hg help rollback' now looks like this: $ hg help rollback hg rollback roll back the last transaction (dangerous) This command should be used with care. There is only one level of rollback, and there is no way to undo a rollback. It will also restore the dirstate at the time of the last transaction, losing any dirstate changes since that time. This command does not alter the working directory. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. This command is not intended for use on public repositories. Once changes are visible for pull by other users, rolling a transaction back locally is ineffective (someone else may already have pulled the changes). Furthermore, a race is possible with readers of the repository; for example an in-progress pull from the repository may fail if a rollback is performed. Returns 0 on success, 1 if no rollback data is available. options: -n --dry-run do not perform actions, just print output -f --force ignore safety measures --mq operate on patch repository use "hg -v help rollback" to show more info

rollback: split off command example paragraph in help

subrepo: add missing newline in Git warning message

merge with main

Merge

localrepo: make requirements and openerreqs mutable by subclasses This is necessary for extensions that need to modify a repo's requirements.

test-clone: load extensions before doing anything This makes it possible to run this test using "--extra-config-opt=extensions.myext=" and have the extension be loaded as intended.

test-clone: load extensions before doing anything This makes it possible to run this test using "--extra-config-opt=extensions.myext=" and have the extension be loaded as intended.