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