rename util.lookup_reg to lookupreg

rename util.set_hgexecutable to _sethgexecutable

rename util.main_is_frozen to mainfrozen

scmutil: rename local function _add_dir_if_not_there

rename scmutil.user_rcpath to userrcpath

rename scmutil.system_rcpath to systemrcpath

rename scmutil.os_rcpath to osrcpath

merge with stable

merge with crew

merge with stable The change from 7b627923739f (parent 2) is not needed after switching to the new url parser.

rename path_auditor to pathauditor The Mercurial 1.9 release is moving a lot of stuff around anyway and we are already moving path_auditor from util.py to scmutil.py for that release. So this seems like a good opportunity to do such a rename. It also strengthens the current project policy to avoid underbars in names.

revlog: use real Booleans instead of 0/1 in nodesbetween

patch: fix clash between local variable and exception instance The local err variable would be bound to PatchError thrown and it keeps this value even after the except block is executed. The whole thing worked anyway since the rejected variable is set in the except block and this makes the function return -1 when a PatchError is thrown.

patchfile: use real Booleans instead of 0/1

annotate: use real Booleans instead of 0/1

hbisect: use real Booleans instead of 0/1

summary: run discovery only once for in/out against same repo Reuses the result of findcommonincoming if default and default-push are the same.

discovery: resurrect findoutgoing as findcommonoutgoing for extension hooks discovery.findoutgoing used to be a useful hook for extensions like hgsubversion. This patch reintroduces this version of findcommonincoming which is meant to be used when computing outgoing changesets.

transplant: remove unneeded loop over repo in revset

transplant: fix revset doc

mq: add a 'mq()' revset predicate that returns applied mq csets

pyflakes: ignore files marked no-check-code

revlog: compute correct deltaparent in the deltaparent function It now returns nullrev for chain base revisions, since they are conceptually deltas against nullrev. The revdiff function was updated accordingly.

changelog: fixes leaked file handle

setdiscovery: limit lines to 80 characters

subrepo: use code from 71ea5b2b9517 only if Python needs it (issue2795) With Python >= 2.6 the original code already works correct, therefore the fix for issue2556 on Python <= 2.5 broke relative subrepositories with newer versions of Python.

sslutil: extracted ssl methods from httpsconnection in url.py This makes it easier to share ssl cert validation with other http implementations.

check-code: fix checking for sh style in .t tests Restore checks after they were disabled by 64de9ca66511.

run-tests: add --shell command line flag This makes it easy to test with, say, both /bin/bash and /bin/dash instead of changing the system-wide /bin/sh.

run-tests: use type of default to convert environment variable Before, defaults could only be integers, they can now also be strings, floats and what have you.

test-treediscovery: fix escaping for both dash and bash A '\n' on the command line is turned into a newline by dash, but kept as-is by bash, which resulted in a syntax error in the config file. Luckily, dash wont turn '\n' into a newline when it is part of a here-doc, so we can write the config file using that technique.

treediscovery: fix regression when run against older repos (issue2793) I ran the entire test suite with "known" and "getbundle" disabled in localrepository. This generated failures because the old findoutgoing had always queried remote's heads explicitly and thus always got them back in the returned heads. treediscovery.findcommonincoming now correctly returns remote's heads in all cases. Also adds a dedicated test for running treediscovery against a pre-getbundle HTTP server.