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.
Fri, 08 Sep 2017 12:24:22 +0200 obslog: uniformize `_debugobshistoryrevs` and `_debugobshistorygraph` arguments
Alain Leufroy [Fri, 08 Sep 2017 12:24:22 +0200] rev 2955
obslog: uniformize `_debugobshistoryrevs` and `_debugobshistorygraph` arguments `_debugobshistoryrevs` and `_debugobshistorygraph` perform quite the same action, the latter simply add graph support. Consequently, it looks better for them to have the same argument list.
Sun, 17 Sep 2017 12:45:28 +0200 obslog: fix --patch with --no-graph options
Alain Leufroy [Sun, 17 Sep 2017 12:45:28 +0200] rev 2954
obslog: fix --patch with --no-graph options The repo given to _debughistorydisplaymarker which computes the diff was filtered when graph mode is disabled.
Thu, 21 Sep 2017 15:18:28 +0200 commands: upgrade pdiff and pstatus to full commands
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 21 Sep 2017 15:18:28 +0200] rev 2953
commands: upgrade pdiff and pstatus to full commands Doing so make them appears in the documentation, improving their discoverability.
Thu, 21 Sep 2017 14:50:55 +0200 gup/gdown: properly mark these commands as deprecated
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 21 Sep 2017 14:50:55 +0200] rev 2952
gup/gdown: properly mark these commands as deprecated They are no longer displayed in the documentation.
Thu, 21 Sep 2017 10:39:49 +0200 Backed out changeset 1b4c92621e23
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 21 Sep 2017 10:39:49 +0200] rev 2951
Backed out changeset 1b4c92621e23 This got published by mistake.
Tue, 29 Aug 2017 16:42:40 +0200 doc: integrate graphviz graphs in tutorials
Boris Feld <boris.feld@octobus.net> [Tue, 29 Aug 2017 16:42:40 +0200] rev 2950
doc: integrate graphviz graphs in tutorials Use the mercurial-graphviz extension (https://bitbucket.org/octobus/mercurial_graphviz) in tutorials in order to have some dot graphs in the tutorials .t files. In order to run the tests, export the GRAPHVIZ_EXTENSION variable which points to your copy of the extension. Please be aware that pygraphviz should be installed in your environment. That should be sufficient for generating dot graphs in text format. 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.
Tue, 19 Sep 2017 12:52:22 +0200 amend: lift the --interactive constraint on `--extract`
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 19 Sep 2017 12:52:22 +0200] rev 2949
amend: lift the --interactive constraint on `--extract` The uncommit logic now supports interactive selection.
Mon, 18 Sep 2017 04:31:59 +0200 readme: mention the topic output cleanup
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 18 Sep 2017 04:31:59 +0200] rev 2948
readme: mention the topic output cleanup
Mon, 18 Sep 2017 04:30:57 +0200 readme: mention the new --interactive mode for uncommit
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 18 Sep 2017 04:30:57 +0200] rev 2947
readme: mention the new --interactive mode for uncommit
Mon, 18 Sep 2017 04:28:12 +0200 uncommit: minor comment cleanup in the test
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 18 Sep 2017 04:28:12 +0200] rev 2946
uncommit: minor comment cleanup in the test Fix some of the sectionning and fix on comments.
Mon, 18 Sep 2017 04:20:36 +0200 uncommit: small cleanup of the interactive test setup
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 18 Sep 2017 04:20:36 +0200] rev 2945
uncommit: small cleanup of the interactive test setup
Mon, 11 Sep 2017 18:12:06 +0200 tests: add tests for interactively uncommitting by mentioning files
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 11 Sep 2017 18:12:06 +0200] rev 2944
tests: add tests for interactively uncommitting by mentioning files
Mon, 11 Sep 2017 17:41:53 +0200 uncommit: fix the dirstate handling in `uncommit -i`
Pulkit Goyal <7895pulkit@gmail.com> [Mon, 11 Sep 2017 17:41:53 +0200] rev 2943
uncommit: fix the dirstate handling in `uncommit -i` This patch fixes the dirstate handling after `hg uncommit --interactive`. This patch is bit verbose about the logic and efforts are not put to plug the logic into existing logic as it's easier to understand like this. Plugging this into non-interactive logic deserves a separate patch.
Tue, 05 Sep 2017 14:35:00 +0530 uncommit: pre-indent a block in if-True
Pulkit Goyal <7895pulkit@gmail.com> [Tue, 05 Sep 2017 14:35:00 +0530] rev 2942
uncommit: pre-indent a block in if-True The block will be moved in if-else in next patch.
Thu, 14 Sep 2017 17:23:24 +0530 uncommit: add an interactive option to uncommit
Pulkit Goyal <7895pulkit@gmail.com> [Thu, 14 Sep 2017 17:23:24 +0530] rev 2941
uncommit: add an interactive option to uncommit This patchs adds an interactive flag to uncommit command which lets you choose hunks interactively. The implementation is as follows: 1) prompt user to select hunks to uncommit interactively 2) make a temporary commit of the hunks user selected 3) calculate the diff of temporary commit and changeset to be uncommitted 4) commit that diff which results in the changeset which should be there after uncommiting 5) create obsmarkers as required, phases and bookmarks handling 6) reroute the working directory
Mon, 04 Sep 2017 15:54:39 +0200 uncommit: pre-indent a block in if-True for the next patch
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 04 Sep 2017 15:54:39 +0200] rev 2940
uncommit: pre-indent a block in if-True for the next patch
Sun, 17 Sep 2017 19:59:25 +0200 topic: provide more information when behind count cannot be computed
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 17 Sep 2017 19:59:25 +0200] rev 2939
topic: provide more information when behind count cannot be computed The behind count has been confusing for various user and the associated error message is even worth. We try to clarify it to see if that helps.
Fri, 15 Sep 2017 23:25:38 +0530 topic: show the t0 even if topic is not yet touched
Pulkit Goyal <7895pulkit@gmail.com> [Fri, 15 Sep 2017 23:25:38 +0530] rev 2938
topic: show the t0 even if topic is not yet touched
Fri, 15 Sep 2017 23:13:05 +0530 topics: improve the description if topic is not touched
Pulkit Goyal <7895pulkit@gmail.com> [Fri, 15 Sep 2017 23:13:05 +0530] rev 2937
topics: improve the description if topic is not touched Instead of an empty stack in `hg stack` when topic does not contain any changeset, we show `not yet touched`.
Fri, 15 Sep 2017 22:48:55 +0530 topics: show working directory branch when topic is empty
Pulkit Goyal <7895pulkit@gmail.com> [Fri, 15 Sep 2017 22:48:55 +0530] rev 2936
topics: show working directory branch when topic is empty
Fri, 01 Sep 2017 15:09:59 +0530 topics: add tests for cases when a topic is empty
Pulkit Goyal <7895pulkit@gmail.com> [Fri, 01 Sep 2017 15:09:59 +0530] rev 2935
topics: add tests for cases when a topic is empty
Fri, 15 Sep 2017 16:28:59 +0200 readme: mention compatibility with future 4.4
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 15 Sep 2017 16:28:59 +0200] rev 2934
readme: mention compatibility with future 4.4
Fri, 15 Sep 2017 17:20:42 +0200 topic: update the message used with --age for empty topic
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 15 Sep 2017 17:20:42 +0200] rev 2933
topic: update the message used with --age for empty topic This clarify things when a topic got emptied by publishing.
Wed, 30 Aug 2017 17:32:32 +0200 sharing: edit pass
Ryan McElroy <rmcelroy@fb.com> [Wed, 30 Aug 2017 17:32:32 +0200] rev 2932
sharing: edit pass
Wed, 30 Aug 2017 17:32:32 +0200 user-guide: edit pass
Ryan McElroy <rmcelroy@fb.com> [Wed, 30 Aug 2017 17:32:32 +0200] rev 2931
user-guide: edit pass
Wed, 13 Sep 2017 21:41:57 +0200 topic: stabilise the output of --age when date ties
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 13 Sep 2017 21:41:57 +0200] rev 2930
topic: stabilise the output of --age when date ties We just needed to introduce sort to stabilize the output order.
Fri, 15 Sep 2017 15:48:18 +0200 tests: update after removing of redundant amend commit
Boris Feld <boris.feld@octobus.net> [Fri, 15 Sep 2017 15:48:18 +0200] rev 2929
tests: update after removing of redundant amend commit Following e8a7c1a0565a, temporary amend commits has been removed impacting all revision numbers in tests including amend operations. Update tests case to use description or hashes when possible and update revisions number when not.
Wed, 13 Sep 2017 15:13:51 +0200 topic: setup 'topic' value for working ctx
Boris Feld <boris.feld@octobus.net> [Wed, 13 Sep 2017 15:13:51 +0200] rev 2928
topic: setup 'topic' value for working ctx The way amend work in core change in e8a7c1a0565a. The intermediate commit disappear and we can no longer rely on it to carry the topic value to amend. To fix this, we ensure the current topic value can be retrieved through the `workingctx.extra()` value. Since there is no way to carry a "missing" key information in a way that survives and "dict.update" call. We also has to introduce hacking behavior about a special empty value for topic.
Thu, 14 Sep 2017 20:33:03 +0200 tests: abstract version number for test-topic-stack.t
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 14 Sep 2017 20:33:03 +0200] rev 2927
tests: abstract version number for test-topic-stack.t Using explicite version number always bring trouble, this is why we have unique description that can select changesets.
(0) -1000 -300 -100 -56 +56 +100 +300 +1000 tip