tests: add tests for showing stack when merge is involved This patch adds tests of showing stack when merges are involved. This will help us in changing the behaviour and realising that in later patches.

stack: move data computation on the object We gather multiple data about the stack on the object. Let us move this on the object and keep it cached there.

stack: replace 'getstack' with direct call to 'stack' The dedicated function do not add any value. We can update all the callers.

stack: introduce a rich stack object The logic around stack object become more and more complex. We great and object to gather and abstract it.

tests: add tests for `hg stack` showing surprising behavior with gaps The test will help us to analyse in next commit if the things are fixed or not.

topic: check availability of obsutil.getmarkers() for portability Before this patch, topic extension causes unintentional failure with Mercurial earlier than 4.3, because obsutil.getmarkers() has been available since Mercurial 4.3 (tests for topic on mercurial-4.* branches fail, too). This breaks "minimumhgversion = '4.0'" declaration of topic extension. This patch fixes this issue in a straightforward way for simplicity on stable branch. I'm planning to centralize such portability logic in topic extension into topic/compat.py or so on default branch for efficiency at runtime, like as evolve/compat.py.

tests: add more explicit test about empty topic from publishing

convertbookmark: advertise the new command in the readme The command is in a good enough shape now.

convertbookmark: properly convert stacked bookmarks We ignores pure descendant when looking for revision to convert. This adds support for cases were a linear stack contains multiple bookmark (or un-bookmarked descendants exists). In this case, some changeset are left orphan, but we'll consider the issue as minor for now.

convertbookmark: perform all actions at the end This will make the whole operation more deterministic and robust.

converbookmark: split target computation from actual update This will allow for further refactoring helping consistency.

convertbookmark: extract the revset into a module level constant This will make it easier to read and modify the query.

convertbookmark: properly exclude public changeset Public changeset are immutable and cannot have a topic anyway.

test: add a new root changeset to all debugconvertbookmark test case We'll make this root changeset public to check the debugconvertbookmark logic in that regards. It is added in its own changeset since it massively impact all output.

tests: import section in 'test-topic-debugcb.t' We now have two levels of titles to clarify some aspect of the tests.

test: avoid using debugdrawdag in 'test-topic-debugcb.t' The 'debugdrawdag' utility adds local tags that prevent hidden changeset to get hidden. We will do without that extension for now.

tests: add more tests for debugconvertbookmark

convertbookmark: add logic to skip revisions with multiple bookmarks When a user tries to converts a bookmark to topic which is on a changeset with more bookmarks we skip that.

topics: add a new debugconvertbookmark command to convert bookmarks to topics This new command, aliased to debugcb converts bookmarks to topics. This command either accept name of a bookmark using flag '-b' or '--all'. If a bookmark is passed using '-b', the whole stack defined by that bookmark is converted to topics. If '--all' is passed, the above thing is repeated for every bookmark in the repository. If the revset which we are using unable to decides revisions of the stack and return an expty set, in that cases we are not deleting the bookmark as we are not writing any topics of the same name as that of bookmark. Also currently if a changeset has two bookmarks, than there is buggy behaviour. So these are known lackings in the current implementation which will be fixed in upcoming patches. This also adds tests for the same.

topic: support --rev argument and properly process then as user input Revisions inputed by the users should be processed using `scmutil.revrange`. This will take alias into account and allow extensions to monitor the user inputs. As a side effect, the '_changetopics' function takes revisions as argument. make the API clearer.

topic: move a status message in the right scope The finally get runs on failure so we should not advertise rewrite topic in the case. In addition the 'rewrote' variable can be undefined in the finally.

obsfate: use effect flag information for computing a better verb

compat: make it more clear that evolve need Mercurial >= minversion The message is more clear when mercurial isn't installed at all.

doc: record all the missings and strange bit we know We know the doc is not as fresh as it could be. We make sure the reader is aware too.

directaccess: fix with tree without order 1b28525e6698 removes order from tree, changing the indexes in gethashsymbols. Fix that

compat: adapt to test output changes different access pattern in 4.4 means different results. Make evolve works with mercurial core 72b5f4d53c58

compat: adapt to rebase change in coming 4.4 Make evolve works with mercurial core 72b5f4d53c58

topics: import lock as lockmods We'll need a 'lock' variable in the next changeset. we move the module out of the way ahead of time for clarity.

topics: make sure we have some restrictions on topic names This patch makes sure we don't allow topic names with just whitespaces, and other checks which we do for a bookmark.

topic: add test showing no restrictions on topic names Currently we don't have any restrictions on topic names and each of the topic name works. We want them to not work as some of them are used internally and only integers can be rev numbers too.

index: edit pass by native english speaker

topic: reword and simplify explanation of "behind"

topic: tutorial grammar fixes

doc-front-page: link to the changeset evolution section in the document The section is unlikely to be perfect, but at least it exists.

doc-front-page: use a clearer statement about the experimental status This text comes form the Mercurial wiki.

doc-front-pagE: add a paragraph about "why the extension" Let us clarify why there is an extension in the first place.

doc-front-page: expand the paragraph about changeset evolution We clarify the part of the explanation about the changeset evolution concept.

doc-front-page: rename the "next step" section This are pointer to relevant section in the doc. It is a bit double usage with the table of content. We at least clarify the title.

doc-front-page: mention that "Changeset Evolution" is a specific concept It will get it own paragraph soon.

doc-front-page: include the index in the TOC This will help important content to stand forward.

doc-front-page: add a title to the part about the extension We'll rework this section more in depth, but I would like it to have a title first to have it show up in the table of content.

doc-front-page: add a feature summary at the beginning of the page

doc-front-page: mention the mailing list in the documentation It is an important tool to keep people up to date.

doc-front-page: move installation instruction earliero This is important for user.

doc-front-page: move introduction before the table of content This should make a friendlier landing.

doc: simplify the reference to in-core features This should do the whole thing lighter.

doc: be less dramatic about changeset immutability Quoting Phillipe: "This is not a Tolkien Novel".

doc: clarify the introduction sentence

topics: allow use a --current when setting a topic This patch allow to use the current flag which can be used by user set existing revs to the current topic.

topic: make --clear + topicname invalid The two flags are mutually exclusive.

topics: add a current flag to display current topic This patch adds a current flag which can be used by user to display the current topic.

topics: add a missing trailing comma on list of flag This will make the next changeset easier to read.

doc: let mercurial find where evolve is installed

doc: use pip to install evolve

doc: reword "target repository" to "remote repository"

doc: typo fixes

doc: use "hidden" instead of "invisible"

tests: add whitespaces in test-topic.t to make it more readable

evolve: undo change from "divergent" to "phasedivergent" for --divergent Looks like an accidental update in feaa52680682 (log: bumped was renamed into phasedivergent, 2017-08-10).

messages: use hyphenated '{phase,content}-divergent' in user messages The hyphenated version is more readable and it's what we use the {instabilities} template.

warning: use 'divergent', not 'contentdivergent' on old Mercurial This was just an oversight in f6517779a7c4 (warning: rename warning message, 2017-08-24).

warning: rename warning message divergent has been renamed into contentdivergent. Use their renamed counterpart in warning message for new unstable changesets. Renaming done according to https://www.mercurial-scm.org/wiki/CEDVocabulary

warning: rename bumped warning message bumped has been renamed into phasedivergent. Update the warning message when new phasedivergent changesets are detected. Renaming done according to https://www.mercurial-scm.org/wiki/CEDVocabulary

warning: rename unstable warning message unstable has been renamed into orphan. Update the warning message when new orphan changesets are detected. Renaming done according to https://www.mercurial-scm.org/wiki/CEDVocabulary

merge with stable

test: fix output of test-discovery-obshashrange.t The username is now quoted in the output.

obscache: use _readmarkers() from core with correct signature The copied _readmarkers() went stale with Mercurial core commit 5d3ba4395288 (obsstore: let read marker API take a range of offsets, 2017-06-04). At the same time, the Mercurial core version of the function gained the desired offset argument, so we can now use that function.

topics: take locks and start transaction before calling _changetopics This will help us in calling _changetopics in other transactions which already started. Currently the _changetopics creates its own transaction and hence can't be used it a same transaction with any other function or logic.

compat: fix instabilities compat We added an instabilities method for old version of Mercurial. But we returned an old value for orphan changesets, the one before the big evolve renaming. Fix the return value to match the new return values.

test: fix output of test-discovery-obshashrange.t The username is now quoted in the output.

revset: bumped volatile set was deprecated Use phasedivergent volatile set instead. Match 07a76d4f2297 mercurial changeset.

revset: divergent volatile set was deprecated Use contentdivergent volatile set instead. Match 31c922423f3f mercurial changeset.

revset: unstable volatile set was deprecated Use orphan volatile set instead. Match 5579864798c6 mercurial changeset.

revset: bumped() is deprecated Use phasedivergent() instead. Match bd71c06eb62f mercurial changeset.

revset: divergent() is deprecated Use contentdivergent() instead. Match 4dd4757db73a mercurial changeset.

revset: unstable() is deprecated Use orphan() instead. Match c8c04a2b7bb4 mercurial changeset.

obsolete: allprecursors was deprecated Use allpredecessors instead. Match e6d8ee3c9ec3 mercurial changeset.

context: precursors was deprecated Use predecessors instead. Match d5acd967f95a mercurial changeset.

context: troubled was deprecated Use isunstable instead. Match 52c5ff856b49ac8f2a4eadda6dc9dbb070f39a3f mercurial changeset.

context: unstable was deprecated Use orphan instead. Match f163edb45c47 mercurial changeset.

context: troubles was deprecated Use instabilities instead. Match ab0c55c2ad9a mercurial changeset.

log: bumped was renamed into phasedivergent Bumped was renamed into phasedivergent, update tests. Match 9c27a2891b75 mercurial changeset.

log: divergent was renamed into contentdivergent Divergent was renamed into contentdivergent, update tests. Match 2194a8723138 mercurial changeset.

log: unstable was renamed into orphan Unstable was renamed into orphan, update tests. Match 03039ff3082b mercurial changeset.

log: trouble was renamed into instability Trouble was renamed into instability, update tests. Match 6f4bc9688ca9 mercurial changeset.

output: update obsfate / obslog output order Always display successors after the verb. So instead of "rewritten by boris as X", display "rewritten as X by boris".

branching: merge with stable

doc: add part about exchanging drafts in topic tutorial

doc: add stack part in topic tutorial

test: setup python path for topic tests This make thing simpler and clearer.

doc: various improvements on topic tutorial

doc: various little improvements for rst export

doc: fix test2rst Previous versions used to break on multi-lines texts and miss entirely single lines of texts. Use a simplest version without regex.

docs: move the topic tutorial in the documentation

test: fix typo in the topic tutorial

test: fix typos in evolve tutorial

topic: fix extension version variable For some reason, this variable use '__xxx__'.

branching: merge with stable

branching: merge with other stable head

debian: add a 6.6.0-1 changelog entry I forgot to do so while building the version :-/

debian: fix 6.5.0-1 changelog entry

packaging: update version to .dev This avoid misleading version number when investigating.

branching: merge back with stable

packaging: mark the stable branch as bugfix version in development

Added tag 6.6.0 for changeset cc3e09e033a3

test-compat: merge with mercurial-3.9

test-compat: merge with mercurial-4.0

test-compat: merge with mercurial-4.1

test-compat: merge with mercurial-4.2

test-compat: merge with stable

packaging: prepare version 6.6.0

readme: mention the documentation update

topic: make command names valid as expected, even if ui.strict=true Before this patch, "hg topics" and "hg stack" cause unintentional "unknown command" failure, if ui.strict=true. In such case, "topics [TOPIC]" and "stack [TOPIC]" are required as a canonical name, because synopsis-like string is used as command name pattern of @command annotation for them. This patch also specifies additional "synopsis" for @command annotation, for intentional output in online help of these commands.

readme: mention the work on API deprecated in 4.3

next: use the utility to retrieve the current topic

test-compat: merge with mercurial-3.9

test-compat: merge with mercurial-4.0

test-compat: merge with mercurial-4.1

test-compat: merge with mercurial-4.2

test-compat: merge mercurial-4.2 with the new stable branch content

branching: default into stable It is time for a new release

compat: handle pre-4.2 compatibility for accessing vfs The vfs module is quite new.

compat: avoid using configoveride This not supported before mercurial 4.1.

compat: use old style method to update bookmark The '_del' and '_set' method are new additions in 4.3 we should not use them in the compatibility layers.

topic: wrap 'update' in a more flexible way This ensure compatibility with mercurial 4.1 and below

branching: open the mercurial 4.2 compatibility branch The freeze as started.

readme: add an entry about the unified message

touch: use precheck to validate revision This gives us standard check and standard error message.

prune: use precheck to validate revision This gives us standard check and standard error message.

uncommit: use precheck to validate revision This gives us standard check and standard error message.

amend: use precheck to validate revision This gives us standard check and standard error message.

split: use precheck to validate revision This gives us standard check and standard error message.

precheck: handle rewrite attempt of nullrev This is a common breaking case, so we handle and test it in the generic code.

precheck: update the orphan message to something me generic This will help to reuse it for other commands.

precheck: point to the instability doc when aborting This will help user to understand what is going on.

evolve: document the various instability/troubles We need something to point people at.

precheck: also check for unstability creation

prefetc: point at the offending changeset when aborting We do our best to display comptact but usable information.

precheck: point to 'phase' help when aborting some of the error message already does that. It seems a good idea.

precheck: use 'changesets' in the message instead of 'revisions' This match the message `hg commit --amend` issue in core.

rewriteutil: add a precheck function to validate rewrite beforehand For now this only checks for changeset mutability and this is only used by 'checkfold'. We'll expand the checking and usage as we go.

test: remove reference to the graphlog extension The feature is in core for ages.

test: use common setup for test-split.t This make things cleaner.

split: compute revision to split after locking This would avoid strange behavior from race condition.

split: basic code cleanup We remove a useless extra variable since another one already hold the same value.

commands: rewrite the 'evocommands' module to 'cmdrewrite' The remaining commands should get their own module, so we rename the module for clarity. We update the module comments to better fits its purpose.

split: add support for the -D and -U option

split: fix the --user option The option ended up being ignored.

metaedit: add support for the -D and -U options

fold: add support for the -D and -U options

test: extract most fold testing into a test-fold module

commands: move 'prune' to the 'evocommands' module

rewriteutil: move 'deletebookmark' to the module

rewriteutil: move 'reachablefrombookmark' to the module

commands: move the touch to the 'evocommands' module

commands: move split to the 'evocommands' module

commands: move fold to the 'evocommands' module

commands: move metaedit to the 'evocommands' module

rewriteutil: move the 'rewrite' function

rewriteutil: move 'foldcheck' to the new module

rewriteutil: move disallowednewunstable in the new module

rewriteutil: create a rewriteutil module to host utility function The ultimate goal of this module is to gather basic building block for rewriting changesets. This is aimed at moving into core and being use by the core extension.

interactive: fix the interractive option import The move made in e6bc6eaa17c5 was buggy.

test: update test output to match b11e8c67fb0f hg debugobsolete now issues a message about the obsoleted changesets.

test: update test output from b47fef6d2365 We run this check for bundle1 too now.

compat: add a compatibility layer for bookmark move The API was updated in 4.3 (712a85b3677f) we adapt to that.

compat: use 'safehasattr' over 'hasattr' 'hasattr' is broken in python 2.

stack: show short node of changesets in `hg stack -v` After this patch, hg stack -v shows short nodes for changesets which have topic index, i.e. excluding the bases except t0.

compat: use 'repo.cachevfs' when available In 4133c0b0fcd7 (core), the repository gained a new vfs dedicated to caches. We update the code to follow this new pattern.

debugobsconvert: take the lock when writing the obsstore file We were upgrading the store unprotected.

topics: add a test demonstarting sorting of topics by time using --age

branching: merge with stable

prev: allow to update to 't0' from 't1' When on the first changeset of a topic, one can move back one changeset to end up on t0. The new working copy parent to not belong to the topic, but the topic is still active. The next commit will create a new root to the active topic. You can get the same result using `hg up t0`

topic: add a 'topicidx()' to context This will be useful for the `t0` logic in `hg prev`

prev: retrieve the 'no-topic' result is a clear and reusable option We'll use it more, so let us make it pretty first.

prev: add '_getcurrenttopic' helper and use it We'll add more spot where this information is used.

prev: explicitly use 'p1' as a variable name This make the code clearer.

topic: rename the internal topic option we'll use it more widely so I give it a more generic name. It is an internal option so not wories regarding compatibility.

prev: extract the code computing the destination This make the handling of the result simpler. The test agree as one return code is fixed.

prev: issue a proper error when reaching repository root (and adds the associated test)

prev: stop creating a repository at the root of 'test-repo.t' We run the test in a subdirectory now, this usually avoid various kind of future issue.

prev: extract the function performing the update That code is fairly independant so let us isolate it to simplify the rest of the code.

prev: simplify the bookmark preserving logic We can use 'None' as a special value and have a simpler code.

prev: rename 'p' to 'target' This makes the code clearer.

topics: check for topic on commit before a user enters message We have a enforce-topic cofig which can forbid user to commit without a topic on it. We used to check topic on a commit after the user enters message, but we should fail early.

packaging: update readme I forgot again.

topics: add a new flag --age which will show last touched time for topics This adds a new flag `--age` to `hg topic` command which will show topics sorted by their last touched time and will also show the last touched time for them. This patch also adds a simple test to make sure the flag does not breaks by future changes. Adding more tests showing output like "3 hours ago", "2 minutes ago" etc will change as the code takes time.time() into account which will increase with time, and hence the output will change, so we need some static output like a date.

uncommit: expose the feature with a '--extract' to amend The name of the "uncommit" feature have been an ongoing issue, but no better name have been found in the past year. We try another approach by exposing the 'uncommit' feature directly in `hg amend`. The command will not be able to do both operation a the same time (add new change to the commit + extract should change, but this is already the case with the two command today.

uncommit: add support for -U and -D

uncommit: add support for --user and --date This is also long overdue

uncommit: add support for --message and --logfile This is long overdue.

amend: drop the implementation details from the user help This is not relevant to users.

uncommit: move to the 'evocommands' module We are about to play around with a UI mixing amend and uncommit, we take advantage of this to split the __init__.py module a bit more.

amend: extract into a 'evolve.evocommands' module We are about to play around with a UI mixing amend and uncommit, we take advantage of this to split the __init__.py module a bit more.

test: handle output change in 20f533a92eda The bundle backup name has changed.

tutorial: fix grammar and spelling

tutorial: word wrap long lines

tutorial: use rm instead of 'hg rm' for an untracked temporary file

readme: update with various topic improvement

topics: add a config knob to forbid untopiced commit After this patch one can add the following to their hgrc to stop allowing new commits with no topic on it. [experimental] enforce-topic = yes

topics: update the help for `hg topics` describing ways to use the command

branching: merge with stable

obshashrange: add cache warming instruction to the documentation

evolve: explain how to disable markers discovery in the documentation This is useful for large repository.

obshashrange: add cache warming instruction to the documentation

topics: add t0 and b0 to the stack t0 or b0 will be the base of the stack and it's the parent of t1 or b1. The cool thing about this is that if you update to t0 using `hg up t0` or do `hg prev` on t1, you will be updated to t0 with the current topic preserved. This patch adds t0 to stack and implement the preserving topic case for t0 while using `hg update`.

topics: wrap the update function to check if either t0 or b0 is passed as rev t0 or b0, seriously, what's that. Do they even exist? Hold on and look for the next commits what we are trying to do.

compat: adapt to change in 53b3a1968aa6-core

merge back with stable (version updated in the process)

packaging: update versions to '.dev' one This help to spot install from unreleased source.

Added tag 6.5.0 for changeset 734c0bc066cd

packaging: prepare version 6.5.0

topic: update extensions metadata Let us assign a version number to this release and add some more data about the extensions.

readme: prepare version 6.5.0

compat: merge with mercurial-3.9

compat: merge with mercurial-4.0

compat: merge with mercurial-4.1

compat: merge with stable Nothing to report beside the drop of the obsfate related tests.

evolve: preserve the branch of the original changeset when evolving merge

merge: default into stable to prepare next version Let us prepare ourself for 6.5.0

obslog: handle patch generation for mercurial 4.1- The unidiff API changed, we detect and work around that.

topic: also have the revbranchcache during the discovery

topic: cleanup the repository wrapping logic in topic discovery We are know overriding the class so we do not need to update and restore the pushop itself.

topic: adapt to function migrate to obsutil Mercurial 4.3 has a new module "obsutil" and multiple functions moved there. We handle the move for the one we care about.

evolve: adapt to function migrate to obsutil Mercurial 4.3 has a new module "obsutil" and multiple functions moved there. We handle the move for the one we care about.

topic: directly use the '_notpublic' revset This is just more robust to achieve the same goal.

topic: drop the message about running evolve after topic change Topic change is no longer creating a mess that needs cleaning.

template: handle lack of "users" in the obsfate data This can happens when their are no markers (or the markers has no user data?)

doc: update effect flag documentation

obsfate: override the default log output Override the default log output by showing obsfate if not empty.

evolve: fix documentation formatting The config example were formatted as standard paragraph.

compat: fix topicset for mercurial 4.1 The 'getrevset' method is not available there.

obsfate: refactor obsfate data computing Refactor how obsfate data are computed in order to reuse this logic later when hooking on default log output.

topic: exclude public and topic changeset from branch stack Stack use-case is to show the current work in progress, which are symbolized by the phase draft and secret phase. Moreover showing public changesets in stack output when displaying current branch would display a lot of changesets for long-lived branches and would be quite useless. We also exclude topic changeset form the stack since they already exist on their own stack. getstack revsets didn't needed update when displaying a topic as when a changeset become public, its topic is no longer relevant.

tests: use a more portable form for new lines

topic: don't abort if there is no current topic in stack() revset Named branches support has been added and we should not abort if there is no active topic.

topics: return a parse error if stack() revset is passed with argument

tests: add test to show topics working with shelve

topics: update current topic to the topic of newly rebased commit (issue5551) The rebase code passes branchmerge equals to True while updating to the rebased commit. We need to make sure topic is preserved even after rebase and hence we need to update the topic even when branchmerge argument is set to True. But there is a twist in the tale, merge also uses this part of code and we allow to update topic when brancmerge is True, in merge cases the topic after merge will the topic of the destination commit, not the topic of working directory parent. So we need the function to have information about whether a rebase is going on, and we do it by wrapping the rebase command and storing some value in the config. This is a bit hacky but works for now. This patch fixes issue related to loosing of topic while rebase. Thanks to Boris Feld for the rigourous tests.

docs: some fixes to the help text

topics: pass 'topics' to ui.formatter instead of 'bookmarks'

topic: also insert the extra head check with using the new head checking This will get the protection in place in all cases.

topic: some document for an obscure function

topic: adjust head checking wrapping to not interfere with concurrent push In the previous form, the new topic head was detected as affected and the push was rejected. We introduce a of 'test-topic-push.t' using the new race checker as there have been many compatibility issue with this new checkers.

topic: also detect head checking using the concurrent part

test: avoid 'test-check-commit.t' complaining copied code We switch to git diff.

topic: small test cleanuo The section was repeated.

topic: move the heads data to the branch line when appropriates The topic line is dropped as it is quite confusing.

topic: add some initial support for using stack on named branch Stack is a useful command that can make sense in other context. The current support is hacky and awful, but we have something!

topic: explicitly pass topic as a keyword argument This clarify all callers before adding more logic related to bare branch in stack.

topic: makes split keep the topic Refactor split to extract the preparation of the working directory in a separate function. This helps topic wrap this function to save topic before update and restore it after preparing the working directory just before the split.

topic: add tests for fold behavior with topics Clarify the fold behavior for keeping topics.

topics: pass quietempty=True to suppress useless output while changing topics This will help in suppressing the output "0 files updated, 0 file removed, ..."

topics: return early so that other if conditions don't get execute (issue5600) We were not returning after the _changetopics() call and hence the if's below it were also executed which resulted in changing of current topic. This prevent current topic to be updated even when we only affect changeset unrelated to the working copy. Not that the rebase output change as it expose a new bug (rebased changeset gain a topic)

test: extra output to understand the next changeset better

topics: move the logic to change or clear current topic into a new function It adds a new _changecurrenttopic which changes or clears the current topic.

tests: expand output to check topic activation This will help understanding later changesets.

branching: merge stable into default

split: preserve author of the original changeset in the successors Previously, the new changesets were authored by the default user.

grab: properly quote hg executable in the alias Breakage has been reported on Windows.

topic: improve the revset used to return name->nodes mapping The 'topic' version already filters public changeset out, and skipping 'changectx' creation will helps performance.

topic: update the changectx method to respect phases The topic is no longer returned once the changeset is no longer mutable (unless explicitly requested).

topic: avoid crash when topic is loaded but not enabled for a repository

compat: update test to match core default state This output changed in 560ceb654180.

topicmap: massive rework Massively rework the way we build and use topicmap. This bring massive performance benefit. Topic map use to be a fully independant thing that we would switch on and off globaly. The caching on disk was broken so the performance were atrocious. Intead, now the topic are inherited from the 'immutable' map. We gave up on storing them on disk for now since the mutable set is usually small enough. The activation is done by hacking new "filter" on the repository and detection when they are one. This is hacky but core is hard to wrap here. Overall this whole wrapping is really scary and we should massage core API to help it.

topic: use the 'topic' revset in namespace This revset performance just got improved.

topic-revset: update the revset to no longer build changectx Atribute access is expensive, and changectx are very expensive to build, so we skip these for better performance. Before: ! wall 0.012195 comb 0.020000 user 0.020000 sys 0.000000 (best of 217) After: ! wall 0.008816 comb 0.010000 user 0.010000 sys 0.000000 (best of 303) (Before this changeset parent) ! wall 0.213261 comb 0.210000 user 0.210000 sys 0.000000 (best of 45)

topic-revset: changectx creation in the revset The current mutability filter is very expensive, we use a more direct and efficent way to do so: Before: ! wall 0.213261 comb 0.210000 user 0.210000 sys 0.000000 (best of 45) After: ! wall 0.012195 comb 0.020000 user 0.020000 sys 0.000000 (best of 217)

topics: add some noise to rewrittent changeset to prevent hash cycle If we have a changeset with topic `x`, we change it's topic to `y`, fine. When we change it's topic back again to `x`, we get the hash of the the obsoleted changeset which had the topic `x` initially. The same happens for few more cases like clearing the topic of a changeset which initially had no topic. This approach is influenced from cmdutil.amend and other commands (rebase, histedit, etc…)

topic-change: update the working copy along when changing topic of '.' This avoids leaving the working copy behind, removing another large parts of issue5441.

topic-change: cleanup the locking and transaction mechanism The previous code did not garanted we would release all lock (and was a bit more complicated than needed.

topics: use a dict for successors of changesets produced by topic change This patch adds a dictionary to store the successors of changesets which got obsoleted when we change it's topic. This is an improvement in the fix for issue5441.

topic: further simplify the clear logic We just set 'topic' to None and the rest should follow.

topics: drop the clean argument from _changetopics() After this commit, None will represent that we want to clean the topic.

topics: rename '--change' flag to '--rev' flag The --change flag was used to read a revset of which topic should be changed. In mercurial we use --rev for this type of flag. Now things will work as follows: `hg topics topicname`: It will set the current topic `hg topics topicname --rev revset`: Change topic of all the revs in the revset to topicname Further patches will try to achieve the following: `hg topics --clear --rev revset`: clear topic from all the revisions in the revset `hg topics --clear`: clear the current topic (Current behavior) `hg topics --rev revset`: show topics on the revisions in the revset

topics: factor out the logic to change topic in a new function It will help to refactor and fix bugs. Moreover we can re-use the logic.

obslog: update the readme This is release not worthy

obslog: add a comment about the final new line of descriptions

obslog: also display description patch with --patch When activating the --patch option, also display the description patch.

obslog: extra patch indentation code The code is simple and we need to reuse it.

obslog: add a patch option Add support for '--patch' option in obslog for a similar effect than "hg log --patch". The patch support is only limited to a few basic cases that will be extended in the future.

obslog: clarify some sorting code I'm not sure why Boris did it, but this belong to the next patch.

obslog: pass directly unfiltered_repo _debugobshistorydisplaynode used to create two times an unfiltered repo, makes _debugobshistoryrevs create only one unfiltered repo and pass it directly.

obslog: remove useless repo arg _debugobshistorydisplaymarker used to takes repo as an argument but it isn't needed anymore.

obslog: small renaming of _debugobshistorysingle Rename _debugobshistorysingle to _debugobshistoryrevs in order to better reflect its purpose.

refactoring: directly use 'ctx.unstable()' in showstack function This is simpler and more efficient.

packaging: flag default as version 6.5.0.dev This helps to reduce confusion when installing intermediate version.

merge: get stable change back into default

obsfate: improve obsfate output Improve obsfate output: * Remove newline and replace it by '; ' * Improve the hybrid object for making join(obsfate, '|') working.

packagin: mark stable branch as 6.4.1.dev This help prevent confusion with installing intermediate version

topics: abort if user wants to show the stack of a non-existent topic

stack: show unstable state for the current revision if it is one (issue5553) Before this patch if the current revision is unstable, hg stack does not show the unstable state. This patch fixes that by showing both current and unstable state for the current revision if that's unstable.

topics: some minute fixes to the documentation which shows up in help I am not a native but these changes are simple and obvious.

topics: make sure we commit on new parents while changing topics (issue5441) While changing topics of a set of linear commits, we used to commit our new changesets with new topic on parents of its predecessor i.e. changeset before the topic change. If the topic of parent was also changed, that parent will become obsolete and hence resulting the cnew commit in unstable state. For a set of linear commits this repeats and we end up in a tree state as mentioned in the bug. This patch fixes the bug by checking whether the parent was obsoleted and if yes, commit on the new parent.

tests: add a test to show issue5441 in test-topic.t The issue will be fixed in the next patch and the test will be helpful to show that.

merge back with stable (test change from stable has been reverted)

Added tag 6.4.0 for changeset e60248f26f92

packaging: prepare version 6.4.0

readme: fix readme for future 6.4.0

test-compat: merge with mercurial-3.9

test-compat: merge with mercurial-4.0

test-compat: merge with mercurial-4.1

compat-test: merge with stable

test-compat: fix previous merge The merge was a bit too heavy handed in dropping some part of the test.

merge with default Integrate new development around obsfate.

obsfate: by default only display the username if differ from the current one This will will keep the output simple in the simple case.

obsfate: display more data about direct prune markers This does not handle all cases, but this should handle the most common ones.

obsfate: split markers fetch from successor set annotation This will help to improve support for pruned changesets.

obsfate: mark successorsetallmarkers public We are about to use it in another module.

obsfate: mark 'preparesuccessorset' as public It is used in another module so it is not really private.

obsfate: use 'split' as verb when appropriate

obsfate: improve prune support in _successorsetverb In the prune case, still have markers (at least the prune markers). If we want to be able to return these markers we need the underlying function to support it.

obsfate: rename 'successorsset' to 'sset' in the loop The old name make it too close to 'successorssets', and the shorter name is not ambiguous in the context anyway.

template: use hex node in the obsmarkers used in the obsfate template This was pointed by Yuya and yuya is right.

template: use hex successors in obsfate This was spotted by Yuya.

template: use hex-node in successors AS pointed by yuya on the list, the raw data for the template should be hex and not binary.

template: update successors doc I'm not very happy about it, but at lease there is a show description now

template: fix precursors documentation

template: used hex-node for the precursors underlying data As pointed by yuya on mercurial-dev we should not use binary node here.

compat-test: merge with mercurial-3.9

test-compat: merge with mercurial-4.0 branch Minor merge conflict.

compat-test: merge with mercurial-4.1

compat-test: merge with stable * Blackbox format seems to have change when displaying config CLI options. * As obsfate template is now only compatible with hg 4.2+, remove all references to it in test files.

merge with stable

changelog: announce that obsfate is hg > 4.2 now Update changelog to announce the fact that obsfate has been improved and is now only compatible with mercurial version greater than 4.2.

compat: make obshistory._getdifflines compatible with mercurial 4.1 On Mercurial version 4.1 and lower, patch.diff seems to returns an empty list when there is no change. Mercurial 4.2 returns None so we add a if for this case.

obsfate: add a new obsfate template The obsfate template display for each obsolete changeset a line summarizing what changed between the changeset and its successors. This dict is computed in obshistory._preparesuccessorset. It uses obshistory.FORMATSSETSFUNCTIONS which is a list of function that individually compute a part of each dict. You can override fields or add new ones by adding your own function in this list. The format of obsfate is computed in templatekw.obsfatedefaulttempl and can be wrapped if necessary, the code is not quite extendable for the moment but can be refactored later.

obsfate: prepare fatelog tests Prepare obsfate venue by adding new blank output, it will helps clarify which are the new output due to obsfate or not.

obsfate: build more advanced markers for tests Prepare obsfate venue by building more advanced markers by varying obs markers users and dates.

readme: fix entry for 6.4.0 some data were missing and some were in the wrong spot

test: drop now useless config about effect flag The experiment is on by default now.

effectflag: activate effect flag by default Remove forcing effect-flag in test files

effectflag: activate effect flag on test-evolve-obshistory test file Prepare activation of effect flag by default by activating it on test-evolve- obshistory.t test file first.

effectflag: activate effect flag on test-wireproto.t test file Prepare activation of effect flag by default by activating it on test- wireproto.t test file first.

effectflag: activate effect flag on test-uncommit.t test file Prepare activation of effect flag by default by activating it on test- uncommit.t test file first.

effectflag: activate effect flag on test-stabilize-order.t test file Prepare activation of effect flag by default by activating it on test- stabilize-order.t test file first.

effectflag: activate effect flag on test-obsconvert.t test file Prepare activation of effect flag by default by activating it on test- obsconvert.t test file first.

effectflag: activate effect flag for obsmarkers-case-*.t test files Prepare activation of effect flag by default by activating it on test- exchange-obsmarkers-case-*.t test file first.

effectflag: activate effect flag on test-drop.t test file Prepare activation of effect flag by default by activating it on test-drop.t test file first.

effectflag: activate effect flag on test-amend.t test file Prepare activation of effect flag by default by activating it on test- amend.t test file first.

effectflag: activate effect flag on test-stabilize-result.t test file Prepare activation of effect flag by default by activating it on test- stabilize-result.t test file first.

effectflag: activate effect flag on test-split.t test file Prepare activation of effect flag by default by activating it on test-split.t test file first.

effectflag: activate effect flag on test-evolve-cycles.t test file Prepare activation of effect flag by default by activating it on test-evolve- cycles.t test file first.

effectflag: activate effect flag on test-evolve-obshistory-complex.t test file Prepare activation of effect flag by default by activating it on test-evolve- obshistory-complex.t test file first.

effectflag: activate effect flag on test-prune.t test file Prepare activation of effect flag by default by activating it on test-prune.t test file first.

effectflag: activate effect flag on test-evolve.t test file Prepare activation of effect flag by default by activating it on test-evolve.t test file first.

effectflag: activate effect flag on test-obsolete test file Prepare activation of effect flag by default by activating it on test- obsolete.t test file first.

obscache: directly allocate zeroed bytearray This is much faster that incrementally appending to it. On mozilla central without obsolescence markers this move full cache building from 0.3s to nothing visible.

obscache: plug on core 'update cache' method if available I was planning to have this implemented in core but since things are not getting in I'm updating evolve.

obscache: pre-indent code This will make the next changeset clearer.

fix: fix _headssummary call to orig 65cf338258d2 one of two orig call wasn't compatible with mercurial version < 4.3, fix it.

test-update: update hg update output in test files Following hg revision 1b5c61d38a52, hg update now show the commit to which we updated in case of multiple heads. test-obsolete.t and test-sharing.t falls in these situations, acknowledge the new outputted line.

test-drop: all obsmarkers are now dropped Previously, hg drop may leave some obsmarkers behind, like with temporary amend commit. Following mercurial revision 71eb6a098315, strip now correctly remove the associated obsmarkers and as drop is also calling strip, the bug is now resolved.

test-evolve: garbage collection changeset only, not obsmarkers

test-inhibit: adapt to 4.3 version 4.3 introduce markers stripping with strip. We adapt the test output to the (harmless) consequence.

test-exchange-case-D3: avoid stripping obsolescence marker The test needs to have changeset unknown locally with obsolescence markers still applying to them. So we make sure the markers are not stripped (future 4.3 strip markers by default).

test-exchange-case-D2: avoid stripping obsolescence marker The test needs to have changeset unknown locally with obsolescence markers still applying to them. So we make sure the markers are not stripped (future 4.3 strip markers by default).

test-exchange-case-D1: avoid stripping obsolescence marker The test needs to have changeset unknown locally with obsolescence markers still applying to them. So we make sure the markers are not stripped (future 4.3 strip markers by default).

test: fix test-discovery-obshashrange.t new output Update test-discovery-obshashrange.t test file with new mercurial dev output.

fix: fix _headssummary api _headssummary now takes directly the pushop, update the topic extension wrapping to fix the API.

url: update url to point to https://www.mercurial-scm.org/repo/evolve

doc: document the evolve templates

test: fix template condition for obsfate

obscache: add a missing "new line" at the end of a debug message

default: merge back with stable

obscache: shortcut the attribute access for testing The attribute access adds a significant overhead. we can gain -20% performance by doing so.

obshashrange: add an option to protect from accidental activation The new 'obshashrange.max-revs' option is meant to help large installation like bitbucket to avoid impact on repositories that cannot handle it.

obshashrange: basic proof reading of the documentation Nothing major but this should be a bit better.

proofread

effectflag: fix content change detection for filtered revs In some cases (like amended an obsolete changeset), computing the diff and comparing them need to work with filtered revisions. We need to use unfiltered change contexts to safely compute diffs.

debugobsstorestat: adds static about actually obsolete changeses

evolve: fix typo: -list -> --list

Added tag 6.3.1 for changeset e358c0263e46

prepare release 6.3.1

merge with stable

packaging: bump to 6.4.0.dev

serveronly: also backport the fixes from 5adb8bdb935e The fixes to the computation of "relevant" markers. Was missing for server only.

merge stable back into default

readme: merge 6.2.2 and 6.3.0 changelog 6.2.2 never happened.

packaging: mark as version 6.3.1.dev This reduce confusion when installing version from source.

readme: clarify the branch policy

Added tag 6.3.0 for changeset 6da4ca7b3e4f

packaging: prepare release 6.3.0

test-compat: merge with mercurial-3.9

test-compat: merge with mercurial-4.0 branch The new 'olog' command is not working with 3.9 so we skill all mentions of it in the tests. This also apply to the topic extensions.

test-compat: merge with mercurial-4.1 hg log has no trouble field in mercurial 4.0, output fixed.

test-compat: merge with stable Nothing special to report, minor test-metaedit.t output change.

merge with default

compat: fix stablerange for mercurial 3.9 Lrudict.get change of api between mercurial 3.9 and mercurial 4.2. Bypass this limitation by using lrudict.__getitem__ and catch the KeyError directly.

template: fix successors and precursors templates In mercurial 4.1-, the gen argument is expected to be an iterator and not an iterable, fix successors and precursors templates.

lint: remove double newline in test file Test file test-stablesort-criss-cross.t contained two double newline, I remove them.

template: fix precursors template for older mercurial version In mercurial 4.1 and below templatekw._hybrid require the gen argument to be different than None. Manually compute the same default output for these older mercurial versions.

compatibility: backport mercurial 176d1a0ce385 Backport obsstore.relevantmarkers change for including previously forgotten pruned obs markers. Target mercurial version lesser than 4.3. This impact multiple tests. All test changes has been manually checked. Since the computation of relevant obsmarkers have changed, we are bumping the cache schema version. So that caches get recomputed.

evolve: fix import order

compat: adapt to buildobsmarkerspart move The function has been moved in e70d6dbde713 so we must we search in both location.

effetflag: detect other meta (extra) changes Check other changeset meta other than branch and *_source and if there is a change, set the METACHANGED effect flag. Add a test for this scenario with a topic change.

obsdiscovery: add an option to disable all obsdiscovery On large repository, computing the obshashtree can we as slow as resending everything. We give the option for people to opt out.

effectflag: better diff detection Improve the diff detection algorithm to have less false positive like in the case of a rebase that move the hunk in the file but the hunk stays the same.

effectflag: add a test for content detection Add a test for diff detection when the diff is different but only because of line numbers. The test is a append at the end of the file and we try to rebase it. We shouldn't detect a content change, it will be done in the next patch.

test: fix test-evolve-effectflags dates Mercurial < 4.3 don't have default date so add globs in the test-metaedit.t file.

test: fix metaedit tests by forcing dates Mercurial < 4.3 don't have default date so restore aliases forcing date in the test-metaedit.t file.

test: split test-stablesort.t in two This is the longest running test so we split it in two to help with parallel execution.

obsdiscovery: automatically pick protocol in a list This makes the code cleaner, clearer and more flexible. This also prepare the ability to disable obsmarkers discover entirely.

obsdiscovery: extract push-obshashtree discovery in a function This will help use to simplify the code.

obsdiscovery: directly use the 'only' revset for obshashtree The revset now exists and is fast. This remove the needs to hold a reference to "revs" in that code.

obsdiscovery: extract push-obshashrange discovery in a function This will help us to simplify the code. The code is updated to directly use 'outgoing' missing so that is no longer needs to access 'futureheads'.

obsdiscovery: merge two distinct if statement It did not made any sense for them to be split.

obsdiscovery: extract '_canobshashtree' having this as a simple function will help use to generalise the obsdiscovery algorithm we use.

obsdiscovery: move code inserting discovery at the end of the file This makes it easier to reuser function defined earlier in the file.

obsdiscovery: trust core to do the right thing if no discovery is available This is fixed for a long time now.

obsdiscovery: factor the "do we push markers" check out This clarify the code a bit.

stablerange: also respect the 'warm-cache' config This will help large install to enable obshashrange as "opt-in" without impacting other repositories.

debugstablerange: cleanly "Abort" when no revision are specified Previously we had a traceback from a max on an empty sequence.

stablerange: use last recently used caching for revisions associated to ranges This does not make things faster but at least it make them able to finish on large repositories.

stablerange: report progress more often in slow case For small repositories the time spent in progress was problematic. However on large repository it quickly becomes negligible, so we add a way to detect this case and report more often in this case.

template: update successors template output Use templatekw._hybrid as return value for precursor template, it's nicer and easier to play with than returning a formatted string.

test: extract metaedit tests into test-metaedit.t test file The metaedit command deserver it own test file and this shave of 15% of the runtime of test-evolve.t one of our longest tests.

template: update precursors template output Use templatekw._hybrid as return value for precursor template, it's nicer and easier to play with than returning a formatted string.

template: skip "fate" in test output when empty This should clarify the test output a bit.

template: skip "successors" in test output when empty This should clarify the test output a bit.

template: make the template definition more manageable Readable config is readable

template: skip "Precursors" in test output when empty This should clarify the test output a bit.

template: move each template on its own line during tests This will clarify the various coming changes around template.

refactoring: rename obsfate template to obsfate_quiet As I don't know how to handle templates arguments, create different templates for each verbosity level wanted.

doc: add documentation about effectflag experiment

effectflag: split effect flag meta Split effect flag meta into 3 separate flags: - USERCHANGED - DATECHANGED - BRANCHCHANGED Also display them separately for the moment, they could be grouped back together if we want later.

tests: update missing amend (I need a hook)

template: update obsfate to be more human friendly Approach the obslog output for the moment.

template: add the obsfate template Reuse _getobsoletefate and nextvisiblesuccessors to easily get the obsolescence fate of any node. The limitation is that obsfate is as precise as these two functions, which is not great for nextvisiblesuccessors.

refactor: extract obs fate algorithm from _getobsoletereason Refactor _getobsoletereason to extract the obs fate computation into a separate function, it will be used later and put it in obshistory as it will be needed in other files. Rename _getobsoletereason to _getobsoletefateandsuccessors.

template: add successors template The successors templates display the closest visible successors of each changeset, we may have gap, like in this case: A -> B -> C -> D If we display A, C and D but not B, we can't display than B is the closest successor of A because it's not displayed. We display C as the closest successor of A instead.

template: add precursors template The precursors templates display the closest visible precursors of each changeset, we may have gap, like in this case: A -> B -> C If we display A and C but not B, we can't display than B is the closest precursor of C because it's not displayed. We display A as the closest precursor of C instead. Add a new test file as we will need to generate theses gaps and modifying test-evolve-obshistory.t will lead to many unrelated lines changes.

refactor: extract templates into a new file Extract evolve template from evolve/__init__.py to evolve/templatekw.py as more templates will come in the future.

obshistory: add the all option to obslog to show the while obs tree Add a --all option to obslog in order to display also the successors of each obs markers. It has the effect of showing a more comprehensive graph when a split or a divergence happened.

merge with stable

readme: update changelog for 6.2.2

test: fix test-evolve.t Metaedit take the current date when no date is given. When we added default- date, the date ended up to be the same and the behavior changed. Fix the text by disabling default-date in the metaedit call and update the comment about what is needed to fix correctly the test; take the changeset date when metaediting only one changeset.

test: split evolve cycle tests in a separate test file

evolve: fix --rev with --list This was untested and never worked.

test: improve the globing for obsmarker date If we force the date of obsmarkers, they will no longer include "20".

test: rename all olog references Replace them by hg obslog which is more explicit.

test: improve the globing for obsmarker date If we force the date of obsmarkers, they will no longer include "20".

documentation: recomment using blackbox with the obshashrange experiment

merge with stable

packaging: update the development version number This helps catch non-tagged version installed with pip.

Added tag 6.2.1 for changeset 0af99106b075

packaging: prepare release 6.2.1

compat: merge with stable Stable has multiple changeset that solve deprecation warning for the future Mercurial 4.3.

test-compat: merge with mercurial-3.9

test-compat: merge with mercurial-4.0 branch

test-compat: merge with mercurial-4.1 Nothing to report

test-compat: merge with stable Nothing special to report, minor blackbox output update and color extensions was needed for test-prune.t

deprecation: fix dirstate.beginparentchange deprecation warning Replace calls to dirstart.beginparentchange and dirstate.endparentchange to dirstate.parentchange context manager.

deprecation: fix cmdutil.command deprecation warning

obshistory: be more flexible about createmarkers API The API got touched in core.

inhibit: be more flexible on createmarkers API This API got touched in core.

merge with stable

obshashrange: document the experiment This should help people jump in.

obshashrange: add an option to disable local cache warming The cache still a bit too volatile an costly to update. This offer a way for developer working copy to only compute it when used.

obshashrange: re-warm less revision after reset rewarming every single revision get very expensive quickly. Instead we warm few key revision and rely on the fact this will warm enough useful subrange.

effectflag: simplify meta data change testing Let us just do one larger test. G: changed hgext3rd/evolve/obshistory.py

effectflag: add a small comment to suggest improvement The code run but we will likely need something easier to extend.

effectflag: handle invalid data If we get a marker with an invalid input we should not crash the whole process.

effetflag: move the flag back with the test of the creation logic Previous changeset was published by mistake.

obshistory: display informations from the obs marker effect flag Leverage the effect flag to actually show what change for each obsmarker in the obslog command. (first basic version).

test: add (glob) to globed line Ingloriously forgot to amend.

effectflag: add test combining multiple flag We check that multiple changes might be detected a the same time.

effectflag: basic diff change detection We adds some basic diff detection.

effectflag: detect parent change Add the detection of parent changes.

effectflag: detect meta changes Add the detection of known meta field changes. The known meta fields that we check are: - user - date - branch

effect-flag: rework existing test to prepare for mor tests

effectflag: allow to save effect of change in obsmarkers Obsmarkers lack a precious information, what are the changes between the source and the destination. This could be several thing: - The description has changed, with a amend -e for example - The parent has changed, with a rebase for example - The content has changed, with a amend for example - The meta, like the user, has change, with a amend -u for example Or any combination of them. We hijack the createobsmarkers in order to compute the modification and store the effect flag which is basically a bitfield of the changes list above and we store it in the metadata for the moment. The advantage of computing the flag just before creating the obs marker is that all commands will immediately be compatible and we can start working on the UI display of the flag. As a future optimization, the commands will be able to pass the flag directly or data to help computing them, for example amend knows if the description has changed or rebase now if the parent has changed, virtually removing the overhead. To start simple, this patch add the detection and storage of the effect flag when the description has changed. And hide it behind an experimental flag disabled by default 'experimental.evolution.effect-flags'. More flag will follow.

merge back with stable

readme: fix version number

next: prevent a color related crash when evolve This was not caught by test because they run color less.

prune: prevent a color related crash when the working copy is moved This was not caught by test because they run color less.

evolve: adding longer aliases for olog Novice users will likely find the longer versions more obvious to understand what they're doing (olog only makes sense once you already know what it does). Especially on the help page, "obslog" will be easier to find and make sense of.

debugobsstorestat: add markers size information We adds some extra information about markers size in all known format.

packaging: bump version to 6.3.0.dev

merge back with stable (post-release)