Wed, 02 May 2018 11:59:06 +0200 branching: merge stable into default
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 02 May 2018 11:59:06 +0200] rev 3733
branching: merge stable into default
Sat, 28 Apr 2018 18:44:07 +0530 tests: add test showing `hg evolve --stop` works fine with phase-divergence stable
Pulkit Goyal <7895pulkit@gmail.com> [Sat, 28 Apr 2018 18:44:07 +0530] rev 3732
tests: add test showing `hg evolve --stop` works fine with phase-divergence This patch adds a new test file which contains test demonstrating that `--stop` flag works well while resolving phase-divergence using `hg evolve`.
Sat, 28 Apr 2018 18:03:32 +0530 tests: rename the test file to add 'orphan' in the name stable
Pulkit Goyal <7895pulkit@gmail.com> [Sat, 28 Apr 2018 18:03:32 +0530] rev 3731
tests: rename the test file to add 'orphan' in the name test-evolve-stop.t contains test for `hg evolve --stop` for orphan resolution only. We also need to test the flag while resolving divergence. It will be good if we have a test file for each type of instability.
Fri, 27 Apr 2018 16:28:34 +0800 tests: test that `hg obslog wdir()` aborts with a useful message stable
Anton Shestakov <av6@dwimlabs.net> [Fri, 27 Apr 2018 16:28:34 +0800] rev 3730
tests: test that `hg obslog wdir()` aborts with a useful message
Fri, 27 Apr 2018 16:19:45 +0800 obshistory: make obslog work when a commit doesn't have any description stable
Anton Shestakov <av6@dwimlabs.net> [Fri, 27 Apr 2018 16:19:45 +0800] rev 3729
obshistory: make obslog work when a commit doesn't have any description This logic is taken from logcmdutil.changesetprinter class. It checks that commit description is not empty before extracting the first line (before this patch it would try to index an empty list). Stripping description also makes obslog behave more like regular log when there are trailing/leading whitespaces.
Fri, 27 Apr 2018 16:14:10 +0800 obshistory: use a more appropriate type for obslog entries stable
Anton Shestakov <av6@dwimlabs.net> [Fri, 27 Apr 2018 16:14:10 +0800] rev 3728
obshistory: use a more appropriate type for obslog entries cand is actually a regular changeset and not 'M' (graphmod.MISSINGPARENT). And 'M' is only used for graph edges, but cand is drawn as a graph node. Visually there's no effect, but the code makes more sense this way.
Wed, 25 Apr 2018 14:19:13 +0100 packaging: mark as development version
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 25 Apr 2018 14:19:13 +0100] rev 3727
packaging: mark as development version This help avoiding confusion when installing from source.
Wed, 25 Apr 2018 14:18:19 +0100 branching: merge with latest release
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 25 Apr 2018 14:18:19 +0100] rev 3726
branching: merge with latest release
Wed, 25 Apr 2018 14:16:35 +0100 packaking: mark as development version stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 25 Apr 2018 14:16:35 +0100] rev 3725
packaking: mark as development version This avoid confusion when installing from source.
Wed, 25 Apr 2018 14:09:36 +0100 test-compat: merge mercurial-4.4 into mercurial-4.3 mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 25 Apr 2018 14:09:36 +0100] rev 3724
test-compat: merge mercurial-4.4 into mercurial-4.3
Wed, 25 Apr 2018 14:09:35 +0100 test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 25 Apr 2018 14:09:35 +0100] rev 3723
test-compat: merge mercurial-4.5 into mercurial-4.4
Wed, 25 Apr 2018 14:09:34 +0100 test-compat: merge stable into mercurial-4.5 mercurial-4.5
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 25 Apr 2018 14:09:34 +0100] rev 3722
test-compat: merge stable into mercurial-4.5
Wed, 25 Apr 2018 14:09:14 +0100 Added tag 8.0.0 for changeset 116cdd8c102a stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 25 Apr 2018 14:09:14 +0100] rev 3721
Added tag 8.0.0 for changeset 116cdd8c102a
Wed, 25 Apr 2018 14:02:43 +0100 packaging: update version number stable 8.0.0
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 25 Apr 2018 14:02:43 +0100] rev 3720
packaging: update version number
Wed, 25 Apr 2018 13:55:52 +0100 packagin: update `tested-with` statement stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 25 Apr 2018 13:55:52 +0100] rev 3719
packagin: update `tested-with` statement
Wed, 25 Apr 2018 13:49:00 +0100 changelog: mention 4.6 compatibility stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 25 Apr 2018 13:49:00 +0100] rev 3718
changelog: mention 4.6 compatibility
Wed, 25 Apr 2018 11:55:49 +0100 Changelog: pre-version gardening stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 25 Apr 2018 11:55:49 +0100] rev 3717
Changelog: pre-version gardening
Wed, 25 Apr 2018 01:58:45 +0100 testcompat: update output for Mercurial 4.3 mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 25 Apr 2018 01:58:45 +0100] rev 3716
testcompat: update output for Mercurial 4.3 Lets of minor update + one major update to tests/test-evolve-phase-divergence.t since all hashed chance (different instability name).
Mon, 23 Apr 2018 12:23:00 +0200 test-compat: merge mercurial-4.4 into mercurial-4.3 mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 23 Apr 2018 12:23:00 +0200] rev 3715
test-compat: merge mercurial-4.4 into mercurial-4.3
Mon, 23 Apr 2018 12:11:10 +0200 test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 23 Apr 2018 12:11:10 +0200] rev 3714
test-compat: merge mercurial-4.5 into mercurial-4.4
Tue, 24 Apr 2018 08:57:18 +0100 testcompat: revert output change from new capabilities mercurial-4.5
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 24 Apr 2018 08:57:18 +0100] rev 3713
testcompat: revert output change from new capabilities This new capabilities is 4.6 only.
Tue, 24 Apr 2018 08:42:47 +0100 testcompat: revert output change from 54a469cd5b26 mercurial-4.5
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 24 Apr 2018 08:42:47 +0100] rev 3712
testcompat: revert output change from 54a469cd5b26 These are 4.6 only changes.
Tue, 24 Apr 2018 08:41:57 +0100 testcompat: revert output change from 1de6ba0ac6d7 mercurial-4.5
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 24 Apr 2018 08:41:57 +0100] rev 3711
testcompat: revert output change from 1de6ba0ac6d7 These are 4.6 only changes.
Mon, 23 Apr 2018 12:10:26 +0200 testcompat: merge stable into mercurial-4.5 mercurial-4.5
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 23 Apr 2018 12:10:26 +0200] rev 3710
testcompat: merge stable into mercurial-4.5
Tue, 24 Apr 2018 15:23:15 +0100 compat: handle different `ui.edit` signature with Mercurial 4.3 stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 24 Apr 2018 15:23:15 +0100] rev 3709
compat: handle different `ui.edit` signature with Mercurial 4.3
Tue, 24 Apr 2018 16:13:42 +0100 wirepeer: try modern module first stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 24 Apr 2018 16:13:42 +0100] rev 3708
wirepeer: try modern module first This avoid some issue with remaining .pyc
Tue, 24 Apr 2018 12:07:35 +0100 compat: handle lack of allpredecessors for Mercurial 4.3 stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 24 Apr 2018 12:07:35 +0100] rev 3707
compat: handle lack of allpredecessors for Mercurial 4.3
Mon, 23 Apr 2018 12:03:05 +0100 branching: merge further fix into stable stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 23 Apr 2018 12:03:05 +0100] rev 3706
branching: merge further fix into stable
Mon, 23 Apr 2018 11:44:05 +0100 wrapping: fix a silly error were we checking on module and wrapping the other
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 23 Apr 2018 11:44:05 +0100] rev 3705
wrapping: fix a silly error were we checking on module and wrapping the other ...
Mon, 23 Apr 2018 11:04:27 +0200 brancing: merge next release into default stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 23 Apr 2018 11:04:27 +0200] rev 3704
brancing: merge next release into default We are about to release hg-evolve 8.0.0
Sat, 21 Apr 2018 11:01:12 +0200 test-compat: open mercurial-4.5 branch mercurial-4.5
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 21 Apr 2018 11:01:12 +0200] rev 3703
test-compat: open mercurial-4.5 branch
Sun, 22 Apr 2018 11:40:17 +0200 evolve: point to '--abort' in error message
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 22 Apr 2018 11:40:17 +0200] rev 3702
evolve: point to '--abort' in error message The way to escape and evolve run has been updated and we need to tell our user about it.
Thu, 19 Apr 2018 16:27:13 +0200 compat: drop compatibility layer for pager
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 19 Apr 2018 16:27:13 +0200] rev 3701
compat: drop compatibility layer for pager All versions we support now support `ui.pager`.
Thu, 19 Apr 2018 16:25:17 +0200 compat: drop compatibility layer for duplicatecopies
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 19 Apr 2018 16:25:17 +0200] rev 3700
compat: drop compatibility layer for duplicatecopies We no longer support version before Mercurial 4.3.
Thu, 19 Apr 2018 16:21:44 +0200 compat: drop compatibility layer for bookmark.applychanges
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 19 Apr 2018 16:21:44 +0200] rev 3699
compat: drop compatibility layer for bookmark.applychanges We now only support Mercurial version down to 4.3.
Thu, 19 Apr 2018 16:15:10 +0200 compat: from compatibility layer for allprecursors
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 19 Apr 2018 16:15:10 +0200] rev 3698
compat: from compatibility layer for allprecursors We only support down to 4.3 now.
Thu, 19 Apr 2018 16:12:37 +0200 compat: drop compatibility layer for successorssets
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 19 Apr 2018 16:12:37 +0200] rev 3697
compat: drop compatibility layer for successorssets We support down to Mercurial 4.3 now.
Thu, 19 Apr 2018 16:08:01 +0200 compat: drop compatibility wrapper for "relevantmarkers"
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 19 Apr 2018 16:08:01 +0200] rev 3696
compat: drop compatibility wrapper for "relevantmarkers" We no longer support version without the logic we have been adding.
Thu, 19 Apr 2018 16:51:53 +0200 compat: drop compat layer for cleanupnodes
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 19 Apr 2018 16:51:53 +0200] rev 3695
compat: drop compat layer for cleanupnodes We no longer support version lower than 4.3.
Thu, 19 Apr 2018 16:07:23 +0200 compat: from compatibility layer for createmarkers
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 19 Apr 2018 16:07:23 +0200] rev 3694
compat: from compatibility layer for createmarkers We support down to 4.3 now. It supports operation.
Thu, 19 Apr 2018 16:01:49 +0200 compat: drop obsutile layer
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 19 Apr 2018 16:01:49 +0200] rev 3693
compat: drop obsutile layer Mercurial 4.2 is no longer supported.
Thu, 19 Apr 2018 15:59:39 +0200 compat: drop vfsmod compat layer
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 19 Apr 2018 15:59:39 +0200] rev 3692
compat: drop vfsmod compat layer Mercurial 4.2 is no longer supported.
Thu, 19 Apr 2018 14:26:03 +0200 evolve: use in code filtered error for 4.6
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 19 Apr 2018 14:26:03 +0200] rev 3691
evolve: use in code filtered error for 4.6 Things have been upstream into core for a while, let us use them instead of the evolve version.
Thu, 19 Apr 2018 15:51:44 +0200 documentation: refer to 4.3 in the help text
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 19 Apr 2018 15:51:44 +0200] rev 3690
documentation: refer to 4.3 in the help text Minimal version supported is now 4.3. Drop reference to 4.2 in the help.
Thu, 19 Apr 2018 14:14:34 +0200 topic: remove compatibility for older version in discovery wrapping
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 19 Apr 2018 14:14:34 +0200] rev 3689
topic: remove compatibility for older version in discovery wrapping Support for 4.1 and 4.2 has been dropped.
Thu, 19 Apr 2018 14:01:24 +0200 obscache: drop compat layer to access public changeset
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 19 Apr 2018 14:01:24 +0200] rev 3688
obscache: drop compat layer to access public changeset We can now access precomputed sets. (compat to 4.1 and 4.2 dropped)
Thu, 19 Apr 2018 14:00:12 +0200 obscache: drop compat layer for obsmarkers reading
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 19 Apr 2018 14:00:12 +0200] rev 3687
obscache: drop compat layer for obsmarkers reading We cna now use a version with the argument we needs.
Thu, 19 Apr 2018 13:40:57 +0200 template: drop compatibility layer
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 19 Apr 2018 13:40:57 +0200] rev 3686
template: drop compatibility layer Support has been dropped for 4.1 and 4.2
Thu, 19 Apr 2018 13:35:31 +0200 timer: drop compat layer for time
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 19 Apr 2018 13:35:31 +0200] rev 3685
timer: drop compat layer for time Support for 4.1 and 4.2 has been dropped.
Thu, 19 Apr 2018 11:38:13 +0200 compat: drop support for Mercurial 4.2
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 19 Apr 2018 11:38:13 +0200] rev 3684
compat: drop support for Mercurial 4.2 Since Mercurial 4.6 is about to be released, we drop support for 4.2 too. (code still need to be cleaned up).
Thu, 19 Apr 2018 11:39:04 +0200 compat: close test-compat branch for mercurial-4.2 mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 19 Apr 2018 11:39:04 +0200] rev 3683
compat: close test-compat branch for mercurial-4.2 Support for this version have just been dropped.
Wed, 18 Apr 2018 22:54:11 -0700 evolve: add support for hg >= b4d85bc1
Martin von Zweigbergk <martinvonz@google.com> [Wed, 18 Apr 2018 22:54:11 -0700] rev 3682
evolve: add support for hg >= b4d85bc1 Mercurial commit b4d85bc1 deleted the wireproto module and its contents are now in various other modules, so we can not even do unchecked imports of it now.
Thu, 19 Apr 2018 10:59:12 +0200 discovery: handle deletion of 'wireproto' module
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 19 Apr 2018 10:59:12 +0200] rev 3681
discovery: handle deletion of 'wireproto' module Mercurial commit b4d85bc122bd. deleted the wireproto module and its contents are now in various other modules, so we can not even do unchecked imports of it now.
Thu, 19 Apr 2018 10:55:57 +0200 evolve: handle wireproto module deletion for registering new commands
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 19 Apr 2018 10:55:57 +0200] rev 3680
evolve: handle wireproto module deletion for registering new commands Module have been deleted in b4d85bc122bd. We can no longer import it blindly.
Thu, 19 Apr 2018 10:53:59 +0200 minitopic: handle wireproto module change from b4d85bc122bd
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 19 Apr 2018 10:53:59 +0200] rev 3679
minitopic: handle wireproto module change from b4d85bc122bd This module have been scattered in other place, so we need to detect and handle this for 4.6+
Thu, 19 Apr 2018 10:50:24 +0200 topic: handle wireproto module change from b4d85bc122bd
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 19 Apr 2018 10:50:24 +0200] rev 3678
topic: handle wireproto module change from b4d85bc122bd This module have been scattered in other place, so we need to detect and handle this for 4.6+
(0) -3000 -1000 -300 -100 -56 +56 +100 +300 +1000 tip