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

util: add optional path auditor argument to canonpath The canonpath function will default to creating its own path auditor, but in some cases it will be useful to use a specialized auditor, e.g., one that wont abort if a path lies within a subrepository.

mail/hgweb: support service names for ports (issue2350) This adds util.getport(port) which tries to parse port as an int, and failing that, looks it up using socket.getservbyname(). Thus, the following will work: [smtp] port = submission [web] port = http This does not apply to ports in URLs used in clone, pull, etc.

tests: unify test-qrecord

tests: unify test-record

tests: unify test-help

tests: unify test-bheads

tests: unify test-lock-badness

Merge with stable

churn: do not crash on malformed lines in alias file

churn: do not crash on empty lines in alias file

Lowercase error messages

localrepo: introduce method for explicit branch cache update Currently, localrepo.branchtags() is called in two locations to update the _branchcache dict, however branchtags() itself does not update anything, it calls branchmap() to do so. This change introduces a new updatebranchcache() method that is used by both branchmap() and the calls to update the cache.

color: handle more Windows console errors If your application is being built as a non-console application, stdout is not a valid handle and raises an exception: pywintypes.error: (6, 'DuplicateHandle', 'The handle is invalid.') Alternatively, non-console applications launched outside of a console will return None from GetStdHandle instead of raising an exception.

patchbomb: remove unneeded line continuation

cleanup: remove unused variables

cleanup: remove unused imports

Merge with stable

subrepo: use [0-9] instead of [\d] in svn subrepo regex The \d was used in a normal (not raw) string and was only passed through to re.search because Python does not define that escape character itself. Using 0-9 makes it clearer what is happening.