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.