inhibit: compatibility with 4.4-rc

branching: merge with stable Merge with the inhibit fix.

inhibit: respect '--keep' when handling rebase clean up

test: adapt to change from 537de0b14030 If we use phase for pull/push this impact some debug output. CORE-TEST-OUTPUT-UPDATE: 537de0b14030

test: adapt to output change from eb586ed5d8ce Core have a more verbose output on pull. We have to update tests with it. CORE-TEST-OUTPUT-UPDATE: eb586ed5d8ce

compat: fix compatibility with new duplicatecopies Changeset 754b5117622f updated the signature of 'copies.duplicatecopies'. We can now handle the multiple version of that code for compatiblity.

topic: remove 'ass' from the random animal list As much as I love donkey… this generate inappropriate names.

config: stop passing useless default value to config

branching: merge with stable

changelog: add about fixed bookmark and phase handling while changing topics

changelog: add about pager support

pager: add support to `hg evolve --list`

pager: add support to `hg obslog`

pager: add support to `hg topic`

pager: add support to `hg stack`

pager: add a function in compats to start pager This will help us enabling pager when ui.pager API exists. Also we can try plugging in the old pager API in this function and we won't have to change anything.

metadata: cleanup metadata file I'm not sure how this conflict marker survived the pre-publish test run...

branching: merge with stable

topic: remove a silly duplicate in a revset Spotted by Pulkit Goyal. More performance win seems to exists here, but we starts with the obvious.

topics: show changesetcount, troubledcount and headscount by default

topics: use stack.stack() instead of stack.stackdata() stack.stackdata() also calls stack.stack() internally. Moreover if we just want to calculate changesetcount, troubled count, it will be cheap to calculate using stack.stack rather than stackdata().

packaging: mark version as bugfix dev version This avoid confusion when installing non tagged version.

branching: merge with stable

Added tag 6.7.1 for changeset 430ad68292d7

obslog: remove the word "yet" from "No patch available yet" "yet" was a bit confusing as it let me think that patch is currently not available but can be available sometimes later. This is true for cases when it says "context not local" but we have more messages like "no successors", "too many successors", "changesets rebased" where we can't have a patch.

obslog: spell out successor completely If the successor is not known locally, obslog says `succ is unknown locally` which is not a good message. This patch makes sure succ is spelled out completely as successor.

readme: update readme with latest fix (also more the stack one in the right location).

obsfate: make the user list more readable Separate each user in the obsfate user list by a space for readability.

obsfate: fix user filtering in obsfate-printer Only hide current user only if it's the only one that create obs-markers.

obsfate: add a test with user both current and other This will help highlight change in the next changesets.

obsfate: update test The obsfate templatekw and the obsfateprinter behavior was different when displaying or not the current user in obsfate users. Update the test to makes the behavior fix more visible.

packaging: prepare version 6.7.1 The are an important fix on evolve and another important fix for topic performance, let us make a release.

readme: add changelog for topic 0.3.1

add mention of the topic 0.3.0 version

readme: fix evolve 6.7.1 entry

topic: reorder revset for faster evaluation When running the revset on unfiltered repository, the mutable set can get huge. So removing the obsolete changeset first provide a large speedup. This resolve the performance regression we were seeing since the 6.7.0 release.

topics: use stack rather than stackdata when one only wants the changeset count There might be a significant performance impact. Might resolve #309.

log: update obsfate output order Always display successors after the verb. So instead of "rewritten by boris as X", display "rewritten as X by boris". 07b9fcf8b6d3 did update template-based obsfate but forget to update obsfatelineprinter.

test: remove bashism in test-topic-change.t The test was broken on various machine using shell not supporting the `{start..end}` construct.

topics: handle phase correctly while changing topics

tests: add test showing change of phase while changing topic on secret commit

topics: use scmutil.cleanupnodes to create markers while changing topics Earlier if we change topics on changesets with bookmark, the bookmark is not moved to the new changeset as we didn't add that logic and we were creating obsmarkers directly. This patch calls scmutil.cleanupnodes to create obsmarkes which also handles the bookmark movement.

tests: add a new test for testing changing or clearing topics test-topic.t is getting bigger and bigger. This patch introduces a new test which includes test for clearing and changing topics. Since the tests are moved to a new file, this patch, removes those tests from test-topic.t also.

obscache: do not check of argument count of wrapped function After talking with the original author of this check, it appears that it never worked properly, since _readmarkers was always wrapped with @util.nogc.

legacy: rename lookup_errors to not be in all caps (flake8 warning) flake8 has a plugin, pep8-naming, which is not installed by default, but is used if available, no extra config required. This plugin checks names of variables, classes, functions and so on against PEP-8, and it complained about this variable: N806 variable in function should be lowercase Since this isn't a module-level constant, but just a helper variable used only in one function, it's fine to just rename it. With this error gone, flake8 output (used plugins: mccabe, naming, pycodestyle, pyflakes) is totally clean.

randomname: fix the header of the file

topics: move README-topic as hgext3rd/topic/README Before improving the docs about topics, lets move them into the topics folder.

README: move CHANGELOG to a new file

test: small cleanup in test-topic-mode.t remove the mention of "new" (this won't be new soon) and use the official config name.

test: add support for random-all topic mode The 'random' mode no longer generate a random topic for merge.

test: rename test-topicmode to test-topic-mode This is easier to read.

topicmode: add 'random' topic mode That mode will generate a random topic name when the user is about to commit an untopiced changeset.

topic: update the topic-mode hint The hint is now shorter and reference the documentation. That should provide more concise output with more details for user who seeks it.

topic: rename the 'topic-mode' help subtopic This will help making reference to it in warning.

topic: add a 'enforce-all' mode The mode abort for all commit without a topic, even merges.

topicmode: 'enforce' topic mode, no longer warn about untopiced merge merging a topic back in a branch is common case, it seems sensible to not pester the user about it.

topicmode: add new warning topicmode

topic: add documentation for the 'topic-mode' option This should help people to discover it.

test: update tests to use topic-mode enforce

topic: migrate experimental.enforce-topic to experimental.topic-mode

test: adapt to output change from 10e162bb9bf5 The changeset 10e162bb9bf5 in code extend the list of capabilities to include "phases=['heads']" this has a minor impact on test output CORE-TEST-OUTPUT-UPDATE: 10e162bb9bf5

merge with stable

stack: handle basic case of splitting with crash hg stack used to crash horribly whenever a split was encountered. This is no longer the case. If the result of the split (or there successors) produce a sensible linear result with on final head, we can just assume that head is the evolution destination.

tests: update test output with commit 4f969b9e0cf5 in core