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

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

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

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

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

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

tutorial: add a second part about having multiple topic

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

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

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

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

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

flake8: fix E713 style

flake8: fix E301 style

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

flake8: fix E222 style

flake8: fix E127 style

flake8: fix W391 style

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

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

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

init: cache repo.topics

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

cleanup: removed unused mercurial.util import

compat: tolerate missing rebase extension

compat: mercurial dropped alias for hashlib.sha1

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

update: calculate 'partial' as core does

discovery: flake8

destination: flake8

style: update __init__.py

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

patch: document the section about import/export

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

tests: add pyflakes test

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

topicmap: whitespace

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

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

stack: whitespace

stack: remove unused import

revset: add missing imports

revset: whitespace

discovery: whitespace

discovery: removed unused oldgetitem

setup: break long line

init: indent correctly

init: whitespace fixups

init: remove unused module

spelling: histedit

spelling: changeset

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

merge with other duplicate head

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

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

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

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

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

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

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

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

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

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

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