tests: fix directory names in exchange-D3 test The test is based on another one and the directory name had not been updated.

merge back with default

Added tag 6.0.0 for changeset 165ad227993d

packaging: prepare version 6.0.0

merged with future 6.0 No output changed.

test-compat-hg-3.9: merge with future 6.0

merge with future 6.0.0

merge with default We are getting close to cutting a 6.0.0

readme: mention the fix for issue4354

checkheads: add a small debug message in case were we give up fast When node is unknown we assume it will stay. Yet, we might have markers to it that are going to be pushed. However, we do not have branch (ancestors) information unless we are very lucky an all of them are pruned. So for now we do not do anything assuming this will be rare. We still add a small debug message to help detecting such situation in the future.

checkheahds: switch algorithm to use pushed markers instead We now checks if markers involved in the push are relevant to nodes in the branch we try to replace. The approach is simpler and more robust. A test showing the limitation of the previous approach is added.

checkheads: add test where the rewrite of the other branch is not direct This will help testing that our logic is properly transitive.

check-heads: add tests about old heads indirectly pruned

checkheads: add more complexe case where a branch is split on multiple ones We extend case A-6 and A-7 with partial counterpart. These case are interesting because some of the partial pushing will (rightfully) works and some other won't.

checkheads: add a test of partially pushing a branch spread on multiple other If a branch is fully obsolete but is result are spread on multiple branch, pushing only one of them should detect we create new branches.

checkheads-tests: add missing parents recording for prune markers It is a bit too easy to forget about theses :/ If they are missing, the markers are not going to be exchanged on push.

checkheads: add some extra tests about "partial push" This adds a couple of test that checks that the head replacement code is properly ignored replacement not relevant to the push.

checkheads: handle partial obsolescence We now properly detects situations were only parts of the remote branch is obsoleted. To do so, we process children in the branch recursively to see if they will be obsolete. The current code has some trouble when the remote branch in unknown locally, or when the prune happened on a successors that is not relevant to the push. These case will be handled later. The processing code is becoming more and more complex, a lighter approach would be to check for the obsolescence markers that are relevant to the pushed set, but I prefer to stick with the current approach until more test cases are written.

test: force a push in inhibit's test Our checkheads detection code is becoming better and will prevent that push. As we do not care about this for inhibit, we simply force the push.

checkheads: basic handling of pruned heads (and associated tests) We now detect that heads was pruned and stop warning about it. Note that this has the same shortcoming as the existing code and only looks at the heads.

checkheads: give up on processing locally unknown changeset There are too many issue with locally unknown changesets, we ignore them for now while we get the core feature of the detection working.

checkheads: import our own copy of the checkheads code I expect enough change and experimental will be made that is it worthwhile having them done in evolution close to the rest of the exchange tests make sense.

compat: work around some filecache bug in 3.8 We are still compatible with this version.

obshashrange: have an half descent wireprotocol command The previous implementation was extremely hacky. The new version is based on the other discovery function and work!

obshashrange: improve message issued during discovery This is a minor new message that help to understand what is going on.

obshashrange: introduce basic sqlite caching Same as for stablerange, this is far from perfect but already a win. The cache is currently extremely volatile, but that will still be a win when doing multiple consecutive request during discovery. Better cache invalidation will happens "in the future".

stablerange: warm cache before using it server side We make sure the cache is fully up to date before starting to use it. Updating all value is more efficient and this give us a single point where we update and write on disk. Hopefully the cache have been kept up to date as we go anyway.

stablerange: warm cache before using it in findrangemissing We make sure the cache is fully up to date before starting to use it. Updating all value is more efficient and this give us a single point where we update and write on disk. Hopefully the cache have been kept up to date as we go anyway.

stablerange: warm cache on transaction (if obshashrange is enabled) If we plan to use it (obshashrange is enabled) we better keep it up to date. If a transaction adds node, we update the cache (this should also update the on disk version).

stablerange: introduce ondisk caching through sqlite There is many short cut and limitation with this first version of a cache but this allow use to envision some actual usage of the stablerange thingy so let us got for it.

stablerange: drop the cache on 'destroyed' if the repository have been strip, the cache is not usable as is. We could be smarter in the invalidation but that is a prototype anyway. G: changed hgext3rd/evolve/stablerange.py

stablerange: support loading the cache iteratively We record how far we loaded so that we can resume from this point.

stablerange: add some basic documentation about the cache

stablerange: warmup all upto a revision Let us start doing more systemic warming of the cache before we start writing things out. This prepare on disk caching.

debugstablerange: add a --verify flag to the command This should help us finding bugs.

stablerange: add a proper debugstablerange commands This commands allows to inspect the standard stable range of a range. That should come handy.

debugobshashrange: add a --subranges option We stop displaying -everything- by default, since is is usually very large. This will help getting better timing when measuring cache effect too, since we won't need to dig out deep cache value that real life usage would not touch.

debug: rename 'debugstablerange' to 'debugobshashrange' The command is more about the 'obshashrange' computation.

debugstablerange: improve output spacing On repo with a descent amount of changeset the number where overflowing in all directions. We give use more room now.

subranges: add a utility function to set the cache This is preparing on disk persistence for the value in this cache.

subranges: add a utility function to access the cache This is preparing on disk persistence for the value in this cache.

depth: add a utility function to set the cache This is preparing on disk persistence for the value in this cache.

depth: add a utility function to access the cache This is preparing on disk persistence for the value in this cache.

stablerange: add warming of the subrange Note that this means we build standard stable subrange for all changesets in the repository this is significantly more than what we were computing before and result is significantly more ranges being computed.

stablerange: fix merge slicing when range has multiple roots The first element in the bottom set is not necessarly the one with the lowest revision. We now properly compute and use the minimum value.

stablerange: small style fix

merge-slicing: introduce and use "inheritance point" for merge The first part of the stable sorted list of revision of a merge will shared with the one of others. This means we can reuse subranges computed from that point to compute some of the subranges from the merge. That point is latest point in the stable sorted list where the depth of the revisions match its index (that means all revision earlier in the stable sorted list are its ancestors, no dangling unrelated branches exists). This is a bit expensive to find since we have to walk all the revision, but being able to reuse subranges in all case (not just regular changesets) provide a massive speedup so the cost is worth it.

stablerange: rearrange the code picking subrange to warm Same logic, as the previous changesets, we prepare the code before adding merge support.

stablerange: rearrange the reusing logic to prepare to merge We'll soon be able to reuse some lower range when dealing with merge too. So we prepare the code for this in advance for clarity.

merge-slicing: explain an alternative implementation in a comments It has a better time complexity so a C implementation would likely out perform the current implementation

merge-slicing: use reachable roots to filter the various branches Reachable roots does what we want and have a quite fast C implementation.

merge-slicing: simplify various aspect of the code Especially the case were the bottom have single heads is not more efficiently handled.

stablerange: soon it will not provide any benefit and it gets in the way This was a bit strange and memory consuming anyway.

revsfromrange: reuse information from the stablesort We collaborate with the stablesort to store the order that led to a merge. That way, when we needs to retrieve revision from that merge we can reuse that order. We might need to filter to only retains ancestors of the merge we care about but skipping the stablesort safe a large amount of time.

stablesort: allow a callback to be triggered on merge Storing some information as we sort is going to be useful to avoid performing multiple sort while computing the stablerange.

minor simplification around rangelength

more explicite name in revsfromrange

stablerange: cache parents We happens to be doing and awful amount of parent call. We cache them locally for efficiency.

merge-slicing: avoid doing the same work twice We have already computed the list of revision in that bottom slice as 'hrevs' so we do not need to compute it a second time.

stablerange: fix a bug when a top slice ended on a merge Our "smart" detection of merge was buggy if the top slice ended on a merge. This is not fixed and tested.

slicesrangeat: stop double setting the revsinranges cache The cache should have already been filled by the logic warming the cache for the parent.

subranges: remove the recursivity of the call to isubranges(parentrange) We add some logic to ensure we'll have hot cache for the parent ranges when that matters, the cache is filled from ancestors to descendant to ensure this. The range are still 'created from descendant to ancestors to fill the revsfromrange cache since it important.

subranges: detach cache logic from computation logic Having both the logic around cache checking and setting makes is a bit harder to follow. In addition, this allow to gather the computation logic next to the other related function.

findmissingrange: properly queue new subrange for slicing The previous code was buggy and used the wrong variable leading to no extra slicing being performed to file the sample at the requested size.

findmissingrange: fix reversed value in debug output "oops"

stablecache: warmup on unfiltered repository We only looks at ancestors revision so filtering will not have any effect. This reduce overhead from the filtering.

stablerange: rename the class This is much more than just a cache now.

stablerange: do not inherit from dict This seems like and old cargo cult that when unnoticed.

stablerange: move a utility function around It make more sense to have this small function earlier in the series

stablerange: remove the now unused individual range class That class is now longer necessary, we dropped its usage for performance reason.

stablerange: directly use tuple to refer to a stable range Now that all advance logic lives in the unified class we no longer needs the individual class. Creating and operating on this cache introduce a significant overhead that we can not stop having. From now on, a range a is pair tuple '(headrev, index)'. Long live the tuple.

obshash: properly cache obshash value The code was buggy and only cached non-nullid/non-inherited value. This was previous hidden because we were using a 'propertycache' to cache the value on the range object. This fixes it and restore a lot of performance.

stablerange: directly use 'self' when possible Code movement introduced multiple silly case were we where accessing 'self' though 'repo.stablerange' for no good reasons.

revsfromrange: set the cache for the multiple bottom ranges in merge slicing We no longer rely on the object magic here.

revsfromrange: set the cache for the single bottom range in merge slicing We no longer rely on the object magic here.

revsfromrange: set the cache for the top range in merge slicing We no longer rely on the object magic here.

revsfromrange: remove reference to '_revs' in merge slicing Given '_revs' is a property from the cache, we use the official method of the object we are on instead. That method should be using the same cache than the property if available.

revsfromcache: update cache for the top slice if possible Same logic, we update the cache if have the data.

revsfromrange: skip setting the cache for length-1 top entry The content of the range is trivial to compute.

revsfromrange: update cache for parentrange directly in the code We update it where it matters if we detect that we have the data.

revsfromramge: hard code the single changeset range case That case is trivial and triggering and full stable sort for it seems a bit silly.

stablerange: introduce caching for the full revision in a set Such cache proved handy in the "per-range" class so we carry it along to the unified class. cf documentation for details.

stablerange: add a cache for stablesort ordering This will be very handy for merge, cf inline documentation for details.

stablerange: move revs computation within the main class We still need to compute the revision withing a range when we slice a merge. This is the last large logic that remains in the individual class and we migrate is on the main class.

stablerange: minor method reorders on the main class We put the public method first for clarify.

stablerange: drop "key" and "id" logic form the class We can restrict to the bare minimun for equality and hashing now.

stablerange: drop length from the class There is not remaining user.

stablerange: drop _depth Nothing uses it anymore.

stablerange: drop __repr__ IT was used for debug and the class is on it way out.

stablerange: drop the subranges method on the small class Nobody use it anymore.

stablerange: use subranges from the main class in subrangesclosure This is the last method used on the class.

stablerange: use subranges from the main class in _obshashrange This is the last method used on the class.

stablerange: use subranges from the main class in findrangemissing This is the last method used on the class.

stablerange: make sure nobody use '.depth' anymore

stablerange: use depthrevs in range slicing We stop using the property from the class to get us closer to tuple.

stablerange: use depthrevs in debugstablerange We stop using the property from the class to get us closer to tuple.

stablerange: use rangelength inside the class itself We stop using the building '__len__' this get use closer to be able to use a tuple.

stablerange: use rangelength in '_slicesatrange' We stop using the building '__len__' this get use closer to be able to use a tuple.

stablerange: use rangelength in '_slicepoint' We stop using the building '__len__' this get use closer to be able to use a tuple.

stablerange: use rangelength in subrangesclosure We stop using the building '__len__' this get use closer to be able to use a tuple.

stablerange: use rangelength in _obshashrange We stop using the building '__len__' this get use closer to be able to use a tuple.

stablerange: use rangelength in debugstablerange We stop using the building '__len__' this get use closer to be able to use a tuple.

stablerange: use rangelength in findmissingrange We stop using the building '__len__' this get use closer to be able to use a tuple.

stablerange: make sure nobody use '.index' anymore We rename the attribute for good measure.

stablerange: stop using '.index' inside the class itself We now access '[1]' as we'll do with the future tuple.

stablerange: stop using '.index' in '_slicesrangeat' We now access '[1]' as we'll do with the future tuple.

stablerange: stop using '.index' in '_slicepoint' We now access '[1]' as we'll do with the future tuple.

stablerange: stop using '.index' in 'rangelength' We now access '[1]' as we'll do with the future tuple.

stablerange: stop using '.index' in '_queryrange' We now access '[1]' as we'll do with the future tuple.

stablerange: stop using '.index' in debugstablerange We now access '[1]' as we'll do with the future tuple.

stablerange: make sure nobody use the 'stablekey' property outside the class

stablerange: make sure nobody use '.head' anymore We rename the attribute for good measure.

stablerange: stop using '.head' inside the class We now access '[0]' as we'll do with the future tuple.

stablerange: stop using '.head' in '_slicesrangeat' We now access '[0]' as we'll do with the future tuple.

stablerange: stop using '.head' in '_slicepoint' We now access '[0]' as we'll do with the future tuple.

stablerange: stop using '.head' in rangelength We now access '[0]' as we'll do with the future tuple.

stablerange: stop using '.head' in debugstablerange We now access '[0]' as we'll do with the future tuple.

stablerange: remove node unused 'node' property Close to killing that object.

stablerange: stop using '.node' in __repr__ This remove the last user to this method.

stablerange: change the key to use the revision number Using node is more stable but for now do not have on disk caching and revision number should be find in memory. This makes the data used for the file cache closer to what it will be when we use tuple. We might reintroduce node in the future but let us keep it simple for now.

stablerange: stop using '.node' in _queryrange We access the range-head revision number by index and convert it on site.

stablerange: stop using '.node' in debugstablerange We access the range-head revision number by index and convert it on site.

stablerange: stop using '.node' in findmissingrange We access the range-head revision number by index and convert it on site.

stablerange: stop using '.node' in obshashrange We access the range-head revision number by index and convert it on site.

stablerange: stop using '.node' in subrangesclosure We access the range-head revision number by index and convert it on site.

stablerange: have the class behave as a tuple If we want people to use a tuple, we should offer them a tuple. This should help update most of the code iteratively.

obshashrange: extract computation back into the discovery module This obshash is related to discovery and it seems more appropriate to have to live there. This remove the last large piece of logic from the class. We'll now be able to slowly turn it into a tuple.

obshashrange: use a small utility function to access the obshash If we want the object to disappear we needs the top level code to stop accessing its attribute.

debugstablerange: minor code reformat The content of that list will become more complex as we drop the object so we make sure to have one value per line for clarity.

stablerange: move the subrangesclosure inside the module This seems more suitable and open the way to simple update of how we build things without too much impact outside the module. The debug command is still in the 'obsdiscovery' module because it also deal to obshash and I'm not sure of were this should live yet.

stablerange: compute subranges from parent when possible Unless we are a merge, we can infer the standard subranges of a range by reusing the subranger of its parent. We update the implementation to do so. We still needs the "old way" for merge. We move that code in a dedicated function for the sake of simplicity.

stablerange: add an official warmup function The function is responsible for making sure we have the necessary data for a sets of heads. For now this only warm the depth cache. More will follow soon. Such explicite warmup will be usefull for on disck caching as an early point of writing will be easier.

stablerange: remove now unnecessary setter The class is handling all computations and cache access by itself now. So we can drop this method.

stablerange: directly perform slicing in the getting method Now that all necessary functions are available, we simply apply the standard slicing on cache miss and proceed.

stablerange: move standard slice point definition in main class More migration of code away from the doomed individual class.

stablerange: move the slicing method on the central class We migrate code away for the individual range class.

stablerange: move the range class in the new module Our ultimate goal is to remove this class for performance reason. however for now, it contains most of the code we care about so we migrate it as a block first.

stablesort: move into the stablerange module The stable range rely on the stable sort so it make senses to move it there. Will need direct access to it in the future.

subranges: migrate handling of single element range This is the simplest case by far, so we start with that one. We still use the rich object as an argument, but we'll do our best to not relying on that. This is important for performance reason.

stablerange: move the subrange cache into our new class This is the first step toward having more logic in that class

depth: extract code dedicated to depth of a merge in its own function The merge case is more complicated than the regular one, we extract is for the sake of clarity.

stablerange: move 'depth' inside a new 'stablerange' module The stablerange used for discovery requires significant amount of code. There is algorithme, cache, cache persistence, etc. So we create a dedicated module for it. The function is directly moved into a rich class handling cache (for now in memory) because we know we will need it.

obsdiscovery: document the status of the module I figured i would be useful to document what we expect from the code in each module.

split: move the debugcommand into a dedicated module The code related to debugobsstorestat is fairly independant, we move it into its own module.

legacy: move 'debugrecordpruneparents' in the extensions The transition is a couple of year old now, repository with the old format must be quite hard to find by now.

checks: correct the shebang line filtering for python files As it is, the only related file is docs/test2rst.py, which was covered by **.py. Not sure if it matters, but most patterns in core tests are for "#!.*?python". (Though there are a couple "#!.*python" tests.)

tests: add glob for Windows

tests: adds simple test case for heads checking This is the start of some systemic testing of the head superceeding detection mechanism.

tests: move exchange utility in testlib We have a testlib directory now lets use it.

exchange: fix some wrong reference to serveronly The function have all moved into 'obsexchange' now, so we do not need (and actually cannot) seek them in 'evolve.serveronly'.

checks: add a test that check MANIFEST.in content This make sure we keep the things updated.

README: add a link to mercurial devel This will help people to find the mailing list details.

README: tries to improve the title about server only This seems a bit better.

README: remove mention of make Using pip in all cases seems a better direction.

version: mark the current source as development version for 6.0.0 This is useful to distinguish the development version from the latest tagged version. In this particular case, this will allow us to publish a pre-version on pypi.

mercurial-3.8: merge with future evolve-6.0.0 We introduces the new code on the compat branch to check the tests.

mercurial-3.9: merge with hg-4.0 branch We merge with the code for the future evolve 6.0.0 code to check for compatibility. Only minor test output change (" -> ') have been noted.

mercurial-4.0: merge with future 6.0.0 A new version will be released soon, we start handling mismatch in test output to make the actual release time smoother.

checks: update pyflakes matching too We make sure to not select removed files.

checks: do not run pyflake on removed file The fileset matches removed files. This confuses pyflakes for good reasons.

compat: closing mercurial-3.7 compatibility branch The "evolve-6.0.0" release drop compatibility with Mercurial 3.7. No new commit are expected on this branch.

compat: closing mercurial-3.6 compatibility branch The "evolve-6.0.0" release drop compatibility with Mercurial 3.6. No new commit are expected on this branch.

compat: closing mercurial-3.4 compatibility branch The "evolve-6.0.0" release drop compatibility with Mercurial 3.4. No new commit are expected on this branch.

compat: closing mercurial-3.5 compatibility branch The "evolve-6.0.0" release drop compatibility with mercurial 3.5. No new commit are expected on this branch.

README: timeless typo fixes This applies some feedback timeless provided me from IRC.

cleanup: drop an empty section header

compat: drop some <hg-3.4 compatibility code The `hg commit` commands has a -i flag for ages now.

README: more update to prepare for pypi upload * mention the evolve.serveronly extension, * remove help related to topic into a different README file.

evolve: update the capabilities and commands name for obshashrange We makes is clear that these version are useful for earlier testing but they are not ready for any kind of real usage yet.

README: more change to have a pretty rendering on pypi We moves section around and fixes some markup.

MANIFEST.in: fix various mismatch check-manifest is no longer complaining

README: rework install instruction For both evolve and topic. The topic introduction is updated too.

README: rework the intro Less scary wording (similar to the wiki changes) and point to the user mailing list.

rangeobshash: minor cleanup of the obshash code We achieved minor speedup by delaying the hashing until we know it is needed.

stablerange: remove call to 'repo.revs' It turned out that the percentage of time spend parsing the revset string was two digits, so we compute de heads inline.

stablerange: reuse node calculation as much as possible We have a property cache with that value, so we just reuse it.

stablerange: adds some caching of the subranges The goal of subranges is to be as reusable as possible, so we cache the subrange relationship to take advantage of this.

stablerange: operate on an unfiltered repository We only do operation on ancestors so using unfiltered is fine.

depth: use lower lever function to compute missing The time spend parsing the revset is noticeable.

depth: update depth to code to reuse ancestors depth Computing the depth of all N revs is no longer 'O(N**2)'

obsdiscovery: extract a smarted depth in utility The function is reusing previous depth for ancestors unless this is a merge.

obsdiscovery: simply some of the missing computation

discovery: implement some range based discovery This use the previously implemented methods to implement some discovery and fetch method using ranges. There is currently major performance issue and some aspect of the protocol will changes.

discovery: introduce a official 'obshash associated to a range The hash in a combination of the hash a its subrange. If the range is a leaf, we have the obsmarker relevant to the node in that leaf range.

discovery: introduce "stable slicing" methods We introduce new code that leverage the stable sorting to slices a graph in a way "stable" accross repository. This should allow us to use theses slices for obsolescence markers discovery.

discovery: adds a function doing revnum independant sorting The function is doing a topological sort without depending on revision number. This make the sort independent of the repository and suitable for discovery.

hgignore: also ignore the 'dist' directory This is generated by the 'sdist' command

obsexchange: drop unused module shame shame shame

MANIFEST.in: also includes topic That was also overlooked when we added topic.

MANIFEST.in: fix to include all evolve submodule This was overlooked before.

obsdiscovery: organize the code by category A private function get promoted to public since another module uses it.

evolution: drop the old __temporary__.advertiseobsolete option Mercurial code supports such feature directly though its 'experimental.evolution' config option. So we drop the old code and config.

README: mention the 'serveronly' extensions It is now properly installed with the package.

server only: test a more standard method of disabling exchange We have an "official" config option from core so lets just use it.

debian: don't delete evolve and topic extensions The debian packaging rules deletes all __init__.py to avoid conflicting with the __init__.py that declares the namespace package. Now that the evolve and topic extensions also live in __init__.py files, we clearly don't want to delete all __init__.py files anymore; only the hgext3rd/__init__.py should be deleted.

serveronly: replace exc.message with str(exc) BaseException.message is deprecated in Python 2.6, so use str() instead.

cleanup: stop using 'repo.join' methods These repository method might get deprecated soon. In addition, accessing the vfs-s is not that hard.

setup: add author_email The 'sdist' command complains about it otherwise.

readme: make it valid rst That will eventually please pypi

setup.py: remove unused and harmful code importing mercurial This was failing on some build system we have. The import seemed to succeed, but then mercurial.__all__ would fail. I don't know why, but since it's unused anyway, let's just drop it.

docs: update references to installation path

test: rename serveronly tests to reflect the new extension name

evolve: stop running 'serveronly' setup Since there is no common logic remaining the smaller extension we can stop running its setup in the main extensions

discovery: directly merge the 'obsdiscovery' exthelper in top level extensions There is no reason to proxy it through the 'obsexchange' submodule.

compat: drop advertising of unsupported experimental bundle2 part The support for this part was dropped long ago in 74bc8a0c2c02. But we forgot to remove it from the 'simple4server' extension.

exchange: dispatch all code in 'serveronly' to the appropriate submodule All code related to exchange is now in either 'evolve.obsexchange' or 'evolve.obsdiscovery', and the 'serveronly' extension is using their 'exthelper' to set itself up. As a side effect, the 'serveronly' extensions now enable better exchange when pushing from that server too.

capabilities: properly sort capabilities after updating them Capabilities are usually sorted. This is especially useful to avoid silly error in test.

pull: also issue warning for old mercurial version

exchange: split between modern and legacy code We make it clearer what code is old crust and what code is the cutting edge part.

push: add extra warning about pushing to old server Pushing using old method is slow and racy. We adds warning to point this to the user. We also add inline comment to clarify the function purpose.

push: exit obsexchange early if disabled We were exiting the function later, in particular -after- issuing a message about exchanging obsmarkers.

compat: drop special code handling change in push/pull op API All version of Mercurial we support have the same API.

discovery: split discovery related code in 'obsdiscovery' More code splitting for more clarity.

exchange: rename the module Let's add a 'obs' prefix to make the module role clearer.

setup.py: include all evolve submodule We are splitting more and more code into submodule, we make sure their are properly installed. As a side effect the 'legacy' module is now installed, that is not too important. The 'evolve.hack' package is still non installed by default, as intended.

evolve: switch away from deprecated repo.opener

serveronly: use the same extensions metadata than evolve This will avoid them to drift out of sync with evolve.

evolve: move extension metadata in their own module This will allow the server only extension to reuse them. As a side effect we can now simplify the config parsing in setup.py

evolve: specify the 'minimalhgversion' 3.7 added a new nice and shinny variable to help user know when they use the wrong version of Mercurial with an extension. We now use it.

serveronly: give the sub extension a way to access to the 'evolve' module We keep it as clean as possible but if the extension is specified with a direct path, we have to be a bit hacky. Being able to access the whole evolve extension from the 'serveronly' extension will lift multiple constraints on how we organise the code and will allow for cleaner and clearer code. We extract a minor function into a 'utility' module to have something to depends on.

test: update test to check for various way to import the serveronly things We add a "setup script" that update the PYTHONPATH to allow direct import of the extension code. Then we tests that all way to import the extensions works.

tests: move "test setup" script into a 'testlib' directory This will avoid cluttering the tests directory.

exchange: move code related to exchange into a 'evolve.exchange' submodule The evolve extension is HUGE, we split exchange code appart before doing more work on it.

exthelper: move command declaration into the exthelper This is necessary to allow sub module to declare commands too.

exthelper: add a 'merge' method This will help us spread more code in different sub module.

exthelper: extract into its own submodule That code is fairly independant, we extract it into its own extensions to clarify the code

makefile: add an 'install-home' target It is similar to the Mercurial one.

makefile: only check for HGROOT when running tests Otherwise we breaks other target that do not needs HGROOT.

tests: split pyflake and flake8 tests This allow more parallelism and better skip message

flake8: run on all python file We can now run it on all file in the repository to catch potential regression.

flake8: fix error in 'setup.py' Some strange indentation in there.

flake8: fix error in 'test2rst.py' There is variosu dead code in there :-/ but we just fix flake8 complains for now.

flake8: remove "error" in documentation configuration The "error" are debatable but cheap to fix.

flake8: enable on evolve too Now that all error are fixed we can run it on all file to prevent regression.

flake8: update the code sources to fixes a horde of pyflake warnings There is many of them, they all fixed.

flake8: register 'xrange' as a builtins For some reason, flake8 thinks is is undefined.

flake8: ignore an addition rules related to import Our initialization code is too complex to make flake8 happy

flake8: document all the exception we added

README: mention the addition of the topic extensions That is probably worth noting.

tests: run pyflake on all python files We have fixed the handfull of error pyflakes found on evolve so we can setup the test to prevent regression. Next stop flake8.

serveronly: fix undefined variable This is a legit bug caught by pyflake

legacy: properly test for mercurial version in the legacy extensions Otherwise 'demandimport' would delay the raising of ImportError.

evolve: prevent global variable shadowing Small and harmless pyflake complains.

evolve: drop some unused variables More pyflakes catches.

evolve: drop some unused import topic came with pyflake checking, let us make use of it.

README: fix evolve installation path We forgot to do so when we moved things to hgext3rd.

topic: merge the topic extension in the evolve repository There is a lot of synergy between the two concepts. Topic is expected to be able to smooth multiple of evolution sharp edge. Having them both in the same repository will make this collaboration easier.

test: adapt to new core output Troubles are now displayed by log so we have to update the test.

test: adapt to change in mercurial output Nothing major here.

compat: handle difference of signature for update destination hooks The 'check' argument have been dropped in 11c253997b0e. So we make it optional for compatibility.

setup.py: also install 'hgext3rd/__init__.py' This file is needed for the namespace package to work. (And also for the package to work on its own at all).

tutorial: add a very basic pointer in the readme Ideally we should at least build the html from the rst.

tutorial: add a second part about having multiple topic

tutorial: add a first version of the tutorial with the basics This is probably not wonderful but at least we have a base.

doc: add more details about the head checking Once again, probably not great, but better than nothing.

documentation: some basic update of the documentation So far the documentation was pretty scarce and a lot of important information was missing. The new content is probably not great but it is an improvement.

flake8: ignore N801 N801 is "class names should use CapWords convention" The message comes from a pep8 plugin "pep8-naming" which cares about naming conventions. If the plugin is installed, it is automatically used by pep8 and flake8.

flake8: don't ignore E713 now that it's fixed E713 is "test for membership should be ‘not in’"

flake8: fix E713 style

flake8: fix E301 style

flake8: fix E111 style OFF BY ONE ERRORS ARE THE WORST

flake8: fix E222 style

flake8: fix E127 style

flake8: fix W391 style

tests: add flake8 check This test will hopefully help prevent style errors. To be determined: which errors / warnings to ignore?

flake8: add file for rules to ignore This will help prevent users that have an editor with flake8 capabilities from fixing linter errors for rules that are not wanted by the project. Initially, this ignore list includes everything in the project that violates pep8. I'll try to ween this list down to something a little more manageable.

init: guard _namemap with repo.topics (issue5351) This prevents reading extra data on all repo commits when there is no topic for a given name. _namemap is called a lot, and it is often called for commit shas -- which should pretty much never be names of topics...

init: cache repo.topics

stack: add warning about multiple heads This seems a good spot to nudge people toward reducing there head count.

stack: add some behind information This is the next useful thing after branch

stack: add some basic branch information In the same spirit as knowing the topic you are on, having some branch data seem useful (yet, this smell a bit like summary)

stack: add some header with the topic name This is the first step of a move to add more data about a stack in the command output.

test: add testing of stack output in 'stack-data' test. We are going to display common information, so we reuse test case.

test: rename 'list' test to 'stack-data' We are about to add stack data information to 'hg stack'. As we'll re-use the test data creating the 'test-topic-list.t' we need to rename it first to embrace its new semantic.

stack: also dim bases Now that they may have index it seems better to have a stronger marking for bases.

stack: reusing the index number in base when applicable This clarify the branching when it is easy to track back the branching point. This does not takes the evolution graph into account yet.

stack: extra argument validation logic outside of showstack It seems sensible keep the 'showstack' function purely about actually displaying and existing stack.

summary: properly label the topic name in summary This should be labelled 'topic.active' so that color can pick it up properly.

topic: list the branches this topic belong to when verbose Using the verbose listing a bit more, this seems to be useful information.

topic: properly justify the verbose data when listing topic We align all data to the widest topic.

ngtip: rely on topicmap for 'ngtip' ngtip is an old function that predates the introduction of a more proper topic aware 'topicmap'. We replace the old code with a call to the new one. This change set function return type and have minor effect in a couple of place.

topic: list the number of 'behind' changeset when --verbose is used Displaying more information in the topic list is useful, we continue with the number of 'behind' changesets. This 'behind' count the number of new changesets on the default rebase destination. This will highlight topics that need rebasing.

destination: honor the sourceset argument of _destmerge Mercurial gained a "sourceset" argument to compute the merge destination of any changeset (the one in the 'sourceset'). This now works for the version in topic too. The support is quite basic (because we pick only one changeset from the sourceset) but that's a start.

destmerge: improve topic head computation and handling This rework get use two benefits: - heads are now computed on a "stabilized" state, - heads above the 'source' are now properly cleaned up,

evolve: extract the code copied from evolve in a submodule This will allow us to use that code in other module.

destmerge: honor the 'onheadcheck' argument This argument was introduced in Mercurial some time ago but the topic extension was never updated to take it in account. This is now fixed.

destination: use the correct abort class for error These errors have been in Mercurial long enough. Having them will make the coming changesets simpler.

topic: list the number of head when --verbose is used Displaying more information in the topic list is useful, we continue with the number of heads on the topics, this will help highlight the problem to users. We only display head if there is more than one.

topic: list the number of troubled changesets when --verbose is used Displaying more information in the topic list is useful, we continue with the number of troubled changesets. This will help people to spot topics that needs evolution, for example after a pull.

topic: list the number of changesets when --verbose is used Displaying more information in the topic list is useful, we start with the most obvious: number of non-obsolete changeset in the topic.

topic: add color for the active topic We reuse the same color that the one used for the active bookmark.

topic: add formatter support Using formatter to output the list of topic will add support for color and richer templater. We add some test for output control. We introduce a dedicated test to help with coming more complexe output.

topic: extract the code listing all topics The code will become more complexe with formatter support and additional data in the verbose output. We extract the code in its own function first.

stack: introduce and explicite command to display the stack If is worth testing having the feature lives outside 'hg topic --list'. The 'stack' name is sub optimal because the conflict with 'status'. using "hg st" would still work as 'st' is hard coded, but this mean 'hg stack' has no short version.

testedwith: update to 3.9 This is might still 3.7 compatible but I'm no longer running the test and I would says the user base is small enough to not care.

topic: make sure we have the 'wlock' when setting topic We where writing the '.hg/topic' file without a lot. That was bad.

cleanup: removed unused mercurial.util import

compat: tolerate missing rebase extension

compat: mercurial dropped alias for hashlib.sha1

destination: add an XXX about handling destspace in destmerge This that we hopefully do not forget about this.

update: calculate 'partial' as core does

discovery: flake8

destination: flake8

style: update __init__.py

compat: adapt to the new destspace argument of destmerge The argument is currently ignored in the topic case for simplicity, but we properly accept it and propagate it to the original function to prevent crash and behavior regression in the non-topic case.

stack: prevent crash when topic is rooted on nullid We exclude null from displayed base. This was causing a crash when trying to display its description (we'll still have to handle the empty description case, but it is now less urgent).

test: add topic on the first 2 changesets too This will be used to add a test for topic rooted on nullid. We introduce this in its own changeset to reduce the noise if the actual changeset.

test: remove comment about new head warning The new head warning was buggy. This was fixed in bdc5bb223b50.

stack: also change the indexing of the t# reference Changeset 61f36480740f changed the index displayed (we now index from 1), but forgot to update the logic used to resolve the 't#' name. This changeset fixes it.

stack: change the ascii symbold for base Now that the children line go upward, '_' is no longer clear as is take the lower part of the line. We go for '^' that use the upper part.

stack: reverse the display order Most mercurial command display the most recent changeset first. We put `hg topic --list` inline with this.

topic: extract display from entry computation We are about to reverse the order of the output (most recent first) so it will be useful.

stack: start indexing at 't1' instead of 't0' I think 't0' could have special meaning (eg: before 't1', but still with topic activated) so let's keep room for that. Indexing from 1 is not crazy anyway.

commit: wrap "commitstatus" to take topic into account The "created new head" message was appearing for every single commit made on a topic. It should now properly only appears when a new head is actually created on a topic.

uisetup: add call to 'topicmap.modsetup' this was forgotten in 99c1a26abf3f. Tests did not broke because the wrapping of cg.apply only have performance impact (cache warmup).

uisetup: move all remaining wrapping into uisetup All our wrapping is now properly done at uisetup time. Hooray.

topicmap: move 'cgapply' wrapping into the topicmap module More gathering of related logic.

topicmap: move the 'usetopicmap' context manager into the topicmap module There is no good reason to not have it gathered with the rest.

patch: move setup of import/export logic into a function The function is now called during uisetup.

patch: remove version compatibility check We don't support anything under 3.7.

patch: document the section about import/export

patch: move import/export wrapping close to the function definition This gather similar logic together.

discovery: move all setup into a 'modsetup' function The various wrappings are moved into a function that live in the module and the function is now properly called during 'uisetup'.

revset: add a ui argument to 'modsetup' This is a gratuitous change for consistency with the function that use it.

revset: run 'modsetup' at uisetup time We are slowly moving away from module time wrapping. These thing should be done in the dedicated 'setup' method called by Mercurial.

destination: rename 'setupdest' to 'modsetup' the topic.revset module use 'modsetup' as a name for its setup function. It looks like a good name, lets unify names toward that.

destination: document 'setupdest' Let's make the role of this function clear.

destination: add a ui argument to 'setupdest' This is a gratuitous change for consistency.

destination: make sure 'setupdest' is the latest function in the module Let's introduce some consistency, end of module seems fine.

topicmap: move to new style import This unify with the new core Mercurial usage and this will make future changes to the imports easier to track.

stack: move to new style import This unify with the new core Mercurial usage and this will make future changes to the imports easier to track.

revset: move to new style import This unify with the new core Mercurial usage and this will make future changes to the imports easier to track.

discovery: move to new style import This unify with the new core Mercurial usage and this will make future changes to the imports easier to track.

destination: move to new style import This unify with the new core Mercurial usage and this will make future changes to the imports easier to track.

init: move to new style import This unify with the new core Mercurial usage and this will make future changes to the imports easier to track.

test: disable the new style rendering for "missing parent" The style kicks in when we display a partial tree. Supporting test running both 3.7 and default with this is painful, we disable the new feature for now.

tests: add pyflakes test

setup: make sure we use the imported module This prevent pyflakes to complains about it (and work around any possible demand import magic. I'm not sure why we do this important dance at all, but I'm leaving it there in doubt.

topicmap: whitespace

topiccache: directly instantiate a topiccache object when reading There is no need to rely on a temporary monkey patching.

readme: fix instruction to enable topic We moved the source code in 85390446f8c1 but we messed up the readme update. We are fixing it here.

stack: whitespace

stack: remove unused import

revset: add missing imports

revset: whitespace

discovery: whitespace

discovery: removed unused oldgetitem

setup: break long line

init: indent correctly

init: whitespace fixups

init: remove unused module

spelling: histedit

spelling: changeset

readme: remove the part about 3.7 and hgext3rd We are using direct path already so we don't need any magic here. The 'hgext3rd.'bit is only required (for 3.7) when the module is installed and we rely on sys.path to find it.

merge with other duplicate head

histedit: restrict default edited set to current topic when possible If we have an active topic, we restrict the edit within that topic.

stack: add a 'stack()' revset We give access to the list of relevant commit with a revset. Benefits over 'topic(.)' are the filtering of obsolete changeset and the reordering (to topological as-in unstability were resolved).

stack: display the base of the stack Displaying the first parent of the stack seems useful. I'm even tempted to call it 't0' and have the topic still active when 'hg up t0' is used to move to the base. As a side effect we gain a way to denote that the stack is not linear. I'm not super convinced that it is the right way to display it, but this is better than no information.

stack: add some default color configuration We can make the output more insightful with some default colors, let's do it.

stack: add basic formatter and label support This still is not great, especially I would like '-T' to be able to control how we display the changeset, but this is useful progress.

stack: show the currently active changeset and unstable ones Still super basic, but give a basic idea of the feature. We use both symbols and explicit text because symbols are cool but text is more explicit

stack: add "t" prefix to index in the output This make the existance and meaning of "t2" reference clearer.

stack: allow to refer to changeset using "t2" form hg up "t0" is seen as "update to the first changeset of my current topic". Eventually we'll drop the "t2" form in favor of the planned generic indexing operator '.{t2}'.

topic: don't take topic into account when pushing to non-topic repo Previously, pushing to a non-publishing repository without topic support would wrongfully use topic when searching for new heads.

destination: fix 'hg pull --rebase' I'm not sure why sometime functions do not have func_default but this is easy to fix. I've added a test to catch such stuffs it in the future.

packaging: fix setup.py and install as hgext3rd.topic This changeset is doing two things (gasp): - It fixes various errors in the setup.py - It move the topic source and install into hgext3rd.topic. This last part (code source move) use hgext3rd as namespace package to prevent installation nightmare. This won't be officially supported until Mercurial 3.8, but in the meantime, 3.7 user can enable it using the full package name: [extensions] hgext3rd.topic= Thanks goes to Julien Cristau <julien.cristau@logilab.fr> for the initial version of this.

destination: fix 'hg pull --rebase' I'm not sure why sometime functions does not have func_default but this is easy to fix. I've added a test to catch such stuff it in the future.

discovery: remove a spurious print

task: add index number to the output We are doing to use these number for easy movement in later changesets. The numbering will probably evolve over time but this is a good start.

stack: fix printing order in case of unstability The stack was displayed using revision number order, this give good result in the simple case (straight stack) but give bad result when the stack is not linear because of unstability. We fixes it by reusing the evolution logic for sorting. As we do not live next to evolution yet, we duplicated this logic for now.

stack: exclude obsolete changeset from the set We care about relevant changeset, obsolete have a new version somewhere and we don't care about the old one in our display. In case of unstability, the ordering used is still wrong.

stack: add a very first version of stack display with 'hg topic --list' This mark the first step toward a set of feature dedicated to displaying and moving within the current stack of work. Everything is still super basic so don't look too much at the feature. The goals of this changeset are: * having a flag to trigger the feature * having a basic (imperfect selection mechanism)

topic: get 'Abort' from error, not 'util' The class live in 'mercurial.error'.

Makefile: meant tests-@ not tests-tip

update: change default update destination to take topic in account When within a branch update to ngtip(branch). When within a topic update to the top topic.

rebase: test default rebase destination behavior In future mercurial 3.8, rebase and merge share the same destination logic. So if merge work, rebase should work as well. However, we double test it to be sure. Especially, in 3.7 the logic is not shared so we have to introduce an extra hack to share it in this case.

topicmap: write and read format from disc To prevent too awful performance we allow writing and reading topicmap cache. This is done with a lot of code duplication from core because core is not extensible enough.

topicmap: ensure that 'served' view is updated with topicmap There is multiple place that explicitly update the 'served' branchmap to ensure it stay up to date. We ensure it use the proper topicmap in this case.

topicmap: move the monkey patching into a context manager There is a couple of other place doing branchmap/topicmap update (of the served set), we'll have to set the monkey patching for them. This changeset is just doing the move to a context manager to make sure it is correct.

push: hackish handeling of new branch head from phase move The current head checking mechanism is not expecting "head change" from phase movement. Topic allows that, changeset with a topic moving to public can create a new head. We introduce a hack to double check that no head were added at the transaction level to work around this.

push: allow pushing new topic to non-publishing server by default This improves and fix the behavior change introduced by the new "topicmap". * Topics are properly ignored when pushing to a publishing server, * pushing new topics is allowed without --force a non-publishing server, * Pushing extra heads on a topic requires --force. Create of new head on a branch by phase movement is not properly detected for now. We'll improve that part in a later changesets. There is more awful monkey patching going on. We'll have to refactor core to get rid of them.

topic: take topic in account for all branch head computation This changeset introduce a "topicmap" that is tracking not just the head of all branches, but the heads of all branch+topic pair. Including the head of the part of the branch without any topic. In practice this means that BRANCHNAME now resolve to the tipmost part for the branch without topic and impact various other logic like head checking during push and default destination for update and merge (these aspect will need adjustment in later changesets). The on-the-fly-temporary-monkey-patching process is pretty horrible, but allow to move forward without waiting on having core patched. We use 'branch:topic' as the branchmap key, this is a small and easy hack that help use a lot for (future) support of heads discovery/checking and on disc cache. I'm not sure it is worthwhile to improve this until an implementation into core. Note that this changeset change the branchmap in all cases, including during exchange, see next changeset for improved behavior. We also currently have the on-disk cache disabled because the core branchmap is lacking phase information in its cache key. This will get done in a later changesets

testedwith: declare compatibility with Mercurial 3.7

Makefile: update all-version-tests to explicitly test 3.7

hgignore: also ignore testtimes

killdaemons: discard now that it's unused

test: drop custom run-tests.py We should use the one provided by Mercurial core directly.

Makefile: rework running of tests This makes running tests easier without depending on our own copy of run-tests.py (though I'd still prefer to keep that around.)

compat: adapt to change in mercurial core The code around merge destination have been changed in core, we do some basic adaptation to make sure we don't crash. Further rework to adapt//take advantage of core change would probably be useful but this is not the point of this commit.

topic: handle merge.update function signature change I think this is backwards compatible with how it used to be called, but I didn't worry about it too much either.

Merge.

test-topic-dest: test fixes I should have put in the previous change I split a bigger change from marmoute that included some rebase support that I wanted to discuss more, but I didn't correctly commit my fixes to the tests before pushing. Oops.

topic: fix changing topics of commits that have an amend_source Includes a test for this specific case, but we should probably spend more time squinting at the interactions between the current topic wrapper function and commitctx for memctx instances.

topic: remove useless call to c.parents()

topic: fix up change logic a little and add debug logging

merge: use topic to pick default destination If the topic have multiple heads, reduce that. Otherwise, pick the branch we are on.

topic: introduce a 'ngtip' concept The concept is to be massively used in naming and default destination logic. The name is horrible so that people find a better one.

template: test that topic is accessible through template This comes free with the namespace feature but it is good to have.

test: adapt to newer mercurial

patch: import topic from patch header If the used Mercurial supports it, we import topic from patch headers.

patch: add topic to exported patch If used Mercurial supports it, we add a topic header to patches.

topic: work around stringmatcher moving during development of hg 3.6

topic: allow use of topic(.) to match the p1 topic As far as I can tell this matches the behavior of branch(.) in core hg in tht it matches p1's value rather than the wdir value.

topic: fix missing error import

amend: allow clearing topics on amend

changectx: add topic method

topics: consistently use empty string instead of None This agrees with repo.currenttopic which uses ''. A subsequent patch is going to provide a context topic method that returns the empty string.

topics: drop debugging print in rebase

topics: allow commits that only change topic (issue4725) This allows amend to change topics. It also matches the behavior of branches.

topics: add listnames hook so completion works

rewrite: use a lock and transaction as spotted by devel warnings

topics: only apply topic to commits of the working copy

rebase: teach rebase how to copy topics

topic: wrap the underlying update function rather than the command This more properly manages the updates done by things like rebase.

commit: add a topic field to the in-editor commit text

topic: only require obsolete support for --change

commit: add a --topic flag

topic: note when switching topics

summary: add topic summary hook

topics: add command summary

docs: fix format of extension docstring

constants: extract key for extra into a constant It might be prudent to prefix it, and regardless it was bugging me to have it repeated everywhere.

topic: add ability to change topic of non-public changes This is a little crude, but it gets the job done. You probably don't want to use this without evolution for now.

revset: add a topic() revset for querying topics

topic: disallow use of topics without obsolete enabled This is a prelude to allowing changing topics. The experience will be disastrous without obsolete markers, so let's just preempt any potential problems.

topic: use repo.set() where we need a changectx anyway I always forget repo.set() exists and use repo.revs(). Sigh.

testlib: enable rebase and obsolete for easier testing

Initial dumb version of topics.

serveronly: deduplicate code with the main evolve extension Now that 'serveonly' is a sub module of evolve. We can access its content in evolve. As a result we stop duplicating code all common parts are defined in the 'serveronly' module and imported by evolve when needed.

serveronly: clean up imports remove unused one and arrange them

compat: just use '_callcompressable' That API is available in all version we supports.

compat: drop bookmark compatibility layer All the version we now supports have the 'new' API.

compat: drop compat for older wireproto implementation We only support Mercurial version with these attributes.

compat: always use the strip revset from core We only support versions that defines it.

compat: drop support for ancestral pushop object Pushoperation object have a 'cgresult' attribute in all the versions we support.

compat: drop compatibility layer around update We now support only versions with the new API.

compat: drop compatibility layer for 'tryimportone' Return is now homogeneous for all the version we support.

compat: drop superfluous summary output All versions we support issues this output.

compat: drop compatibility layer around memctx The version we support all have the same API now.

compat: drop handling of ancestral 'helploader' caller We only support recent only version on Mercurial now.

compat: drop hack around a 'graft' signature change We only support recent only version of Mercurial now.

evolve: proactively detect bad version early The extensions have been providing such error to the user for some time. So we keep this explicit check (instead of some later errors). The check is update to match out new version constraint.

evolve: drop support for version older than 3.8 The support for 'hgext3rd' was introduced in 3.8. Dropping support for older version seems reasonable.

evolve: cleanup imports Just rearrange imports to a new/clearer style.

merge with stable

merge with mercurial-3.5

merge with mercurial-3.6

merge with mercurial-3.7

merge with mercurial-3.8

merge with mercurial-3.9

merge with mercurial-4.0

merge future 5.6.1

Added tag 5.6.1 for changeset 70694b2621ba

update debian changelog

evolve: extend API fix from 25254b2f8116 to another relevant case For some reason, only part of this API change got fixes. Test did not caught this because 'False' is a valid revision number (0) and update force did not mind using it as an ancestors. The API changed in Mercurial 43c00ca887d1

hgext3rd: drop the last remains of hgext3rd Not that all extensions as moved, we can drop the directory.

hgext3rd: move 'obsolete' as 'evolve.legacy' We move that last extension. It seems like we could use the repo upgrade framework for this, but this is another adventure.

hgext3rd: move 'drophack' as 'evolve.hack.drophack' Yet another extension migrating. Ideally we would implement stripping obsolescence marker in code soon and be able to dispose of this extensions directly. In the mean time this goes into the "hack" namespace.

hgext3rd: move 'simple4server' as 'evolve.serveronly' We also more the server only extension into hgext3rd. We makes it a python sub-module of evolve for two reasons: * less polution in the hgext3rd namespace, * this make it possible to share the code between 'evolve' and 'evolve.serveronly' instead of duplicating it. note that we now install the extension too

hgext3rd: move 'directaccess' and 'inhibit' in 'evolve.hack' We move them in the 'hgext3rd' package. In the same move we put them under the 'evolve' package for clarity. We use a sub-package 'hack' to make their status clearer.

evolve: move the extensions to 'hgext3rd' We have the 'hgext3rd' as the official place for extension for some time now. We start the big migration. This might break some people setup but this is a necessary step to have evolve easily available through pip.

extensions: drop the old 'pushexperiment' extension This extensions predate bundle-2 and their have not been any reason to use it for years.

merge with stable

Update tag 5.6.0 for changeset e7b6e9c4a5d4 There was a small error in the README. The previous tag is fresh and the announcement was sent yet. So I'm exceptionally overwriting the tag.

fix release date in the Readme, Copy paste error :-/

reopen the default branch

merge with 5.6.0 no extra changes were needed from the mercurial-3.5 branch.

merge with 5.6.0 no extra changes were needed form the mercurial-3.6 branch.

merge with 5.6.0 No extra changes were needed from the mercurial-3.7 branch.

merge with 5.6.0 Not extra change were needed from the mercurial-3.8 branch

merge with 5.6.0 A minor one line conflict on test output were encountered.

merge with 5.6.0 No extra changes needed from the 'mercurial-4.' branch.

merge with future 5.6.0 There is only minor test output change, 4.0 do not have the "trouble:" wording in there.

Added tag 5.6.0 for changeset 99ede2d77545

exchange: fix compatibility layer We forgot a return into some compatibility layer. This is now fixed.

open the mercurial-3.9 compat branch

prepare release 5.6.0

debian: fix version format There was a small error in the debian packaging

merge with default to prepare the next version

merge with stable

uncommit: don't lose copy information of remaining files (issue5403) As reported in the issue, "hg uncommit" would lose copy information of the files that remained in the commit. The problem was simply that the a dict of copies was iterated as "src, dst in copies.items()" where it should have been "dst, src ...".

merge with stable

fold: cleanly abort on empty fold set (issue5453) We now handle the empty set case, cleanly aborting instead of crashing with a traceback. The message used match the output of 'hg push' in similar situation.

README: update changelog

fold: require --from flag for folding revisions to working copy It's very easy to think that "hg fold 4::6" will fold exactly those revisions. In reality, it will fold those *and* any revisions between them and the working copy. To prevent users from making that mistake, require the use of a new --from flag for folding revisions from the given set to the working copy. With this change, I'm sure some users will be surprised that the command can not be run without either --from or --exact, but at least the consequences will be smaller (the command simply aborts and the user can try again).

fold: use 'fold', not 'touch', for transaction description

tests: fix tests to reflect hg core changes In f05ede08dcf7d13794ccc9abb53877a50bf2b58b in core hg there were changes to changeset_printer.

prune: improve error message if unstable changes are disallowed I saw a question on stackoverflow why evolve reports something like cannot fold chain not ending with head. Even I was confused the first time about the behavior. The error message can be improved to avoid confusion to people who are unaware about the config in future.

wireproto: chunking and compression is forthwith to be handled by hgweb Various functions disappeared in the process. Use the new streamres API but fall back to the old way if the keyword arguments are not accepted. See https://www.mercurial-scm.org/repo/hg/rev/2add671bf55b

readme: fix the test run command As we use the run-tests.py in Mercurial, we do not need to specify the path to a Mercurial utility.

Manifest.in: exclude unshipped extensions Many extensions life in the repository without being shipped we exclude them from the dist tarball.

Manifest.in: include Manifest.in Apparently this file should be in the tarball.

Manifest.in: exclude debian related file The debian rules life in the repository for convenience, however they should not be included in the dist tarball.

Manifest.in: include all script in tests We now have a small fake editor scrip that should be in the dist tarball.

Manifest.in: drop tests/test-qsync.t entry This file is now longer in the repository.

Manifest.in: drop the 'tests/dummyssh' entry That file is now longer in the repository for some time.

Manifest.in: sort entry

makefile: fix documentation The only available rules is 'deb-prepare' we fix the documentation.

tests: use curl instead of wget curl is supplied by default on macOS 10.12, but wget isn't. As curl is easy to install on other OSes, just switch the tests over. For Windows systems, you can obtain cURL from https://curl.haxx.se/download.html - for other systems, please use your native package manager. This undoes 4e7da688a066 and 3ffa12edc05a, as they don't make things much simpler on Windows (you have to install extra packages either way round), but they do make things harder on macOS (as curl is supplied by default, whereas wget isn't).

merge with stable

Added tag 5.5.0 for changeset 727c7211c810

prepare release 5.5.0

readme: mention that the next release make use 4.0 compatible

merge with latest fix

merge with latest fix

merge with latest fix

merge with latest fix

merge with latest fix

merge with latest fix

errors: add missing imports of mercurial.error

evolve: use single quotes in usage messages Mercurial core has moved in this direction, so let's follow.

evolve: prefer "abort" over "abandon" in messages for consistency

setupevolveunfinished: use "hg update -C ." to abort I don't know what this function does, but it seems like it should recommend the same way of aborting as other places do.

evolve: suggest "hg update -C .", including '.', to abort evolve The user will probably not also want to change commit when they abort evolve, like "hg update -C" (without the '.') would do. Note that we already do recommend aborting by using "hg update -C ." in another place.

evolve: update the tested with statement Test pass fine with 4.0-rc. By some magic, we are still compatible down to Mercurial 3.4.

merge with future 5.5 All was fine for 3.4.

merge future 5.5 There is a small limitation of split that does not clean up its working directory on failure otherwise all is fine.

merge with future 5.5 No extra change needed to get the test to passe with 3.6

merge with future 5.5 No extra new change are needed from the one needed from the 3.8 branch and previous version.

merge with future 5.5 Test also run on 3.8 with minor cosmetic change. The 'separate' function is not available before 3.9 so we had to drop it.

integrate code update and test change from future 5.5 code This prove that the code is compatible with 3.9

merge with default, Mercurial 4.0-rc is out The content of the Mercurial stable branch changed, we update it here too.

open the mercurial-3.9 compat branch

merge with stable

evolve: lock the working copy early in next and prev (issue5244) Both next and prev depend on a consistent working copy, but were waiting to take the lock until they were ready to alter the working copy. Take the lock before reading the working copy state, and do not release it until we're definitely not going to change the working copy.

evolve: indent cmdnext and cmdprev ready for locking change (issue5244) The locking change I'm about to introduce forces an indentation shift. Do the indentation change with no code change now, to make the next change easier to review

tests: adapt to some change to topic output

split: avoid trying to split an empty commit (issue5191)

split: avoid trying to split an empty commit (issue5191)

evolve: fix test breaks related to double->single quote changes

merge with stable

bump: copy parent manifest before editting it Previously, the bump code would access the previous manifest, then edit that dictionary data structure. Because the manifest was in the mancache at that time, those edits were persisted to other readers who asked for that manifest. This caused commits being made during bump to have the wrong file parents in many situations (hence why the tests need updating).

backed out changeset 7a76f9a43e89

readme: add an entry about the {obsolete} template change (It should have been included into the parent changeset.

templates: change {obsolete} to emit only "obsolete" or "" The {obsolete} template function can currently emit "stable", "unstable", "extinct", or "suspended". The distinction between "extinct" and "suspended" seems likely to be more confusing that enlightening, and "stable" and "unstable" are not even obsolete. Let's simplify it to just emit "obsolete" for obsolete changesets and "" for others. That will also make it much easier to test for obsolete changsets and do things like "if(obsolete, obsolete, troubles)".

debug data for manifest change in core

evolve: drop point release of versions Modern Mercurial only looks at X.Y versions, so point releases can be dropped.

evolve: removed redundant try/finally blocks There were two todo's to remove the redundant try finally blocks. Done that and also fixed the indentation afterwards.

docs: spelling fixes Squashed into 1 commit because I'm lazy: - non-existant -> nonexistent - accros -> across - comptatibility -> compatibility - requieres -> requires - aliast -> alias - unexistent -> nonexistent - convertion -> conversion - nto -> not

simple4server: update buglink to point to bz.mercurial-scm.org

evolve: update buglink to point to bz.mercurial-scm.org

docs: use https for mercurial-scm.org

docs: point wiki and bz links to mercurial-scm.org

test: adapt to topic changes We display more information about the stacks, so we have to take than in account in the tests.

continue: ensure we hold the wlock before writing file to disk A hack in 'hg evolve --continue' involve writing a 'graftstate' file. We take the wlock before doing so.

test: also use 'devel.legacy.exchange=bundle1' in test Changeset 39537bc64442 in mercurial removed the 'experimental.bundle2' option. We use the new option in parallel.

dirstate: use arg count for version check In 52ff07e1de91 in the main hg repo, dirstate was changed to require a second argument, making the default args check no longer work. Instead, we switch to check the number of arguments, which should be backwards and forwards compatible.

merge back with stable

Added tag 5.4.1 for changeset 2ad40d972a74

prepare release 5.4.1

3.9 have been released

open mercurial-3.7 compat branch

directaccess: make sure gethashsymbols does not return rev numbers With "hg log -r 1 -r 2 -r 3", gethashsymbols will get the following tree: ('func', ('symbol', '_list'), ('string', '1\x002\x003')) Before this patch, it will return ['1', '2', '3'], which are revision numbers and causes unnecessary (expensive) partialmatch lookups. This patch refacts gethashsymbols a bit, making sure the returning values are always filtered.

evolve: use hashlib to compute sha1 hashes The util alias for sha1 was dropped in c27dc3c3122 in favor of hashlib.

merge with stable

inhibit: protect agains dropped 'bmstore.write' As planned per the deprecation policy, 'bmstore.write' have been dropped in Mercurial core (052c9318e464).

help: fix evolution help grammar

help: fix evolution hg phases reference

merge latest tag in 3.4 branch

merge latest tag in 3.5 branch

merge latest tag in 3.6-branch

merge latest tag in 3.7-branch

merge back with stable

Added tag 5.4.0 for changeset b21ce82e6f76

evolve: prepare release of version 5.4.0

evolve: update testedwith field 3.8.1 is working fine and no older branch had to be dropped.

merge with stable through 3.5 branch

test: wider glob for payload size For some reason this various a bit more than previously though.

merge with stable throug 3.6 branch

merge with stable through 3.7 branch dropped the topic test and updated output with some minor difference Hg: Enter commit message. Lines beginning with 'HG:' are removed.

mercurial-3.7: revert output change No feature regression but various output change

merge default into stable Mercurial 3.8 have been release, let's get ready for a 5.4.0 release.

test: rename TOPICROOT to HGTEST_TOPICROOT Mercurial is about to introduce whitelisting of environment variable, we comply to the planned prefix in advance in a hope to stay compatible in the future.

test: update topic test output for order change As in topic d8f1e432b16a the tipmost changeset is now displayed first. We adapt the test output to reflect it.

test: update topic test output for indexing change Changeset 61f36480740f in topic updated the indexing scheme, we update the test to take this into account.

test: adapt topic test The 'created new head' bug was fixed in bdc5bb223b50, we adapt the test with the fixed output.

test: improve skipped message for topic The skipped message should point people to a way to solve the situation.

prune: suggest --biject in error "hint" When use specify multiple changesets to prune and as successors, we should point them to the right options to confirm there intend.

metaedit: check for public changeset before instability Public changeset will stay public even if the selection is adjusted, this is a more definitive condition that is worth warning about first.

fold: move sanity check after locking Checking for operation validaty without the locks open us to race condition.

metaedit: add support for folding commits while editing their metadata This also allows us to accept multiple commits without dealing with the thorny algorithmic and UI issues of editing multiple commits at once. Crucially, it is different from 'hg fold --exact' in that it also allows 'folding' a single commit and rewriting its metadata. This is really useful to have as a single logical operation, for example while preparing a series of multiple local changesets that will need to be pushed as a single changeset.

commands: introduce a new command to edit commit metadata This patch introduces metaedit, a command to metadata of a set of revisions without updating the working copy. This is particularly relevant for repositories where changing the parent of the working copy is time-consuming. We could add more stack manipulation operations to metaedit in the future.

evolve: factor out check for creating unstable commits This check is pretty non-trivial, and we do it in two places already. We're going to do it in a third place soon.

evolve: factor out sanity checks for folds We're going to use the same checks in another context in an upcoming patch.

evolve: include node, rev, desc, and phase in list

evolve: use hex in list output

py3: use items() instead of iteritems()

py3: change except from two comma to as notation

py3: tolerate io/StringIO divergence

split: rewrite the pre-split commit message I find this wording slightly clearer.

open mercurial-3.7 compat branch

readme: add various missing parts

hgignore: add an ignore rule for test timing Modern tests runner store a record of last test run timing. We properly ignore it.

tests: change quoting pattern to match core's conventions This patch modifies two tests to match new quoting patterns used in core: (use "hg config --edit" to set your username) becomes (use 'hg config --edit' to set your username) and (use hg resolve and hg graft --continue) becomes (use 'hg resolve' and 'hg graft --continue')

Spelling: committed

Spelling (en-us): behavior

Spelling: forbidden

Brand: Mercurial

Grammar: paragraphs should end with periods

Grammar: the

Grammar: resulting issues

Grammar: introduced

Grammar: has

Spelling: versioning

Spelling: unnecessary

Spelling: through

Spelling: those

Spelling: succeeded

Spelling: remotely

Spelling: remains

Spelling: precursors

Spelling: practice

Spelling: directory

Spelling: happened

Spelling: formerly

Spelling: extinct

Spelling: directly

Spelling: deserialize

Spelling: accessing

Spelling (en-us): -ize

list: report the phase for divergent commits

readme: improve bug tracker link

readme: fix domain for bug tracker (bz.mercurial-scm.org)

ignore: remove stale items docs are built into ^/html

project: change evolution domain to mercurial-scm

tests: adapt output to the new graphlog style Core have change the way graphmod handle missing parent. We adapt our output.

evolve: add --continue note to summary

evolve: report merge node When running evolve --any, evolve will report that it can not handle a merge node. In order for this to be helpful, we report the revision so that a user could fix t.

evolve: treat no support as non fatal When running evolve --all, unhandled edges should not block other revisions from being solved.

list: limit to descriptions to firstline

config: report evolve as origin for config

alias: report evolve as origin for aliases

evolve--list: initial implementation This implementation does not work with '-T json' since it needs multiple levels of depth. There is various small issue with the current data, the test coverage is a bit low and the output is likely to change, but this is a good step forward. Sample output: 01a3e66ba030: e (amended) unstable: 1995fc658ad6 (unstable parent) divergent: 84e1c6ae319d d3b90e9c84ab (precursor 3efa43a7427b) divergent: add9a356b8cf (precursor 3efa43a7427b) add9a356b8cf: e (rebased) divergent: 84e1c6ae319d d3b90e9c84ab (precursor 3efa43a7427b) divergent: 01a3e66ba030 (precursor 3efa43a7427b) 84e1c6ae319d: e (e+f split) unstable: 1995fc658ad6 (unstable parent) divergent: 01a3e66ba030 (precursor 3efa43a7427b) divergent: add9a356b8cf (precursor 3efa43a7427b) d3b90e9c84ab: f (e+f split) unstable: 84e1c6ae319d (unstable parent) divergent: 01a3e66ba030 (precursor 3efa43a7427b) divergent: add9a356b8cf (precursor 3efa43a7427b) 8febfaee0dd1: c unstable: 43765473b851 (obsolete parent) bumped: b36d99df9f41 (immutable precursor) 1995fc658ad6: d: commit with a long happy message, ababagalamaga, ababagal... unstable: 8febfaee0dd1 (unstable parent) fa8498ad030f: aa unstable: d3b90e9c84ab (unstable parent)

merge with stable

evolve: Fix crash when reading docstring Before this patch, hg evolve --divergent could crash when looking for docstring of function of merge.update. We were checking the docstring to work properly with older version of Mercurial. It could crash if an extension would wrap merge.update without keeping the docstring. This patch fixes the crash.

prune: remove the kill alias This have been a long time since the command was rename (over 'kill -1' threat), it is time to get rid of it.

evolve: Fix crush when reading docstring Before this patch, hg evolve --divergent could crush when looking for docstring of function of merge.update. We were checking the docstring to work properly with older version of Mercurial. It could crush if an extension would wrap merge.update without keeping the docstring. This patch fixes the crush.

topic: restrict 'hg prev' to current topic unless --no-topic is passed This is far from perfect but a good start

topic: restrict 'hg prev' to current topic unless --no-topic is passed This is far from perfect but a good start.

topic: preserve topic during evolve previously, topic handling was absent leading to whatever the active topic was when `hg evolve` was run to be used for all evolve results

topic: 'hg evolve --all' pick all trouble within current topic This is the first changeset of a collaboration between the topic extensions and evolve. If there is an active topic, 'hg evolve --all' will try to fix all changesets in that topic wherever they are. Aspiring descendant that are not in the current topic will be ignored. For now, evolve behave as usual if there is no active topic. This is a bit inconsistent and will probably be unified in the future.

close branch 3.3 I'm not expecting any more work in there.

evolve: mark progress units for translation

evolve: ui.progress doesn't use total count if pos is None, let's drop it Every other call of ui.progress that has argument #2 (named `pos`) set to None doesn't specify `total`, because it won't be used. Basically, ui.progress(action, None) is enough, when used like this it hides progress bar because the action is considered completed. So this is just a minor cleanup patch.

debugrecordpruneparents: fix an apparent typo (marks)

test: explicitly disable rebaseskipobsolete in a couple of place (issue5135) We want to keep the old behavior for the sake of testing.

evolve: remove unused import

hgext: turn 'hgext' into a namespace package Actually since Python 2.3, there is some way to turn top level package into "namespace package" so that multiple subpackage installed in different part of the path can still be imported transparently. This feature was previously thought (at least by myself) to be only provided by some setuptool black magic. Turning hgext into such namespace package allows third extensions to install themselves inside the "hgext" namespace package to avoid polluting the global python module namespace. They will now be able to do so without making it a pain to use a Mercurial "installed" in a different way/location than these extensions.

merge stable into default

url: update url to point to the latest hosting The documentation and various packaging were out of date.

tests: add head warning messages Core gained a warning about other head on the same branch. This impact our tests.

split: fix wording of documentation for --rev option

merge with stable

Added tag 5.3.0 for changeset bd59cc2ee203

merge with strange other head on stable

prepare version 5.3.0

evolve: update testedwith statement We have carefully testing with Mercurial form 3.4 to 3.7

Readme: mention fix for issue4950

merge with new stable through 3.5 and 3.6

tests: register expected difference for Mercurial 3.4

merge with stable through 3.6

readme: mark feature only available in 3.7 as such

Merge with stable, updating tests output Notable change: - We do not support evolving merge before 3.7 - We don't support inhibit/direct-access

readme: point to mercurial-scm.org instead of selenic.com

merge with stable (Mercurial 3.7 is out)

tests: register expected difference for Mercurial 3.6

tests: register expected difference for Mercurial 3.5

test: adapt to 3.6 help changes

evolve: make split respect rev args passed without --rev or -r Currently, if one runs `hg split .` or `hg split`, it will fail with an exception. This happens becuase we only expect revision args to be passed as --rev/-r ones and don't treat unnamed args properly or add default values if no args are provided.

evolve: write our own custom evolvestate file Since for ever, we were using 'graftstate' to record the node currently being evolve and allow 'hg evolve --continue' we now move to our on 'evolvestate' file. This remove and issue with 'hg summary' listing interrupted evolve as graft. This also open the way for storing more data into that file and allow proper --abort and --continue of the whole evolve operation (and not just the last one). The whole thing is very hacky but at least there is some progress. Thanks goes to Shusen Liu for initiating this work.

readme: update readme for issue 4966

test: back hash change from 'extra' content change out The changesets 13701c3fed9c, 3e907ff1981f and 54394d2aaf5e were introduced to handle a change to the way extra were carried out by various command in core. This had to be backout for 3.7.1 as is broken multiple third party extension. We backout the test update as a result. Core changesets performing the backout: ce9696193175::b698abf971e7

evolve: close transaction if conflict is detected in relocate (issue4966) Before this patch, transaction is aborted, if conflict is detected at merging while "hg evolve". Since 8f2ff40fe9c9 (or 3.6) of Mercurial, aborting transaction discards all dirstate changes inside transaction scope for "transactional dirstate" (see below wiki page for detail about it). https://mercurial.selenic.com/wiki/DirstateTransactionPlan Therefore, just aborting transaction causes unchanged (and unexpected) dirstate, even though subsequent commands require dirstate changes while "hg evolve". To keep dirstate changes while "hg evolve", this patch closes current running transaction, if conflict is detected in relocate(), even though exception is raised as usual. Even though "save dirstate and restore it after aborting transaction" like shelve._aborttransaction() of Mercurial can also solve this issue, this patch chose closing transaction for similarity with failure for conflict at "hg unshelve". In addition to it, closing transaction can keep any previous (implicit) changes. In newly added test, there is an additional ancestor revision, which "will be evolved safely". It is used to examine whether failure for conflict doesn't discard already relocated revision(s) while "hg evolve". It is fact for current implementation that "hg evolve" relocates each revisions in separated transactions and already relocated ones are never discarded, even if subsequent relocation fails. Though, this examination is useful to detect unintentional regression in the future.

evolve: remove meaningless transaction nesting Before this patch, functions below nest transaction scope, even though they are invoked only inside a transaction scope created at _solveone(). - _solvebumped() - _solvedivergent() - relocate() via _solveunstable() or _solvebumped() Transaction nesting is useful for localizing "success" (e.g. one scope per commit inside wider scope for multiple committing). But such nesting is redundant for _solveone(), because there is no code path, which causes failure after successfully closing inner transaction(s). In addition to it, this nesting makes it complicated to close current transaction successfully with exception raising inside inner scope, like "hg shelve" at detection of conflicts. "tr.close()" is required at each outer scopes for such case. To remove meaningless transaction nesting, this patch replaces repo.transaction() in functions above by repo.currenttransaction(). This reuses transaction created at _solveone(). This patch also adds 'assert tr' after getting current running transaction, to avoid invocation of functions above without transaction.

evolve: extract logic to new method _evolvemerge This patch introduces a new method _evolvemerge to merge orig to dest in relocate method. This simplifies the code of the method relocate and allows us to re-use it later in the scope of the rework of 'hg evolve --continue'

test: add extra expected output (I forgot to amend...)

inhibit: make bookmark -D work with a list of bookmarks `hg bookmark -D` was not accepting a list of bookmarks. This behavior was inconsistent with the behavior of `hg bookmark -d`, which does accept multiple bookmarks.

touch: prompt the user for what to do with the revived changeset This patch improves our interface for reviving changesets. This patch makes touch not assume that the user wants to create divergence by default and gives a prompt instead. The prompt is skipped for changeset that have no living successor as no divergence would be created by reviving them anyway. To restore the previous behavior, one should now use the --allowdivergence flag. The prompt looks like: [10] <description> reviving this changeset will create divergence unless you make a duplicate. (a)llow divergence or (d)uplicate the changeset? a In further patches we will want to add one more choice to that prompt, for example having a marker between the old and revived nodes but no divergence displayed on the UI.

inhibit: fix compat with rebaseskipobsolete We wrap _computeobsoletenotrebased and _clearrebased to fix the following case: - Assuming that we have markers from revisions of the rebase set and destination set and that these markers are inhibited - At the end of the rebase the nodes are still visible because rebase operate without inhibition and skip these nodes Had we not have those markers to begin with the revisions could be hidden at the end of the rebase. We keep track in repo._obsoletenotrebased of the obsolete commits skipped by the rebase and lift the inhibition at the end of the rebase. We add three test cases to make sure that the edge cases are covered.

test: update with new graft output Graft now has a --continue it seems. We need to update our test output.

merge with stable

tests: fix change to help output Core have made minor update to its documentation.

tests: change some double quotes to single quotes Since hg core change 58f8b29c37ff (minirst: change hgrole to use single quotes, 2016-01-12)

inhibit: fix compatibility with changes in rebase Because we compute the obsolete revisions before calling _computeobsoletenotrebased lifting the inhibition stopped working since 8a8ee8338e6 in core. This patch makes it work again.

inhibit: fix _filterpublic Before this patch, _filterpublic would always filter rep._obsinhibit and not its "nodes" argument. Fortunately, we always called it with repo._obsinhibit as its "nodes" argument!

debian: blacklist test-inhibit.t Since we don't add inhibit to the debian packages, let's not run test-inhibit.t

evolve: duplicate evolution summary entries (issue5014) Since we added summary entries for trouble changesets in core we don't need to display it anymore in evolve for the version of hg with the change. Tested with 3.6.1 and 3.6.2.

merge with stable

merge with the rest of stable

debian: update changelog to 5.2.1

evolve: handle merge commit with single obsolete parent (issue4389) This handles evolving merge commits with a single obsolete parent. Merge commits with two obsolete parents are still unsupported. Note this depends on a change to merge.graft in core. Older versions of mercurial will not have this functionality. Also, test-unstable.t will fail with older versions.

merge with stable

evolve: rewrite help for prune command

evolve: improve help for split command

evolve: improve help for prev, next commands

evolve: improve the confusing docstring for _orderrevs()

evolve: improve help for some debug commands

evolve: scattered typo fixes in comments, docstrings

evolve: extract logic to new method _finalizerelocate This patch introduces a new method _finalizerelocate to finalize current state after merge states in relocate method. This simplifies the code of the method relocate and allows us to modify it later to support a continued keywork to implement evolve state.

evolve: extract logic to new method _relocatecommit This patch introduces a new method _relocatecommit to commit current state after merge states in relocate method. This simplifies the code of the method relocate and allows us to modify it later to support a continued keywork to implement evolve state.

evolve: apply API change to 'merge.update' Mercurial core43c00ca887d1 (future 3.7) changed the signature of the 'mercurial.merge.update', this impact our code so we update it. This

debian: don't refer to deleted tests/run-tests.py in debian/rules tests/run-tests.py was deleted in 25a0c31882df (tests: remove the custom run-tests.py, 2015-11-02), but we still refer to it in debian/rules. Fix by having the user define a HGSRC variable when calling 'debuild' (with e.g '-e HGSRC=~/hg').

prune: changing bookmark argument to be a list Currently prune works with a single bookmark the changes in this patch modifies the prune command to accept a list of bookmarks Also changes to inhibit module which internally calls the cmdprune function. the change is to wrap the bookmark input into a list.

prune: remove a list of bookmarks Currently prune works with a single bookmark, the changes in this patch modifies the prune module to work with a list of bookmarks Building on this we can take a list of bookmarks as input and remove all of them in a single go

test: adapt to fix to "known" wireprotocol command Core fixed a bug in discovery (in b64b6fdc5c9b) and this is showing up in our test output.

evolve: renaming local variables Renaming local variables to be more precise, i want to store a different list of bookmarks(input-list) and it would be hard to understand what marks represents in that change therefore renaming it to repomarks. Renames mark to bookmark, which will make the changes in next patch more understandable, when it is pluraized. Also renames bookmarks (module) to bookmarksmod so as to free up the name when bookmark gets pluralized.

inhibit: backout 23a34dce5131 remove unused bookmark operation wrapping This breaks potentially a lot of things. Let's give a change to extensions maintainers to adapt to the new bookmarks.write api before removing this code right away.

readme: add something about bookmark within transaction

commitwrapper: use bookmarks.recordchange instead of bookmarks.write Before this patch we were using the deprecated API bookmarks.write, this patch replace its usage by the new API call bookmarks.recordchange.

next: replace call to bookmarks.write by bookmarks.recordchange bookmarks.write is now deprecated, we are moving to the new api: bookmarks.recordchange.

previous: replace call to bookmarks.write by bookmarks.recordchange bookmarks.write is now deprecated, we are moving to the new api: bookmarks.recordchange.

prune: use bookmarks.recordchange instead of bookmarks.write Before this patch we were using the deprecated bookmarks.write instead of bookmarks.recordchange in prune