patchbomb: show prompt and selection in non-interactive mode Akin to 01ada7b1861d for the custom patchbomb prompt.

patchbomb: use ui.promptchoice for diffstat to allow localization of choices The extra check for ui.interacive from patchbomb's prompt function is not needed here. Format boolean prompt as in filemerge.py.

tests: unify test-issue*

tests: unify test-globalopts

tests: unify test-git-*

tests: unify test-filebranch

tests: unify test-extension

tests: unify test-execute-bit

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

tests: unify test-empty-file

tests: unify test-empty-dir

tests: unify test-dispatch

tests: remove unneeded -d flags Many tests fixed the commit date of their changesets at '1000000 0' or similar. However testing with "Mon Jan 12 13:46:40 1970 +0000" is not better than testing with "Thu Jan 01 00:00:00 1970 +0000", which is the default run-tests.py installs. Removing the unnecessary flag removes some clutter and will hopefully make it clearer what the tests are really trying to test. Some tests did not even change their output when the dates were changed, in which case the -d flag was truly irrelevant. Dates used in sequence (such as '0 0', '1 0', etc...) were left alone since they may make the test easier to understand.

test-merge5: removed unnecessary parts of test - no need to initialize a new directory - no need to fix the commit time, already done by run-tests - no need to exit 0, use exit code from hg instead - better spacing around comments

test-merge5: ensure updating to tip across branches is tested When doing "hg update" across branches (without any revision specified), hg will abort and ask the user to merge or do hg update -c. This tests for that error.

test-convert-cvs: add a sleep to make test more stable The recent addition of fuzzy tests introduced a new cvs commit which sometimes fails. This adds a sleep to make sure that cvs notices that the file has changed, similar to how it is done in other tests.

merge with stable

tests: unify test-diff-binary-file

tests: unify test-diff-copy-depth

tests: unify test-diff-upgrade

tests: unify test-convert-hg-startrev.

tests: unify test-diffstat

bookmarks: break long line found by check-code

help: make "hg help hgrc" an alias for "hg help config"

clone, patch, convert: use hex(nullid) instead of '0'*40

tests: unify test-diff-newlines

merge with stable

tests: unify test-diff-unified

tests: unify test-diff-subdir

tests: unify test-diff-reverse

tests: unify test-diff-ignore-whitespace

tests: unify test-diff-hashes

tests: unify test-diff-change

test-serve: ensure KILLQUIETLY is only used once 49463314c24f introduced a feature to the hgserve() function that suppresses errors from kill(1). It wrongly assumed that setting an environment variable when calling a function would make it local to the function. It ended up suppressing kill errors for every call thereafter. This patch sets KILLQUIETLY=N after use.

dagparser: translate and lowercase error messages

match: mark error messages for translation

debugindex(dot): try to access filelogs through repo, if possible If a repository is accesible, first treat the filename as a working copy file and try to open its filelog. Fallback to opening the file directly as a revlog, as before.

debugdata: try to access filelogs through repo, if possible If a repository is accesible, first treat the filename as a working copy file and try to open its filelog. Fallback to opening the file directly as a revlog, as before.

merge with stable

remove: properly set return code when warnings are issued This removes the warn() function in favor of issuing warnings directly for each kind of file that Mercurial won't remove. This also uses three separate translatable strings instead of using string formatting to build the message. This should make it easier to localize.

pull: lowercase error message

commit: sort subrepos before committing for stable test output

tests: unify test-interhg

test-custom-filter: heredoc is not required for single line operations

tests: unify test-custom-filters

tests: unify test-parse-date

tests: unify test-purge

tests: unify test-rebuildstate

tests: unify test-up-local-change

tests: unify test-impexp-branch

tests: unify test-incoming-outgoing

tests: unify test-resolve

tests: unify test-requires

tests: unify test-relink

tests: merge the two test-rename-dir-merge* into one

tests: unify test-rename-dir-merge2

tests: unify test-rename-dir-merge

tests: unify test-revert-unknown

tests: unify test-revert-flags

tests: remove useless sed in test-hgrc

tests: mq-safety: use regular expression instead of sed

tests: use regular expression instead of sed in test-subrepo-deep-nested-change

tests: unify test-revert

util: get rid of extra trailing whitespace in parsedate abort message

tests: unify test-revset

test-revset: remove trailing whitespaces

test-keyword: use regular expressions instead of grepping

tests: remove useless grep -v in test-mq.t

tests: unify test-remove-new

tests: unify test-remove

tests: unify test-rename

tests: unify test-strict

tests: unify test-inherit-mode

tests: unify test-churn

tests: convert test-bisect

alias: on --debug, print expansion when it has invalid arguments

alias: print what command is being shadowed in debug message

merge with stable

mail: use standard section.entry format in error message

color: accept usual boolean values as synonyms for always and never

parsebool: accept always as true and never as false

parsebool: create new function and use it for config parsing

util: clean up trailing whitespace

Consistently import foo as foomod when foo to avoid shadowing This is in the style of 5f091fc1bab7.

Merge with stable

help: refer to user configuration file more consistently Currently, a number of commands and help topics mention the user hgrc file in different ways. Among these are following: 1. .hgrc - "please specify your commit editor/username in your .hgrc file", bookmarks, color, hgk, pager, hg help environment 2. $HOME/.hgrc - hg help paths, hgrc(5), hg(1) 3. ~/.hgrc - hgrc(5) In addition to being inconsistent, none of these make sense on Windows. This patch replaces the above with a more general term of "[your] configuration file".

tests: unify test-config-case

win32: add hgweb scripts to Inno Setup installer

win32: add Emacs scripts to Inno Setup installer

path_auditor: delegate checking of nested repos to a callback

util: use 'auditor' as consistent name for path auditors