commit: avoid potential deadlock We must acquire 'wlock' before 'lock'.

update readme

pull: fix bundle2 part generation The new part generator (allowing partial pull) was unproperly installed.

simple4server: cleanup debug output The debug output got duplicated with the original code. And the cleanup forgot about simple4serve. (code duplicated yeah!)

merge with stable

update readme

discovery: stop being stupid about variable name Overwritten variable are overwritten... The test coverage makes a simple pass in the loop :(

merge with stable

inhibit: explicitly test for None It is always better to check for None explicitly.

#iforgottoamendagain

discovery: port the new hashing version to simple4server

discovery: introduce a obshash1 function using fm1 during hashing (issue4587) The 'fm0' serialisation translate float to text. This give different result between python2.6 and python2.7 (because python2.7 got smarter). The 'fm1' is all binary and expected to be stable so we introduce the ability to do the discovery using hash computed with 'fm1' serialisation. We use a new wireprotocol version (Partly because I'm too lazy to check how to add an argument to the existing one) and capabilities). Support in simple4server is will come in the next changeset.

tests: use 'wget' instead of 'curl' for Windows compatibility The whole test suite now runs without skips, and the only two failures are a bookmark cache issue in test-prune.t, and a local output vs remote output reordering when pushing to ssh. The latter anyway is a core problem.

setup: allow including inhibit in the build Adds the INCLUDE_INHIBIT environment variable to allow including the inhibit extension in the build.

inhibit: Add -D option to the bookmark command The -D option for bookmark is similar to the -B option for strip. It deletes the bookmark and prunes the changes underneath it that are not reachable.

inhibit: don't leave any obsolete commit visible after closing transaction We add a callback to wrap the transaction closure to identify commits that are obsolete and visible. We inhibit them to prevent the user to see instability in the UI.

evolve: apply prune update before creating obsolescence markers Prune used to compute the destination commit to update to after creating the obsolescence markers. This is a commit to prevent a bug that would occur with the changes in inhibit for transactions (next commit). Indeed, with that change in inhibit, when creating the obsolescence markers in prune, they would get inhibited right away and we wouldn't update to the first non obsolete parent but stay on the same node as its obsolescence would have been inhibited (bug).

test-inhibit: check graph after prune We want to ensure prune keep working even with inhibit.

test-inhibit: drop trailing white space

tests: make tests work on Mac OS wc -m adds spacing before the results, we trim them to make the test pass on Mac OS.

merge with stable

inhibit: ensure that no obsolete changesets are visible after a bookmark change When creating a bookmark, we could reveal obsolete changesets. We are inhibiting the obsolete changesets resulting from a bookmark change. There are two ways to record bookmark changes to disk and we wrap both.

inhibit: ensure no visible changesets are obsolete after an update When updating to a commit we want to inhibit any obsolete commit affecting the changeset we are updating to. In other words we don't want any visible commit to be obsolete.

inhibit: enable direct access from parsing the revset tree To enable direct access we: - detect explicit hexadical reference to node in the revset tree - add these hashes to the static blockers to make them and their parent visible for the command to run

Added tag 5.1.2 for changeset e886bc501796

preparing version 5.1.2

update 5.1.2 with latest bugfix

evolve: have a stable manifest content when solving bumped We cannot really use iteritems here.

evolve: change config option name I forgot to amend...

config: allow disabling commands Now that upstream Mercurial has multiple options for obsolete configuration, we can allow enabling and disabling of evolve commands.

inhibit: Add some inhibition clearing mechanism We do not want to keep inhibition marker around for ever. So we are removing the one applying on public changeset.

add a 'inhibit' extension This extension will be used to reduce the scope of evolve in order to make some of its features available to the mass earlier. See extension documentation for details.

tests: use 'wget' instead of 'curl' for Windows compatibility The whole test suite now runs without skips, and the only two failures are a bookmark cache issue in test-prune.t, and a local output vs remote output reordering when pushing to ssh. The latter anyway is a core problem.

tests: import killdaemons.py from Mercurial 1cfded2fa1a9 This contains updated functionality to kill the server process on Windows, which is needed to run the test-*server.t tests. This version requires the pids to be passed as an argument instead of via $DAEMON_PIDS.

prune: add --keep to not touch the working copy In order to more closely emulate strip, lets add --keep to leave the working copy untouched when we do our prune.

strip: add the option for wrapping the strip command Adds an experimental option for wrapping the existing strip command and replacing its functionality with prune. It currently doesn't handle the --keep case, but an upcoming patch will address that.

wrapcommand: fix wrapping extensions that aren't enabled The extension command wrapping would previously fail if the extension wasn't enabled. Let's just eat that silently.

wrapcommand: allow adding additional arguments to commands This allows eh.wrapcommand to specify additional parameters to be added to the commands being wrapped. This will be useful when wrapping strip in the future.

pushexperiment: remove use of obsolete._enabled pushexperiment.py was using obsolete._enabled but it didn't cause any tests to fail so I didn't see it. Let's go ahead and replace it with the new obsolete.isenabled() api.

oldobsolete: remove use of obsolete._enabled obsolete._enabled is deprecated. Switch to the newer obsolete.isenabled() logic.

server4simple: remove use of obsolete._enabled obsolete._enabled is deprecated, so let's replace it's uses.

config: remove uses of obsolete._enabled Upstream Mercurial will be removing obsolete._enabled soon, so switch all our uses of it to use the new obsolete.isenabled(repo, option) function.

config: enable all obsolete options Upstream Mercurial has moved away from obsolete._enabled as the obsolete flag to a series of options. This patch makes evolve enable all the options automatically if the user hasn't enabled any already. This preserves the existing evolve experience of not having to configure anything.

merge with stable

evolve: fix manifest usage to match upstream The manifest class upstream is no longer a dictionary, so switch to using an API it does support.

drophack: fix to match upstream repair.strip repair.strip upstream now assumes the input nodelist is a list, so update to match it. The upstream change only affects the name of the backup bundle, so this shouldn't affect any other functionality.

evolve: prevent a crash in httpclient_pushobsmarkers() when pushing I've been running into a crash when pushing from my hg repo in a Fedora 16 VM to Win7 running 'hg serve', even with extensions disabled on both sides: ../hg push -r . pc pushing to http://192.168.1.4:8000/ searching for changes no changes found pushing 2 obsolescence markers (263 bytes) ** unknown exception encountered, please report by visiting ... File "hg-evolve/hgext/evolve.py", line 2482, in _pushobsolete remote.evoext_pushobsmarkers_0(obsdata) File "hg-evolve/hgext/evolve.py", line 2522, in httpclient_pushobsmarkers ret, output = self._call('evoext_pushobsmarkers_0', data=obsfile) ValueError: too many values to unpack I'm not sure how this repo differs from the one in the test suite, so I'm not sure how to craft a test for this. The failure occurs even when there _are_ csets to push. There was no crash if no obsolete markers needed to be pushed. At any rate, this code was stolen from httppeer._callpush(), where it calls self._call(). The socket exception handling wasn't necessary to fix the crash, but the calling code might as well be duplicated in its entirety. A successful push with this patch looks like this. Note the final line is _not_ in the output of the http push in test-simple4server.t: ../hg push -r . pc pushing to http://192.168.1.4:8000/ searching for changes remote has heads on branch 'default' that are not known locally: 3af110194a0c 56000e3ae44d 57ac6e51d290 7da4355c21b8 and 8 others remote: adding changesets remote: adding manifests remote: adding file changes remote: added 1 changesets with 0 changes to 1 files (+1 heads) pushing 4 obsolescence markers (525 bytes) remote: 2 obsolescence markers added

merge stable into default

Added tag 5.1.1 for changeset 9b8628e0a142

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.

evolve: fix error during iteration over bumped changesets (bug38) We are iterating over a manifest while altering it. We cannot use iteritems() in this context. we move to items, that will be an issue for very large changesets.

evolve: add various version info to save time on troubleshooting

readme: drop the mention to the wip repo The time spend in work in progress repo are fairly low nowaday.

readme: update the contribution process The inability to easily pull from pull request on bitbucket and the lack of obsolescence support there are too much pain. Patchbombed contribution are flowing so we drop the bitbucket mention in the README.

merge 5.x line into stable (drop pre hg-3.2 compat)

evolve: add the missing newline to output messages where needed

evolve: add the missing argument to a debug statement

uncommit: abort when rev specifies the current changeset The uncommit command now fails when the rev argument indicates the current changeset. Previously this aborted in the changeset obsolescence machinery when the current commit tries to obsolete itself. Using the rev argument like this indicates a misunderstanding, so printing an uncommit-specific error should make it easier to understand what went wrong.

test-amend: add a test for amend with no configured username (issue4211)

evolve: preserve branch change evolve will now preserve branch change. If the evolved changeset had a different phases than its parent, this branch name will be preserved. This allow propagation of branch change during amend but do not overwrite special branch name on children,

amend: allow the --logfile argument to work properly Though documented to work, using --logfile previously set the message option to that of the parent commit, and cause amend to abort with this message: abort: options --message and --logfile are mutually exclusive It's not clear why the 'edit' option is popped, but this option is only fetched in order to let the core commit command do the work.

Added tag 5.0.0 for changeset c13b408c0006

setup.py: bump version to 5.0.0

evolve: update tested with statement

README: update for 5.0 release

fixup previous changesets (after forgot to amend).

prune: stop reinjecting all selected revisions back into the revrange This trigger quadratic complexity for no good reason.

test: adapt to new hidden-changeset message From c1aede895072 we have a nicer error message when accessing public changesets: abort: hidden revision '6'! (use --hidden to access hidden revisions)

pullobsolete: handle migration from todosteps to donesteps This make evolve compatible with change made in Mercurial (92bf9abc4deb)

evolve: adapt to change in core rebase Mercurial core changeset 63e889cc610d (And the ones around it) changed the way graft and rebase work. We adapt to them.

test: ignore bytes lenght in message We should be storying floating point number as floating point number. So the size of the meta for fm0 format is going to be unstable. We cover them with a glob.

evolve: adapt to the new metadata storage Metadata are not stored as a "list" of (key, value) tuple instead of a binary blob. This adapt to ef880e28e56a in Mercurial.

debugobsstorestats: drop the average meta length Does not have much sense with the existence of multiple format with different meta storage. We drop it for now and will introduce and average markers length later.

debian: remove .PHONY line completely This does not work in the case of implicit pattern matching rules as used by dh. Consider this example from Geoffrey Thomas: $ ls -l total 16 -rw-r--r-- 1 faheem faheem 17 Aug 16 20:27 blue.c -rw-r--r-- 1 faheem faheem 17 Aug 16 20:27 green.c -rw-r--r-- 1 faheem faheem 35 Aug 16 20:26 Makefile -rw-r--r-- 1 faheem faheem 17 Aug 16 20:27 red.c $ cat Makefile %: %.c gcc -o $@ $< .PHONY: blue $ make red gcc -o red red.c $ make green gcc -o green green.c $ make blue make: Nothing to be done for blue'. The Make manual (http://www.gnu.org/software/make/manual/make.html#Phony-Targets) says Since it knows that phony targets do not name actual files that could be remade from other files, make skips the implicit rule search for phony targets (see Implicit Rules). Thanks to the good folks on #debian-mentors on OFTC for instruction and explanation in these matters.

debian: replace clean with override_dh_auto_clean The current version does not call the default dh_auto_build, which is a bug. This is required in particular for cleaning the build directories.

debian: replace build line with a override_dh_auto_build line This is more in line with how dh is supposed to work. In particular, dh_auto_build is functionally equivalent to the repeated "dh build --with python2 --buildsystem=python_distutils" used currently.

debian: remove clean target before implicit match rule This is redundant because it is a match-everything rule. Possibly a typo.

debian: Add DH_VERBOSE, commented out, for debugging convenience

evolve: wrap exchange.push() for compatability with core mercurial 4d52e6eb98ea

drophack: use `first` and `last` on smartset This matches the new changes in mercurial core.

evolve: use `first` and `last` on revset this match change in mercurial core. G: changed hgext/evolve.py

test: adapt to core mercurial 9ab18a912c44 This changesets improved the output of prompt during test.

evolve: adapt to core changeset 4f14303e8954 pushop.ret is now pushop.cgresult

merge with stable

evolve: update evolve merge message People are apparently unaware of --succ

import: fix the "is None" check for the Node We are checking the wrong variable.

test: remote "date" from the output of obsmarker meta Data is no longer a generic meta. it has its own field now.

test: adapt to mercurial changes Changeset 816be4ca4ae2 in core make hg config return non-zero when no value match the filter.

evolve: wrap setparents calls in begin/endparentchange Mercurial rev d259322a394b added a requirement to wrap any dirstate.setparents calls and their associated dirstate changes in begin/endparentchange.

merge with stable A couple of test fix were added on stable.

test: add glob annotations where Mercurial's run-tests.py suggests These happen to also be 5 of the 6 tests that warn about no result code when run on Windows. Probably not a coincidence. The tests previously warned about no result code whether or not it was run interactively. They only started working when test output changes were accepted in interactive mode, and these globs were added automatically.

evolve: really fix the 'grab' alias on Windows Something seems to have happened when importing cb36a4eb0157- it dropped the $@ argument to --rev, and it picked up a bunch of test changes for the obsolete sha1 replacement patch. Instead of backing it out and breaking the tests for the sha1 replacement, this just fixes the missing $@.

evolve: keep vague compatibility with 3.1 Matt Mackall work flow requires this to not crash in fire with 3.1. We apply basic bandage to stop the bleeding.

merge: all the stable sweetness into default

evolve: replace each obsolete sha1 in the description with its latest successor Obsolete csets are hidden by default and don't get pushed to the parent repo. In order to avoid broken references in commit messages, it makes sense to evolve those references to the latest and greatest successor, as each cset containing them is evolved. Of course, stale references can still occur if a commit in branch 'A' references something in branch 'B', and that something in 'B' is evolved but 'A' isn't subsequently evolved. This alleviates the user that is evolving a series of commits from having to 1) recognize that there is a hash that needs updating in any one of the series 2) look up the latest successor manually 3) hg amend -e The regular expression for matching and the logic for replacing are borrowed from the convert extension [1]. It might be nice for the output to state the reason that the reference couldn't be updated (it was pruned, split or diverged), but that may be excessive for something only displayed in verbose mode. (Maybe it should be a ui.status() instead?) [1] http://selenic.com/hg/rev/45562379ce4e

test: add parent hash to commit message in test-evolve.t This (slightly) reduces the changes to the test when hashes in the commit message are evolved in the next commit.

evolve: fix the 'grab' alias to work on Windows For some reason, the variable wasn't substituted on Windows in this case. From the test suite: $ hg grab 8 '' is not recognized as an internal or external command,\r (esc) operable program or batch file.\r (esc) This change seems hacky, but there isn't a readily available example of setting up a shell alias like this from a python module to know if there is a better way, and it seems like this is maybe just a convenience for tests, since there is no documentation for the aliases. The local copy of run-tests.py appears to predate the Windows support in the Mercurial repository's version, and fails each test with: The system cannot find the path specified. However, with this change and blacklisting test-simple4server.t, the tests can (mostly) be run on Windows like so: $ ../../hg/tests/run-tests.py --with-hg=../../hg/hg --blacklist windows Skipped test-simple4server.t: blacklisted Warned test-obsolete.t: no result code from test Warned test-tutorial.t: no result code from test Warned test-evolve.t: no result code from test Warned test-userguide.t: no result code from test Warned test-sharing.t: no result code from test Warned test-drop.t: no result code from test Failed test-prune.t: output changed # Ran 41 tests, 1 skipped, 6 warned, 1 failed.

debian: add README to the list of documents shipped with the package.

debian: add missing curl Build-Depends curl is required to run the tests.

prune: work around lazy revset slowdown Since 3.0 lazy revset is making some revset very slow. We currently work around the issue by using a simple loop instead.

readme: act that there will not be a 4.1.1 release

evolve: write a status message when the working directory changes Evolve changes the working directory during atop, etc which can confuse people as they are not aware that this happend. The ideal solution is to not have evolve change it, however mercurial limitations don't allow us to do that at the moment. So instead we are printing a status message that the working directory changed.

merge small default improvement before dropping compat with released Mercurial We are going to drop a bunch of compatibility layer.

pull: use discovery to pull less obsmarkers through bundle2 This hooks in the official API for bundle2

pull: run obsmarker discovery only on the common set If the discovery is run before the obsmarker push, pulled revs does not exist in the repository yet.

evolve: fix a typo in a long function name

bundle2: burn some more of the old code Some of it survived.

obsexch: respect todosteps when using the old push

compat: update the tests after the jump

compat: use in-core encodemarkers Now exist in core witha slightly different format.

compat: rename encodeonemarkers to _fm0encodemarkers This is getting renamed in core.

enable bundle2

drop the debug output

test-simple4server: add error output for http This is useful in case of failure.

compat: adapt to change to memctx Since core mercurial 650b5b6e75ed we must return None instead of raising IOError. Hooray for mads!!

evolve: use pushkeyescape from core It exists for all version we are compatible with.

evolve: display more message

evolve: drop a very old safe guard about bad marker The do not clean marker with nullrev successors. I assume none of them remains.

pull: drop the custom bundle2 part

obsexc: add support for evoext_pushobsmarkers_0 on localpeer This will unify the behavior of exchange in the tests.

evolve: allow read() from the magic StringIO

evolve: drop old obsmarker discovery code It as not caller anymore.

obsexc: use the common discovery We drop the hand made discovery and rely on the general one introduced some time ago.

obsexc: push nothing if push fail This is closer to the future behavior with bundle2.

discovery: hook on the official discovery for obsmarker This will let the discovery be done once and used by core.

discovery: use a different setup step for discovery This will ease the dropping of the other part later.

evolve: remove unused drop random

obshash: resist to unknown revision during discovery

code movement: gather discovery code together The discovery code is the one thing that will survive the great purge.

bundle2: drop custom compat We'll rely on the core implementation to use bundle2.

drop relevant marker compat

evolve: always use the transaction version of phase movement This drop compat with all known released version of Mercurial.

evolve: drop debugobsoleterelevant Core gained this capability usig `hg debugobsolete --rev REV`

evolve: yield to relevant markers handling in core The handling of obsolescence marker is now performed in core. If we detect a mercurial with such power we skip the wrapping from evolve. This changeset also suffer from massive diff from the change in display of obsolescence marker with parent information introduced at the same time in core.

test-wireproto: adapt to output change from core

test: update test to new date formatting in debuobsolete output The date is now a first class citizen with proper formatting.

test: update help output to future 3.2

merge with stable

pkg: make tests pass using the generated tarball Exclude tests/test-drop.t and include tests/_exc-util.sh, tests/dummyssh, and hgext/simple4server.py.

compat: always call metadata as a keyword argument Those function are gaining more arguments. using keyword argument keep use safe in all version.

test: work around a bug in debugobsolete The defautl date was wrong all along. So we use a fixed date for all tests.

merge with stable

uncommit: add a --rev argument The uncommit command now taks a --rev argument. This lets restore the file content in the current commit to another revision (instead of just is parent content). This still does not touch the working directory content.\ This allow the longly awaited: hg uncommit --hidden --rev 'precursors(.)'

readme: add missing changelog entry My dear friends changelog.

merge with stable

import: handle patch with no node information patch created by old Mercurial version or other tool have no node information. We cannot create marker in this case.

import: compare binary node with binary node when using --obsolete hex(N) != N

README: fix version number

relocate: fix typo

merge back with stable

Added tag 4.1.0 for changeset 4d5d101e878f

pkg: prepare release 4.1.0

merge default into stable Release 4.1.0 is coming

evolve: adds a --confirm option This option lets the use double check if it wants the evolve operation.

evolve: gather evolve output together We stop relying on ui.status being muted when --quiet is used. Instead we use plain write and hide this behind an explicite ui.quiet check. This will help use enforcing this output in the comming --confirm mode.

doc: forgotten amend

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

merge with stable

update readme (I should have a hook preventing me to push to public repo with uncommited changes)

evolve: add --tool option so we don't have to use HGMERGE

amend: add -U/--current-user option (inspired by mq)

tests: fix grammar, spelling, punctuation in comments

evolve: minor reorganisation of code responsible for evolve output This does not change any of the semantic as status is not printed when --quiet is provided. This juste make it more explicit that the output are related.

template: add a troubles keyword This keyword list all evolution troubles that affect a changeset. Evolution troubles can be "unstable", "divergent" and "bumped".

docs: update copyright statement used by sphinx

docs: add concepts guide (the set theory behind obsolescence)

docs: add guide to sharing mutable history

docs: add new user guide This has also been reviewed to death on evolve-testers. There are still a couple of short sections to write (clearly marked "TODO"), and one example to add. But (if I may be so bold) this is a gigantic improvement over the current docs, so it really should get merged. Incidentally, the figures are all SVG files created with Inkscape. They're not perfect, but they're pretty nice. Anyone who knows a better way to create technical diagrams is welcome to contribute. One wart: there's a test script that accompanies the document and largely duplicates it, but I haven't unified them. I've been concentrating on writing the best possible content, not on fiddling with tools. I suspect that unifying them will be non-trivial, but definitely worth doing.

docs: rewrite index page (including dangling links to future docs) This has been reviewed to death on the evolve-testers mailing list. I've made some minor tweaks since the last round of reviews, but the main content is the same.

amend: add -D/--current-date option, just like mq's qrefresh has Carefully designed so we can easily add -D to other changeset-creating commands (probably anything that takes -d), and so that we can add -U/--current-user as well. When that's done, the date and user options should be very similar to those in MQ.

amend: explicitly test -d option

amend: in tests, do not rely on defaults -- always use explicit -d Having a default -d option will make it hard to test -D/--current-date, which is coming shortly: presence of -d overrides -D, just like with mq's qrefresh.

evolve: fix createmarkers() wrapper to accept an iterable Docstring in mercurial.obsolete says "<relations> must be an iterable of ...", and hgsubversion takes it at its word and passes a generator. Until around Mercurial 3.0, this did not cause any problems, but now it does: in a repo with both evolve and hgsubversion enabled, pushing to Subversion when obsolete changesets are present causes a crash: [...] File "/home/gward/src/hgsubversion/hgsubversion/wrappers.py", line 346, in push obsolete.createmarkers(repo, relations) File "/home/gward/src/hg-stable/mercurial/extensions.py", line 196, in wrap return wrapper(origfn, *args, **kwargs) File "/home/gward/src/hg-evolve/hgext/evolve.py", line 332, in _createmarkers relations[idx] = (prec, sucs, meta) TypeError: 'generator' object does not support item assignment Since hgsubersion is playing by the documented rules, evolve must be the guilty party here.

merge with 4.0.0

Added tag 4.0.0 for changeset 0304fc2bab15

pkg: prepare release of version 4.0.0

pkg: drop pushexperiment from the install list

merge stable into default default is meant to be a superset of stable

merge default in to stable evolve 4.0.0 is coming.

merge back into stable The 2,7 is meant to be a subset of stable.

prepare a branch for compatibility with mercurial 2.7 to 3.0(.0) Evolve 4.0.0 is coming

test: update to output change introduced by future 3.1

simple4server: backport the bundle2 exchange

evolve: install progress support for the bundle2 pull path The custom wireprotocol command had a trick to display progress while pulling. We reinstall such logic for the new path using bundle2. Its notable that we are using the bundle2 advisory parameter for this purpose.

evolve: install progress support for the bundle2 push path The custom wireprotocol command had a trick to display progress while pushing. We reinstall such logic for the new path using bundle2.

evolve: add a pull path using bundle2 Instead of using a dedicated wireprotocol commands, we use bundle2 to transmit an obs marker parts. This aims at both testing bundle2 more and to limit the amount of special code we needs to put in simple for server to fit our needs. The massive test changes comes from the fact we can use this fast path for both remote and local push.

evolve: advertise obsmarker creation in the transation hook This will let extensions hooks on marker exchange.

evolve: add bytes and new marker data when processing part This will helps use to keep printing useful message when pulling through bundle2.

evolve: add a push pass using bundle2 Instead of using a dedicated wireprotocol commands, we use bundle2 to transmit an obs marker parts. This aims at both testing bundle2 more and to limit the amount of special code we needs to put in simple for server to fit our needs. The massive test changes comes from the fact we can use this fast path for both remote and local push.

evolve: make exchange output compact in the old pushkey case too.

evolve: compatibility with memfilectx change The future 3.1 have have more sophisticated memfilectx object. We add a compatibility layer for them.

evolve: abstract access to context.memfilectx This class is getting altered in the future Mercurial 3.1.0. This changeset prepare a compatibility layer.

import: drop version check for ``import --obsolete`` This code base does not support anything below mercurial-3.0 anyway.

evolve: bump requirement to 3.0.1 Use of bundle2 for pulling will require this version or above.

test: fix test-import condition The help text is ``"only(`` not `` only(``

merge with stable

evolve: make most line lenghts 80 characters or less There are still a few lines that are above 80 characters in length. Those have not been changed because doing so would make the code a bit less clear.

evolve: start all util.Abort messages with lower case

evolve: improve wording of a few of messages

evolve: fix a couple of typos

evolve: fix spelling error

evolve: more compact output in the wire protocol case We made the wording more similar and use less line. The writing operation is usually fast so we do not needs a specific line for it.

evolve: test exchange through wireprotocol The wireprotocol version of the exchange was only tested in the `simple4server.py` case.

evolve: align working during obsmarker push using pushkey lets use the same wording everywhere to prevent user confusion.

evolve: drop some pre-3.0 compatibility code This extension already requires Mercurial 3.0

evolve: update the errors message to request mercurial 3.0 and above And update the checking code too. This extension already requires 3.0 for some time.

readme: remove some duplicated entries Those changes where backported to 3.3.2.

readme: remove embarrassment There were… conflict marker in this file. Its over, they are gone now.

merge with 3.3.2

Added tag 3.3.2 for changeset a03ea39aca2a

prepare release 3.3.2

fold: add squash as a possible alias In order to respect the habituation of the majority of DVCS users and to make this feature more easily discoverable, the very common "squash" terminology should be added as a synonym to "fold". Since git does not have a squash command, this should be safe.

fold: add --message and --logfile options Like other commit-creating commands, this add two options for specifying the resulting commit message, with tests. If either of these options is specified, no editor is popped up asking for a commit message.

merge with stable

prune: update to successor rather than parent when prune '.'

import: --obsolete flag for automatic obsolescence marker creation A new `--obsolete` flag is added to import. When present, the new node will be marked as a successors of the one specified in the `Node` field of the imported patch. No marker are created when revision have the node expected in the patch. This improves email based work flow where implicit rebase are likely to happen and extra information are lost, changing the hash. This new behavior requires a flags, otherwise the `hg export x | hg import -` idiom would change, turning the source obsolete. (Changing from `hg graft x` to `hg rebase --dest . --rev x`) This change only takes effect when using Mercurial 3.0 and above

merge with all other change to 3.3

update 3.3.0 readme to include minimal mercurial requirement This clarify the situation.

evolve: fix grammar in a comment

README: document how to run the tests

uncommit: change 'kill' to 'prune' in error message 'kill' was renamed to 'prune' Long time ago.

readme: the forgotten update strike again

evolve: protect call to rebase within a wlock (#42, #35, #16) Without a wlock, repo.commit would blow away the dirstate's parents on OSes that have no 'os.symlink' support in python, leading evolve to produce a merge instead of a rebase. If a user ran the rebase command instead of evolve, then things would work because rebase is wrapped in a giant wlock. Unfortunately, we can't use the same idea of wrapping the evolve command in one giant wlock because that's too early in the process. If the lock did wrap the entire evolve command, then the working directory would save its current parents which, since rebase hasn't been called yet, would be just p1. Therefore, we need to obtain the lock *after* the dirstate's parents are changed but *before* the call to rebase. This way ensures that when a conflict happens the working directory correctly shows both parent changeset.

readme: update the readme with all missing entry One days one will stop forgetting to update it.

readme: rephrase the changelog entry regarding the new exchange Lets try to have it readable by human being.

readme: drop the reference to fastobs Its dead Jim.

merge with stable

Added tag 3.3.1 for changeset fc04758ea9f5

prepare release 3.3.1

fix maintainer email I'm not working at Logilab since july 2013. Using my personal address to prevent this kind of situation in the future.

fold: enable --date and --user options Like all other commit-creating commits, `hg fold` should also have these options enabled. This also allows getting consistent hashes during tests involving fold.

evolve: improves readme wording (yes I just pushed the other version…)

evolve: update changelog in README

test: update testing statement

evolve: abort when trying to move a node on top of itself This provides a clearer error message when evolve misstakenly tries to move a changeset on top of itself. Before we got an abort with a cryptic message about trying to rebase a merge changeset. A proper fix to make sure that evolve never tries to move a node on top of itself will come in later patches.

run-tests: add executable bit

rewrite: use cmdutil.logmessage instead of ad-hoc methods The logic for handling the --message and --logfile options is already in core hg in the cmdutil.logmessage function. This patch removes this duplicate logic from Evolve and just calls the core function.

fold: enable --date and --user options Like all other commit-creating commits, `hg fold` should also have these options enabled. This also allows getting consistent hashes during tests involving fold.

merge with stable

test: sort output of listkey command The pushkey namespace came as dict key. So they have no defined order. We sort them to stabilize the test.

exchange: use fixed order for obstore content The obsstore content seems unstable from one version of python to another (we most certainly use some dict) we fix the order once and for all.

Finish killing fastobs (this test failed loudly after 33fdaec24432)

Kill fastobs, as marmoute says it causes problems

tests: fix test-prune.t breakage test-prune.t was broken due to 91d28bd0e04e in upstream Mercurial, which made hidden commits visible when a local tag made the commit reachable. The fix is to delete the tag in the test.

Fix preservation of rename information on evolve (#33) Following what rebase itself does, call duplicatecopies between rebasenode and concludenode. Should fix https://bitbucket.org/marmoute/mutable-history/issue/33/evolve-command-loses-copy-metadata

merge stable into default

tests: fix test-prune.t breakage test-prune.t was broken due to 91d28bd0e04e in upstream Mercurial, which made hidden commits visible when a local tag made the commit reachable. The fix is to delete the tag in the test.

evolve: small white space change

evolve: use new api _callcompressable This changeset makes evolve compatible with the change introduced in 167047ba3cfa

evolve: downcase first word in module doc This makes the output of hg help consistent with the other extensions.

evolve: deprecate gup and gdown aliases This is done in an effort to clean up the UI of evolve.

evolve: add function to deprecate an alias When cleaning up the UI for evolve we will deprecate old aliases, but still want them to work for a while. This is a helper function that will be called during the extension setup and has the ability map an old alias to a new or canonical one.

evolve: downcase first word in module doc This makes the output of hg help consistent with the other extensions.

evolve: active bookmark should move when using prev/next (#37) The #37 references the bitbucket issue for mutable-history, that can be found here: https://bitbucket.org/marmoute/mutable-history/issue/37/

commands: small language fixes in help

evolve: abort when trying to move a node on top of itself This provides a clearer error message when evolve misstakenly tries to move a changeset on top of itself. Before we got an abort with a cryptic message about trying to rebase a merge changeset. A proper fix to make sure that evolve never tries to move a node on top of itself will come in later patches.

run-tests: add executable bit

evolve: add a hook related to the new pushobsmarkers command Before the current expericment, people could hook on obsolescence marker push using pushkey. We add a new hook to serve the same purpose.

exchange: dropping dead code (issue36) This variable does not exist anywhere else in the code.

evolve: fix evolve with mercurial default MODERNCAPS have been renamed to moderncaps upstream.

simple4server: update tests Forgot to amend before pushing.

sinmple4server: advertise new cap only when advertising obsolescence This is more consistent.

evolve: do not exchange obsolescence markers when server refuse it The server can be configured to refuse obsolescence markers exchange. See changeset 48804a8d7472 for details about it. We respect server will in the client.

simple4server: option to advertise obsolescence support We had an option to control the advertising of the obsolescence markers support from the server. The goal of this option is to allow large scale repo hosting service to control the use of obsolescence markers exchange.

export: add test for simple4server We now officially test it over http

exchange: fix push markers over wire protocol for http peer Http actually interpret the data passed to _callpush expecting them to a bundle. Interpretation of a markers stream as a bundle obviously led to crash.

exchange: expose length of pushed markers http wireprotocol will need it.

simple4server: update "from <changeset>" statement Could obviously not do it in the same changeset than the original changes.

exchange: fix changeset pulling over http http compress its stream. The were building a bogus stream where the first 10 bytes where uncompressed. Confusing the client.

simple4server: update "from <changeset>" statement Could obviously not do it in the same changeset than the original changes.

exchange: properly wrap wireprotocol capabilities Just wrapping the module function only works for ssh. Ssh gets capability through the `hello` command. We also need to wrap the function stored in the command dict. This fix discovery for http peer.

simple4server: add origin and documentation to most function

evolve: add 2.9.1 compatibility seal to simple4server

simple4server: fix a missing import

evolve: update version compatibility error message

exchange: fix pull over wire protocol Actually hand pulled obsolescence markers to the pull logic. In the wire protocol case we did not reset the position of the file pointer after writing the pulled data. This lead the pull logic to thing that no markers were send at all. This changeset fix this client side bug. (apparently no test check both markers pulling and wireprotocol)

exchange: enforce permission on new wireprotocol command hgweb needs an explicit declaration of the permission level of each commands.

merge stable

evolve: fix typos in uncommit docstring

simple4server: add the wireproto command for obsolescence markers discovery This come with its usual train of duplicated utility.

discovery: use the discovery process for pull Wow! Such speed! Much functional! Very proof on concept implementation!

discovery: implement a discovery process and use it for push Much faster! So functional! Very proof on concept implementation! Wow!

discovery: first version of the "hash tree" idea We build a hash for each node based on the markers that applies to it and the hash of its parent. This will allow a kind of discovery process for markers.

evolve: update changelog with recent advance

merged 3.3 release into default Some of the default content was released in 3.3.0 the other ones are moved to 3.4

Added tag 3.3.0 for changeset 83882f2fbecb

prepare 3.3.0 release

evolve: drop `latercomer` and `conflicting` compatibility. Those old alias are deprecated for a long time now. All computations related to troubles are in Mercurial core for multiple versions.

evolve: use flag value from core for bumped fix This flag is available from core for a long time, lets use it directly from there. This commit intend to cleanup old stuff from the evolve extention.

test: get rid of all reference to conflicting changesets They are now called divergent for a long time.

merge various improvement to stable We want a good stable state before starting massive changes in default for obsolescence marker update.

exchange: add progress bar when pushing using wire protocol command Progress bar on pull was only available for pushkey based push before this changeset. This implementation is very hacky but we are still at a proof of concept stage for those new exchange method.

exchange: add progress bar when pulling using wire protocol command progress bar on pull was only available for pushkey based pull before this changeset.

exchange: fix pulling from simple for server There is far too much code duplication down there.

exchange: add test case for D.4

exchange: add test case for D.3

exchange: add test case for D.2

exchange: add test case for D.1

exchange: add test case for C.4

exchange: add test case for C.3

exchange: add test case for C.2

exchange: add test case for C.1

exchange: add test case for B.7

exchange: add test case for B.6

exchange: add test case for B.5

exchange: add test case for B.4

exchange: add test case for B.3

exchange: add test case for B.2

exchange: add test case for B.1

exchange: add test case for A.7

exchange: add test case for A.6

exchange: add test case for A.5

exchange: add test case for A.4

exchange: add test case for A.3 Allow arbitrary arguments to dotest. This allow to push --force when the push creates more heads.

exchange: automate the testing process too we now have: dotest TESTNAME [TARGETNODE]

exchange: have a function doing all the common initial setup This will help creation of further test.

exchance: add a common setup script for all test

exchange: add test case for A.2 Testcase defined here: http://mercurial.selenic.com/wiki/ObsolescenceMarkersExchange

exchange: add test case for A.1 Testcase defined here: http://mercurial.selenic.com/wiki/ObsolescenceMarkersExchange

exchange: add the pullmarker wireproto command to simple4server This will allow simple server side support. (yes, code duplication is bad I already told you I won't do it too much mom)

exchange: extract computation of pulled markers boundary in a function I expect massive experimentation on this specific aspect. so we better isolate it.

exchange: pull markers relevant to the pulled subset only With the command recently introduced we can select to pull only markers relevant to some nodes. We are now pull all markers for all node in the relevant subset. We'll try to pull less (just markers for node where local and remote marker diverge) later, but we need some marker discovery mechanism for that. which are not easy.

exchange: add a new method to pull markers It has both local and wire protocol implementation. This command does not requires escaping of the marker and are expecting to me highly faster than the pushkey method. The other main point is that command is to accept a `heads` and `common` argument to select to pull changeset only relevant to a set a of node. We are not using this capability yet but we'll do it soon

exchange: add the pushmarker wireproto command to simple4server This will allow simple server side support. (yes, code duplication is bad, I won't do it too much mom)

exchange: introduce a wireprotocol command to push markers Pushkey is not adapted to transmit a stream of binary data. We used it as a hack so far. We add a new wire protocol command to speed the things up (and also push all the markers in a single transaction). The proper way to do it is to introduce bundle2 in core, but this will already help in the mean time.

exchange: actually use _pushkeyescape fallback The code was still calling `obsolete._pushkeyescape` therefore never calling the fallback we defined. Now that we call it, it had to be fixed to actually work too.

merge with stable

prune: accept '0 0' as a valide --date value I 've no idea why 4c0f6d555032 introduced it with this check.

exchange: only push the set of marker relevant to want we push We now compute all markers relevant to pushed set. And just send just those one. So you are no longer pushing markers that point to changeset your are not pushing. See the in line comment for details about what "relevant" is. Multiple nice output have been added in the process.

evolve: add relevant marker exchange machinery This is going to be needed for obsolescence marker exchange.

fastobs: rename var from `node` to `rev` It contains revision (from repo.revs not node).

fastobs: move the extension to the hgext dir

test-prune: update test with a prune output compatible with newest hg Newest hg can record the parent information in the marker. This change the debugobsstorestate output a lot.

drophack: major speedup to marker stripping It appear that each call to obsstore.add have a significant overhead (in particular the creation of a set form the list of markers and file system operation to the obsstore file. We now compute the marker we need to store and write them in a single call.

evolve: add a cmddebugrecordpruneparents command This command can be used to create prune marker with parent information from prune marker on changeset known locally.

debugobsstorestat: add test for pruning There is multiple prune specific code in this command. So we test it in the presence of prun marker too.

debugobsstorestat: add information about cluster We now display information about independant osolescence markers clusters.

evolve: fix creation of prunedchildren for merge The `p2` code path was broken. (stupid typo)

evolve: add a debugobsstorestat command This commands print multiple some data about the content of the obsstore. This will be usefull to provide some metric and insight for obsolescence marker exchange.

evolve: extend obsstore object to use prune parent information Now that we have the information, we can use it to build a mapping to access all marker that prune a children of a node. This is similar to what we do for successors and precursors. The performance impact is a few tens of second on my mercurial clone. Experimenting is worth the trouble.

prune: wrap mercurial internal to add parent information in prune marker We store as a p1 (and p2) key in the extra dict for marker. This allow us to record this information for future use without requiering a format change.

evolve: drop `latercomer` and `conflicting` compatibility. Those old alias are deprecated for a long time now. All computations related to troubles are in Mercurial core for multiple versions.

test: get rid of all reference to conflicting changesets They are now called divergent for a long time.

evolve: use flag value from core for bumped fix This flag is available from core for a long time, lets use it directly from there. This commit intend to cleanup old stuff from the evolve extention.

importing fastop extension in this repo This repo is dedicated to experimentation on mutable history topic. Fastop is appropriate there.

fastobs: revset refactor related fixes

adapt fastopt extension to mercurial.exchange module The push code have changed to be more modular. the fastop extension need to be rewritten. No backward compatibility preserved for mercurial <=2.9x.

drop unused function `pushmarkerwrapper` I can find any user for this function.

Add initial test.

Deduplicate markers. Depends on __hash__ and __eq__ on obsolete.marker

copy precursor revset from evolve so we don't depend on involve

fastobs: details strategies in the main help

fastobs: fix a bunch of stupid errors that prevented it from working at all

fastobs: clean up logging a little

fastobs: first commit of an extension to test obsolete marker exchange methods This currently implements the "fill in the box" approach discussed at the 2.6 sprint, which seems to handle common cases correctly with significantly less data transferred.

drophack: add a new drop hack extension for Matt Mackall usage This extension is hacky and not intended for real world usage. See documentation for details.

prune: add biject option This option allows two ranges to be given for successors and precursors such that there is a one-to-one match between each range. Test coverage has been added.

evolve: register a summary hook instead of wrapping the summary command

merge stable into default.

doc: improve reference to log --hidden - glog is not mucha thing anymore - also add a usage exemple

doc: fix trailing white space

doc: DIE MQ DIE

doc: use --succ in prune help --succ is the new only way.

doc: remove referenc to proleferation of hidden commit This is not much something we try to avoid anymore This changeset is eathenly adding reference to other toubles too.

doc: try to clarify rebase warning

doc: enhance your fold help Refer to the two different for of using fold.

doc: refer to previous and next in the gup, gdown help

doc: replace graft -O with grab

doc: rework how to entry about amend We can recommand the core `hg commit --amend` now. We also drop reference to MQ.

raise util.Abort instead of assertion when trying to evolve a merge changeset. This prevent exposing a nasty traceback to the user.