prepare release 5.1.1

update readme

evolve: use 3.2+ fullreposet to evaluate argument set (issue4515) getset() has no compatibility wrapper for old-style argument and we don't want to add more hacks in Mercurial core.

evolve: cache marker encoding to avoid performance degradation The main overhead in bug 4518 is caused by calculating relevant markers and encoding markers into the correct format. Calculating relevant markers takes (worst case) ~ 0.12 seconds. Encoding markers takes (worst case) ~ 0.06 seconds. Caching encoded markers takes care of the second part and speeds up cloning in bug 4518 by about 35%.

evolve: handle invalid obsmarkers in the `debugobsconvert` User can now recover from such situation, The error message is also changed to point the `debugobsconvert` commands.

fix release date in the readme

merge stable in default

Added tag 5.1.0 for changeset bfe9be352453

update readme and bump version to 5.1

merge default into table 3.3 is about to be released.

discovery: filter null from the discovery revset If there is nothing in common, common will be "null" and the revset will now returns "-1" crashing the discovery process. We filter out the null revision to prevent that.

tests: update to new core output Multiple output change need to be applied to the test suite.

evolve: explicitly disable bookmark on evolve (issue4432) We no longer leave the current bookmark active after an evolve, since it is no longer pointing to the working directory.

discovery: do not build sample if undecided is smaller than sample size This prevents crash with coming change in the mercurial discovery.

merge with stable

init: don't abort Mercurial on version mismatch Evolve causes Mercurial to exit if there is a version mismatch, even if no evolve command is invoked. This is a headache for people who have to work with multiple versions of Mercurial. Instead, raise an ImportError, which gives a warning but otherwise allows Mercurial to run non-evolve commands.

Added tag 5.0.2 for changeset dbd0733e5840

prepare release 5.0.2

test: adapt to core change in graft and rebase The ouput changed we have to adapt

merge with stable

doc: drop rebase extension activation The dependency have been dropped.

evolve: remove the dependency to the rebase extension We do not use any rebase internal anymore.

evolve: remove the use of `rebase.concludenode` Half of this function is now done in `merge.graft` and the over part is easy to redo manually. So we remove the usage of this function to remove the dependency of evolve on the rebase extension.

evolve: use `merge.graft` instead of `rebasenode` The core mechanism is properly factorised and have a more stable API. This is also a good step toward removing the dependency between evolve and the rebase extension. This also avoid a breakage with the future 3.3 where some of the rebase API changed.

readme: add a reference to the bugtracker in the contribute section Idea from Patrick Mezard

merge with stable

debian: update changelog to 5.0.1

test: adapt test to stable output Stable branch should pass test with mercurial stable branch.

Added tag 5.0.1 for changeset 0f3090785283

evolve: update in file version (I'll eventually -not- forget to do so)

Added tag 5.0.1 for changeset 51e1e962172c

readme: prepare for release 5.0.1

readme: update changelog

evolve: tell user which "base of divergent changeset" is not found

debugobsconvert: fix 6f08a8f6bb1d and add proper test The changeset adding deduplication (6f08a8f6bb1d) was super buggy and dropped all obsmarkers in the repo. We update the test to check this case and fix the deduplication.

merge with stable

debugobsconvert: fix a typo on "version"

debugobsconvert: also deduplicate markers in the process Various bug allowed identical or semantically identical marker to be added to the repository. So we also filter duplicates when converting.

evolve: fix capitalization in docstring for commands

test: ensure we echo prompt Tool running using the shipped 'run-tests.py' instead of the mercurial one would get different result otherwise.

debian: blacklist simple4server tests simple4server is not part of the package.

debian: blacklist test-drop drophack.py is not shipped.

debian: update control file to reflect dependency to mercurial 3.2

evolve: fix the version number The tag is 5.0.0 the content of the file was wrong.

help: fix typo in help for 'obsolete' option added to import command

test: add an explicit test for simple4server with bundle2 This makes it more likely to we catch issue with the iteration of these two.

Make next/prev only move bookmarks optionally

obsup: hack extension to make in-place upgrading of obsolete markers easy I tried upgrading my obsstore by doing a local clone as suggested by Pierre-Yves and Sean, but that caused me to end up with a ton of unstable changes that should have been marked dead. In fact, as far as I can tell, most of the performance win of that upgrade came from the fact that only about 46% (46672 of 102285) of my markers were brought over with the copy-and-pull method.

merge stable into default

evolve: fix selection of changeset to evolve from the middle of a stack (issue4434) The evolve algorithm picked a bad changesets to evolve (unstable changeset with no obsolete parent (but unstable parent). And then get confused assuming that is the first parent was not obsolete, the second should be. This changeset fixed the issue by preventing selection of direct descendant of [.] when evolving.

merge

merge back with compat branch

create a branch compatible with mercurial between 3.0.1 and 3.1.2

evolve: fix suggested commands in "parents are not common" hint The argument to 'hg rebase' is --dest, not -dest. Also, the same command should not be suggested twice -- the second option should be the rebasing the other way around.

evolve: add missing newlines in "parents are not common" hint

test-touch: add a test for rename preservation after touch This bug was recently fixed in 3.2.