Fri, 20 Oct 2017 18:25:05 +0200 branching: merge with mercurial-4.3 branch creation mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 18:25:05 +0200] rev 3107
branching: merge with mercurial-4.3 branch creation The other changeset marks the point were 'stable' is no longer about Mercurial version 4.3.
Fri, 20 Oct 2017 20:04:13 +0200 test-compat: revert output changes from phase renaming mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 20:04:13 +0200] rev 3106
test-compat: revert output changes from phase renaming We keep using the old name for the older version. test has to reflect that.
Fri, 20 Oct 2017 19:32:18 +0200 test-compat: revert output changes related to temporary amend commit mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 19:32:18 +0200] rev 3105
test-compat: revert output changes related to temporary amend commit This backed out changeset 06844693bb21 and other related changes.
Fri, 20 Oct 2017 16:07:40 +0200 test-compat: revert ouput change to blackbox mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 16:07:40 +0200] rev 3104
test-compat: revert ouput change to blackbox This backed out changeset 86be70ae38b9.
Fri, 20 Oct 2017 16:07:06 +0200 test-compat: revert ouput related to operation mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 16:07:06 +0200] rev 3103
test-compat: revert ouput related to operation This effectively backs out 4b951a9a6895.
Fri, 20 Oct 2017 17:30:20 +0200 test-compat: revert output change in rebase mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 17:30:20 +0200] rev 3102
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/
Fri, 20 Oct 2017 15:31:06 +0200 test-compat: revert output change from bundle2 capability mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 15:31:06 +0200] rev 3101
test-compat: revert output change from bundle2 capability This backout changeset dd3eda2f7a89 not relevant for verison < 4.4.
Fri, 20 Oct 2017 15:30:42 +0200 test-compat: revert output change on pull report mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 15:30:42 +0200] rev 3100
test-compat: revert output change on pull report The revert the changeset from 8feb2cae7eae. Not relevant for verison < 4.4.
Fri, 20 Oct 2017 15:30:16 +0200 test-compat: revert output change from 'phase' part mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 15:30:16 +0200] rev 3099
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.
Fri, 20 Oct 2017 17:23:12 +0200 test-compat: revert output change from using core obsfate mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 17:23:12 +0200] rev 3098
test-compat: revert output change from using core obsfate The output update arrives in e91ca8b5ecf7. This output is only relevant for Mercurial 4.4
Fri, 20 Oct 2017 21:29:14 +0200 topic: do to check to topic while amending stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 21:29:14 +0200] rev 3097
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.
Fri, 20 Oct 2017 21:43:13 +0200 topic-mode: add missing end line in topic-mode warning stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 21:43:13 +0200] rev 3096
topic-mode: add missing end line in topic-mode warning
Fri, 20 Oct 2017 20:58:35 +0200 compat: work around the lack of configoverride in mercurial 4.0 stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 20:58:35 +0200] rev 3095
compat: work around the lack of configoverride in mercurial 4.0 The phase preservation will stay broken on 4.0 and below
Fri, 20 Oct 2017 19:29:56 +0200 compat: add an abstraction for 'scmutil.cleanupnodes' stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 19:29:56 +0200] rev 3094
compat: add an abstraction for 'scmutil.cleanupnodes' The usage of the function was added in 103244e34a9c but is not compatible with Mercurial <= 4.2.
Fri, 20 Oct 2017 18:56:15 +0200 compat: conditionally access config item stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 18:56:15 +0200] rev 3093
compat: conditionally access config item Version 4.2 and below do not have config items support. So the extensions helper do not register anything.
Fri, 20 Oct 2017 18:50:26 +0200 compat: handle version where obsutil is not available stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 18:50:26 +0200] rev 3092
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.
Fri, 20 Oct 2017 18:19:01 +0200 test: use node instead of rev in topic push tests stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 18:19:01 +0200] rev 3091
test: use node instead of rev in topic push tests This makes the test more stable when revision number changes.
Fri, 20 Oct 2017 17:12:03 +0200 test: use node instead of rev in uncommit -i test stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 17:12:03 +0200] rev 3090
test: use node instead of rev in uncommit -i test This makes the test more stable when revision number changes.
Fri, 20 Oct 2017 15:20:20 +0200 branching: create the mercurial-4.3 test compatibility branch mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 15:20:20 +0200] rev 3089
branching: create the mercurial-4.3 test compatibility branch This branch will contains the expected test output with 4.3.
Fri, 20 Oct 2017 15:18:51 +0200 branch: merge with stable to prepare 6.7 release stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 15:18:51 +0200] rev 3088
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.
Fri, 20 Oct 2017 15:13:28 +0200 changeloge: add details about topic-mode
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 15:13:28 +0200] rev 3087
changeloge: add details about topic-mode
Fri, 20 Oct 2017 14:00:30 +0200 effect-flag: remove wrapping of createmarkers for Mercurial 4.4
Boris Feld <boris.feld@octobus.net> [Fri, 20 Oct 2017 14:00:30 +0200] rev 3086
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.
Fri, 20 Oct 2017 14:56:03 +0200 stack: order the adjective of changeset
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 14:56:03 +0200] rev 3085
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.
Sun, 15 Oct 2017 00:03:59 +0530 stack: show current and unstable also for t0 and bases
Pulkit Goyal <7895pulkit@gmail.com> [Sun, 15 Oct 2017 00:03:59 +0530] rev 3084
stack: show current and unstable also for t0 and bases
Fri, 20 Oct 2017 12:04:45 +0200 obsfate: use core version of obsfate if available
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 12:04:45 +0200] rev 3083
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.
Thu, 19 Oct 2017 18:18:43 +0200 topic: register config items
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 19 Oct 2017 18:18:43 +0200] rev 3082
topic: register config items There is a couple more hoops to jump through but all config items used are now registered.
Thu, 19 Oct 2017 18:17:47 +0200 directaccess: register config item if possible
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 19 Oct 2017 18:17:47 +0200] rev 3081
directaccess: register config item if possible Mercurial 4.4 warns about unregistered config.
Thu, 19 Oct 2017 14:46:06 +0200 evolve: registed configitems if available
Boris Feld <boris.feld@octobus.net> [Thu, 19 Oct 2017 14:46:06 +0200] rev 3080
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).
Thu, 19 Oct 2017 21:23:21 +0200 inhibit: compatibility with 4.4-rc
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 19 Oct 2017 21:23:21 +0200] rev 3079
inhibit: compatibility with 4.4-rc
Thu, 19 Oct 2017 20:01:00 +0200 branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 19 Oct 2017 20:01:00 +0200] rev 3078
branching: merge with stable Merge with the inhibit fix.
(0) -3000 -1000 -300 -100 -50 -30 +30 +50 +100 +300 +1000 tip