evolve: attempt to clarify the documentation around --all and --any This have been confusing to people. We try to be a bit more verbose in the evolve help.

evolve: re enable progress for all Progress is an important information for user facing slow push.

evolve: stop pretending we are pulling markers when we don't If discovery did not found any unknown marker, we should not display the "pulling marker" message.

evolve: do not even try to pull if all remote markers are known previously we were explicitly pulling an empty bundle.

evolve: add "obsolescence" in front of marked in the previous message

evolve: make the "X markers added" message during pull important

evolve: make the "pulling obsolescence marker" message important This is likely to take some time the user needs to know what is going on.

evolve: add "absolescence" in front of markers in the message

evolve: re-introduce the "pushing 42 markers…" message Informing the user about marker behind pushed sounds a good idea.

evolve: hide the OBSEXC message behind a config option This will lets most people ignore them while keep evolve dev having a close look at them. Some of the most useful messages will be reintroduced for all in coming changeset.

evolve: move OBSEXC progress in a dedicated function This will help use to rework them.

evolve: move OBSEXC message in a dedicated function This will help use to rework them.

merge with stable

Added tag 4.0.1 for changeset e914884fb721

evolve: prepare release 4.0.1

evolve: fix distribution for 4.0.0

evolve: update readme

evolve: update tested with statement

test: apply message changes introduced by mercurial 3.1

test: use `hg log` in the `getid` function using `hg id` to retrieve full lenght node requires to use --debug. This may include debug output (regarding branch cache invalidation for example) that breaks the test. We now use `hg log` with a custom template. This is a simple, clean and robust solution.

evolve: add a tr arguement to retractboundary Mercurial core is adding a transaction argument to its phase movement function. We do the same. If Mercurial appears to be an old version (without the extra args) we call it the old way.

relocate: add transaction around phase movement cheap way to acces access to the transaction object

uncommit tr

evolve: saner locking an transaction in `hg evolve` Each trouble solved used to handle locking and transaction on its own. We now have a top level locking and transaction. This will helps use making sure phase are moved within a transaction.

uncommit: saner locking scheme (and do it in the right order in the process)

prune: lock inside the try tss…

debugrecordpruneparents: release tr the same way than the lock Nicer code is nicer.

evolve: drop useless wlock in rewrite

divergence: actually use the hint that have been around for age Having a hint in the code is good, having it displayed is usually seens as better.

evolve: rename `tr` variable (for troubled) to `tro` tro is usually dedicated to transaction.

evolve: add a custom layer around retractboundary retract boundary is about to gain a new argument in core, we need somethign to handle this

merge with stable

evolve: point to the core mercurial tracker for bugfix As per Matt Mackall request evolution related bug should be filled again the main tracker as at some point al lof evolve wil be in core.

evolve: drop reference to 2.3 in the extension help text We are far away from 2.3 now.

readme: update the work in progress repository location

readme: update the official documentation location

evolve: deprecated --obsolete and --old-obsolete option on commit and graft Such option are unlikely to make it into core, so we deprecate them to avoid uer discovery them and getting used to them.

push: put phase in the same bundle2 than changegroup and obsmarkers Note that the usual phase push from core will be performed in all case. But the discovery should find already in sync phase at that time. The old ways sync will be properly skipped when this logic is introduced into core.

push: put obsmarkers in the same bundle2 than changeset When client is Mercurial 3.1 and server have proper evolve version and both side have bundle2 enabled, we'll includes a part containing obsolescence markers. When obsmarkers are included to the main bundle2 push, they will failed to be pushed if the changeset failed to be pushed (and reciprocally).

push: extract obsmarkers discovery in a dedicated function The need to factorise the computation of the markers to send in a dedicated function. This prepare the inclusion of obsmarkers in an atomic bundle2 push. For now, when obsmarkers are pushed using bundle2, they are still doing it on their own, in a dedicated bundle2 push.

evolve: update the tested with statement Tested with the soon to be release 3.1.

test: adapt to upstream message change A message gained parenthesis in 3.1 we reflect than in the test.

uncommit: improve error message for use with no arguments

test: use `hg log` in the `getid` function using `hg id` to retrieve full lenght node requires to use --debug. This may include debug output (regarding branch cache invalidation for example) that breaks the test. We now use `hg log` with a custom template. This is a simple, clean and robust solution.

readme: mention patchbomb usage and patch description guidelines on wiki

debian: add line to clean target to delete error files caused by failing tests

fold: improve error messages for multiple heads and roots This commit adds hints and i18n to the error messages about non-linear revisions, along with corresponding tests.

fold: reword error message for public commits This rewords the error message when attempting to fold public csets. It is somewhat clearer to not use contractions in formal writing. It also uses i18n for it. This commit also adds a new test for this error message.

fold: overhaul handling of revisions with --rev (BC) The fold command parsed the revision arguments in a very peculiar and idiosyncratic fashion: if revisions were passed without a --rev argument, then they would all be extended to ".", but if they were passed with --rev, then no extension would happen. Passing revisions both with and without --rev would abort. This is inconsistent with the way all other hg commands parse revision arguments. We have several examples of command where several revisions are passed, and the --rev option is optional for specifying those revisions (update, strip, export). This patch alters the way in which fold parses its revision arguments. No distinction is made between revisions passed with or without the --rev argument. Regardless if a single or multiple revision is specified, all will be folded together into the parent of the working directory. If the --exact argument is passed, then the parent of the working directory is ignored and the specified revisions must be a single contiguous line. The docstring and tests are modified accordingly.

fold: emit error message when folding a single revision Previously, a confusing error state would happen if the revision set to fold was a singleton.

fold: clarify message for empty revision set and abort instead (BC) I find it clearer that there are no revisions to fold because none were specified. Otherwise it seems ambiguous: maybe there are no revisions to fold because it's impossible to fold whatever was given? In analogy of other commands that are given no revisions (e.g. strip, graft), this is also now an abort instead of a mere error message, which is a BC.

evolve: do not use _ as an unused variable The _ variable is the i18n function from core Mercurial, so locally assigning to it can lead to name clashes.

merge with stable

merge with very old 2.2 branch

test-obsolete: make log templates more consistent: add {desc} to one This has the extra added benefit of making the divergence situation easier to understand.

test-obsolete: explicitly show which changesets are divergent