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

transaction: fix release order in 'rewrite' This was wrong for quite sometime.

check-code: make drophack comply with check-code

check-code: make directaccess.py comply with check-code

check-code: make inhibit.py comply with check-code

check-code: make obsolete.py comply with check-code

check-code: make pushexperiment.py comply with check-code

check-code: make simple4server.py comply with check-code

check-code: make evolve.py comply with check-code

evolve: fix test-inhibit to match latest hg When I fixed an issue in core about rebaseset 40a2f972f26d (that I introduced before), it restored the original behavior of inhibit with rebase. This patch fixes test-inhibit to match the latest hg.

evolve: fix test-stabilize-conflict.t to match new extra computation in core Recent patches changed the way we compute extras for rebase and graft. This changes the hashes in evolve's tests. This patch fixes the test test-stabilize-conflict.t.

evolve: fix test-sharing.t to match new extra computation in core Recent patches changed the way we compute extras for rebase and graft. This changes the hashes in evolve's tests. This patch fixes the test test-sharing.t

evolve: fix test-tutorial.t to match new extra computation in core Recent patches changed the way we compute extras for rebase and graft. This changes the hashes in evolve's tests. This patch fixes the test test-tutorial.t

inhibit: make rebase see obsolescence even for visible nodes Rebase changed recently to take advantage of obsolescence markers to reduce the number of conflicts to resolve. Inhibit users were unable to leverage this new feature because none of their visible nodes could be obsolete. This patch makes the nodes that would be obsolete without inhibit, actually obsolete for the duration of the rebase to take advantage of the feature mentioned before.

inhibit: remove unused bookmark operation wrapping Before this patch, inhibit was wrapping bookmarks.write and bookmarks.recordchange. Since all the usage of bookmarks.write are not replaced by bookmarks.recordchange all bookmarks operation happen in a transaction. Inhibit already wraps the transaction mechanism to make sure that no revision can end up being obsolete and visible. This makes the wrapping of bookmarks.write superfluous. Wrapping bookmarks.recordchange was wrong in the first place and redundant with wrapping transactions.

inhibit: update test with new behavior from core The recent changes in core (to make sure that all bookmarks write are done at the end of a transaction) changed the behavior of inhibit. When one rebases a set of hidden revs somewhere, the hidden revs become visible at the end of the rebase. Both the previous behavior and new behavior seems acceptable but the tests have to be changed subsequently. This patch modifies one of the test for inhibit when the case mentioned above happens. We prune the revs inhibited by the rebase to make the change minimal.

inhibit: remove unused import The error module from mercurial was imported but unused in the inhibit code.

inhibit: improve handling of error cases for bookmark -D Before this patch bookmark -D was crashing in some cases like: hg book -Dmaster-fix. This was because -m is a valid option for hg bookmark. This patch disallows using -m with -D (moving and pruning does not make much sense) and throws an error instead of crashing if the command is malformed.

directaccess: fix case of shortened hash containing only digits For directaccess, there are four cases for what looks like short hashes made of digits only: 1 | the hash is a revision number and not a short hash for another revision: we don't change the visibility 2 | the hash is a revision number and a short hash for another revision: we don't change the visibility 3 | the hash is not a revision number and not a short hash for another revision: we don't change the visibility 4 | the hash is not a revision number but is a short hash for another revision: we make it visible Before the patch we were not lifting visibility in case number 4. This patch fixes the issue.

evolve: evolve --divergent failed when merge had nothing to do (issue4950) Before this patch, if the divergence resolution lead to an empty commit, the transaction would be rolled back and the divergence not resolved. This patch allows empty commits in that case. It is legitimate to end up with an empty commit in that case, for example when divergent commits differ over their commit messages.

inhibit: use dirty revset trick to speedup the inhibit search space. See documentation for details. I'm a bit sad about this changesets.

inhibit: use 'repo.revs' instead of 'repo.set' This skip the creation of a changectx object.

_inhibitmarkers: turn the result from generator into a list A generator object is always True, we have to turn it into a list in order to be able to use it in the tests. Before this patch we were rewriting the 'obsinhibit' file all the time, this had a performance impact especially on repository where transaction are expensive (hooks, cache invalidation, etc). Writing this file less often have a minor effect on test where a stripped changeset does not get removed from the obsinhibit file is still inhibited when unbundled back. I think this is fine and I'm moving forward.

split: drop the experimental flag I've been using it without issue for some time. The only blocker in my mind was the lack of commit message preservation and this is now fixed.

split: preserve original changesets description Losing the description on split is to much an issue, we offer the original description to edition for every part of the split.

merge with stable

readme: updateing changelog We forgot a couple of recent improvement.

evolve: rewrite command help (evolve command only)

parents: avoid locking the repository during 'hg parents' The wrapping code was initially written for update and pull who need the lock anyway. We duplicated the logic in the parent case to remove the need for locking.

README: update instructions for running tests.

tests: remove the custom run-tests.py This test-runners is a copy from the Mercurial one and slowly drift out of sync. Use the Mercurial's core test runners instead.

make: clean test related target We removed the runner, so they are broken. We can reintroduce them later with proper data to fetch an official 'run-tests.py' runner.

test: use 'dummyssh' from the run-tests directory This is a step toward not shipping our own test runners and relying on the official Mercurial one.

test: use 'killdaemons.py' from the run-tests directory This is a step toward not shipping our own test runners and relying on the official Mercurial one.

merge back with stable

Added tag 5.2.1 for changeset c15d6168412f

prepare version 5.1.2

merge with default there is some 3.6 related fix and test change that we need on default. No other significant change happened since last release expect for split, still marked experimental. So we prepare for a bugfix release.

split: mark the command as experimental It has a bit too many rough edge for now.

tests: run test with 3.6 and apply test change Tested with 3.4, 3.5 and 3.6. Some minor test update had to be done.

prune: have dirstate collaborate with transaction With 3.6, dirstate update can work with transaction to ensure proper rollback. We do it if the mercurial version permit it.

evolve: have dirstate collaborate with transaction With 3.6, dirstate update can work with transaction to ensure proper rollback. We do it if the mercurial version permit it.

prune: reuse revset from repair instead of copy-pasting code

merge with stable

evolve: compatibility with coming 3.6 Some function in the import stack changed, we have to adapt.

evolve: be more complete about copying extra from old revisions For 'hg evolve' we want to copy all extra-level metadata except for branch. This keeps the experimental topics extension from getting obliterated by evolve runs. Many hashes in tests changed due to some extra data coming along for the ride in various places, but no functionality that was tested. It's plausible that this copies too much metadata - maybe we should be dropping rebase_src or convert_revision as well. Right now no tools do that, so I'm biasing towards preserving everything except branch when copying metadata for now.

evolve: ignore ui argument passed to help loader The API changed at Mercurial e0c572d4d112.

directaccess: inspect trees of len() > 3 Previously, when inspecting revset AST's we'd only traverse down the tree if it was length 3 ([op, left, right]). In some situations, like 'or' the tree node will be greater than length 3 ([op, first, second, ..., nth]). So we need to traverse all the parts of the node to catch all the symbols.

debugobsconvert: make sure obsstore is loaded before version comparison hg 44918682093f delays loading obsstore, so we have to access _all to get the correct store version.

evolve: use repo._bookmarks.recordchange instead of repo._bookmarks.write We want to get rid of the api repo._bookmarks.write and this patch removes its use in evolve.py. Before this patch, we were using repo._bookmarks.write to save bookmarks change immediately instead of repo._bookmarks.recordchange that write change when transaction ends.

evolve: indentation change for making next patch more legible In the next patch: "evolve: use repo._bookmarks.recordchange instead of repo._bookmarks.write" we need to add a transaction in the rewrite function. To do so adds an indentation level and makes the patch harder to review. This patch makes the indentation change so that the next patch is easier to review.

merge with stable

next/prev: properly lock repo before touching bookmarks

next/prev: properly lock repo before touching bookmarks

prune: ensure we prune bookmarks in a transaction

next: add support for --dry-run also adds support to prev

evolve: spelling uncommitted

evolve: annotate translatable strings with _()

evolve: do not capitalize description of next/previous

evolve: _() should not contain %

evolve: add progress for _obsrelsethashtree

evolve: add progress for the obsmarkers discovery parts

test-obsolete: clarify divergence detection output order

directaccesss: also look for symbol into list revrange is now much smarted and optimise multiple simple symbol (like hash) into an efficient '_list' call. So we need to look into these to find user provided input too.

merge with stable

inhibit: fix inhibit working with non-inhibit repos Inhibit was breaking when two repos were in memory, but one was not an inhibit repo (like when doing a local pull between two repos). The fix is to add inhibitenabled checks to all the places where inhibit does global wrapping of commands (every code path from the extsetup wrappers).

directaccess: don't try to partialmatch things that aren't hashes Trying to partialmatch identifiers like '.' turns out to be (a) pointless and (b) extremely slow. On a repo with a million commits, with directaccess enabled, hg log -r .^::. goes from 2.1 seconds to 0.5.

merge with stable

next: properly report no children when --evolve is used If no aspiring children exist, 'hg next --evolve' should properly issue an error message instead of crashing.

inhibit: do not search for visible obsolete changeset during stripping Stripping use transaction in an unorthodox way. We should not run the inhibit postclose hooks as it can lead to crash.

split: handle bookmarks instead of leaving them on precursor Before this patch we were leaving the bookmarks on the precursor of the split instead of moving them on the tip of the split chain. We add a test to verify the behavior.

split: don't update before it is actually needed Before this patch, we were updating the working copy parent needlessly and before the error checking. This patch fixes the issue.

split: add more output to the test Before this patch, we were not displaying the final graph resulting from the tests but just the obsolscencence markers. This patch adds more output to the test to make it more descriptive.

split: fix commit message numbering error in the test Before this patch, the test was wrong and the successors of a splitted commits all had the same commit messages. This patch makes the test right making sure that the numbering of the split successors is accurate.

evolve: handle split commit for instability

merge with stable

evolve: add test for instability

evolve: add a command to split commits Before this patch, to split commit one had to use prune. This patch adds a new command called split that prompts the user interactively to split a given changeset with record/crecord.

merge with stable

test-inhibit: simplify push destinations for Windows This was aborting because $pwd is expanding to 'C:/path/to/tests': - pushing to file://$TESTTMP/inhibit2 - abort: hidden revision '003a4735afde'! - (use --hidden to access hidden revisions) + abort: file:// URLs can only refer to localhost

test-sharing: fix globs for Windows

inhibit: don't abort when directaccess is not enabled When directaccess is not enabled, we should just print a warning and not set up inhibit. We don't need to abort in that case. Example: if the user is running hg showconfig, we don't want to crash as the command is unrelated to inhibit.

merge with stable

inhibit: add missing locking in wrapper for obsmarker creation The develwarning for transaction without lock rightfully pointed out to this issue. Before this patch we were not locking in the transaction for obsmarker creation and therefore showing the warnings.

evolve: (issue4386) cleanup, split, fold and bijection in `hg prune` Before this patch, the prune command was splitting and folding implicitely based on the number of successors and precursors. This patch makes the two behavior explicit by requesting a flag to perform a split or a fold.

merge with stable

evolve: fix typo in fold docstring

evolve: remove trailing spaces

evolve: dedupe divergents when running evolve --all --any or evolve --rev Before this patch, when running evolve --all --any or evolve --rev with the --divergent flag, we were selecting all of the divergents. After solving the first one, its counterparts would get pruned and potentially hidden which would crash when trying to resolve them. This patch introduces logic to dedupe the divergents to be resolved by keeping only one per group of divergent with the lower revision number.

evolve: remove unused warning message in _solvedivergent Before this patch, we were checking for a case where a divergent changeset could be public and printing a warning in that case. When we compute the divergent set in the obsolete module we explicitely look for not public() changesets. This patch removes this unused warning.

compat: use svfs instead of sopener The "new" attribute is about 2 years old so let's move on.

fold: avoid using x:y in the help Suggesting "x:y" is a bad idea because x:y is a very deceptive revset.

evolve: improve the help of the fold command The help of the fold command needed a little rework. This patch makes it a little less verbose and adds an example. It also highlights a little more the importance of the --exact flag.

merge with stable

Added tag 5.2.0 for changeset 44a9dcb3fefc

merge with 3.3

fix version number

fix debian changelog

merge with stable

Added tag 5.2.0 for changeset 00026533ff9f

merge with preparation for version 5.2.0

prepare version 5.2

merge with stable (restore test for Mercurial default branch

merge back with 3.3 compat branch

tests: adapt the test for Mercurial 3.3 Some fix in the obsolete parent directory warning where also necessary.

merge with stable Test are updated to run with current mercurial stable (3.4.1)

next: add a --evolve option When on a topological head, this option will trigger the evolution of a unstable changeset that will result in a children of the current working copy parent. This should ease stacked changesets workflow by allowing to stick to prev and next to move through a stack of diff, evolving part of it on demand when needed. In case of ambiguity, the command will ask the user to choose. We need a better definition of "the stack of changesets I'm working on" to be able to seamlessly handling branching.

next: print some message when on a head with some aspiring children Being on a head does not necessary means that this is the end of the road. It is likely that some changesets could be evolve as children. We detect this case and provide a hint.

next: reword error output We move to a more compact and direct phrasing. I'm not fully happy about it yet, but this is a step forward. The listing of candidate should maybe be moved behind a --verbose flag (and such verbose flag be suggested in the error). G: changed tests/test-prev-next.t

next: refactor the command code We make the conditional flatter and the return more straight forward. This will make addition of more complex cases more straightforward in future changesets.

next: add extensive testing to the 'next' command We are going to introduce more complexity to it. We add the full extend of the case we want tested to see how they evolve later.

readme: add an entry about the obsolete wdir parent hint

evolve: add a hint when the parent working copy become obsolete This should help people find the right commands to recover from this situation.

evolve: better error message when command is Ambiguous Having more data help the user.

evolve: mechanism to load some commands selectively This patch introduces a new config option: experimental.evolutioncommands to load evolve's command selectively. It is part of a sequence of patches to make evolve's command respect the value of experimental.evolution. Once these commands are ready and actually respect the flag, they are safe to use and can be enabled with the mechanism developed in this patch.

evolve: clarify code in _singlesuccessor Before this patch we were not very explicit with this while condition in _singlesuccessor. This patch makes it more legible.

merge with stable

merge with inactive compat branch

merge with inactive compat branch

close inactive compatibility branch

close inactive compatibility branch

merge with inactive compat branch

merge with inactive compat branch

merge with inactive compat branch

close inactive compatibility branch

close inactive compatibility branch

close inactive compatibility branch

evolve: raise MultipleSuccessorsError when computing dependency for split commits We don't know how to handle dependency for split commits yet. When facing a splitted commit, instead of silently adding the first successor to the dependency list and fail later, we do nothing.

next/prev: require --merge to move with uncommitted changes This should previous common mistake.

merge with stable

Added tag 5.1.5 for changeset 1377f6a7f9ec

prepare version 5.1.5

evolve: non recursive implementation for _aspiringdescendants We switch from a N squared recursive implementation for _aspiringdescendants to a more efficient algorithm in O(len(unstable)).

evolve: distinct between '--all' and '--all --any' Before this patch, evolve --all implied evolve --all --any. With this patch evolve --all evolves all the aspiring descendants of the parent of the working copy. evolve --all --any does what evolve --all did before: evolving all the troubles in the repo. We add anew function _aspiringdescendant for this purpose

rework refactor _aspiringchildren by introducing _possibledestination This allows us to reuse some of the logic for evolve from _aspiringchildren for the new implementation of evolve --all. The logic is also better as some previously selected changesets may not actually evolve on the target, and some changesets that does not would not.

evolve: consider all potential candidates on bare evolve Instead of stopping at the first resolution, we returns all matches. If there is ambiguity, we abort. The function itself seems fairly flawed but will do the job in simple case.

evolve: fix an issue in the documentation of the evolve function hg evolve is solving troubles that will become children of the parent of the working copy and its descendant. This last part was omitted by mistake from the help message before.

evolve: fix error in builddependencies When MultipleSuccessorsError was raised, we were still running the code below to add the dependency if succ was not None from a previous iteration. This bug was harmless because dependencies and rdependencies are sets but it makes the code clearer this way.

test-evolve-bumped: add new test case for merge Before this patch we were not testing our warning message for bumped changesets that are the product of a merge. This patch adds a test case for that.

test-evolve-bumped: improve tests legibility This patch introduces in test-evolve-bumped some of the test helpers that we use in other tests to make the code more legible.

evolve: drop len comparison in prune and fold Computing the length of a smartest may be significantly more expensive than computing it length.

evolve: add an help topic about evolution The text is probably bad, but this have been laying around for quite sometime (with Mercurial core in mind) lets move forward and add this to evolve.

evolve: remove _picknexttroubled It was not used anymore

evolve: warn about every skipped evolution When we could not evolve a revision, we used to silently ignore it. We now inform the user that we ignored something and tell him why (with more or less informative message).

evolve: some style fix

evolve: unify revision handling and rework error message This changesets do a massive refactoring of the way evolve select changesets to be evolve. We now use a two stages approach: 1) read command line argument and produce a list of revision to evolve. 2) evolve all these revisions. This allow a much cleaner, robust and extensible code. In the process the error message issued when there is nothing to evolve have been updated to informs about other troubles in the repository and point at useful option to solve them. The 'update' case is handled independently at the start of the function.

evolve: move the 'update' if '.' is obsolete earlier A big refactoring of the computation of the revision to evolve is coming. This case won't be handled by it, so we extract it earlier.

evolve: skip unstable changesets with multiple successorssets We were previously crashing when encountering them, but we want to be able to solve the other solvable troubles instead of stopping right there.

evolve: allow multiple --rev argument This is standard behavior for Mercurial commands.

test-evolve: fix tests failing on some platform We change from echo to printf to print newlines so that evolve's tests work cross-platforms.

evolve: prevent using --rev and --any together Before this patch it was possible to use evolve --rev --any and it meant evolve --rev. This patch throws an error when using evolve --rev --any.

evolve: add selector for trouble types This patch adds command line flags to select the kind of troubles to solve. Before this patch evolve was solving any kind of troubled. With this patch evolve --all and evolve --rev can be configured to only solve only some type of troubles (divergent, bumped or unstable). To give this choice to the user we add three new command line flags to the evolve command: --bumped, --divergent and --unstable.

evolve: refresh the documentation Multiple behavior change are coming, a perfect timing to refresh the doc before we rework it more.

evolve: check for uncommited change earlier Before this patch we were checking for uncommited change multiple times and quite late for uncommited change. This patch moves the check at the beginning of the evolve method to avoid these shortcomings.

merge with some old heads

merge with some older backport

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

evolve: make fold aware of allowunstable Before this patch, the fold command was performing the same way regardless of the value of experimental.evolution. With this patch if the configuration does not allow unstability, fold won't create instability.

evolve: make prune respect allowunsable Before this patch, the prune command was performing the same way regardless of the value of experimental.evolution. With this patch if the configuration does not allow unstability, prune won't create instability.

merge with stable

evolve: add a hint about how to abort an evolve with conflict The whole evolve --continue is hacky, but the way to abort it have been arcane knowledge, carried from sith lord to its apprentice for centuries. We add a hint to help the use discover it. One day a clean solution will come.

merge with branch closing commit

close 3.1 compat branch

evolve: marks the extension as tested with 4.1 Because it is.

merge with stable

evolve: fix default value for --confirm Before this changes, the default was yes, unlike advertised. The test were actually catching that so I go them updated.

prune: use the bookmark wrapper for 3.4 compatibility

merge with stable

evolve: update readme regarding the preview perf improvement

evolve: move 'allsuccessors()' to smarted usage The "new" smarted can be significantly more efficient than the old was. We convert our revset to take advantage of that.

evolve: move 'successors()' to smarted usage The "new" smarted can be significantly more efficient than the old was. We convert our revset to take advantage of that.

evolve: move 'allprecursors()' to smarted usage The "new" smarted can be significantly more efficient than the old was. We convert our revset to take advantage of that.

evolve: move 'precursors()' to smarted usage The "new" smarted can be significantly more efficient than the old was. We convert our revset to take advantage of that.

evolve: move 'suspended()' to smarted usage The "new" smarted can be significantly more efficient than the old was. We convert our revset to take advantage of that.

evolve: move 'troubled()' to smarted usage The "new" smarted can be significantly more efficient than the old was. We convert our revset to take advantage of that.

evolve: avoid creating changectx object in _allsuccessors The repo lookups and object creations have a significant performance overhead.

evolve: avoid creating changectx object in _successors The repo lookups and object creations have a significant performance overhead.

evolve: avoid creating changectx object in _allprecursors The repo lookups and object creations have a significant performance overhead.

evolve: avoid creating changectx object in _precursors The repo lookups and object creations have a significant performance overhead.

evolve: fix the template keyworkd decorator docstring It was still talking about revsets.

evolve: search divergence within all precursors Before this patches we looking for divergence base in immediate successors only. This was a bug leading the divergence base to be reported missing more than it should.

evolve: make sure we use an unfiltered repo when looking for divergence data Let's be double sure

evolve: make sure we use an unfiltered repo when looking for divergence data Let's be double sure

directaccess: remove import from the no warning list removal of the list previously failed for some reason.

directaccess: add some commands to the directaccess list Before this patch we had a limited list of commands in the directaccess list. This patch adds about 20 commands to that list: - all the read-only commands in core supporting a rev as an argument - 'outgoing': since people can use 'outgoing' to know what is going to be pushed, the output of hg outgoing should be consistent with to the output of hg push and must therefore disallow directaccess since hg push forbids it.

evolve: move test for evolve --rev ordering in a separate file evolve --rev reordering is a complicated enough topic to justify a separate test.

evolve: properly evolve stacked unstable with --rev Before this patch, _singlesuccessor was not returning a revision number for the case where the parent of the argument was not obsolete. This resulted in bug when testing membership with the set of revisions. This patch fixes it and adds a test.

directaccess: disable directaccess for push and serve Before this patch, push and serve were subject to directaccess. This patch makes them throw error when trying to access hidden hashes.

directaccess: change rule from opt-in to opt-out Before this patch we would opt-in commands for direct access and the default filter for new repository was 'visible'. With this patch, the default filter for new repos is 'visible-directaccess-warn'. It means that by default all the commands have directaccess with warnings.

inhibit: move transaction wrapping outside of repo setup Before this patch, transaction wrapping code was done in reposetup. It happened to cause stackoverflows in repos with a lot of subreps. This patch moves the wrapping to extsetup and avoids this problem.

tests: ignores other core output in capability testing This will avoid breaking the test anytime core changes.

evolve: make uncommit respect allowunsable Before this patch, the uncommit command was performing the same way regardless of the value of experimental.evolution. With this patch if the configuration does not allow unstability, uncommit won't create instability.

directaccess: use cached filteredrevs Before this patch we were calling directly repoview.computehidden(repo) to compute the revisions visible with direct access, without going through the caching mechanism for the filtered revisions. There was two issues with that: (1) Performance: We were not leverating the cached values of the 'visible' revs (2) Stability: If there were to be a cache inconsistency with the computation of 'visible' we would crash in the branchmap consistency check partial.validfor. Consider the scenario of rebase with bookmarks: - when we delete a bookmark on an obsolete changeset (like what rebase does when moving the bookmark after rebasing the changesets) - then this changes the value returned by repoview.computehidden(repo) as bookmarks are used as dynamic blockers in repoview.computehidden(repo) - as of now, we don't invalidate the cache in the case of bookmark change - if we have a cached value from before the bookmark change, repoview.filterrevs(repo, 'visible') considers the cached value correct and returns something different than repoview.computehidden(repo) - in turn, if we use repoview.computehidden(repo) in directaccess, the subset relationship is broken and the cache consistency assertion (parial.validfor) fails if branchmap.updatecache is called in this time window This patch leverages the caching infrastructure in place to speed up the computation of the filteredrevs for visible-directaccess-nowarn and visible-directaccess-warn. Incidentally it prevents the bug discussed in (2) from crashing when running a rebase with a bookmark. Note that there still needs to be a fix in core for the case discussed in (2). The test for this side of the fix (not core's fix for (2) is very hard to implement without introducing a lot of dependencies and does not belong here. It is much easier to have the test of the fix for the scenario (2) in core along with the fix.

inhibit: improve performance of transaction wrapping Before this patch, transaction wrapping was the most expensive part of inhibit computation wise. This patch changes the revset that we use in the transaction wrapping to make it ~50x faster to compute: revset #0: obsolete() - hidden() 0) wall 0.000214 comb 0.000000 user 0.000000 sys 0.000000 (best of 11209) vs revset #0: (not hidden()) and obsolete() 0) wall 0.010965 comb 0.010000 user 0.010000 sys 0.000000 (best of 237)

evolve: extract the code computing dependencies in a separate function The code to compute dependencies between unstable changeset can be reused to compute the next reveset. This patch extracts it in its own function to make it reusable.

directaccess: add mechanism to load directaccess after some other extensions directaccess needs to load after some extensions to avoid interfering with them. This patch adds a mechanism to specify what extension directaccess needs to load after.

evolve: add another test for evolve --rev This patch adds one test for three conditions not covered before: - evolve --rev on a stack with obsolete commits without successors - evolve --rev on two sets of stacks in parallel - evolve --rev on a set of stack partially solvable (because all of the commits of the stack are not specified with --rev)

evolve: add a more complex test for evolve --rev The previous tests of evolve --rev would have passed with an ordering of revs by increasing revision numbers. This patch adds a test that would fail if that was what we were doing and therefore tests the implementation better.

evolve: add ordering of the revisions for evolve --rev When running evolve --rev we want to process the revisions in an optimal fashion to solve the maximum amount of trouble in the minimum number of steps. This patch adds a step to evolve --rev to order the revision before solving the troubles. A simple test is added to cover a basic case.

test: adapt to change in mercurial core Bundle2 is one by default and more capability have been added.

evolve: add directaccess to the setup.py directaccess was missing from the list so that when we were building evolve it was not contained in the build.

evolve: don't crash on singled out revisions Before this patch, we were crashing on unsolvable revisions when using evolve --rev. This patch removes the crash and prints a warning when we encounter such revision.

test: adapt test to less frequent branch warning The 701df761aa94 changeset in mercurial core made the branch warning issue only for the first branch created. We adapt the tests to reflect this change.

tests: adapt summary output to 6084926366b9 The 'summary' commands recently gained phases related output, 6084926366b9 put it into a "final" state. We adapt the test to this new style.

evolve: small refactoring of the uncommit function We introduce a new variable to simplify the implementation of hg uncommit --interactive.

evolve: improve error message We add a new line and change the wording from 'revsets' to 'revisions'.

evolve: move return statement at the right level When no trouble was found with the --rev option, the code of the evolve function would continue running and would solve unwanted troubles. This patch makes sure it does not happen.

evolve: remove extra whitespace This patch removes a whitespace at the end of a line.

directaccess: don't crash when evolve is not loaded Before this patch, when evolve was not loaded direct access was crashing. This patch catches the error and prevents the crash.

inhbit: don't crash on commit with no changes Before this patch inhibit would crash when running hg amend with no changes. This patch fixes this case and adds a test to prevent regression.

evolve: add a test for prune --keep -r . with active bookmark We recently changed the behavior of prune to make sure that the active bookmark stays active after prune -r . This patch adds a test for the case of prune --keep -r . that does not take the same code path.

Merge with stable

inhibit: add test to ensure that --hidden is working with inhibit There was a concern with the transaction hook in inhibit and its potentially devastating effect when used with --hidden. The transaction hook in inhibit hides all the visible & obsolete commits when the transaction ends using the visible() and the obsolete() revset. --hidden does not change the visible() revset so it is fine. If this changes in the future and --hidden actually ends up impacting the visible() revset, this test will catch it and prevent inhibit from putting inhibition markers on all of the obsolete changesets.

prune: with active bookmark should stay active hg prune with an active bookmark was deactivating the bookmark after the prune. This patch makes sure that if a bookmark was active before a "prune" operation (except prune -B) then the bookmark stays activate afterwards.

merge with stable

evolve: migrate off of now-dead util.any

inhibit: create direct access extension Since we want to use direct access without necessarily using inhibit, this patch separates both extensions. Inhibit depends on direct access and we add a test to check that it complains if that is not the case.

inhibit: handle inhibit marker on stripped revision If a revision disappear from the repo, we should not crash.

update README

evolve: don't use python sets on top of revset for evolve --rev In --rev we were wrapping the revsets in python sets. This is wrong as the use python sets force the wrapper revision set to be computed earlier than it has to and have no order guarantee. Removing this wrapping changes a test because the ordering does not appear to be the same but the end result is the same.

evolve: current bookmark wrongly moving during prune (issue4559) Before this patch: prune -r <otherbookmark> also moved the current bookmark eventhough it was not related to the pruned changes. This patch fixes it and adds a test to catch regressions.

inhibit: direct access with and without warning on a per command basis We introduce a new filtername visibile-directaccess-nowarn to enable direct access with no warning on a per command basis. The motivation behing this change is to display warning when attempting direct access in destructive commands.

inhbit: make tests work with evolution.createmarkers config Before this patch, the test for inhibit was assuming evolve fully running. For most of the features that inhbit enables, createmarkers is sufficient. This patch makes the test of inhibit run with the createmarkers config and only lifts it for operations in the middle of the stack.

inhibit: config to enable only direct access Inhibit provides several features to hide instability and direct access. We want to use direct access in evolve without hiding the instability. This patch adds a config flag to enable only direct access in inhibit, when this config flag is not set or set to false we enable all the features of inhibit that don't concern direct access.

merge with stable

bookmarks: update to use new bookmarks api via compatibility layer Tested against 3.4 and latest hg + upcoming bookmarks patches

simple4server: remove buggy wrapping of pull related function Not only the wrapping was all buggy, but simple4server is not supposed to affect client side pull.

simple4server: update bugtracker link We moved all evolution related bug to the core Mercurial tracker.

evolve: rename handlenotrouble to _handlenotrouble and add doc As suggested by Pierre-Yves on his comments on f113636997660b807c36cf1d0a06b76d53ada1a4 we make it clear that this function is private and explain what it does.

evolve: improve the help message of --rev User's are not exposed to the notion of revset, this patch makes the help message more intelligible.

evolve: add --rev option to the evolve command This patch is part of a series of patches to refactor the evolve method and make it more readable. We introduce a new --rev flag to specify a revset where to solve the troubles instead of looking from the parent changeset. All add a test checks that --rev works with several commits

evolve: extract cleanup logic in the evolve function We are going to need to reuse the cleanup logic when introducing --rev, so we extract it in a method to avoid code duplication.

evolve: simplify the evolve function We compute the troubles once and use it in two places instead of recomputing them just to count them.

evolve: optimize the computation of the troubled() revset We take the implementation from _counttroubles() and rely on the more efficient & operation for revset instead of laying down the entire set with %ld.

inhibit: don't inhibit pinned commits during rebase During a rebase we pin certain commits to always be visible. This caused the inhibit extension to inhibit them when a transaction closed. Let's make inhibit aware of such pins and not obsolete them.

evolve: extract the logic to solve one change into a method The goal is to later reuse this method to implement the --rev flag for evolve that solves the troubles in a revset.

evolve: add new variable and comment Add comment and introduce a new variable to keep track of if the progress ui is shown. Later on we will use this variable in the implementation of the --rev option.

evolve: move code to track progress and start node This makes it easier to refactor the evolve function in this serie of patches.

evolve: renaming of a variable tro was not a really descriptive name, replacing it with nexttrouble.

evolve: refactoring of the code displaying error when no trouble found Before this patch, we had many return statements in the evolve function especially in the part in charge of displaying errors when no troubles were found. We move this code in a separate function.

evolve: refactor code computing stats of obsolescence markers Duplicated code removal by extracting a function.

evolve: refactoring of code related to pushing obs markers This removes duplicated code for the pushobsmarkers logic

merge with stable bunch of cleanup on stable

update readme

evolve: update cmddebugrecordpruneparents to the new markers creation API The parents information are now first class citizen. (caught by laurent using pylint)

evolve: drop useless return This return statement is never reached. This a actually a good new because its variable was undefined. We remove it. (caught by laurent using pylint)

evolve: add missing import (caught by pylint)

evolve: improve transaction related code to use the lock module Refactored some of the places where we are using locking in evolve to use the lock module and write less code. This should also fix a couple of bug where tr could be None at release time.

evolve: remove unused variables As suggested by pyflakes, remove 5 unused variables in the evolve module.

evolve: remove unused code in _evolveany remove some code that was doing nothing useful in _evolveany.

evove: remove unused imports Three imports where unused in the evolve module.

tests: ensure we keep capturing output In 3.4, output capture with bundle2 is disabled by default on local push.

inhibit: updating to a obsolete commit prints warning message We move the inhibition marker in the same wlock than the update operation, this clears the warning message. To make it work we display the warning message on lock release in evolve.

evolve: stop conditional wrapping of _checkinvalidmarkers We support down to Mercurial 3.3, all such version have this function.

evolve: stop conditional wrapping of _getbundleobsmarkerpart We support down to Mercurial 3.3, all such version have this function.

evolve: stop conditional wrapping of _pushdiscoveryobsmarkers We support down to Mercurial 3.3, all such version have this function.

merge with stable

test-inhibit: test bookmark -D without prune enabled The --config option were dropped for lack of documentation.

inhibit: fix devel warning _inhibitmarkers was taking a transaction without the proper lock. Adding the lock removes the warnings.

evolve: add -i flag to amend command The -i flag was missing because it is not a global flag of the commit command. We can't make it a global flag yet as it is used in many places where it would not be appropriate so we just add it for this occurrence. Also, we only want to add it when commit supports it (otherwise it wouldn't work with older versions of mercurial)

prune: prune fix transaction pattern I forgot to amend.

prune: fix pruning w/ bookmarks and inhibit Previously prune would create the obsolesence markers, then try to fix up the bookmarks. With inhibit enabled, the act of closing a transaction for the bookmark step caused it to unhide commits that were trying to be pruned. The fix is to put the whole thing in a transaction.

inhibit: remove book -D dependency on cmdprune Bookmark -D was relying on the prune command to be registered, which isn't the case if we've disabled evolve commands. Instead, let's just hard code the arguments. The real fix would be to abstract away the 'I want to prune commits' functionality in evolve to a reusable function, but this will do for now.

inhibit: wrap repo.commit to inhibit nodes Rebase was failing if you rebased a commit, stripped it, then rebased it again. This is because the node was still hidden and we needed repo.commit to uninhibit it.

merge with stable

tests: ensure we keep capturing output In 3.4, output capture with bundle2 is disabled by default on local push.

update readme Mentions greg ward work in documentation.

docs: format concepts guide better, with literal blocks

docs: fix slightly unconventional .rst markup

docs: remove unused/obsolete figures

docs: remove obsolete documentation evolve-collaboration.rst replaced by sharing.rst instability.rst introduction to the concept for Mercurial developers -- no longer needed since most are now convinced obs-concept.rst largely replaced by the user guide obs-implementation.rst more for Mercurial developers; the source code is probably more accurate and up-to-date qsync.rst the extension this referred to no longer exists This fixes several more sphinx warnings. I've left some other old docs around, because they still have useful content that needs to be adapted and updated.

docs: add a table of contents This silences many sphinx warnings about documents not included in any toctree. Still need to delete obsolete .rst files to silence the rest of the warnings.

merge with stable

Added tag 5.1.4 for changeset 891c3ce894fa

prepare release 5.1.4

evolve: drop unused 'urllib' import

debugobsrelsethashtree: get the command to work again The command was untested and became broken when we introduced the new discovery hashing.

getbundleobsmarker: prevent crash from filtered content (issue4616) The discovery may discover common markers on non-served nodes. This lead to crash when building the obsmarker part.

test-wireproto: add some obsmarker discovery usage. The old code was never checking that the discovery were skipping common markers. This is now done.

test-wireprotocol: test with both bundle1 and bundle2 Bundle two is becoming the major way of exchanging things now. We duplicate the test and ensure the default version runs using bundle2.

Update debian packaging for 5.1.3

Update debian packaging for 5.0.0

create 3.1 compatibility branch The next changeset drop 3.1 compatibility.

merge with stable

Add "documentation update" to the changelog.

docs: cover 'touch' command

docs: explain that obsolete is not hidden

docs: explain --hidden option Also move the discussion of revision numbers up, and splice the explanation of --hidden into it.

docs: tweak wording, punctuation for better readability

docs: flesh out unfinished bits in the intro page

docs: revive the explanation of divergent changesets in the sharing guide

docs (sharing): more scattered wording tweaks

docs: sharing guide: clarify end-game of "Example 2" - push to dev-repo, rather than pulling into it (consistent with how we work the multiple developer scenario later) - explicitly demonstrate that public changesets are immutable

docs: minor tweaks to sharing guide (suggested by timeless)

docs: add code review scenario to sharing guide The idea is to demonstrate a simpler multiple-developer situation that does not involve getting into trouble. The final scenario illustrates Alice and Bob getting into trouble with bumped and divergent changesets by amending each other's history. The required tests and text are all written, but will need to be heavily revised because of the inserted scenario.

docs: add a bit more hierarchy to the sharing guide

docs: update sharing guide based (mostly) on marmoute's review - don't claim certain scenarios are more/less common, just simple/advanced - mention code review as a multiple-developer scenario (not described in detail yet!) - suggest "hg config --edit --local" instead of "cat >> .hg/hgrc" - use -q less often (and show resulting output) - edit some section headers to be consistent with user guide (example numbers; "amend" instead of "amending") (These are just the small changes; big changes are yet to come.)

Added tag 5.1.3 for changeset c52c15100fb2

prepare version 5.1.3

graft: avoid potential deadlock We must acquire 'wlock' before 'lock'.

commit: avoid potential deadlock We must acquire 'wlock' before 'lock'.

update readme

pull: fix bundle2 part generation The new part generator (allowing partial pull) was unproperly installed.

simple4server: cleanup debug output The debug output got duplicated with the original code. And the cleanup forgot about simple4serve. (code duplicated yeah!)

merge with stable

update readme

discovery: stop being stupid about variable name Overwritten variable are overwritten... The test coverage makes a simple pass in the loop :(

merge with stable

inhibit: explicitly test for None It is always better to check for None explicitly.