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.

commands: use util.Abort's hint some more

commands: use double-quotes for strings with single-quotes The globalopts table contain a couple of \' still, but it was normalized like that in 83238c1db6de.

revlog: remove support for punched/shallow The feature was never finished, and there has been restructuring going on since it was added.

revlog: remove support for parentdelta We will introduce a more powerful and general delta concept instead, called generaldelta.

store: break up reference cycle introduced in 9cbff8a39a2a see also 996c1cd8f530

test-https.t: clean up superfluous trailing whitespace

run-tests.py: correctly handle list options with parallel tasks

mq: don't suggest to refresh when qpushing with no applied patches

bundlerepo: fix closing and docstring of getremotechanges I did not in fact implement what I documented about closing of the original repo. And there was a bit of leftover from an older version of the API.

bookmarks: allow deactivating current bookmark with -i

bookmarks: allow to create/move bookmark without making it current (issue2788) Adds a -i/--inactive flag to the bookmarks command to create or move a bookmark without making it the current one. This lets you use a bookmark like a shareable, movable 'tag' and less like a 'branch'. Thanks to Alexander Solovyov <alexander@solovyov.net> for most of the work of implementation, and Matt Mackall <mpm@selenic.com> for suggesting the option name.

tests: test subrepos with ssh urls

tests: share dummyssh

tests: fix test-ssh.t after 6bd9778ae749

fix errors reported by pyflakes test

merge with crew

tests: fix deprecated use of hg debugdata/debugindex For filelogs, debugindex and debugdata can be called with the file name directly instead of the path to the revlog. Since in the future filelogs will no longer be valid revlogs, calling with a path to the revlog is deprecated for debugdata. For debugindex it is expected to still work, but I changed them as well for consistency.

merge with stable

merge with crew

hgext: fixup a couple missed file().read() instances

test-casecollision.t: add test for case changing rename

convert: fix error in git solaris code

test: add pyflakes checking for unable to detect undefined names

tests: add pyflakes checking for assigned to but never used

remove unused variables

test-pyflake: improve sorting algorithm

add make check: tests rule

ui: add configint function and tests

mq: strip extra whitespace from node ids in header (issue2790) This makes `hg qpush --exact` work with patches created by `hg export`.

check-code: disallow calling opener(...).read() and opener(..).write()

prevent transient leaks of file handle by using new helper functions These leaks may occur in environments that don't employ a reference counting GC, i.e. PyPy. This implies: - changing opener(...).read() calls to opener.read(...) - changing opener(...).write() calls to opener.write(...) - changing open(...).read(...) to util.readfile(...) - changing open(...).write(...) to util.writefile(...)

util & scmutil: adapt read/write helpers as request by mpm

store: use a subclass, not a function for fncacheopener

util.termwidth: never return 0 for terminal width Catch a case where the termwidth was being reported as 0 when I was connecting with TLMTask instead of NSTask in OSX. This caused the progress extension to print no progress. The termwidth should never return 0 so in case we would return 0, simply fall back to the default termwidth below which is 80.

discovery: add new set-based discovery Adds a new discovery method based on repeatedly sampling the still undecided subset of the local node graph to determine the set of nodes common to both the client and the server. For small differences between client and server, it uses about the same or slightly fewer roundtrips than the old tree-based discovery. For larger differences, it typically reduces the number of roundtrips drastically (from 150 to 4, for instance). The old discovery code now lives in treediscovery.py, the new code is in setdiscovery.py. Still missing is a hook for extensions to contribute nodes to the initial sample. For instance, Augie's remotebranches could contribute the last known state of the server's heads. Credits for the actual sampler and computing common heads instead of bases go to Benoit Boissinot.

debugbuilddag: use memctx for speed This drops the options to run arbitrary shell commands within commits and the option to create a file that gets appended to in every revision. It now supports to not write file data at all, which is very fast for generating a pure 00changelog.i (useful for discovery tests, for instance). Timings for 1000 linear nodes: * Old `hg debugbuilddag -o '+1000'` took 4.5 secs. * New `hg debugbuilddag -o '+1000'` takes 2 secs. * New `hg debugbuilddag '+1000'` takes 0.8 secs. (The last one creates only 00changelog.i).

localrepo: reuse parent manifest in commitctx if no files have changed This speeds up the in-memory version of debugbuilddag that I'm working on considerably for the case where we want to build just a 00changelog.i (for discovery tests, for instance). There are a couple of test changes because node ids in tests have changed. The changes to the patch names in test-mq-qdelete.t were required because they could collide with nodeid abbreviations and newly actually do (patch "c" collides with id "cafe..." for patch "b").

bundlerepo: fix and improve getremotechanges Fixes the regression where incoming could show local changes introduced by rev 72c84f24b420.

hgrc.5: mention new 'case collision' handling for ui.portablefilenames

win32: remove obsolete bookmarks and parentrevspec extensions from mercurial.ini

bundlerepo: drop struct

bisect: fix indent level

share: create 'hgrc' using an opener, like clone

backout 3a3584967a93 - the "unreachable code" was apparently not unreachable All tests repeatedly passes with 3a3584967a93 on some machines, but on other machines it regularly causes failure in test-mv-cp-st-diff.t, such as: @@ -203,6 +203,7 @@ - working to root: --rev 0 M a + M x/x A b a

merge with mpm

revset: avoid over-aggresive optimizations of non-filtering functions (issue2549) When limit, last, min and max were evaluated they worked on a reduced set in the wrong way. Now they work on an unrestricted set (the whole repo) and get limited later on.