test-compat: merge mercurial-4.2 into mercurial-4.1

test-compat: merge mercurial-4.3 into mercurial-4.2

test-compat: merge stable into mercurial-4.3

branching: merge stable into default

changelog: add details about the pushkey related fix

wireproto: gracefully fail on http when trying to use older pushkey method Previously the HTTP server would return a 500. It now returns a 410.

wireproto: avoid exposing pushkey abort for server without evolution Client with evolution enabled will query the 'obsolete' pushley namespace if no other way to request obsmarkers have been found. They will do this unconditionally as long as no other obsolescence related capabilities have been advertised by the server. The call is "harmless" since the namespace will be empty if obsmarkers exchange is disabled. However, since we forbid the use of pushkey for obsmarkers this lead to unexpected crash report for up to date client talking to a server with the evolve extensions but exchange disabled. We fix the issue by serving the expected empty namespace in this case. We keep forbidding the query if obsmarker exchange is enabled since new client should have picked another more effective was to fetch the data first. We also add some tests for this logic.

obsdiscovery: enforce the config on the server too Right now, setting 'experimental.evolution.obsdiscovery=no' disable obsolescence markers discovery on client only. The server still advertise discovery related capabilities. We now also honor the config on the server side.

packaging: mark default branch as development version This help avoid confusion when installing version from the repository.

branching: merge back stable back into default

test-compat: merge mercurial-4.2 into mercurial-4.1

test-compat: merge mercurial-4.3 into mercurial-4.2

test-compat: merge stable into mercurial-4.3

packaging: mark as development version This help avoid confusion when installing non tagged version.

Added tag 7.0.0 for changeset c56c028f3802

packaging: prepare version 7.0.0

debian: drop outdate part of the description

debian: update Mercurial version dependencies The debian package now reflect the actual requirement of the extension in its current version.

branching: merge with stable to prepare version 7.0.0

push: add a --publish flag The new flag turns all element in the push to public changeset. This will help experiment with diverse publishing workflow.

topic: add an option to automatically publish topic-less changeset This new option will help playing with merge based workflow.

topic: add an option to enforce a single head per name in a repository

revset: clean up some messy logic

evolve: rename --phasedivergent flag to --phase-divergent This makes the whole things easier to read.

evolve: rename --contentdivergent flag to --content-divergent This makes the whole things easier to read.

pushkey: forbid usage of pushley to exchange markers The pushkey based protocol lacks many important feature and is very slow. We disable it to prevent any usage by mistake.

changelog: add an entry for 7.0.0 with recent change

compat: drop compat code for smartrevs.first The 'first' method have been around for years.

compat: drop compatibility dance around configoverride This was introduced in hg-4.1 and we do no longer support lower versions.

compat: drop support for older exchange protocol Their have been better alternative for years. In addition they have been officially deprecated for quite some time. So we official stop support them to ease the maintainance.

compat: drop compatibility for 'streamres' prior to 4.1 We no longer support these version.

compat: drop the directaccess hacky extension The user of this extension has forked their own version. We lighten our maintenance burden and drop it.

compat: drop the inhibit hacky extension The user of this extension has forked their own version. We lighten our maintenance burden and drop it.

compat: drop 'lru.get' work-around for 3.9 We no longer support this version.

compat: stop working around 3.8 file cache limitation We no longer support this version.

compat: simply the wrapping of '_destmergebranch' All the version we support now use the same interface.

compat: drop support for 3.8's '_destrebase' function We no longer support this version.

compat: mark version 4.1 as the minimum version required We dropped compatibility for version 3.8, 3.9 and 4.0.

compat: drop compatibility for Mercurial <= 4.0 We are dropping compatibility with older mercurial version. This will help us to clean up the code base.

packaging: mark as development version This helps avoid confusion.

branching: merge with stable Prepare the 7.0.0 line.

packaging: mark version as development version This helps to avoid confusion.

branching: close mercurial-4.0 branch We are dropping support for older Mercurial version.

branching: close mercurial-3.9 branch We are dropping support for older Mercurial version.

branching: close mercurial-3.8 branch We are dropping support for older Mercurial version.

util: add a small script to help with the merging of branches We have multiple test-compat branches merging them can be a bit tedious. We add a nice script doing so for us.

test-compat: merge mercurial-3.9 into mercurial-3.8

test-compat: merge mercurial-4.0 into mercurial-3.9

test-compat: merge mercurial-4.1 into mercurial-4.0

test-compat: merge mercurial-4.2 into mercurial-4.1

test-compat: merge mercurial-4.3 into mercurial-4.2

test-compat: merge stable into mercurial-4.3

Added tag 6.8.0 for changeset ec0bbf26ce7f

packaging: prepare version 6.8.0

flake8: rename some ambiguous identifier Apparently, pyflakes declared war on 'l'.

topic: instroduce a fast path when computing stack We do some stack related computation during transaction now. The current inefficiency of the revset is hurting us too much. We pre-compute a subset using native set operation to speed things up.

branching: merge stable back into default

test-compat: merge future 6.7.0 in mercurial-3.8 branch

test-compat: merge future 6.7.0 in mercurial-3.9 branch

test-compat: merge future 6.7.0 in mercurial-4.0 branch

test-compat: merge future 6.7.0 in mercurial-4.1 branch

test-compat: merge future 6.7.0 in mercurial-4.2 branch

test-compat: merge future 6.7.0 in mercurial-4.3 branch

obsfate: re-enables operation display in obsfate Now that the compatibility checks are in a good shape we can re-enable more noise in it.

changelog: update to reflect latest change

test-compat: merge with mercurial-3.9 branch

test-compat: merge with mercurial-4.0 branch

compat-test: remove topic related tests for 3.9 The extension is no longer supported for 3.9

test-compat: merge with mercurial-4.1 branch

test-compat: merge with mercurial-4.2 branch

test-compat: merge with mercurial-4.3 branch

branching: merge with mercurial-4.3 branch creation The other changeset marks the point were 'stable' is no longer about Mercurial version 4.3.

test-compat: revert output changes from phase renaming We keep using the old name for the older version. test has to reflect that.

test-compat: revert output changes related to temporary amend commit This backed out changeset 06844693bb21 and other related changes.

test-compat: revert ouput change to blackbox This backed out changeset 86be70ae38b9.

test-compat: revert ouput related to operation This effectively backs out 4b951a9a6895.

test-compat: revert output change in rebase This backed out changeset d12c82fd1143 and a couple of other changes. The change are not relevant in Mercurial < 4.4/

test-compat: revert output change from bundle2 capability This backout changeset dd3eda2f7a89 not relevant for verison < 4.4.

test-compat: revert output change on pull report The revert the changeset from 8feb2cae7eae. Not relevant for verison < 4.4.

test-compat: revert output change from 'phase' part The output change were introduced in changeset from 87e349f617f9 and it not relevant for version lower than 4.4.

test-compat: revert output change from using core obsfate The output update arrives in e91ca8b5ecf7. This output is only relevant for Mercurial 4.4

topic: do to check to topic while amending Right know the 'topic-mode' mess with amend. Especially in case of amending merge where the merge is not properly detected.

topic-mode: add missing end line in topic-mode warning

compat: work around the lack of configoverride in mercurial 4.0 The phase preservation will stay broken on 4.0 and below

compat: add an abstraction for 'scmutil.cleanupnodes' The usage of the function was added in 103244e34a9c but is not compatible with Mercurial <= 4.2.

compat: conditionally access config item Version 4.2 and below do not have config items support. So the extensions helper do not register anything.

compat: handle version where obsutil is not available Version older than 4.3 is do not have the obsutil option. We need to handle that.

test: use node instead of rev in topic push tests This makes the test more stable when revision number changes.

test: use node instead of rev in uncommit -i test This makes the test more stable when revision number changes.

branching: create the mercurial-4.3 test compatibility branch This branch will contains the expected test output with 4.3.

branch: merge with stable to prepare 6.7 release In addition, Mercurial 4.4-rc is out, so we need to update the expected output.

changeloge: add details about topic-mode

effect-flag: remove wrapping of createmarkers for Mercurial 4.4 Now that effect-flag has landed in Mercurial 4.4, we don't need to wrap createmarkers for this version anymore.

stack: order the adjective of changeset The new order give more interesting result: * base current * base unstable * current unstable It seems more harmonious this way. Base seems the most core and immutable adjective describing the element. Then current is a volatile but important one. Finally, unstable is less information than current, so it goes last.

stack: show current and unstable also for t0 and bases

obsfate: use core version of obsfate if available Let us use the upstream version whenever available. The operation display is currently disabled to ease with the test changes.

topic: register config items There is a couple more hoops to jump through but all config items used are now registered.

directaccess: register config item if possible Mercurial 4.4 warns about unregistered config.

evolve: registed configitems if available The config are registered as 'dynamicdefault' because we still need to explicitly pass the config option for older version of Mercurial. (4.2 and before).

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().