Sun, 01 Oct 2017 10:44:23 +0100 test: rename test-topicmode to test-topic-mode
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 01 Oct 2017 10:44:23 +0100] rev 3029
test: rename test-topicmode to test-topic-mode This is easier to read.
Sun, 01 Oct 2017 00:35:28 +0100 topicmode: add 'random' topic mode
Boris Feld <boris.feld@octobus.net> [Sun, 01 Oct 2017 00:35:28 +0100] rev 3028
topicmode: add 'random' topic mode That mode will generate a random topic name when the user is about to commit an untopiced changeset.
Sun, 01 Oct 2017 09:10:48 +0100 topic: update the topic-mode hint
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 01 Oct 2017 09:10:48 +0100] rev 3027
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.
Sun, 01 Oct 2017 09:05:42 +0100 topic: rename the 'topic-mode' help subtopic
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 01 Oct 2017 09:05:42 +0100] rev 3026
topic: rename the 'topic-mode' help subtopic This will help making reference to it in warning.
Sun, 01 Oct 2017 00:44:41 +0100 topic: add a 'enforce-all' mode
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 01 Oct 2017 00:44:41 +0100] rev 3025
topic: add a 'enforce-all' mode The mode abort for all commit without a topic, even merges.
Sat, 30 Sep 2017 23:18:29 +0100 topicmode: 'enforce' topic mode, no longer warn about untopiced merge
Boris Feld <boris.feld@octobus.net> [Sat, 30 Sep 2017 23:18:29 +0100] rev 3024
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.
Sat, 30 Sep 2017 23:00:21 +0100 topicmode: add new warning topicmode
Boris Feld <boris.feld@octobus.net> [Sat, 30 Sep 2017 23:00:21 +0100] rev 3023
topicmode: add new warning topicmode
Sun, 01 Oct 2017 00:14:19 +0100 topic: add documentation for the 'topic-mode' option
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 01 Oct 2017 00:14:19 +0100] rev 3022
topic: add documentation for the 'topic-mode' option This should help people to discover it.
Sat, 30 Sep 2017 22:42:52 +0100 test: update tests to use topic-mode enforce
Boris Feld <boris.feld@octobus.net> [Sat, 30 Sep 2017 22:42:52 +0100] rev 3021
test: update tests to use topic-mode enforce
Sat, 30 Sep 2017 22:24:24 +0100 topic: migrate experimental.enforce-topic to experimental.topic-mode
Boris Feld <boris.feld@octobus.net> [Sat, 30 Sep 2017 22:24:24 +0100] rev 3020
topic: migrate experimental.enforce-topic to experimental.topic-mode
Sat, 30 Sep 2017 12:35:49 +0100 test: adapt to output change from 10e162bb9bf5
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 30 Sep 2017 12:35:49 +0100] rev 3019
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
Sat, 30 Sep 2017 11:38:08 +0100 merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 30 Sep 2017 11:38:08 +0100] rev 3018
merge with stable
Sat, 30 Sep 2017 11:11:04 +0100 stack: handle basic case of splitting with crash stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 30 Sep 2017 11:11:04 +0100] rev 3017
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.
Mon, 25 Sep 2017 02:29:41 +0530 tests: update test output with commit 4f969b9e0cf5 in core
Pulkit Goyal <7895pulkit@gmail.com> [Mon, 25 Sep 2017 02:29:41 +0530] rev 3016
tests: update test output with commit 4f969b9e0cf5 in core
Mon, 25 Sep 2017 02:23:36 +0530 tests: update test output with commit ecc96506c49d in core
Pulkit Goyal <7895pulkit@gmail.com> [Mon, 25 Sep 2017 02:23:36 +0530] rev 3015
tests: update test output with commit ecc96506c49d in core
Wed, 27 Sep 2017 16:30:43 +0200 packaging: update version to match development version
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 27 Sep 2017 16:30:43 +0200] rev 3014
packaging: update version to match development version This helps avoid confusion when installing from source.
Wed, 27 Sep 2017 16:26:30 +0200 packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 27 Sep 2017 16:26:30 +0200] rev 3013
packaging: merge stable back into default 6.7.0 has been released.
Wed, 27 Sep 2017 16:24:44 +0200 packaging: mark stable branch as dev bugfix version stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 27 Sep 2017 16:24:44 +0200] rev 3012
packaging: mark stable branch as dev bugfix version This help avoiding confusion when installing evolve from sources.
Wed, 27 Sep 2017 16:18:24 +0200 Added tag 6.7.0 for changeset 3a4f75c6619c stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 27 Sep 2017 16:18:24 +0200] rev 3011
Added tag 6.7.0 for changeset 3a4f75c6619c
Wed, 27 Sep 2017 16:18:11 +0200 packaging: update debian changelog stable 6.7.0
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 27 Sep 2017 16:18:11 +0200] rev 3010
packaging: update debian changelog
Wed, 27 Sep 2017 16:15:56 +0200 packaging: update version number and testedwith version stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 27 Sep 2017 16:15:56 +0200] rev 3009
packaging: update version number and testedwith version
Wed, 27 Sep 2017 01:44:29 +0200 packaging: mark version 6.7.0 in the source stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 27 Sep 2017 01:44:29 +0200] rev 3008
packaging: mark version 6.7.0 in the source Version ready to be released.
Wed, 27 Sep 2017 01:41:46 +0200 packaging: update compatible version stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 27 Sep 2017 01:41:46 +0200] rev 3007
packaging: update compatible version This has been tested with 4.3 too.
Wed, 27 Sep 2017 01:37:21 +0200 readme: prepare readme stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 27 Sep 2017 01:37:21 +0200] rev 3006
readme: prepare readme The feature that only work with 4.3+ are flagged as such.
Wed, 27 Sep 2017 01:27:40 +0200 compat-test: merge future 6.7.0 into 3.8 compat branch mercurial-3.8
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 27 Sep 2017 01:27:40 +0200] rev 3005
compat-test: merge future 6.7.0 into 3.8 compat branch (merging through 3.9 compat branch)
Wed, 27 Sep 2017 01:22:58 +0200 compat-test: merge future 6.7.0 into 3.9 compat branch mercurial-3.9
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 27 Sep 2017 01:22:58 +0200] rev 3004
compat-test: merge future 6.7.0 into 3.9 compat branch (merging through 4.0 compat branch)
Wed, 27 Sep 2017 01:18:39 +0200 compat-test: merge future 6.7.0 into 4.0 compat branch mercurial-4.0
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 27 Sep 2017 01:18:39 +0200] rev 3003
compat-test: merge future 6.7.0 into 4.0 compat branch (merging through 4.1 compat branch)
Wed, 27 Sep 2017 01:12:47 +0200 compat-test: merge future 6.7.0 into 4.1 compat branch mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 27 Sep 2017 01:12:47 +0200] rev 3002
compat-test: merge future 6.7.0 into 4.1 compat branch (mergeing through 4.2 compat branch)
Wed, 27 Sep 2017 01:07:22 +0200 compat-test: merge future 6.7.0 into 4.2 compat branch mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 27 Sep 2017 01:07:22 +0200] rev 3001
compat-test: merge future 6.7.0 into 4.2 compat branch Couple feature to disable and other various test impact.
Wed, 27 Sep 2017 00:54:28 +0200 branching: merge future 6.7.0 in the stable branch stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 27 Sep 2017 00:54:28 +0200] rev 3000
branching: merge future 6.7.0 in the stable branch We are getting ready to release a new version.
Wed, 27 Sep 2017 00:00:22 +0200 topic: fix topic message for mercurial 4.2 and below
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 27 Sep 2017 00:00:22 +0200] rev 2999
topic: fix topic message for mercurial 4.2 and below
Tue, 26 Sep 2017 19:05:04 +0530 README: mention that --age also shows the user
Pulkit Goyal <7895pulkit@gmail.com> [Tue, 26 Sep 2017 19:05:04 +0530] rev 2998
README: mention that --age also shows the user While I was here, I fixed the a spelling mistake in previous commit.
Sun, 24 Sep 2017 11:30:14 +0200 topic: try to clarify the "branch" part in stack
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 24 Sep 2017 11:30:14 +0200] rev 2997
topic: try to clarify the "branch" part in stack The idea is to clarify the meaning of "behind" with using the "target" word.
Tue, 26 Sep 2017 13:01:21 +0200 readme: mention the message update
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 26 Sep 2017 13:01:21 +0200] rev 2996
readme: mention the message update
Mon, 25 Sep 2017 03:30:56 +0530 topics: make sure user don't pass both the age option and a topic name
Pulkit Goyal <7895pulkit@gmail.com> [Mon, 25 Sep 2017 03:30:56 +0530] rev 2995
topics: make sure user don't pass both the age option and a topic name
Mon, 25 Sep 2017 03:29:45 +0530 topics: spell out topics completely in help
Pulkit Goyal <7895pulkit@gmail.com> [Mon, 25 Sep 2017 03:29:45 +0530] rev 2994
topics: spell out topics completely in help
Mon, 25 Sep 2017 03:23:06 +0530 topics: show the user who last touched the topic in --age
Pulkit Goyal <7895pulkit@gmail.com> [Mon, 25 Sep 2017 03:23:06 +0530] rev 2993
topics: show the user who last touched the topic in --age This patch adds support for showing the user who last touched the topic in the age option to `hg topics`.
Mon, 25 Sep 2017 03:06:37 +0530 topics: initialize variable with default value instead of assigning later
Pulkit Goyal <7895pulkit@gmail.com> [Mon, 25 Sep 2017 03:06:37 +0530] rev 2992
topics: initialize variable with default value instead of assigning later
Mon, 25 Sep 2017 03:04:42 +0530 topics: improve the function signature by accepting arguments as **opts
Pulkit Goyal <7895pulkit@gmail.com> [Mon, 25 Sep 2017 03:04:42 +0530] rev 2991
topics: improve the function signature by accepting arguments as **opts
Tue, 26 Sep 2017 12:58:10 +0200 topic: merge with strip related fix
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 26 Sep 2017 12:58:10 +0200] rev 2990
topic: merge with strip related fix
Tue, 26 Sep 2017 12:56:03 +0200 topic: skip topic movement message during strip
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 26 Sep 2017 12:56:03 +0200] rev 2989
topic: skip topic movement message during strip During strip transaction the repository is not in a great state. It is simpler to skip the computation entirely.
Tue, 26 Sep 2017 12:39:11 +0200 topics/ui: detect and signal when an empty changeset becomes non-empty
Aurélien Campéas [Tue, 26 Sep 2017 12:39:11 +0200] rev 2988
topics/ui: detect and signal when an empty changeset becomes non-empty
Fri, 22 Sep 2017 18:01:29 +0200 topics/transaction: return immediately if we are in the middle of a transaction
Aurélien Campéas [Fri, 22 Sep 2017 18:01:29 +0200] rev 2987
topics/transaction: return immediately if we are in the middle of a transaction
Fri, 22 Sep 2017 16:41:37 +0200 topics/ui: signal when an operation entails voiding a topic
Aurélien Campéas [Fri, 22 Sep 2017 16:41:37 +0200] rev 2986
topics/ui: signal when an operation entails voiding a topic Typical situations may include: * publish * push (to publishing server) * pull * fold
Tue, 26 Sep 2017 12:29:15 +0200 topics/ui: signal when the topics command creates a new (empty) topic
Aurélien Campéas [Tue, 26 Sep 2017 12:29:15 +0200] rev 2985
topics/ui: signal when the topics command creates a new (empty) topic
Tue, 26 Sep 2017 12:27:43 +0200 topics: signal to the end user when a topic has been forgotten
Aurélien Campéas [Tue, 26 Sep 2017 12:27:43 +0200] rev 2984
topics: signal to the end user when a topic has been forgotten Situation is: * we're updating outside an empty topic. * we've cleared topics
Fri, 22 Sep 2017 13:46:41 +0200 topic: add a --topic option to "outgoing" command
Denis Laxalde <denis.laxalde@logilab.fr> [Fri, 22 Sep 2017 13:46:41 +0200] rev 2983
topic: add a --topic option to "outgoing" command By symmetry with "push" in the previous changeset.
Fri, 22 Sep 2017 13:43:38 +0200 topic: add a --topic option to "push" command
Denis Laxalde <denis.laxalde@logilab.fr> [Fri, 22 Sep 2017 13:43:38 +0200] rev 2982
topic: add a --topic option to "push" command This is symmetrical with --bookmark or --branch; it selects changesets in specified topic as revisions to push.
Fri, 22 Sep 2017 12:48:57 +0200 test-compat: adapt to core change in b90bd9a98c8b
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 22 Sep 2017 12:48:57 +0200] rev 2981
test-compat: adapt to core change in b90bd9a98c8b Blackbox just got a little more chatty.
Thu, 21 Sep 2017 19:34:37 +0200 readme: update about obslog update and documentation refresh
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 21 Sep 2017 19:34:37 +0200] rev 2980
readme: update about obslog update and documentation refresh
Thu, 21 Sep 2017 17:08:00 +0200 topic/tuto: be more precise in the top introduction about the publishing server
Aurélien Campéas [Thu, 21 Sep 2017 17:08:00 +0200] rev 2979
topic/tuto: be more precise in the top introduction about the publishing server Indeed there is a chapter with a non-publishing one.
Thu, 21 Sep 2017 17:06:16 +0200 topics/tuto: prefer rebase over merge and remove the weird merge attempt
Aurélien Campéas [Thu, 21 Sep 2017 17:06:16 +0200] rev 2978
topics/tuto: prefer rebase over merge and remove the weird merge attempt
Thu, 21 Sep 2017 17:04:24 +0200 topics/tuto: typo fix and s/multiple/two
Aurélien Campéas [Thu, 21 Sep 2017 17:04:24 +0200] rev 2977
topics/tuto: typo fix and s/multiple/two
Thu, 21 Sep 2017 17:00:04 +0200 topics/tuto: be more complete over the de-orphaning action within a topic
Aurélien Campéas [Thu, 21 Sep 2017 17:00:04 +0200] rev 2976
topics/tuto: be more complete over the de-orphaning action within a topic
Thu, 21 Sep 2017 16:52:05 +0200 topics/tuto: try to be more precise on why `hg log` output is hairy
Aurélien Campéas [Thu, 21 Sep 2017 16:52:05 +0200] rev 2975
topics/tuto: try to be more precise on why `hg log` output is hairy
Thu, 21 Sep 2017 16:42:45 +0200 topics/tuto: attempt to have a slightly more clear wording
Aurélien Campéas [Thu, 21 Sep 2017 16:42:45 +0200] rev 2974
topics/tuto: attempt to have a slightly more clear wording
Thu, 21 Sep 2017 16:41:42 +0200 topics/tuto: try to be more clear when explaining previous/next
Aurélien Campéas [Thu, 21 Sep 2017 16:41:42 +0200] rev 2973
topics/tuto: try to be more clear when explaining previous/next
Thu, 21 Sep 2017 18:35:22 +0200 test: fix the enforce-topic configuration
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 21 Sep 2017 18:35:22 +0200] rev 2972
test: fix the enforce-topic configuration There have been an error while updating this patch.
Thu, 21 Sep 2017 16:25:58 +0200 topics/tuto: clarification on the scope of the tutorial
Aurélien Campéas [Thu, 21 Sep 2017 16:25:58 +0200] rev 2971
topics/tuto: clarification on the scope of the tutorial Also we try to remain the reader that push -> publish.
Thu, 21 Sep 2017 15:27:20 +0200 topics/tuto: slightly more verbose explanation of what we are seeing
Aurélien Campéas [Thu, 21 Sep 2017 15:27:20 +0200] rev 2970
topics/tuto: slightly more verbose explanation of what we are seeing
(0) -3000 -1000 -300 -100 -60 +60 +100 +300 +1000 tip