test-compat: merge stable into mercurial-4.6

compat: make compatible call to ui.edit for hg <= 4.3 This is similar to what is already happening elsewhere.

compat: ignore extra status feature for hg <= 4.3 The feature does not exist in 4.3 and below.

format: fix indentation level Previous change got pushed without the fix by mistake.

test-compat: merge mercurial-4.6 into mercurial-4.5

test-compat: merge stable into mercurial-4.6

compat: disable empty topic warning on `hg phases` for hg <=4.5 This is annoying to support for lower version.

compat: restore compatibility with Mercurial <= 4.5 The __init__ arguments changed a lot in 4.6 and 4.7, lets do be as transparent as possible

test-compat: merge stable into mercurial-4.6

test-compat: merge stable into mercurial-4.6

branching: merge stable back into default

compat: improve detection of Mercurial 4.6 fixed case where AttributeError can be thrown when importing wireproto

cleanup: use NotImplementedError instead of NotImplemented Caught by pyflakes.

CHANGELOG: add some entries and remove duplicated entries

branching: merge default into stable The stable branch of Mercurial core now contains Mercurial 4.7 so evolve branch policy requires this merge. The @ bookmark is in the right location, so people doing clone will get to the latest release.

branching: merge with the other head

test-compat: backed out changeset 8fe8152ff071 These output change were for 4.7 only.

test-compat: backed out changeset 41fc764bf28c These output change are for mercurial-4.7 only

test-compat: backed out changeset dda5b2134b32 These change were for Mercurial 4.7 only.

test-compat: backout change to 1e103c7f7663

compat: use older API for older version This API changed in 4.7, we need to adjust.

branching: create mercurial-4.6 branch for updated test output This branch will be used to check for 4.6 compatibility.

builddependencies: extract function for getting successors The code no longer makes a difference between single- and mult-successor cases and just needs a set (or generator, really) of successors to iterate over. Let's extract that into a function.

builddependencies: share code between single- and multi-successor cases The two cases now have more similar structure ("if succ in revs: dependencies[r].add(succ)"), so let's share the code so it doesn't start drifting apart again.

builddependencies: build inverse dict from forward dict It's error-prone to keep "dependencies" and "rdependencies" in sync (we don't do it correctly when there are multiple successors or a node). It's easier to just create "rependencies" from "dependencies" after it's complete.

builddependencies: remove a use of defaultdict I don't see much reason to make "rdependencies" be a defaultdict when "dependencies" is not. It's easy to initialize each entry ourselves.

branching: merge with stable

builddependencies: don't remove found deps when divergence found (issue5946) It seems obviously wrong to not keep any dependencies for a revision that we had already found (for p1) if we run into divergence (from p2). It also happens to fix issue5946 :)

builddependencies: don't add dependency on revision outside input set This was already handled in the single-successor case, but had been missed in the multiple-successors case. Note that there seems to be a copy of builddependencies() in the topics extension. I don't use topics more than I have to, so I'll let someone else fix that code.

builddependencies: consider all divergent successors We were only considering one. In test-evolve-abort-conentdiv.t:165, the input revs were {5, 8} and dependency dict was {8: set([]), 5: set([10])}, which is a little weird (10 is not in the input set). It still worked because the callers used it (they seemed to only care if there were *any* dependencies). This patch fixes the issue by considering all successors. That means the dependency dict will be {8: set([]), 5: set([8, 10])} after this patch. The next patch will remove the 10 from that set.