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