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