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