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

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

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

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

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

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

patch: document the section about import/export

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

tests: add pyflakes test

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

topicmap: whitespace

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

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

stack: whitespace

stack: remove unused import

revset: add missing imports

revset: whitespace

discovery: whitespace

discovery: removed unused oldgetitem

setup: break long line

init: indent correctly

init: whitespace fixups

init: remove unused module

spelling: histedit

spelling: changeset

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

merge with other duplicate head

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

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

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

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

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

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

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

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

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

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

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

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

discovery: remove a spurious print

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

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

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

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

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

Makefile: meant tests-@ not tests-tip

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

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

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

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

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

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

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

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

testedwith: declare compatibility with Mercurial 3.7

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

hgignore: also ignore testtimes

killdaemons: discard now that it's unused

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

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

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

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

Merge.

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

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

topic: remove useless call to c.parents()

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

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

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

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

test: adapt to newer mercurial

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

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

topic: work around stringmatcher moving during development of hg 3.6

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

topic: fix missing error import

amend: allow clearing topics on amend

changectx: add topic method

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

topics: drop debugging print in rebase

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

topics: add listnames hook so completion works

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

topics: only apply topic to commits of the working copy

rebase: teach rebase how to copy topics

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

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

topic: only require obsolete support for --change

commit: add a --topic flag

topic: note when switching topics

summary: add topic summary hook

topics: add command summary

docs: fix format of extension docstring

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

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

revset: add a topic() revset for querying topics

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

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

testlib: enable rebase and obsolete for easier testing

Initial dumb version of topics.

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

serveronly: clean up imports remove unused one and arrange them

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

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

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

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

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

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

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

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

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

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

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

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

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

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

merge with stable

merge with mercurial-3.5

merge with mercurial-3.6

merge with mercurial-3.7

merge with mercurial-3.8

merge with mercurial-3.9

merge with mercurial-4.0

merge future 5.6.1

Added tag 5.6.1 for changeset 70694b2621ba

update debian changelog

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

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

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

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

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

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

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

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

merge with stable

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

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

reopen the default branch

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

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

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

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

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

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

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

Added tag 5.6.0 for changeset 99ede2d77545

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

open the mercurial-3.9 compat branch

prepare release 5.6.0

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

merge with default to prepare the next version

merge with stable

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

merge with stable

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

README: update changelog

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

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

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

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

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

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

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

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

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

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

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

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

Manifest.in: sort entry

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

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

merge with stable

Added tag 5.5.0 for changeset 727c7211c810

prepare release 5.5.0

readme: mention that the next release make use 4.0 compatible

merge with latest fix

merge with latest fix

merge with latest fix

merge with latest fix

merge with latest fix

merge with latest fix

errors: add missing imports of mercurial.error

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

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

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

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

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

merge with future 5.5 All was fine for 3.4.

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

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

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

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

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

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

open the mercurial-3.9 compat branch

merge with stable

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

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

tests: adapt to some change to topic output

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

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

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

merge with stable

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

backed out changeset 7a76f9a43e89

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

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

debug data for manifest change in core

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

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

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

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

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

docs: use https for mercurial-scm.org

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

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

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

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

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

merge back with stable

Added tag 5.4.1 for changeset 2ad40d972a74

prepare release 5.4.1

3.9 have been released

open mercurial-3.7 compat branch

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

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