tests: unify test-empty-group

merge with stable

convert: better grouping of command line flags in help We normally put related command line flags after one another.

convert: help string cleanups

convert: better quoting in help text

convert: show example splice, author, and branch map entries in help Also document that - empty lines are skipped and comment are supported in author map - whitespace is not allowed in branch map entries since we split on it when parsing the file

hgweb: support very simple caching model (issue1845)

tests: extend get-with-headers to support cache testing

tests: fix test output for test-hgweb-no* tests

tests: rename test for better grouping

check-code: fix ternary expression introduced in 1ef9b0b5efec

bisect: warn about ending on a merge with only one side marked

bisect: allow revsets in addition to single revs (issue2360)

subrepos: add function for iterating over ctx subrepos

subrepos: handle modified but uncommitted .hgsub

localrepo: check nested repos against working directory This checks against what is really in the filesystem, including subrepositories that have been added to .hgsub but not yet committed.

add: clarify that repo[None].add returns rejected filenames

merge with stable

store: Removed extra space in _data list

verify: fix "missing revlog!" errors for revlog format v0 and add test With revlog format v0 the .d files are empty if the only revision stored is an empty file. Since Mercurial can no longer create format v0 repositories, but still use it, add a script which creates a repository with a single empty file. This can be used in other tests if wanted.

zsh completion: bookmarks support

zsh completion: patchbomb support

diff: recurse into subrepositories with --subrepos/-S flag

status: recurse into subrepositories with --subrepos/-S flag

match: add narrowmatcher class This class can be used to adapt an existing match object to a new match object that only cares about paths within a certain subdirectory.

cmdutil: use repo.auditor when constructing match object This gives the repository control over which nested repository paths that should be allowed via the custom path auditor. Since paths into subrepositories are now allowed, dirstate.walk must now filter away more paths than before.

match: accept auditor argument This is used when normalizing filenames and patterns.

localrepo: add auditor attribute which knows about subrepos

tests: remove unneeded -u flags

merge with stable