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