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
Thu, 21 Sep 2017 15:15:24 +0200 topics/tuto: spell out `hg topics` entirely
Aurélien Campéas [Thu, 21 Sep 2017 15:15:24 +0200] rev 2969
topics/tuto: spell out `hg topics` entirely
Thu, 21 Sep 2017 15:09:14 +0200 topics/tuto: activate the `enforce-topic` option
Aurélien Campéas [Thu, 21 Sep 2017 15:09:14 +0200] rev 2968
topics/tuto: activate the `enforce-topic` option This really help users to stick within topics.
Thu, 21 Sep 2017 14:05:27 +0200 topics/tuto: highlight the behaviour on publish + update
Aurélien Campéas [Thu, 21 Sep 2017 14:05:27 +0200] rev 2967
topics/tuto: highlight the behaviour on publish + update And the fact that empty topics vanish if we update out of them.
Thu, 21 Sep 2017 13:04:19 +0200 topics/tuto: fix title underline type introduced earlier
Aurélien Campéas [Thu, 21 Sep 2017 13:04:19 +0200] rev 2966
topics/tuto: fix title underline type introduced earlier
Thu, 21 Sep 2017 17:44:58 +0200 doc: update graph with latest version of doc-graph
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 21 Sep 2017 17:44:58 +0200] rev 2965
doc: update graph with latest version of doc-graph
Thu, 21 Sep 2017 17:13:46 +0200 flake8 docs/conf.py
Philippe Pepiot <phil@philpep.org> [Thu, 21 Sep 2017 17:13:46 +0200] rev 2964
flake8 docs/conf.py
Thu, 21 Sep 2017 17:13:09 +0200 doc: disable generating command documentation when mercurial is not up-to-date
Philippe Pepiot <phil@philpep.org> [Thu, 21 Sep 2017 17:13:09 +0200] rev 2963
doc: disable generating command documentation when mercurial is not up-to-date
Fri, 01 Sep 2017 08:32:17 +0200 doc: add documentation for evolve commands
Philippe Pepiot <phil@philpep.org> [Fri, 01 Sep 2017 08:32:17 +0200] rev 2962
doc: add documentation for evolve commands By using a sphinx directive that call `hg help`.
Thu, 21 Sep 2017 16:11:59 +0200 doc: clarify undocumented features
Philippe Pepiot <phil@philpep.org> [Thu, 21 Sep 2017 16:11:59 +0200] rev 2961
doc: clarify undocumented features
Thu, 21 Sep 2017 16:55:17 +0200 test2rst: ignore the #if/#endif line in the output
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 21 Sep 2017 16:55:17 +0200] rev 2960
test2rst: ignore the #if/#endif line in the output They are not useful for the rest.
Thu, 21 Sep 2017 10:45:27 +0200 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net> [Thu, 21 Sep 2017 10:45:27 +0200] rev 2959
doc: integrate graphviz graphs in tutorials Use the mercurial-docgraph extension (https://pypi.python.org/pypi/hg- docgraph/) in tutorials in order to have some dot graphs in the tutorials .t files. Then generate the doc as usual, the sphinx-graphviz extension (http://www .sphinx-doc.org/en/stable/ext/graphviz.html) has been added and it should handle the generation of the graphs. Please be aware that you need the dot binary installed in your system. Please refer to the extension documentation for more configuration.
Thu, 21 Sep 2017 10:45:06 +0200 doc: add a special flag for content to ignore in the rst
Boris Feld <boris.feld@octobus.net> [Thu, 21 Sep 2017 10:45:06 +0200] rev 2958
doc: add a special flag for content to ignore in the rst The testfile to rest document convertion has a new way to ignore some commands.
Fri, 08 Sep 2017 12:10:21 +0200 obslog: simplify formatter keys
Alain Leufroy [Fri, 08 Sep 2017 12:10:21 +0200] rev 2957
obslog: simplify formatter keys The formatter field keys are all prefixed with `debugobshistory.'. This is annoyingly useless as they are already in the `debughistory` topic. This patch simplify these keys. For examle, on this repository `hg obslog -Tdebug -r 31cbace4c0f1` : ``` debugobshistory = [ { 'node':'31cbace4c0f1', 'shortdescription':'topics: make sure we have some restrictions on topic names', 'rev':2904, 'markers':[ ] }, { 'node':'d439a6087434', 'markers':[ { 'date':(1504176329.83902, -7200 ), 'verb':'rewritten', 'succnodes':[ '31cbace4c0f1' ], 'effect':[ 'parent' ], 'user':'Pierre-Yves David <pierre-yves.david@octobus.net>' } ] }, { 'node':'1e1f651704d4', 'markers':[ { 'date':(1504175088.811924, -7200 ), 'verb':'rewritten', 'succnodes':[ 'd439a6087434' ], 'effect':[ 'parent' ], 'user':'Pierre-Yves David <pierre-yves.david@octobus.net>' } ] }, { 'node':'eb6495cf6cb1', 'markers':[ { 'date':(1504015275.001643, -19800 ), 'verb':'rewritten', 'succnodes':[ '1e1f651704d4' ], 'effect':[ 'parent', 'content' ], 'user':'Pulkit Goyal <7895pulkit@gmail.com>' } ] }, { 'node':'761e446e0112', 'markers':[ { 'date':(1504015201.780276, -19800 ), 'verb':'rewritten', 'succnodes':[ 'eb6495cf6cb1' ], 'effect':[ 'content' ], 'user':'Pulkit Goyal <7895pulkit@gmail.com>' } ] }, { 'node':'531a626950bd', 'markers':[ { 'date':(1504015017.897054, -19800 ), 'verb':'rewritten', 'succnodes':[ '761e446e0112' ], 'effect':[ 'meta', 'parent', 'content' ], 'user':'Pulkit Goyal <7895pulkit@gmail.com>' } ] }, { 'node':'c2f9ba7329ea', 'markers':[ { 'date':(1504014136.876537, -19800 ), 'verb':'rewritten', 'succnodes':[ '531a626950bd' ], 'effect':[ 'meta' ], 'user':'Pulkit Goyal <7895pulkit@gmail.com>' } ] }, ] ``` We now able to ask `hg obslog -r 78debdfb3e4d -T '{label("log.summary", shortdescription)}\n{if(markers, markers % " {date|age} {user|person}\n")}'` ``` doc: simplify the reference to in-core features 9 days ago Pierre-Yves David 9 days ago Pierre-Yves David 9 days ago Pierre-Yves David 9 days ago Pierre-Yves David 9 days ago Philippe Pepiot 9 days ago Philippe Pepiot ```
Fri, 08 Sep 2017 12:03:23 +0200 obslog: fix `--template` with `--graph` option
Alain Leufroy [Fri, 08 Sep 2017 12:03:23 +0200] rev 2956
obslog: fix `--template` with `--graph` option The `template` option was not propagated.
(0) -3000 -1000 -300 -100 -60 +60 +100 +300 +1000 tip