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.

webcommands: remove unncessary access to repo.changelog changectx are good enough in these cases and their interface is more stable.

archival: do not use repo.changelog directly

repair: pass variable explicitely to nested function

mercurial.spec: specify file modes for install

simplemerge: remove hash-bang from non-executable script

merge with stable

Added signature for changeset ff5cec76b1c5

Added tag 1.6.3 for changeset ff5cec76b1c5

util: avoid using hashlib on Python < 2.5 (issue2278) The following patch allows the use of python2.4 with a standalone hashlib rather than assuming that python2.5 is in use when hashlib is imported successfully.

templates: add filenolink to raw style (issue2332)

url: limit expansion to safe auth keys (Issue2328) Mads Kiilerich pointed out that 7c9beccb0533 was too eager since the prefix and password keys may contain $-signs. So this only add the username to the list of keys that are expanded. This also updates the documentation to match.

url: expand vars in all [auth] settings (issue2328)

merge with stable

Fix merge-tools.checkconflicts re.match only looks at the beginning of the merged file, and without re.MULTILINE the file had to end with ">>>>>>> something". Now conflict markers inside the file are found, too.

Fix merge-tools.checkconflicts re.match only looks at the beginning of the merged file, and without re.MULTILINE the file had to end with ">>>>>>> something". Now conflict markers inside the file are found, too.

bundlerepo: remove duplication of bundle decompressors

bundle: introduce bundle class

bundle: unify/refactor unbundle/readbundle

bundle: factor out decompressor

merge with stable

alias: make shadowing behavior more consistent (issue2054) Currently, given an alias like the following: [alias] summary = summary --remote The alias might be executed - or it might not - depending on the order of the cmdtable dict. This happens because cmdalias gets assigned back to the cmdtable like so: cmdtable['summary'] = ... Yet '^summary|sum' is still in the table, so which one cmdutil.findcmd() chooses isn't deterministic. This patch makes cmdalias assign back to '^summary|sum'. It uses the same cmdtable key lookup that extensions.wrapcommand() does.

hgweb: handle exception of misconfigured path on index page If hgweb.config contains wrong path mapping, hgweb causes internal server error on repository index page. This patch changes makeindex() to ignore RepoError, because it looks to be designed to suppress configuration error.

statichttprepo: disable pushkey

mq: extend support for the --mq argument to extension commands This allows commands like `purge' to accept the --mq option.

repository: drop unused rjoin() method This method was introduced by cfeeac24fc1e but grepping the history does not reveal any call. Extensions may use it but the method intent is not even clear to me.

tests: unify test-export

revert: wrap long line

util: remove lexists, Python 2.4 introduced os.path.lexists

Merge with stable

context: mark string for translation

test-convert-cvs: test fuzz