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.

convert: handle invalid subversion source paths

convert: also catch missing revlogs when introduced in repo roots The previous behaviour was almost as if convert.hg.ignoreerrors was always set for revisions without parents, except that errors were silently ignored. Revlog errors are handled as a side effect of getcopies(), but getcopies() was only called when convert.hg.ignoreerrors was set. Now we always call self.getcopies for root revisions, not only when convert.hg.ignoreerrors is set, just like we do on all other revisions. The extra call might be a bit expensive, but the proper fix for that would be to catch these errors in another way.

status: remove unreachable code for status between revisions The manifest value of a file will never be false when "not parentworking", and the expensive content comparision would thus fortunately never be reached. (If it was reached it would be wrong for example in case of renames.) This code once handled status against working directory, but that has been done elsewhere for a long time.

httprepo: proper handling of invalid responses without content-type (issue2019) This can currently be tested on http://sf.net/

httprepo: use the original exception after falling back to static-http failed Before the fine exception handling in httprepo was never shown. The static-http exception will now only be shown when static-http is requested explicitly.

test: test that backslash is preserved by the url class

tests: use raw string for url tests of '\' handling

color: fix using multiple effects

unbundler: separate delta and header parsing Add header parsing for changelog and manifest (currently no headers might change for next-gen bundle).

changegroup: new bundler API

bundlerepo: port to new bundle API

bundler: make parsechunk return the base revision of the delta

tests: add pyflakes checking for unused imports

remove unused imports

scmutil: introduce casecollisionauditor and cleaning up portability functions

check-code: check for repo in revlog and ui in util

check-code: allow for checking multiple pattern sets per file

check-code: adding debug flag

run-tests: add flag to provide extra hgrc options for test runs

graphlog: always sort revisions topologically The grapher cannot really handled revisions if they are not emitted in topological order. The previous 'reverse()' revset was not enough to achieve that and was replaced by an explicit sort call for simplicity. The --limit option is now also handled as usual with cmdutil.loglimit() instead of a 'limit' revset.

graphlog: take the union of --rev specs instead of the intersection

graphmod: correctly emit nodes with more than 2 predecessors The grandparent() function was returning only the closest predecessor of a missing parent while it must return all of them to display a correct ancestry graph.

graphlog: display nodes with more than 2 predecessors While nodes with more than 2 parents do not exist in revision graphs, they do appear when you transform them by removing subgraphs while trying to preserve ancestry links. This code was borrowed from Peter Arrenbrecht <peter.arrenbrecht@gmail.com> pbranch extension.

context: provide an efficient iterator for workingctx This avoids needing to call status or build a synthetic manifest.

merge with stable