evolve: minor reorganisation of code responsible for evolve output This does not change any of the semantic as status is not printed when --quiet is provided. This juste make it more explicit that the output are related.

template: add a troubles keyword This keyword list all evolution troubles that affect a changeset. Evolution troubles can be "unstable", "divergent" and "bumped".

docs: update copyright statement used by sphinx

docs: add concepts guide (the set theory behind obsolescence)

docs: add guide to sharing mutable history

docs: add new user guide This has also been reviewed to death on evolve-testers. There are still a couple of short sections to write (clearly marked "TODO"), and one example to add. But (if I may be so bold) this is a gigantic improvement over the current docs, so it really should get merged. Incidentally, the figures are all SVG files created with Inkscape. They're not perfect, but they're pretty nice. Anyone who knows a better way to create technical diagrams is welcome to contribute. One wart: there's a test script that accompanies the document and largely duplicates it, but I haven't unified them. I've been concentrating on writing the best possible content, not on fiddling with tools. I suspect that unifying them will be non-trivial, but definitely worth doing.

docs: rewrite index page (including dangling links to future docs) This has been reviewed to death on the evolve-testers mailing list. I've made some minor tweaks since the last round of reviews, but the main content is the same.

amend: add -D/--current-date option, just like mq's qrefresh has Carefully designed so we can easily add -D to other changeset-creating commands (probably anything that takes -d), and so that we can add -U/--current-user as well. When that's done, the date and user options should be very similar to those in MQ.

amend: explicitly test -d option

amend: in tests, do not rely on defaults -- always use explicit -d Having a default -d option will make it hard to test -D/--current-date, which is coming shortly: presence of -d overrides -D, just like with mq's qrefresh.

evolve: fix createmarkers() wrapper to accept an iterable Docstring in mercurial.obsolete says "<relations> must be an iterable of ...", and hgsubversion takes it at its word and passes a generator. Until around Mercurial 3.0, this did not cause any problems, but now it does: in a repo with both evolve and hgsubversion enabled, pushing to Subversion when obsolete changesets are present causes a crash: [...] File "/home/gward/src/hgsubversion/hgsubversion/wrappers.py", line 346, in push obsolete.createmarkers(repo, relations) File "/home/gward/src/hg-stable/mercurial/extensions.py", line 196, in wrap return wrapper(origfn, *args, **kwargs) File "/home/gward/src/hg-evolve/hgext/evolve.py", line 332, in _createmarkers relations[idx] = (prec, sucs, meta) TypeError: 'generator' object does not support item assignment Since hgsubersion is playing by the documented rules, evolve must be the guilty party here.

merge with 4.0.0

Added tag 4.0.0 for changeset 0304fc2bab15

pkg: prepare release of version 4.0.0

pkg: drop pushexperiment from the install list

merge stable into default default is meant to be a superset of stable

merge default in to stable evolve 4.0.0 is coming.

merge back into stable The 2,7 is meant to be a subset of stable.

prepare a branch for compatibility with mercurial 2.7 to 3.0(.0) Evolve 4.0.0 is coming

test: update to output change introduced by future 3.1

simple4server: backport the bundle2 exchange

evolve: install progress support for the bundle2 pull path The custom wireprotocol command had a trick to display progress while pulling. We reinstall such logic for the new path using bundle2. Its notable that we are using the bundle2 advisory parameter for this purpose.

evolve: install progress support for the bundle2 push path The custom wireprotocol command had a trick to display progress while pushing. We reinstall such logic for the new path using bundle2.

evolve: add a pull path using bundle2 Instead of using a dedicated wireprotocol commands, we use bundle2 to transmit an obs marker parts. This aims at both testing bundle2 more and to limit the amount of special code we needs to put in simple for server to fit our needs. The massive test changes comes from the fact we can use this fast path for both remote and local push.

evolve: advertise obsmarker creation in the transation hook This will let extensions hooks on marker exchange.

evolve: add bytes and new marker data when processing part This will helps use to keep printing useful message when pulling through bundle2.

evolve: add a push pass using bundle2 Instead of using a dedicated wireprotocol commands, we use bundle2 to transmit an obs marker parts. This aims at both testing bundle2 more and to limit the amount of special code we needs to put in simple for server to fit our needs. The massive test changes comes from the fact we can use this fast path for both remote and local push.

evolve: make exchange output compact in the old pushkey case too.

evolve: compatibility with memfilectx change The future 3.1 have have more sophisticated memfilectx object. We add a compatibility layer for them.

evolve: abstract access to context.memfilectx This class is getting altered in the future Mercurial 3.1.0. This changeset prepare a compatibility layer.

import: drop version check for ``import --obsolete`` This code base does not support anything below mercurial-3.0 anyway.

evolve: bump requirement to 3.0.1 Use of bundle2 for pulling will require this version or above.

test: fix test-import condition The help text is ``"only(`` not `` only(``

merge with stable

evolve: make most line lenghts 80 characters or less There are still a few lines that are above 80 characters in length. Those have not been changed because doing so would make the code a bit less clear.

evolve: start all util.Abort messages with lower case

evolve: improve wording of a few of messages

evolve: fix a couple of typos

evolve: fix spelling error

evolve: more compact output in the wire protocol case We made the wording more similar and use less line. The writing operation is usually fast so we do not needs a specific line for it.

evolve: test exchange through wireprotocol The wireprotocol version of the exchange was only tested in the `simple4server.py` case.

evolve: align working during obsmarker push using pushkey lets use the same wording everywhere to prevent user confusion.

evolve: drop some pre-3.0 compatibility code This extension already requires Mercurial 3.0

evolve: update the errors message to request mercurial 3.0 and above And update the checking code too. This extension already requires 3.0 for some time.

readme: remove some duplicated entries Those changes where backported to 3.3.2.

readme: remove embarrassment There were… conflict marker in this file. Its over, they are gone now.

merge with 3.3.2

Added tag 3.3.2 for changeset a03ea39aca2a

prepare release 3.3.2

fold: add squash as a possible alias In order to respect the habituation of the majority of DVCS users and to make this feature more easily discoverable, the very common "squash" terminology should be added as a synonym to "fold". Since git does not have a squash command, this should be safe.

fold: add --message and --logfile options Like other commit-creating commands, this add two options for specifying the resulting commit message, with tests. If either of these options is specified, no editor is popped up asking for a commit message.

merge with stable

prune: update to successor rather than parent when prune '.'

import: --obsolete flag for automatic obsolescence marker creation A new `--obsolete` flag is added to import. When present, the new node will be marked as a successors of the one specified in the `Node` field of the imported patch. No marker are created when revision have the node expected in the patch. This improves email based work flow where implicit rebase are likely to happen and extra information are lost, changing the hash. This new behavior requires a flags, otherwise the `hg export x | hg import -` idiom would change, turning the source obsolete. (Changing from `hg graft x` to `hg rebase --dest . --rev x`) This change only takes effect when using Mercurial 3.0 and above

merge with all other change to 3.3

update 3.3.0 readme to include minimal mercurial requirement This clarify the situation.

evolve: fix grammar in a comment

README: document how to run the tests

uncommit: change 'kill' to 'prune' in error message 'kill' was renamed to 'prune' Long time ago.

readme: the forgotten update strike again

evolve: protect call to rebase within a wlock (#42, #35, #16) Without a wlock, repo.commit would blow away the dirstate's parents on OSes that have no 'os.symlink' support in python, leading evolve to produce a merge instead of a rebase. If a user ran the rebase command instead of evolve, then things would work because rebase is wrapped in a giant wlock. Unfortunately, we can't use the same idea of wrapping the evolve command in one giant wlock because that's too early in the process. If the lock did wrap the entire evolve command, then the working directory would save its current parents which, since rebase hasn't been called yet, would be just p1. Therefore, we need to obtain the lock *after* the dirstate's parents are changed but *before* the call to rebase. This way ensures that when a conflict happens the working directory correctly shows both parent changeset.

readme: update the readme with all missing entry One days one will stop forgetting to update it.

readme: rephrase the changelog entry regarding the new exchange Lets try to have it readable by human being.

readme: drop the reference to fastobs Its dead Jim.

merge with stable

Added tag 3.3.1 for changeset fc04758ea9f5

prepare release 3.3.1

fix maintainer email I'm not working at Logilab since july 2013. Using my personal address to prevent this kind of situation in the future.

fold: enable --date and --user options Like all other commit-creating commits, `hg fold` should also have these options enabled. This also allows getting consistent hashes during tests involving fold.

evolve: improves readme wording (yes I just pushed the other version…)

evolve: update changelog in README

test: update testing statement

evolve: abort when trying to move a node on top of itself This provides a clearer error message when evolve misstakenly tries to move a changeset on top of itself. Before we got an abort with a cryptic message about trying to rebase a merge changeset. A proper fix to make sure that evolve never tries to move a node on top of itself will come in later patches.

run-tests: add executable bit

rewrite: use cmdutil.logmessage instead of ad-hoc methods The logic for handling the --message and --logfile options is already in core hg in the cmdutil.logmessage function. This patch removes this duplicate logic from Evolve and just calls the core function.

fold: enable --date and --user options Like all other commit-creating commits, `hg fold` should also have these options enabled. This also allows getting consistent hashes during tests involving fold.

merge with stable

test: sort output of listkey command The pushkey namespace came as dict key. So they have no defined order. We sort them to stabilize the test.

exchange: use fixed order for obstore content The obsstore content seems unstable from one version of python to another (we most certainly use some dict) we fix the order once and for all.

Finish killing fastobs (this test failed loudly after 33fdaec24432)

Kill fastobs, as marmoute says it causes problems

tests: fix test-prune.t breakage test-prune.t was broken due to 91d28bd0e04e in upstream Mercurial, which made hidden commits visible when a local tag made the commit reachable. The fix is to delete the tag in the test.

Fix preservation of rename information on evolve (#33) Following what rebase itself does, call duplicatecopies between rebasenode and concludenode. Should fix https://bitbucket.org/marmoute/mutable-history/issue/33/evolve-command-loses-copy-metadata

merge stable into default

tests: fix test-prune.t breakage test-prune.t was broken due to 91d28bd0e04e in upstream Mercurial, which made hidden commits visible when a local tag made the commit reachable. The fix is to delete the tag in the test.

evolve: small white space change

evolve: use new api _callcompressable This changeset makes evolve compatible with the change introduced in 167047ba3cfa

evolve: downcase first word in module doc This makes the output of hg help consistent with the other extensions.

evolve: deprecate gup and gdown aliases This is done in an effort to clean up the UI of evolve.

evolve: add function to deprecate an alias When cleaning up the UI for evolve we will deprecate old aliases, but still want them to work for a while. This is a helper function that will be called during the extension setup and has the ability map an old alias to a new or canonical one.

evolve: downcase first word in module doc This makes the output of hg help consistent with the other extensions.

evolve: active bookmark should move when using prev/next (#37) The #37 references the bitbucket issue for mutable-history, that can be found here: https://bitbucket.org/marmoute/mutable-history/issue/37/

commands: small language fixes in help

evolve: abort when trying to move a node on top of itself This provides a clearer error message when evolve misstakenly tries to move a changeset on top of itself. Before we got an abort with a cryptic message about trying to rebase a merge changeset. A proper fix to make sure that evolve never tries to move a node on top of itself will come in later patches.

run-tests: add executable bit

evolve: add a hook related to the new pushobsmarkers command Before the current expericment, people could hook on obsolescence marker push using pushkey. We add a new hook to serve the same purpose.

exchange: dropping dead code (issue36) This variable does not exist anywhere else in the code.

evolve: fix evolve with mercurial default MODERNCAPS have been renamed to moderncaps upstream.

simple4server: update tests Forgot to amend before pushing.

sinmple4server: advertise new cap only when advertising obsolescence This is more consistent.

evolve: do not exchange obsolescence markers when server refuse it The server can be configured to refuse obsolescence markers exchange. See changeset 48804a8d7472 for details about it. We respect server will in the client.

simple4server: option to advertise obsolescence support We had an option to control the advertising of the obsolescence markers support from the server. The goal of this option is to allow large scale repo hosting service to control the use of obsolescence markers exchange.

export: add test for simple4server We now officially test it over http

exchange: fix push markers over wire protocol for http peer Http actually interpret the data passed to _callpush expecting them to a bundle. Interpretation of a markers stream as a bundle obviously led to crash.

exchange: expose length of pushed markers http wireprotocol will need it.

simple4server: update "from <changeset>" statement Could obviously not do it in the same changeset than the original changes.

exchange: fix changeset pulling over http http compress its stream. The were building a bogus stream where the first 10 bytes where uncompressed. Confusing the client.

simple4server: update "from <changeset>" statement Could obviously not do it in the same changeset than the original changes.

exchange: properly wrap wireprotocol capabilities Just wrapping the module function only works for ssh. Ssh gets capability through the `hello` command. We also need to wrap the function stored in the command dict. This fix discovery for http peer.

simple4server: add origin and documentation to most function

evolve: add 2.9.1 compatibility seal to simple4server

simple4server: fix a missing import

evolve: update version compatibility error message

exchange: fix pull over wire protocol Actually hand pulled obsolescence markers to the pull logic. In the wire protocol case we did not reset the position of the file pointer after writing the pulled data. This lead the pull logic to thing that no markers were send at all. This changeset fix this client side bug. (apparently no test check both markers pulling and wireprotocol)

exchange: enforce permission on new wireprotocol command hgweb needs an explicit declaration of the permission level of each commands.

merge stable

evolve: fix typos in uncommit docstring

simple4server: add the wireproto command for obsolescence markers discovery This come with its usual train of duplicated utility.

discovery: use the discovery process for pull Wow! Such speed! Much functional! Very proof on concept implementation!

discovery: implement a discovery process and use it for push Much faster! So functional! Very proof on concept implementation! Wow!

discovery: first version of the "hash tree" idea We build a hash for each node based on the markers that applies to it and the hash of its parent. This will allow a kind of discovery process for markers.

evolve: update changelog with recent advance

merged 3.3 release into default Some of the default content was released in 3.3.0 the other ones are moved to 3.4

Added tag 3.3.0 for changeset 83882f2fbecb

prepare 3.3.0 release

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.

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.

test: get rid of all reference to conflicting changesets They are now called divergent for a long time.

merge various improvement to stable We want a good stable state before starting massive changes in default for obsolescence marker update.

exchange: add progress bar when pushing using wire protocol command Progress bar on pull was only available for pushkey based push before this changeset. This implementation is very hacky but we are still at a proof of concept stage for those new exchange method.

exchange: add progress bar when pulling using wire protocol command progress bar on pull was only available for pushkey based pull before this changeset.

exchange: fix pulling from simple for server There is far too much code duplication down there.

exchange: add test case for D.4

exchange: add test case for D.3

exchange: add test case for D.2

exchange: add test case for D.1

exchange: add test case for C.4

exchange: add test case for C.3

exchange: add test case for C.2

exchange: add test case for C.1

exchange: add test case for B.7

exchange: add test case for B.6

exchange: add test case for B.5

exchange: add test case for B.4

exchange: add test case for B.3

exchange: add test case for B.2

exchange: add test case for B.1

exchange: add test case for A.7

exchange: add test case for A.6

exchange: add test case for A.5

exchange: add test case for A.4

exchange: add test case for A.3 Allow arbitrary arguments to dotest. This allow to push --force when the push creates more heads.

exchange: automate the testing process too we now have: dotest TESTNAME [TARGETNODE]

exchange: have a function doing all the common initial setup This will help creation of further test.

exchance: add a common setup script for all test

exchange: add test case for A.2 Testcase defined here: http://mercurial.selenic.com/wiki/ObsolescenceMarkersExchange

exchange: add test case for A.1 Testcase defined here: http://mercurial.selenic.com/wiki/ObsolescenceMarkersExchange

exchange: add the pullmarker wireproto command to simple4server This will allow simple server side support. (yes, code duplication is bad I already told you I won't do it too much mom)

exchange: extract computation of pulled markers boundary in a function I expect massive experimentation on this specific aspect. so we better isolate it.

exchange: pull markers relevant to the pulled subset only With the command recently introduced we can select to pull only markers relevant to some nodes. We are now pull all markers for all node in the relevant subset. We'll try to pull less (just markers for node where local and remote marker diverge) later, but we need some marker discovery mechanism for that. which are not easy.

exchange: add a new method to pull markers It has both local and wire protocol implementation. This command does not requires escaping of the marker and are expecting to me highly faster than the pushkey method. The other main point is that command is to accept a `heads` and `common` argument to select to pull changeset only relevant to a set a of node. We are not using this capability yet but we'll do it soon

exchange: add the pushmarker wireproto command to simple4server This will allow simple server side support. (yes, code duplication is bad, I won't do it too much mom)

exchange: introduce a wireprotocol command to push markers Pushkey is not adapted to transmit a stream of binary data. We used it as a hack so far. We add a new wire protocol command to speed the things up (and also push all the markers in a single transaction). The proper way to do it is to introduce bundle2 in core, but this will already help in the mean time.

exchange: actually use _pushkeyescape fallback The code was still calling `obsolete._pushkeyescape` therefore never calling the fallback we defined. Now that we call it, it had to be fixed to actually work too.

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.

prune: add biject option This option allows two ranges to be given for successors and precursors such that there is a one-to-one match between each range. Test coverage has been added.

evolve: register a summary hook instead of wrapping the summary command

merge stable into default.

doc: improve reference to log --hidden - glog is not mucha thing anymore - also add a usage exemple

doc: fix trailing white space

doc: DIE MQ DIE

doc: use --succ in prune help --succ is the new only way.

doc: remove referenc to proleferation of hidden commit This is not much something we try to avoid anymore This changeset is eathenly adding reference to other toubles too.

doc: try to clarify rebase warning

doc: enhance your fold help Refer to the two different for of using fold.

doc: refer to previous and next in the gup, gdown help

doc: replace graft -O with grab

doc: rework how to entry about amend We can recommand the core `hg commit --amend` now. We also drop reference to MQ.

raise util.Abort instead of assertion when trying to evolve a merge changeset. This prevent exposing a nasty traceback to the user.

merge with stable

tutorial: fix note We need a double semin colon, otherwise this is a comment.

tutorial: warn about rollback beeing obsolete

tutorial: use grab instead of rebase. grab as now the advantage to move the working directory.

tutorial Clarify "." explanation

tutorial: update divergent changeset section Still not there but less fuzy.

tutorial: use long form of argument for the sake of clarity

tutorial: fix some various typo

tutorial Display the help of appropriate command in section that need writting

doc: some documentation on the configuration part of the tutorial Trying to make it less obscure on first contact

doc: smarter make file We regenerate the tutorials when needed only

doc: use a symbolic link to point to the tutorial the file was lagging behind a ton.

import: warn about new unstable changesets 'hg import' can add new unstable changesets, for example when invoked with '--hidden' or '--exact', or when the working directory parent already is unstable.

evolve: show progress The total count may be too low on occasion. Not sure why. gaved up at testing this, can't get stable result.

removed the qsync extension. The only user I knew about (logilab) is not using it anymore. It not compatible with coming Mercurial version 2.9.

evolve: add more details when we abort for case not handled yet Verboser output to help people knowing what is going on and solving it on their own.

merge stable back into default

current release is stable enought

evolve: update the tested with statement It actually ssems to work with version up to 2.6 but some minor changes makes test fails. so better encourage people to upgrade.

evolve: use super for calling parent class method Otherwise we can bipass filtering (and break a lot of things)

debian: add source/format file

Added tag 3.2.0 for changeset c3ba8a965a7a

prepare 2.8 release

grab: update the alias for 2.8 compatibility 2.8 does not update on rebase anymore. We need to update by hand. this makes this alias more fragile.

gdown/gup: add next/previous alias Up and down refer to the customary order in log output rather than concepts; as such, it may be confusing to the user. I for one found them suprising -- they just didn't fit with my mental model. Previous and next, however, imply a clear parent/child relationship. We attroduce the new name as aliases for now.

evolve: allow updating to the successor if the parent is obsolete Although 'hg update' handles this as well, it will also update to tipmost descendent of the successor, if any.

evolve: abort on unknown divergent changeset base ...rather than noisily dying with a KeyError.

test: prepare test for core changeset 6cd9b8428104 Changeset 6cd9b8428104 in Mercurial core (2.8) make rebase preserve more extra. this mean hash changes. We make the test resilient to that.

test: prepare test for core changeset 9c78ed396075 New changeset in mercurial 2.8 (9c78ed396075) change rebase behavior to preverse the original working directory. This break an handfull of test so we preventively update to tip after rebase.

merge stable into default

add obsolete parents wrapper to the 'parents' command although the command itself cannot *cause* obsolete changesets, the information is rather relevant to the state of the parents

README: update changelog