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