amend: lift the --interactive constraint on `--extract` The uncommit logic now supports interactive selection.

readme: mention the topic output cleanup

readme: mention the new --interactive mode for uncommit

uncommit: minor comment cleanup in the test Fix some of the sectionning and fix on comments.

uncommit: small cleanup of the interactive test setup

tests: add tests for interactively uncommitting by mentioning files

uncommit: fix the dirstate handling in `uncommit -i` This patch fixes the dirstate handling after `hg uncommit --interactive`. This patch is bit verbose about the logic and efforts are not put to plug the logic into existing logic as it's easier to understand like this. Plugging this into non-interactive logic deserves a separate patch.

uncommit: pre-indent a block in if-True The block will be moved in if-else in next patch.

uncommit: add an interactive option to uncommit This patchs adds an interactive flag to uncommit command which lets you choose hunks interactively. The implementation is as follows: 1) prompt user to select hunks to uncommit interactively 2) make a temporary commit of the hunks user selected 3) calculate the diff of temporary commit and changeset to be uncommitted 4) commit that diff which results in the changeset which should be there after uncommiting 5) create obsmarkers as required, phases and bookmarks handling 6) reroute the working directory

uncommit: pre-indent a block in if-True for the next patch

topic: provide more information when behind count cannot be computed The behind count has been confusing for various user and the associated error message is even worth. We try to clarify it to see if that helps.

topic: show the t0 even if topic is not yet touched

topics: improve the description if topic is not touched Instead of an empty stack in `hg stack` when topic does not contain any changeset, we show `not yet touched`.

topics: show working directory branch when topic is empty

topics: add tests for cases when a topic is empty

readme: mention compatibility with future 4.4

topic: update the message used with --age for empty topic This clarify things when a topic got emptied by publishing.

sharing: edit pass

user-guide: edit pass

topic: stabilise the output of --age when date ties We just needed to introduce sort to stabilize the output order.

tests: update after removing of redundant amend commit Following e8a7c1a0565a, temporary amend commits has been removed impacting all revision numbers in tests including amend operations. Update tests case to use description or hashes when possible and update revisions number when not.

topic: setup 'topic' value for working ctx The way amend work in core change in e8a7c1a0565a. The intermediate commit disappear and we can no longer rely on it to carry the topic value to amend. To fix this, we ensure the current topic value can be retrieved through the `workingctx.extra()` value. Since there is no way to carry a "missing" key information in a way that survives and "dict.update" call. We also has to introduce hacking behavior about a special empty value for topic.

tests: abstract version number for test-topic-stack.t Using explicite version number always bring trouble, this is why we have unique description that can select changesets.

evolve: use registrar.templatekeyword to register template keyword functions Now, using registrar.templatekeyword of Mercurial directly in evolve extension should be safe enough. because it has been available since Mercurial 3.8, and minimum Mercurial version for evolve extension is 3.8, too. BTW, this also fixes an issue of "hg help templates" output that template keywords "precursors" and "successors" are not displayed as same as others, because they do not have ":KEYWORD:" prefix in their docstring.

evolve: use registrar.revsetpredicate to register revset predicate functions Now, using registrar.revsetpredicate of Mercurial directly in evolve extension should be safe enough. because it has been available since Mercurial 3.8, and minimum Mercurial version for evolve extension is 3.8, too.

topic: use registrar.revsetpredicate to register revset predicate functions Now, using registrar.revsetpredicate of Mercurial directly in topic extension should be safe enough. because it has been available since Mercurial 3.8, and minimum Mercurial version for topic extension is 4.0. This patch also removes modsetup() in topic/revset.py, because it is useless. BTW, this patch fixes an issue of "hg help revsets" output that custom revset predicates are not displayed as same as others, because they are not "inline literal" in reST syntax (``NAME``).

doc: make paragraphs before example code end with "::" for reST syntax This prevents lines in an example code from being treated as a part of normal paragraph. For issue example, lines are folded into one paragraph.

topic: centralize compatibility logic between hg versions into compat module This patch can delay loading obsutil and obsolete modules until they are actually used at "hg topics" or so, if demandimport of Mercurial is enabled.

readme: mention the improvement to stack in the readme

test: issue a clarifying graph print in tests/test-stack-branch.t

stack: properly order stack when gaps existing inside it We transitively search for the next "stack" ancestors, of changeset in the stack not based on other revision of the stack. This should help having a consistent display when topic are interleaved.

stack: display both parent with displaying merge This will help understanding merge in the stack. More test involving merge are adding in the next changeset.

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.