hgext3rd: move 'simple4server' as 'evolve.serveronly' We also more the server only extension into hgext3rd. We makes it a python sub-module of evolve for two reasons: * less polution in the hgext3rd namespace, * this make it possible to share the code between 'evolve' and 'evolve.serveronly' instead of duplicating it. note that we now install the extension too

hgext3rd: move 'directaccess' and 'inhibit' in 'evolve.hack' We move them in the 'hgext3rd' package. In the same move we put them under the 'evolve' package for clarity. We use a sub-package 'hack' to make their status clearer.

evolve: move the extensions to 'hgext3rd' We have the 'hgext3rd' as the official place for extension for some time now. We start the big migration. This might break some people setup but this is a necessary step to have evolve easily available through pip.

extensions: drop the old 'pushexperiment' extension This extensions predate bundle-2 and their have not been any reason to use it for years.

merge with stable

Update tag 5.6.0 for changeset e7b6e9c4a5d4 There was a small error in the README. The previous tag is fresh and the announcement was sent yet. So I'm exceptionally overwriting the tag.

fix release date in the Readme, Copy paste error :-/

reopen the default branch

merge with 5.6.0 no extra changes were needed from the mercurial-3.5 branch.

merge with 5.6.0 no extra changes were needed form the mercurial-3.6 branch.

merge with 5.6.0 No extra changes were needed from the mercurial-3.7 branch.

merge with 5.6.0 Not extra change were needed from the mercurial-3.8 branch

merge with 5.6.0 A minor one line conflict on test output were encountered.

merge with 5.6.0 No extra changes needed from the 'mercurial-4.' branch.

merge with future 5.6.0 There is only minor test output change, 4.0 do not have the "trouble:" wording in there.

Added tag 5.6.0 for changeset 99ede2d77545

exchange: fix compatibility layer We forgot a return into some compatibility layer. This is now fixed.

open the mercurial-3.9 compat branch

prepare release 5.6.0

debian: fix version format There was a small error in the debian packaging

merge with default to prepare the next version

merge with stable

uncommit: don't lose copy information of remaining files (issue5403) As reported in the issue, "hg uncommit" would lose copy information of the files that remained in the commit. The problem was simply that the a dict of copies was iterated as "src, dst in copies.items()" where it should have been "dst, src ...".

merge with stable

fold: cleanly abort on empty fold set (issue5453) We now handle the empty set case, cleanly aborting instead of crashing with a traceback. The message used match the output of 'hg push' in similar situation.

README: update changelog

fold: require --from flag for folding revisions to working copy It's very easy to think that "hg fold 4::6" will fold exactly those revisions. In reality, it will fold those *and* any revisions between them and the working copy. To prevent users from making that mistake, require the use of a new --from flag for folding revisions from the given set to the working copy. With this change, I'm sure some users will be surprised that the command can not be run without either --from or --exact, but at least the consequences will be smaller (the command simply aborts and the user can try again).

fold: use 'fold', not 'touch', for transaction description

tests: fix tests to reflect hg core changes In f05ede08dcf7d13794ccc9abb53877a50bf2b58b in core hg there were changes to changeset_printer.

prune: improve error message if unstable changes are disallowed I saw a question on stackoverflow why evolve reports something like cannot fold chain not ending with head. Even I was confused the first time about the behavior. The error message can be improved to avoid confusion to people who are unaware about the config in future.