merge with stable

ui: change the hidden revision error message It now display the same details than the warning when the working directory parent become obsolete like: $ hg update 0 abort: hidden revision '0' (successor: f301a99bd857)! $ hg up 1 abort: hidden revision '1' (pruned)! $ hg update 0 abort: hidden revision '0' (successors: 91311af6da10, 70653776ec4c)!

ui: add better messages when the working copy become obsolete.

topic: directly use "super" call That is how one is supposed to do it.

repo: properly progate "destroyed" call to super class The propagation of the 'destroyed' call was dropped. I'm not certain of the consequences of having a partially broken "destroyed" call, but this can't be good.

safeguard: add an option to disable automatic publishing Pushing to publishing server by mistake is a bit too common in the current state of evolve. Especially when the lack of good feature branch story make the use of -f a bit too common. So we add a very simple experimental option to allow warning (or abort) when changeset are pushed to a publishing server. This is unlikely to survive as is, but this is useful now.

merge back with stable

Added tag 6.0.1 for changeset 5ef112a6eb87

pkg: prepare release 6.0.1

debian: finalize 6.0.0 entry

readme: fix 6.0.0 release date It was March, not February.

merge with future 6.0.1 Nothing special to report

merge with future 6.0.1 Nothing special to report

merge with future 6.0.1 Nothing special to report

checkheads: update tests to match the one in core These test now exists in core, so we update the evolve version.

serveronly: fix reposetup The local 'reposetup' function was shadowing the extension helper one. We add a test for obshashrange using 'serveronly' since this is the item that made use discover the issue.

extension: simplify the extensions helper hierarchy If one mode depends on the other, its extensions helper is merged.

checkheads: do not overwrite code for Mercurial 4.2 and above The fix has been ported to Mercurial core as c6cb21ddf74a.

legacy: fix debugrecordpruneparents to call obsstore.create() with keywords It appears the API was changed twice in Mercurial at - 570f87422f54 "obsstore: add an explicit `date` argument to obsstore.create" - adb3798dce49 "obsstore: add a `parents` argument to obsstore.create" and metadata would be changed to a list of (key, value) pairs. Convert it back to a dict as expected by create().

template: adapt to new showlist() API introduced by hg e5eab0fe69ee

template: pass all mapping data to showlist() Otherwise a keyword depending on repo or ctx couldn't be rendered.

make: merge recipes for help

make: fix indent of ifeq-endif ifeq() can't be a recipe.

tests: update test to match upstreamable version Name have been clarified, documentation has been updated and some test-case have been updated to match the intended test.

tests: fix directory names in exchange-D4 test The test is based on another one and the directory name had not been updated.

tests: fix directory names in exchange-D3 test The test is based on another one and the directory name had not been updated.

merge back with default

Added tag 6.0.0 for changeset 165ad227993d

packaging: prepare version 6.0.0

merged with future 6.0 No output changed.