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.