Sat, 09 Dec 2017 22:49:07 +0100 stablebranch: avoid overlap between subrange
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 09 Dec 2017 22:49:07 +0100] rev 3252
stablebranch: avoid overlap between subrange Subrange overlap make things more complicated and less efficient. We fix the computation done in the "cached" version of the stablerange cache. This bring things in line with the result produced by the basic version. Since we already bumped the format version since the last release, I don't things we need to do anything else.
Sat, 09 Dec 2017 22:37:10 +0100 stablerange: introduce an 'basicstablerange'
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 09 Dec 2017 22:37:10 +0100] rev 3251
stablerange: introduce an 'basicstablerange' This class hold all the basic of stable range but the part specific to the sorting. This allow to clearly express what is expected from each method and to generate tests output to be validated against the more complex implementation. While writing this, we spotted a bug in the current stable range implementation. Fix coming.
Wed, 29 Nov 2017 11:18:53 -0500 stablerange: extract the core API into a 'stablerangecore' class
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 29 Nov 2017 11:18:53 -0500] rev 3250
stablerange: extract the core API into a 'stablerangecore' class To clarify what the code is doing without all the caching and algorithmic improvement, we extract a core class that highlight the basic API expected from the class.
Sat, 09 Dec 2017 22:17:00 +0100 stable-branch: setup tests to use a specific method by default
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 09 Dec 2017 22:17:00 +0100] rev 3249
stable-branch: setup tests to use a specific method by default This will make future test simpler.
Wed, 29 Nov 2017 10:53:21 -0500 stablerange: rework the debug command to allow for multiple method
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 29 Nov 2017 10:53:21 -0500] rev 3248
stablerange: rework the debug command to allow for multiple method Similar to what we did for the other debug command related to sorting, we prepare for the arrival of multiple method to produce the result (including simple implementation that are easy to read but do not scale).
Sat, 09 Dec 2017 17:34:33 +0100 deptcache: make sure we warm the dept cache before warming the obsdiscovery
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 09 Dec 2017 17:34:33 +0100] rev 3247
deptcache: make sure we warm the dept cache before warming the obsdiscovery The depthcache need to a warmed a bit more agressively
Thu, 23 Nov 2017 16:37:24 +0100 stablesort: add a 'method' argument to the debugstablesort command
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 23 Nov 2017 16:37:24 +0100] rev 3246
stablesort: add a 'method' argument to the debugstablesort command Let start experimenting with other way to do stable sorting.
Sat, 25 Nov 2017 02:58:47 -0500 stablesort: rename function to stablesort_branchpoint
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 25 Nov 2017 02:58:47 -0500] rev 3245
stablesort: rename function to stablesort_branchpoint We are about to test different approach to stable sorting. We clarify that the existing method is sorting from branch points.
Sat, 09 Dec 2017 17:14:53 +0100 stablerange: update the filename to avoid cache confusion
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 09 Dec 2017 17:14:53 +0100] rev 3244
stablerange: update the filename to avoid cache confusion The schema validation seems to not work as well as intended, we update the file name to make sure there will be no confusion.
Thu, 23 Nov 2017 16:34:50 +0100 stablesort: extract in its own module
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 23 Nov 2017 16:34:50 +0100] rev 3243
stablesort: extract in its own module We are going to introduce variants, cache and more complex logic, we move that in its own repository beforehand.
Wed, 29 Nov 2017 12:48:45 -0500 compat: in depth cache, only use cachevfs when available
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 29 Nov 2017 12:48:45 -0500] rev 3242
compat: in depth cache, only use cachevfs when available We support older version without the new vfs.
Thu, 23 Nov 2017 16:53:29 +0100 depthcache: issue a progress bar when loading the depth cache
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 23 Nov 2017 16:53:29 +0100] rev 3241
depthcache: issue a progress bar when loading the depth cache The operation can be in the minute order of magnitude of some larger repository. We better keep the user entertain when he wait.
Wed, 22 Nov 2017 15:05:15 +0100 depthcache: move to a dedicated object and storage
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 22 Nov 2017 15:05:15 +0100] rev 3240
depthcache: move to a dedicated object and storage The SQL cache was overkill and fragile. We move to a dedicated storage using the new generic class.
Wed, 22 Nov 2017 13:44:44 +0100 cache: adds debug details about what the content of the update
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 22 Nov 2017 13:44:44 +0100] rev 3239
cache: adds debug details about what the content of the update Having more data in debug is good, we add a small method to help providing them. This code was headed for core during the 4.3 cycle but never made it there. So we starts with a copy in the evolve repository.
Wed, 22 Nov 2017 13:40:47 +0100 cache: introduce a changelogsourcebase class
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 22 Nov 2017 13:40:47 +0100] rev 3238
cache: introduce a changelogsourcebase class This abstract class will help code that need a cache tracking the changelog content (eg: the branchmap cache). The cache key used is the same as what the branchmap uses. This code was headed for core during the 4.3 cycle but never made it there. So we starts with a copy in the evolve repository.
Wed, 22 Nov 2017 13:40:05 +0100 cache: introduce an abstract class for cache we can upgrade incrementally
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 22 Nov 2017 13:40:05 +0100] rev 3237
cache: introduce an abstract class for cache we can upgrade incrementally Right now each class implements their own mechanism for validation, and update. We start introducing abstract class to ultimately allow more unification of the cache code. The end goal of this series is to introduce a cache for some obsolescence property, not to actually implement the cache. However, taking advantage of adding a new cache to introduce the abstract class seems like a win. This code was headed for core during the 4.3 cycle but never made it there. So we starts with a copy in the evolve repository.
Wed, 22 Nov 2017 16:57:07 +0100 depth: basic debugdepth implementation and test
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 22 Nov 2017 16:57:07 +0100] rev 3236
depth: basic debugdepth implementation and test This will come very handy to validate more advanced implementation later.
Sat, 09 Dec 2017 06:13:28 +0100 topics: add a config to reject draft changeset without topic on a server
Pulkit Goyal <7895pulkit@gmail.com> [Sat, 09 Dec 2017 06:13:28 +0100] rev 3235
topics: add a config to reject draft changeset without topic on a server This patch adds a new config option experimental.topic-mode.server which if sets to True, the server won't accept any draft changeset without topic on it. In case both `experimental.topic-mode.server` and `experimental.topic.publish-bare-branch` are set to True, the enforce-topic one is respected. Tests are added for it. The CHANGELOG file is also updated mentioning about the config option.
Sat, 09 Dec 2017 05:05:39 +0100 test: update output to ad5f2b923b0d
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 09 Dec 2017 05:05:39 +0100] rev 3234
test: update output to ad5f2b923b0d A new bundle2 capabilities have been added (related to bookmark). So we have to update the test output. CORE-TEST-OUTPUT-UPDATE: ad5f2b923b0d
Thu, 07 Dec 2017 20:34:18 +0100 touch: shorten touch's docstring to make it fit into a one line stable
Denis Laxalde <denis@laxalde.org> [Thu, 07 Dec 2017 20:34:18 +0100] rev 3233
touch: shorten touch's docstring to make it fit into a one line This make it show completely (untruncated) in `hg help -e evolve`. This follows up on fed946edc293 where the docstring got unwrap for that purpose and thus made the line length exceed 80 columns.
Tue, 05 Dec 2017 18:31:08 +0100 branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 05 Dec 2017 18:31:08 +0100] rev 3232
branching: merge with stable
Wed, 06 Dec 2017 02:08:37 +0100 help: promote "amend" to important command stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 06 Dec 2017 02:08:37 +0100] rev 3231
help: promote "amend" to important command Recent change to what command we advertise as "basic". It turn out "amend" was not part of one of them. Since "amend" is one of the core command of a rewriting workflow, we promote it to "basic command".
Tue, 05 Dec 2017 16:11:08 -0800 help: fix output for `hg help -e evolve` wrt 'touch' command stable
Kyle Lippincott <spectral@google.com> [Tue, 05 Dec 2017 16:11:08 -0800] rev 3230
help: fix output for `hg help -e evolve` wrt 'touch' command Currently, when running `hg help -e evolve`, the output looks like this on my screen: touch create successors that are identical to their predecessors except With this change, it looks like this: touch create successors that are identical to their predecessors except for the changeset ID
Tue, 05 Dec 2017 16:08:50 -0800 help: remove a few commands from `hg` (no args) command list stable
Kyle Lippincott <spectral@google.com> [Tue, 05 Dec 2017 16:08:50 -0800] rev 3229
help: remove a few commands from `hg` (no args) command list According to `hg help -e evolve`, the following commands come from the evolve extension: amend evolve fold metaedit next obslog pdiff previous prune pstatus split touch uncommit If one runs `hg` without arguments, commands that are prefixed with a ^ character are shown. From the previous list, this includes: evolve fold metaedit next previous prune split touch uncommit It feels several of these commands are not "basic commands" that someone who has never used hg before might care about. They probably also do not come close to passing the "toothbrush test": things that users are likely to use every day. This commit removes these items from the list: metaedit, touch, uncommit This means the following are kept: evolve fold next previous prune split
Mon, 04 Dec 2017 14:27:27 -0800 typos: fix typos in several locations stable
Kyle Lippincott <spectral@google.com> [Mon, 04 Dec 2017 14:27:27 -0800] rev 3228
typos: fix typos in several locations A user at Google attempted to fix our local copy because they had noticed a typo (accross instead of across), but this will just get overwritten on our next import. This commit fixes that case and a few others that my editor found. Most of the typos were in comments, but user-visible output is changed in a few cases: - accross -> across - splitted -> split - ambigious -> ambiguous - evolvestte -> evolvestate (this is in a ui.debug, so not often seen) There is another typo that I wanted to fix, but didn't: 'supercede' is spelled 'superseed' in a few locations. I believe this is only internal to the extension, instead of being user-visible, so while it could probably be fixed easily, I wasn't 100% sure it didn't end up in a file on disk or something and might cause problems, so I left it alone.
Tue, 05 Dec 2017 13:53:04 +0100 topic: use more protective code to access current topic stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 05 Dec 2017 13:53:04 +0100] rev 3227
topic: use more protective code to access current topic There are some code path where the operation is not properly initialized and lack the new attributes. While the lack of initialization, is suspicious and I've not be able to pin point case where this happens. Currently the code crash when it encounter this situation. So we make the code more resistant to this case to prevent bad user experience.
Tue, 05 Dec 2017 13:21:57 +0100 topic: use more protective code to access publishing code stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 05 Dec 2017 13:21:57 +0100] rev 3226
topic: use more protective code to access publishing code There are some code path where the operation is not properly initialized and lack the new attributes. While the lack of initialization, is suspicious and I've not be able to pin point case where this happens. Currently the code crash when it encounter this situation. So we make the code more resistant to this case to prevent bad user experience.
Mon, 04 Dec 2017 14:27:27 -0800 typos: fix typos in several locations
Kyle Lippincott <spectral@google.com> [Mon, 04 Dec 2017 14:27:27 -0800] rev 3225
typos: fix typos in several locations A user at Google attempted to fix our local copy because they had noticed a typo (accross instead of across), but this will just get overwritten on our next import. This commit fixes that case and a few others that my editor found. Most of the typos were in comments, but user-visible output is changed in a few cases: - accross -> across - splitted -> split - ambigious -> ambiguous - evolvestte -> evolvestate (this is in a ui.debug, so not often seen) There is another typo that I wanted to fix, but didn't: 'supercede' is spelled 'superseed' in a few locations. I believe this is only internal to the extension, instead of being user-visible, so while it could probably be fixed easily, I wasn't 100% sure it didn't end up in a file on disk or something and might cause problems, so I left it alone.
Mon, 04 Dec 2017 17:16:01 +0530 tests: add a test for newline in obsnote
Pulkit Goyal <7895pulkit@gmail.com> [Mon, 04 Dec 2017 17:16:01 +0530] rev 3224
tests: add a test for newline in obsnote
Mon, 04 Dec 2017 15:50:32 +0530 obsnote: don't add '' to note while showing it in obslog
Pulkit Goyal <7895pulkit@gmail.com> [Mon, 04 Dec 2017 15:50:32 +0530] rev 3223
obsnote: don't add '' to note while showing it in obslog
Sun, 03 Dec 2017 23:40:08 +0530 obsnote: add an entry in CHANGELOG about it
Pulkit Goyal <7895pulkit@gmail.com> [Sun, 03 Dec 2017 23:40:08 +0530] rev 3222
obsnote: add an entry in CHANGELOG about it
Fri, 17 Nov 2017 03:14:47 +0530 amend: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com> [Fri, 17 Nov 2017 03:14:47 +0530] rev 3221
amend: add support for storing a note in obsmarker
Fri, 17 Nov 2017 03:14:31 +0530 uncommit: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com> [Fri, 17 Nov 2017 03:14:31 +0530] rev 3220
uncommit: add support for storing a note in obsmarker
Fri, 17 Nov 2017 03:14:20 +0530 fold: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com> [Fri, 17 Nov 2017 03:14:20 +0530] rev 3219
fold: add support for storing a note in obsmarker
Fri, 17 Nov 2017 03:14:08 +0530 metaedit: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com> [Fri, 17 Nov 2017 03:14:08 +0530] rev 3218
metaedit: add support for storing a note in obsmarker
Fri, 17 Nov 2017 03:13:52 +0530 prune: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com> [Fri, 17 Nov 2017 03:13:52 +0530] rev 3217
prune: add support for storing a note in obsmarker
Fri, 17 Nov 2017 03:06:06 +0530 split: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com> [Fri, 17 Nov 2017 03:06:06 +0530] rev 3216
split: add support for storing a note in obsmarker
Sun, 12 Nov 2017 01:54:13 +0530 touch: add support for storing a note in obsmarker
Pulkit Goyal <7895pulkit@gmail.com> [Sun, 12 Nov 2017 01:54:13 +0530] rev 3215
touch: add support for storing a note in obsmarker
Sun, 12 Nov 2017 01:35:51 +0530 obslog: add initial support for showing note in obslog
Pulkit Goyal <7895pulkit@gmail.com> [Sun, 12 Nov 2017 01:35:51 +0530] rev 3214
obslog: add initial support for showing note in obslog This add a very basic and initial support for showing the note stored in the obsmarker in obslog to test the upcoming changes which adds support. The UI is not finalised and will be improved in the patches after support is added and we have tests with the current output.
Sun, 12 Nov 2017 01:26:30 +0530 cmdrewrite: add a utility function to make sure note is of valid format
Pulkit Goyal <7895pulkit@gmail.com> [Sun, 12 Nov 2017 01:26:30 +0530] rev 3213
cmdrewrite: add a utility function to make sure note is of valid format Upcoming patches will add support to store a note on various evolution related commands by storing that in obsmarker. Since the obsmarker metadata field can't store things above 255 bytes, this patch introduces a function which will be used to make sure note is under 255 bytes and does not contain newlines. We don't want notes to be multilines.
Thu, 30 Nov 2017 12:14:36 -0500 branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 30 Nov 2017 12:14:36 -0500] rev 3212
branching: merge with stable
Wed, 29 Nov 2017 20:50:37 -0500 test: remove dangling --config in test-metaedit.t
Boris Feld <boris.feld@octobus.net> [Wed, 29 Nov 2017 20:50:37 -0500] rev 3211
test: remove dangling --config in test-metaedit.t
Thu, 30 Nov 2017 21:31:14 -0800 tests: fix previously accidentally matching regexes in test-touch.t stable
Martin von Zweigbergk <martinvonz@google.com> [Thu, 30 Nov 2017 21:31:14 -0800] rev 3210
tests: fix previously accidentally matching regexes in test-touch.t Before Mercurial commit 6d5718e39657 (run-tests: make "| foo (re)" not match everything, 2017-11-29), regexes like "| foo", which are common in graphlog output, would incorrectly match anything. After that commit, they match as they should, meaning that either "" or " foo" would match, but not a "| foo". This commit fixes the test by replacing the "|" by "." rather than escaping with "\|" since that would make the graph harder to read.
Thu, 30 Nov 2017 12:09:21 -0500 test: update test-discovery-obshashrange.t stable
Boris Feld <boris.feld@octobus.net> [Thu, 30 Nov 2017 12:09:21 -0500] rev 3209
test: update test-discovery-obshashrange.t
Wed, 29 Nov 2017 20:50:37 -0500 test: remove dangling --config in test-metaedit.t stable
Boris Feld <boris.feld@octobus.net> [Wed, 29 Nov 2017 20:50:37 -0500] rev 3208
test: remove dangling --config in test-metaedit.t
Fri, 24 Nov 2017 23:46:56 -0500 serverminitopic: also avoid reading
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 24 Nov 2017 23:46:56 -0500] rev 3207
serverminitopic: also avoid reading Avoiding to write cache for filter where topic applies is a good step, but we need to also avoid reading it. Existing branchmap cache might exists before the turned the feature on.
Wed, 15 Nov 2017 08:00:17 +0100 topic: introduce a minimal extensions to enable topic on the server
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 15 Nov 2017 08:00:17 +0100] rev 3206
topic: introduce a minimal extensions to enable topic on the server This small extensions simply expose topic in the branch. This should help getting minimal support for topic from various hosting solution (eg: bitbucket maybe ?) See extensions help for details.
Sat, 25 Nov 2017 17:47:02 -0500 branching: merge stable into default
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 25 Nov 2017 17:47:02 -0500] rev 3205
branching: merge stable into default
Fri, 24 Nov 2017 22:36:57 +0100 pusoperation: wrap pushoperation __init__ directly stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 24 Nov 2017 22:36:57 +0100] rev 3204
pusoperation: wrap pushoperation __init__ directly This is how remote names does it. Using the same method should helps with compatibility when mixing the two extensions.
Thu, 23 Nov 2017 00:29:52 +0100 hgignore: fix .err matching patterns stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 23 Nov 2017 00:29:52 +0100] rev 3203
hgignore: fix .err matching patterns We don't want to ignore .err file outside of the 'tests/' directory.
Sun, 19 Nov 2017 04:47:10 +0100 changelog: fix 7.0.0 release date stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 19 Nov 2017 04:47:10 +0100] rev 3202
changelog: fix 7.0.0 release date We date was the same as 6.8.0 for some unkown reason. We now use the date of the tag.
Fri, 17 Nov 2017 00:51:31 +0100 changelog: mention the improved verbosity handling
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 17 Nov 2017 00:51:31 +0100] rev 3201
changelog: mention the improved verbosity handling
Fri, 17 Nov 2017 00:49:09 +0100 branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 17 Nov 2017 00:49:09 +0100] rev 3200
branching: merge with stable
Fri, 17 Nov 2017 00:48:08 +0100 changelog: update missing release date stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 17 Nov 2017 00:48:08 +0100] rev 3199
changelog: update missing release date
Thu, 16 Nov 2017 11:38:33 -0800 summaryhook: respect -q flag
Martin von Zweigbergk <martinvonz@google.com> [Thu, 16 Nov 2017 11:38:33 -0800] rev 3198
summaryhook: respect -q flag There's no test coverage, but it seems pretty obvious and I don't care enough to write a test.
Thu, 16 Nov 2017 11:32:24 -0800 summaryhook: remove unused function
Martin von Zweigbergk <martinvonz@google.com> [Thu, 16 Nov 2017 11:32:24 -0800] rev 3197
summaryhook: remove unused function
Thu, 16 Nov 2017 11:22:38 -0800 evolve: make prev/next respect --quiet flag (issue5742)
Martin von Zweigbergk <martinvonz@google.com> [Thu, 16 Nov 2017 11:22:38 -0800] rev 3196
evolve: make prev/next respect --quiet flag (issue5742)
Wed, 15 Nov 2017 00:30:15 +0100 packaging: merge 7.0.1 into default
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 15 Nov 2017 00:30:15 +0100] rev 3195
packaging: merge 7.0.1 into default
Wed, 15 Nov 2017 00:16:37 +0100 packaging: mark version as development version. stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 15 Nov 2017 00:16:37 +0100] rev 3194
packaging: mark version as development version. This helps reduce confusion when installing non tagged version.
Wed, 15 Nov 2017 00:15:29 +0100 Added tag 7.0.1 for changeset e7a2a6158077 stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 15 Nov 2017 00:15:29 +0100] rev 3193
Added tag 7.0.1 for changeset e7a2a6158077
Wed, 15 Nov 2017 00:14:01 +0100 packaging: prepare version 7.0.1 stable 7.0.1
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 15 Nov 2017 00:14:01 +0100] rev 3192
packaging: prepare version 7.0.1
Wed, 15 Nov 2017 00:13:10 +0100 packaging: update tested-with version stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 15 Nov 2017 00:13:10 +0100] rev 3191
packaging: update tested-with version Mercurial 4.4.1 is out.
Wed, 15 Nov 2017 00:12:38 +0100 changelog: mention the --publish bugfix stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 15 Nov 2017 00:12:38 +0100] rev 3190
changelog: mention the --publish bugfix
Tue, 14 Nov 2017 23:15:20 +0100 test-compat: merge mercurial-4.2 into mercurial-4.1 mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 14 Nov 2017 23:15:20 +0100] rev 3189
test-compat: merge mercurial-4.2 into mercurial-4.1
Tue, 14 Nov 2017 23:15:19 +0100 test-compat: merge mercurial-4.3 into mercurial-4.2 mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 14 Nov 2017 23:15:19 +0100] rev 3188
test-compat: merge mercurial-4.3 into mercurial-4.2
Tue, 14 Nov 2017 23:15:18 +0100 test-compat: merge stable into mercurial-4.3 mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 14 Nov 2017 23:15:18 +0100] rev 3187
test-compat: merge stable into mercurial-4.3
Tue, 14 Nov 2017 23:11:00 +0100 compat: fix comp ability of the new phase logic for Mercurial < 4.4 stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 14 Nov 2017 23:11:00 +0100] rev 3186
compat: fix comp ability of the new phase logic for Mercurial < 4.4
Thu, 02 Nov 2017 19:08:36 +0100 config: clarify that config is only enabled on the repository is it setup for stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 02 Nov 2017 19:08:36 +0100] rev 3185
config: clarify that config is only enabled on the repository is it setup for This changeset change nothing but clarify a few thing. The ui passed to 'reposetup' is the same as 'repo.ui'. However we would like to clarify things a bit.
Tue, 14 Nov 2017 23:04:04 +0100 branching: merge with an old and strange head stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 14 Nov 2017 23:04:04 +0100] rev 3184
branching: merge with an old and strange head
Tue, 25 Jul 2017 02:29:28 +0200 branching: default into stable stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 25 Jul 2017 02:29:28 +0200] rev 3183
branching: default into stable It is time for a new release
Tue, 14 Nov 2017 21:05:59 +0100 topic: fix new head detection when using --publish on a topic stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 14 Nov 2017 21:05:59 +0100] rev 3182
topic: fix new head detection when using --publish on a topic I suspected a bug lurking around there and I found one.
Tue, 14 Nov 2017 18:35:25 +0100 effect-flag: fix obsfate verb hooking
Boris Feld <boris.feld@octobus.net> [Tue, 14 Nov 2017 18:35:25 +0100] rev 3181
effect-flag: fix obsfate verb hooking Mercurial core commit b81ad5b78a81 renamed a the function we hooked on and update its signature. Update the code to detect that, which fixes tests errors.
Tue, 07 Nov 2017 14:07:19 +0100 test: update test output for effect flag by default
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 07 Nov 2017 14:07:19 +0100] rev 3180
test: update test output for effect flag by default Now that effect flag is in core and turned on by default, this affect topic test that did not had the evolve extension turned on all the time. CORE-TEST-OUTPUT-UPDATE: a7e49a5b3e6f
Tue, 07 Nov 2017 14:21:19 +0100 tests: add more testing of pulling with various setting stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 07 Nov 2017 14:21:19 +0100] rev 3179
tests: add more testing of pulling with various setting We checks for client/server with various combination: * extensions enabled, * extensions enabled but exchange disabled, * extensions disabled,
Tue, 07 Nov 2017 13:05:39 +0100 test-compat: merge mercurial-4.2 into mercurial-4.1 mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 07 Nov 2017 13:05:39 +0100] rev 3178
test-compat: merge mercurial-4.2 into mercurial-4.1
Tue, 07 Nov 2017 13:05:38 +0100 test-compat: merge mercurial-4.3 into mercurial-4.2 mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 07 Nov 2017 13:05:38 +0100] rev 3177
test-compat: merge mercurial-4.3 into mercurial-4.2
Tue, 07 Nov 2017 13:05:37 +0100 test-compat: merge stable into mercurial-4.3 mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 07 Nov 2017 13:05:37 +0100] rev 3176
test-compat: merge stable into mercurial-4.3
Tue, 07 Nov 2017 13:04:58 +0100 branching: merge stable into default
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 07 Nov 2017 13:04:58 +0100] rev 3175
branching: merge stable into default
Tue, 07 Nov 2017 12:57:43 +0100 changelog: add details about the pushkey related fix stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 07 Nov 2017 12:57:43 +0100] rev 3174
changelog: add details about the pushkey related fix
Tue, 07 Nov 2017 12:36:27 +0100 wireproto: gracefully fail on http when trying to use older pushkey method stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 07 Nov 2017 12:36:27 +0100] rev 3173
wireproto: gracefully fail on http when trying to use older pushkey method Previously the HTTP server would return a 500. It now returns a 410.
Tue, 07 Nov 2017 12:10:22 +0100 wireproto: avoid exposing pushkey abort for server without evolution stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 07 Nov 2017 12:10:22 +0100] rev 3172
wireproto: avoid exposing pushkey abort for server without evolution Client with evolution enabled will query the 'obsolete' pushley namespace if no other way to request obsmarkers have been found. They will do this unconditionally as long as no other obsolescence related capabilities have been advertised by the server. The call is "harmless" since the namespace will be empty if obsmarkers exchange is disabled. However, since we forbid the use of pushkey for obsmarkers this lead to unexpected crash report for up to date client talking to a server with the evolve extensions but exchange disabled. We fix the issue by serving the expected empty namespace in this case. We keep forbidding the query if obsmarker exchange is enabled since new client should have picked another more effective was to fetch the data first. We also add some tests for this logic.
Thu, 02 Nov 2017 19:22:32 +0100 obsdiscovery: enforce the config on the server too stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 02 Nov 2017 19:22:32 +0100] rev 3171
obsdiscovery: enforce the config on the server too Right now, setting 'experimental.evolution.obsdiscovery=no' disable obsolescence markers discovery on client only. The server still advertise discovery related capabilities. We now also honor the config on the server side.
Thu, 02 Nov 2017 00:48:25 +0100 packaging: mark default branch as development version
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 02 Nov 2017 00:48:25 +0100] rev 3170
packaging: mark default branch as development version This help avoid confusion when installing version from the repository.
Thu, 02 Nov 2017 00:47:11 +0100 branching: merge back stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 02 Nov 2017 00:47:11 +0100] rev 3169
branching: merge back stable back into default
Wed, 01 Nov 2017 23:58:27 +0100 test-compat: merge mercurial-4.2 into mercurial-4.1 mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 01 Nov 2017 23:58:27 +0100] rev 3168
test-compat: merge mercurial-4.2 into mercurial-4.1
Wed, 01 Nov 2017 23:58:27 +0100 test-compat: merge mercurial-4.3 into mercurial-4.2 mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 01 Nov 2017 23:58:27 +0100] rev 3167
test-compat: merge mercurial-4.3 into mercurial-4.2
Wed, 01 Nov 2017 23:57:56 +0100 test-compat: merge stable into mercurial-4.3 mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 01 Nov 2017 23:57:56 +0100] rev 3166
test-compat: merge stable into mercurial-4.3
Thu, 02 Nov 2017 00:45:28 +0100 packaging: mark as development version stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 02 Nov 2017 00:45:28 +0100] rev 3165
packaging: mark as development version This help avoid confusion when installing non tagged version.
Thu, 02 Nov 2017 00:43:57 +0100 Added tag 7.0.0 for changeset c56c028f3802 stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 02 Nov 2017 00:43:57 +0100] rev 3164
Added tag 7.0.0 for changeset c56c028f3802
Thu, 02 Nov 2017 00:33:14 +0100 packaging: prepare version 7.0.0 stable 7.0.0
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 02 Nov 2017 00:33:14 +0100] rev 3163
packaging: prepare version 7.0.0
Thu, 02 Nov 2017 00:32:47 +0100 debian: drop outdate part of the description stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 02 Nov 2017 00:32:47 +0100] rev 3162
debian: drop outdate part of the description
Thu, 02 Nov 2017 00:32:24 +0100 debian: update Mercurial version dependencies stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 02 Nov 2017 00:32:24 +0100] rev 3161
debian: update Mercurial version dependencies The debian package now reflect the actual requirement of the extension in its current version.
Wed, 01 Nov 2017 23:51:55 +0100 branching: merge with stable to prepare version 7.0.0 stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 01 Nov 2017 23:51:55 +0100] rev 3160
branching: merge with stable to prepare version 7.0.0
Wed, 01 Nov 2017 16:23:13 +0100 push: add a --publish flag
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 01 Nov 2017 16:23:13 +0100] rev 3159
push: add a --publish flag The new flag turns all element in the push to public changeset. This will help experiment with diverse publishing workflow.
Wed, 01 Nov 2017 16:26:33 +0100 topic: add an option to automatically publish topic-less changeset
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 01 Nov 2017 16:26:33 +0100] rev 3158
topic: add an option to automatically publish topic-less changeset This new option will help playing with merge based workflow.
Mon, 30 Oct 2017 19:24:14 +0100 topic: add an option to enforce a single head per name in a repository
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 30 Oct 2017 19:24:14 +0100] rev 3157
topic: add an option to enforce a single head per name in a repository
Sun, 15 Oct 2017 00:07:21 +0530 revset: clean up some messy logic
Pulkit Goyal <7895pulkit@gmail.com> [Sun, 15 Oct 2017 00:07:21 +0530] rev 3156
revset: clean up some messy logic
Thu, 26 Oct 2017 09:03:48 +0200 evolve: rename --phasedivergent flag to --phase-divergent
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 26 Oct 2017 09:03:48 +0200] rev 3155
evolve: rename --phasedivergent flag to --phase-divergent This makes the whole things easier to read.
Thu, 26 Oct 2017 09:02:25 +0200 evolve: rename --contentdivergent flag to --content-divergent
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 26 Oct 2017 09:02:25 +0200] rev 3154
evolve: rename --contentdivergent flag to --content-divergent This makes the whole things easier to read.
Thu, 26 Oct 2017 08:44:50 +0200 pushkey: forbid usage of pushley to exchange markers
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 26 Oct 2017 08:44:50 +0200] rev 3153
pushkey: forbid usage of pushley to exchange markers The pushkey based protocol lacks many important feature and is very slow. We disable it to prevent any usage by mistake.
Thu, 26 Oct 2017 08:29:36 +0200 changelog: add an entry for 7.0.0 with recent change
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 26 Oct 2017 08:29:36 +0200] rev 3152
changelog: add an entry for 7.0.0 with recent change
Wed, 25 Oct 2017 04:41:17 +0200 compat: drop compat code for smartrevs.first
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 25 Oct 2017 04:41:17 +0200] rev 3151
compat: drop compat code for smartrevs.first The 'first' method have been around for years.
Wed, 25 Oct 2017 07:32:06 +0200 compat: drop compatibility dance around configoverride
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 25 Oct 2017 07:32:06 +0200] rev 3150
compat: drop compatibility dance around configoverride This was introduced in hg-4.1 and we do no longer support lower versions.
Wed, 25 Oct 2017 04:45:31 +0200 compat: drop support for older exchange protocol
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 25 Oct 2017 04:45:31 +0200] rev 3149
compat: drop support for older exchange protocol Their have been better alternative for years. In addition they have been officially deprecated for quite some time. So we official stop support them to ease the maintainance.
Tue, 24 Oct 2017 14:30:48 +0200 compat: drop compatibility for 'streamres' prior to 4.1
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 24 Oct 2017 14:30:48 +0200] rev 3148
compat: drop compatibility for 'streamres' prior to 4.1 We no longer support these version.
Tue, 24 Oct 2017 14:24:29 +0200 compat: drop the directaccess hacky extension
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 24 Oct 2017 14:24:29 +0200] rev 3147
compat: drop the directaccess hacky extension The user of this extension has forked their own version. We lighten our maintenance burden and drop it.
Tue, 24 Oct 2017 14:23:31 +0200 compat: drop the inhibit hacky extension
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 24 Oct 2017 14:23:31 +0200] rev 3146
compat: drop the inhibit hacky extension The user of this extension has forked their own version. We lighten our maintenance burden and drop it.
Tue, 24 Oct 2017 14:17:14 +0200 compat: drop 'lru.get' work-around for 3.9
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 24 Oct 2017 14:17:14 +0200] rev 3145
compat: drop 'lru.get' work-around for 3.9 We no longer support this version.
Tue, 24 Oct 2017 14:13:57 +0200 compat: stop working around 3.8 file cache limitation
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 24 Oct 2017 14:13:57 +0200] rev 3144
compat: stop working around 3.8 file cache limitation We no longer support this version.
Tue, 24 Oct 2017 14:13:23 +0200 compat: simply the wrapping of '_destmergebranch'
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 24 Oct 2017 14:13:23 +0200] rev 3143
compat: simply the wrapping of '_destmergebranch' All the version we support now use the same interface.
Tue, 24 Oct 2017 14:12:37 +0200 compat: drop support for 3.8's '_destrebase' function
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 24 Oct 2017 14:12:37 +0200] rev 3142
compat: drop support for 3.8's '_destrebase' function We no longer support this version.
Tue, 24 Oct 2017 14:11:28 +0200 compat: mark version 4.1 as the minimum version required
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 24 Oct 2017 14:11:28 +0200] rev 3141
compat: mark version 4.1 as the minimum version required We dropped compatibility for version 3.8, 3.9 and 4.0.
Mon, 23 Oct 2017 16:08:29 +0200 compat: drop compatibility for Mercurial <= 4.0
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 23 Oct 2017 16:08:29 +0200] rev 3140
compat: drop compatibility for Mercurial <= 4.0 We are dropping compatibility with older mercurial version. This will help us to clean up the code base.
Mon, 23 Oct 2017 16:07:09 +0200 packaging: mark as development version
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 23 Oct 2017 16:07:09 +0200] rev 3139
packaging: mark as development version This helps avoid confusion.
Mon, 23 Oct 2017 16:05:57 +0200 branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 23 Oct 2017 16:05:57 +0200] rev 3138
branching: merge with stable Prepare the 7.0.0 line.
Mon, 23 Oct 2017 16:04:23 +0200 packaging: mark version as development version stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 23 Oct 2017 16:04:23 +0200] rev 3137
packaging: mark version as development version This helps to avoid confusion.
Mon, 23 Oct 2017 16:02:37 +0200 branching: close mercurial-4.0 branch mercurial-4.0
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 23 Oct 2017 16:02:37 +0200] rev 3136
branching: close mercurial-4.0 branch We are dropping support for older Mercurial version.
Mon, 23 Oct 2017 16:02:10 +0200 branching: close mercurial-3.9 branch mercurial-3.9
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 23 Oct 2017 16:02:10 +0200] rev 3135
branching: close mercurial-3.9 branch We are dropping support for older Mercurial version.
Mon, 23 Oct 2017 16:01:07 +0200 branching: close mercurial-3.8 branch mercurial-3.8
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 23 Oct 2017 16:01:07 +0200] rev 3134
branching: close mercurial-3.8 branch We are dropping support for older Mercurial version.
Mon, 23 Oct 2017 15:55:12 +0200 util: add a small script to help with the merging of branches stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 23 Oct 2017 15:55:12 +0200] rev 3133
util: add a small script to help with the merging of branches We have multiple test-compat branches merging them can be a bit tedious. We add a nice script doing so for us.
Mon, 23 Oct 2017 15:50:22 +0200 test-compat: merge mercurial-3.9 into mercurial-3.8 mercurial-3.8
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 23 Oct 2017 15:50:22 +0200] rev 3132
test-compat: merge mercurial-3.9 into mercurial-3.8
Mon, 23 Oct 2017 15:50:22 +0200 test-compat: merge mercurial-4.0 into mercurial-3.9 mercurial-3.9
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 23 Oct 2017 15:50:22 +0200] rev 3131
test-compat: merge mercurial-4.0 into mercurial-3.9
Mon, 23 Oct 2017 15:50:21 +0200 test-compat: merge mercurial-4.1 into mercurial-4.0 mercurial-4.0
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 23 Oct 2017 15:50:21 +0200] rev 3130
test-compat: merge mercurial-4.1 into mercurial-4.0
Mon, 23 Oct 2017 15:50:20 +0200 test-compat: merge mercurial-4.2 into mercurial-4.1 mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 23 Oct 2017 15:50:20 +0200] rev 3129
test-compat: merge mercurial-4.2 into mercurial-4.1
Mon, 23 Oct 2017 15:50:19 +0200 test-compat: merge mercurial-4.3 into mercurial-4.2 mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 23 Oct 2017 15:50:19 +0200] rev 3128
test-compat: merge mercurial-4.3 into mercurial-4.2
Mon, 23 Oct 2017 15:50:18 +0200 test-compat: merge stable into mercurial-4.3 mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 23 Oct 2017 15:50:18 +0200] rev 3127
test-compat: merge stable into mercurial-4.3
Mon, 23 Oct 2017 15:43:42 +0200 Added tag 6.8.0 for changeset ec0bbf26ce7f stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 23 Oct 2017 15:43:42 +0200] rev 3126
Added tag 6.8.0 for changeset ec0bbf26ce7f
Mon, 23 Oct 2017 15:41:58 +0200 packaging: prepare version 6.8.0 stable 6.8.0
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 23 Oct 2017 15:41:58 +0200] rev 3125
packaging: prepare version 6.8.0
Mon, 23 Oct 2017 15:25:00 +0200 flake8: rename some ambiguous identifier stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 23 Oct 2017 15:25:00 +0200] rev 3124
flake8: rename some ambiguous identifier Apparently, pyflakes declared war on 'l'.
Mon, 23 Oct 2017 15:11:48 +0200 topic: instroduce a fast path when computing stack stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 23 Oct 2017 15:11:48 +0200] rev 3123
topic: instroduce a fast path when computing stack We do some stack related computation during transaction now. The current inefficiency of the revset is hurting us too much. We pre-compute a subset using native set operation to speed things up.
Fri, 20 Oct 2017 23:03:11 +0200 branching: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 23:03:11 +0200] rev 3122
branching: merge stable back into default
Fri, 20 Oct 2017 22:56:52 +0200 test-compat: merge future 6.7.0 in mercurial-3.8 branch mercurial-3.8
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 22:56:52 +0200] rev 3121
test-compat: merge future 6.7.0 in mercurial-3.8 branch
Fri, 20 Oct 2017 22:56:21 +0200 test-compat: merge future 6.7.0 in mercurial-3.9 branch mercurial-3.9
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 22:56:21 +0200] rev 3120
test-compat: merge future 6.7.0 in mercurial-3.9 branch
Fri, 20 Oct 2017 22:54:58 +0200 test-compat: merge future 6.7.0 in mercurial-4.0 branch mercurial-4.0
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 22:54:58 +0200] rev 3119
test-compat: merge future 6.7.0 in mercurial-4.0 branch
Fri, 20 Oct 2017 22:54:41 +0200 test-compat: merge future 6.7.0 in mercurial-4.1 branch mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 22:54:41 +0200] rev 3118
test-compat: merge future 6.7.0 in mercurial-4.1 branch
Fri, 20 Oct 2017 22:54:08 +0200 test-compat: merge future 6.7.0 in mercurial-4.2 branch mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 22:54:08 +0200] rev 3117
test-compat: merge future 6.7.0 in mercurial-4.2 branch
Fri, 20 Oct 2017 22:52:55 +0200 test-compat: merge future 6.7.0 in mercurial-4.3 branch mercurial-4.3
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 22:52:55 +0200] rev 3116
test-compat: merge future 6.7.0 in mercurial-4.3 branch
Fri, 20 Oct 2017 22:44:12 +0200 obsfate: re-enables operation display in obsfate stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 22:44:12 +0200] rev 3115
obsfate: re-enables operation display in obsfate Now that the compatibility checks are in a good shape we can re-enable more noise in it.
Fri, 20 Oct 2017 22:31:07 +0200 changelog: update to reflect latest change stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 22:31:07 +0200] rev 3114
changelog: update to reflect latest change
Fri, 20 Oct 2017 18:45:33 +0200 test-compat: merge with mercurial-3.9 branch mercurial-3.8
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 18:45:33 +0200] rev 3113
test-compat: merge with mercurial-3.9 branch
Fri, 20 Oct 2017 18:44:52 +0200 test-compat: merge with mercurial-4.0 branch mercurial-3.9
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 18:44:52 +0200] rev 3112
test-compat: merge with mercurial-4.0 branch
Fri, 20 Oct 2017 22:22:14 +0200 compat-test: remove topic related tests for 3.9 mercurial-3.9
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 22:22:14 +0200] rev 3111
compat-test: remove topic related tests for 3.9 The extension is no longer supported for 3.9
Fri, 20 Oct 2017 18:43:55 +0200 test-compat: merge with mercurial-4.1 branch mercurial-4.0
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 18:43:55 +0200] rev 3110
test-compat: merge with mercurial-4.1 branch
Fri, 20 Oct 2017 18:41:05 +0200 test-compat: merge with mercurial-4.2 branch mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 18:41:05 +0200] rev 3109
test-compat: merge with mercurial-4.2 branch
Fri, 20 Oct 2017 18:34:22 +0200 test-compat: merge with mercurial-4.3 branch mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Oct 2017 18:34:22 +0200] rev 3108
test-compat: merge with mercurial-4.3 branch
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.
Thu, 19 Oct 2017 19:56:18 +0200 inhibit: respect '--keep' when handling rebase clean up stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 19 Oct 2017 19:56:18 +0200] rev 3077
inhibit: respect '--keep' when handling rebase clean up
Wed, 18 Oct 2017 19:00:56 +0200 test: adapt to change from 537de0b14030
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 18 Oct 2017 19:00:56 +0200] rev 3076
test: adapt to change from 537de0b14030 If we use phase for pull/push this impact some debug output. CORE-TEST-OUTPUT-UPDATE: 537de0b14030
Tue, 17 Oct 2017 17:12:38 +0200 test: adapt to output change from eb586ed5d8ce
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 17 Oct 2017 17:12:38 +0200] rev 3075
test: adapt to output change from eb586ed5d8ce Core have a more verbose output on pull. We have to update tests with it. CORE-TEST-OUTPUT-UPDATE: eb586ed5d8ce
Tue, 17 Oct 2017 17:35:05 +0200 compat: fix compatibility with new duplicatecopies
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 17 Oct 2017 17:35:05 +0200] rev 3074
compat: fix compatibility with new duplicatecopies Changeset 754b5117622f updated the signature of 'copies.duplicatecopies'. We can now handle the multiple version of that code for compatiblity.
Sat, 14 Oct 2017 19:14:27 +0200 topic: remove 'ass' from the random animal list
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 14 Oct 2017 19:14:27 +0200] rev 3073
topic: remove 'ass' from the random animal list As much as I love donkey… this generate inappropriate names.
Sat, 14 Oct 2017 19:08:22 +0200 config: stop passing useless default value to config
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 14 Oct 2017 19:08:22 +0200] rev 3072
config: stop passing useless default value to config
Sat, 14 Oct 2017 19:06:06 +0200 branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 14 Oct 2017 19:06:06 +0200] rev 3071
branching: merge with stable
Sat, 14 Oct 2017 18:56:42 +0200 changelog: add about fixed bookmark and phase handling while changing topics
Pulkit Goyal <7895pulkit@gmail.com> [Sat, 14 Oct 2017 18:56:42 +0200] rev 3070
changelog: add about fixed bookmark and phase handling while changing topics
Sat, 14 Oct 2017 18:55:43 +0200 changelog: add about pager support stable
Pulkit Goyal <7895pulkit@gmail.com> [Sat, 14 Oct 2017 18:55:43 +0200] rev 3069
changelog: add about pager support
Fri, 13 Oct 2017 06:10:41 +0530 pager: add support to `hg evolve --list` stable
Pulkit Goyal <7895pulkit@gmail.com> [Fri, 13 Oct 2017 06:10:41 +0530] rev 3068
pager: add support to `hg evolve --list`
Fri, 13 Oct 2017 06:08:32 +0530 pager: add support to `hg obslog` stable
Pulkit Goyal <7895pulkit@gmail.com> [Fri, 13 Oct 2017 06:08:32 +0530] rev 3067
pager: add support to `hg obslog`
Fri, 13 Oct 2017 06:06:09 +0530 pager: add support to `hg topic` stable
Pulkit Goyal <7895pulkit@gmail.com> [Fri, 13 Oct 2017 06:06:09 +0530] rev 3066
pager: add support to `hg topic`
Fri, 13 Oct 2017 06:02:56 +0530 pager: add support to `hg stack` stable
Pulkit Goyal <7895pulkit@gmail.com> [Fri, 13 Oct 2017 06:02:56 +0530] rev 3065
pager: add support to `hg stack`
Sat, 14 Oct 2017 20:17:25 +0530 pager: add a function in compats to start pager stable
Pulkit Goyal <7895pulkit@gmail.com> [Sat, 14 Oct 2017 20:17:25 +0530] rev 3064
pager: add a function in compats to start pager This will help us enabling pager when ui.pager API exists. Also we can try plugging in the old pager API in this function and we won't have to change anything.
Sat, 14 Oct 2017 02:39:21 +0200 metadata: cleanup metadata file
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 14 Oct 2017 02:39:21 +0200] rev 3063
metadata: cleanup metadata file I'm not sure how this conflict marker survived the pre-publish test run...
Fri, 13 Oct 2017 20:32:50 +0200 branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 13 Oct 2017 20:32:50 +0200] rev 3062
branching: merge with stable
Fri, 13 Oct 2017 20:28:21 +0200 topic: remove a silly duplicate in a revset stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 13 Oct 2017 20:28:21 +0200] rev 3061
topic: remove a silly duplicate in a revset Spotted by Pulkit Goyal. More performance win seems to exists here, but we starts with the obvious.
Fri, 13 Oct 2017 10:18:52 +0530 topics: show changesetcount, troubledcount and headscount by default
Pulkit Goyal <7895pulkit@gmail.com> [Fri, 13 Oct 2017 10:18:52 +0530] rev 3060
topics: show changesetcount, troubledcount and headscount by default
Fri, 13 Oct 2017 10:01:38 +0530 topics: use stack.stack() instead of stack.stackdata()
Pulkit Goyal <7895pulkit@gmail.com> [Fri, 13 Oct 2017 10:01:38 +0530] rev 3059
topics: use stack.stack() instead of stack.stackdata() stack.stackdata() also calls stack.stack() internally. Moreover if we just want to calculate changesetcount, troubled count, it will be cheap to calculate using stack.stack rather than stackdata().
Tue, 10 Oct 2017 22:48:43 +0200 packaging: mark version as bugfix dev version stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 10 Oct 2017 22:48:43 +0200] rev 3058
packaging: mark version as bugfix dev version This avoid confusion when installing non tagged version.
Tue, 10 Oct 2017 22:40:41 +0200 branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 10 Oct 2017 22:40:41 +0200] rev 3057
branching: merge with stable
Tue, 10 Oct 2017 21:12:14 +0200 Added tag 6.7.1 for changeset 430ad68292d7 stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 10 Oct 2017 21:12:14 +0200] rev 3056
Added tag 6.7.1 for changeset 430ad68292d7
Mon, 09 Oct 2017 19:39:13 +0530 obslog: remove the word "yet" from "No patch available yet"
Pulkit Goyal <7895pulkit@gmail.com> [Mon, 09 Oct 2017 19:39:13 +0530] rev 3055
obslog: remove the word "yet" from "No patch available yet" "yet" was a bit confusing as it let me think that patch is currently not available but can be available sometimes later. This is true for cases when it says "context not local" but we have more messages like "no successors", "too many successors", "changesets rebased" where we can't have a patch.
Mon, 09 Oct 2017 19:35:32 +0530 obslog: spell out successor completely
Pulkit Goyal <7895pulkit@gmail.com> [Mon, 09 Oct 2017 19:35:32 +0530] rev 3054
obslog: spell out successor completely If the successor is not known locally, obslog says `succ is unknown locally` which is not a good message. This patch makes sure succ is spelled out completely as successor.
Tue, 10 Oct 2017 16:28:50 +0200 readme: update readme with latest fix stable 6.7.1
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 10 Oct 2017 16:28:50 +0200] rev 3053
readme: update readme with latest fix (also more the stack one in the right location).
Tue, 10 Oct 2017 15:52:55 +0200 obsfate: make the user list more readable stable
Boris Feld <boris.feld@octobus.net> [Tue, 10 Oct 2017 15:52:55 +0200] rev 3052
obsfate: make the user list more readable Separate each user in the obsfate user list by a space for readability.
Tue, 10 Oct 2017 15:28:03 +0200 obsfate: fix user filtering in obsfate-printer stable
Boris Feld <boris.feld@octobus.net> [Tue, 10 Oct 2017 15:28:03 +0200] rev 3051
obsfate: fix user filtering in obsfate-printer Only hide current user only if it's the only one that create obs-markers.
Tue, 10 Oct 2017 16:22:21 +0200 obsfate: add a test with user both current and other stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 10 Oct 2017 16:22:21 +0200] rev 3050
obsfate: add a test with user both current and other This will help highlight change in the next changesets.
Tue, 10 Oct 2017 16:12:44 +0200 obsfate: update test stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 10 Oct 2017 16:12:44 +0200] rev 3049
obsfate: update test The obsfate templatekw and the obsfateprinter behavior was different when displaying or not the current user in obsfate users. Update the test to makes the behavior fix more visible.
Tue, 10 Oct 2017 16:06:22 +0200 packaging: prepare version 6.7.1 stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 10 Oct 2017 16:06:22 +0200] rev 3048
packaging: prepare version 6.7.1 The are an important fix on evolve and another important fix for topic performance, let us make a release.
Tue, 10 Oct 2017 16:02:44 +0200 readme: add changelog for topic 0.3.1 stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 10 Oct 2017 16:02:44 +0200] rev 3047
readme: add changelog for topic 0.3.1
Tue, 10 Oct 2017 16:02:23 +0200 add mention of the topic 0.3.0 version stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 10 Oct 2017 16:02:23 +0200] rev 3046
add mention of the topic 0.3.0 version
Tue, 10 Oct 2017 16:02:04 +0200 readme: fix evolve 6.7.1 entry stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 10 Oct 2017 16:02:04 +0200] rev 3045
readme: fix evolve 6.7.1 entry
Tue, 10 Oct 2017 15:47:11 +0200 topic: reorder revset for faster evaluation stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 10 Oct 2017 15:47:11 +0200] rev 3044
topic: reorder revset for faster evaluation When running the revset on unfiltered repository, the mutable set can get huge. So removing the obsolete changeset first provide a large speedup. This resolve the performance regression we were seeing since the 6.7.0 release.
Mon, 09 Oct 2017 17:42:30 +0200 topics: use stack rather than stackdata when one only wants the changeset count stable
Aurélien Campéas [Mon, 09 Oct 2017 17:42:30 +0200] rev 3043
topics: use stack rather than stackdata when one only wants the changeset count There might be a significant performance impact. Might resolve #309.
Thu, 28 Sep 2017 21:35:29 +0100 log: update obsfate output order
Boris Feld <boris.feld@octobus.net> [Thu, 28 Sep 2017 21:35:29 +0100] rev 3042
log: update obsfate output order Always display successors after the verb. So instead of "rewritten by boris as X", display "rewritten as X by boris". 07b9fcf8b6d3 did update template-based obsfate but forget to update obsfatelineprinter.
Fri, 06 Oct 2017 10:28:09 +0200 test: remove bashism in test-topic-change.t
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 06 Oct 2017 10:28:09 +0200] rev 3041
test: remove bashism in test-topic-change.t The test was broken on various machine using shell not supporting the `{start..end}` construct.
Thu, 05 Oct 2017 19:35:58 +0530 topics: handle phase correctly while changing topics
Pulkit Goyal <7895pulkit@gmail.com> [Thu, 05 Oct 2017 19:35:58 +0530] rev 3040
topics: handle phase correctly while changing topics
Thu, 05 Oct 2017 19:30:22 +0530 tests: add test showing change of phase while changing topic on secret commit
Pulkit Goyal <7895pulkit@gmail.com> [Thu, 05 Oct 2017 19:30:22 +0530] rev 3039
tests: add test showing change of phase while changing topic on secret commit
Thu, 05 Oct 2017 19:20:20 +0530 topics: use scmutil.cleanupnodes to create markers while changing topics
Pulkit Goyal <7895pulkit@gmail.com> [Thu, 05 Oct 2017 19:20:20 +0530] rev 3038
topics: use scmutil.cleanupnodes to create markers while changing topics Earlier if we change topics on changesets with bookmark, the bookmark is not moved to the new changeset as we didn't add that logic and we were creating obsmarkers directly. This patch calls scmutil.cleanupnodes to create obsmarkes which also handles the bookmark movement.
Thu, 05 Oct 2017 18:13:52 +0530 tests: add a new test for testing changing or clearing topics
Pulkit Goyal <7895pulkit@gmail.com> [Thu, 05 Oct 2017 18:13:52 +0530] rev 3037
tests: add a new test for testing changing or clearing topics test-topic.t is getting bigger and bigger. This patch introduces a new test which includes test for clearing and changing topics. Since the tests are moved to a new file, this patch, removes those tests from test-topic.t also.
Tue, 03 Oct 2017 11:14:29 -0700 obscache: do not check of argument count of wrapped function
Matt DeVore <matvore@google.com> [Tue, 03 Oct 2017 11:14:29 -0700] rev 3036
obscache: do not check of argument count of wrapped function After talking with the original author of this check, it appears that it never worked properly, since _readmarkers was always wrapped with @util.nogc.
Tue, 03 Oct 2017 22:51:00 +0800 legacy: rename lookup_errors to not be in all caps (flake8 warning)
Anton Shestakov <av6@dwimlabs.net> [Tue, 03 Oct 2017 22:51:00 +0800] rev 3035
legacy: rename lookup_errors to not be in all caps (flake8 warning) flake8 has a plugin, pep8-naming, which is not installed by default, but is used if available, no extra config required. This plugin checks names of variables, classes, functions and so on against PEP-8, and it complained about this variable: N806 variable in function should be lowercase Since this isn't a module-level constant, but just a helper variable used only in one function, it's fine to just rename it. With this error gone, flake8 output (used plugins: mccabe, naming, pycodestyle, pyflakes) is totally clean.
Sun, 01 Oct 2017 15:32:29 +0530 randomname: fix the header of the file
Pulkit Goyal <7895pulkit@gmail.com> [Sun, 01 Oct 2017 15:32:29 +0530] rev 3034
randomname: fix the header of the file
Sun, 01 Oct 2017 15:22:37 +0530 topics: move README-topic as hgext3rd/topic/README
Pulkit Goyal <7895pulkit@gmail.com> [Sun, 01 Oct 2017 15:22:37 +0530] rev 3033
topics: move README-topic as hgext3rd/topic/README Before improving the docs about topics, lets move them into the topics folder.
Sun, 01 Oct 2017 11:23:21 +0100 README: move CHANGELOG to a new file
Pulkit Goyal <7895pulkit@gmail.com> [Sun, 01 Oct 2017 11:23:21 +0100] rev 3032
README: move CHANGELOG to a new file
Sun, 01 Oct 2017 11:18:36 +0100 test: small cleanup in test-topic-mode.t
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 01 Oct 2017 11:18:36 +0100] rev 3031
test: small cleanup in test-topic-mode.t remove the mention of "new" (this won't be new soon) and use the official config name.
Sun, 01 Oct 2017 11:13:38 +0100 test: add support for random-all topic mode
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 01 Oct 2017 11:13:38 +0100] rev 3030
test: add support for random-all topic mode The 'random' mode no longer generate a random topic for merge.
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
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.
Mon, 07 Aug 2017 23:22:41 +0900 evolve: use registrar.templatekeyword to register template keyword functions
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Mon, 07 Aug 2017 23:22:41 +0900] rev 2926
evolve: use registrar.templatekeyword to register template keyword functions Now, using registrar.templatekeyword of Mercurial directly in evolve extension should be safe enough. because it has been available since Mercurial 3.8, and minimum Mercurial version for evolve extension is 3.8, too. BTW, this also fixes an issue of "hg help templates" output that template keywords "precursors" and "successors" are not displayed as same as others, because they do not have ":KEYWORD:" prefix in their docstring.
Sun, 10 Sep 2017 20:06:52 +0900 evolve: use registrar.revsetpredicate to register revset predicate functions
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 10 Sep 2017 20:06:52 +0900] rev 2925
evolve: use registrar.revsetpredicate to register revset predicate functions Now, using registrar.revsetpredicate of Mercurial directly in evolve extension should be safe enough. because it has been available since Mercurial 3.8, and minimum Mercurial version for evolve extension is 3.8, too.
Mon, 07 Aug 2017 23:17:13 +0900 topic: use registrar.revsetpredicate to register revset predicate functions
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Mon, 07 Aug 2017 23:17:13 +0900] rev 2924
topic: use registrar.revsetpredicate to register revset predicate functions Now, using registrar.revsetpredicate of Mercurial directly in topic extension should be safe enough. because it has been available since Mercurial 3.8, and minimum Mercurial version for topic extension is 4.0. This patch also removes modsetup() in topic/revset.py, because it is useless. BTW, this patch fixes an issue of "hg help revsets" output that custom revset predicates are not displayed as same as others, because they are not "inline literal" in reST syntax (``NAME``).
Mon, 07 Aug 2017 23:24:57 +0900 doc: make paragraphs before example code end with "::" for reST syntax
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Mon, 07 Aug 2017 23:24:57 +0900] rev 2923
doc: make paragraphs before example code end with "::" for reST syntax This prevents lines in an example code from being treated as a part of normal paragraph. For issue example, lines are folded into one paragraph.
Sun, 10 Sep 2017 22:41:54 +0900 topic: centralize compatibility logic between hg versions into compat module
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 10 Sep 2017 22:41:54 +0900] rev 2922
topic: centralize compatibility logic between hg versions into compat module This patch can delay loading obsutil and obsolete modules until they are actually used at "hg topics" or so, if demandimport of Mercurial is enabled.
Mon, 11 Sep 2017 17:24:33 +0200 readme: mention the improvement to stack in the readme
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 11 Sep 2017 17:24:33 +0200] rev 2921
readme: mention the improvement to stack in the readme
Thu, 07 Sep 2017 19:18:05 +0200 test: issue a clarifying graph print in tests/test-stack-branch.t
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 07 Sep 2017 19:18:05 +0200] rev 2920
test: issue a clarifying graph print in tests/test-stack-branch.t
Sat, 09 Sep 2017 22:32:50 +0530 stack: properly order stack when gaps existing inside it
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 09 Sep 2017 22:32:50 +0530] rev 2919
stack: properly order stack when gaps existing inside it We transitively search for the next "stack" ancestors, of changeset in the stack not based on other revision of the stack. This should help having a consistent display when topic are interleaved.
Thu, 07 Sep 2017 19:43:07 +0200 stack: display both parent with displaying merge
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 07 Sep 2017 19:43:07 +0200] rev 2918
stack: display both parent with displaying merge This will help understanding merge in the stack. More test involving merge are adding in the next changeset.
Sat, 09 Sep 2017 22:32:44 +0530 tests: add tests for showing stack when merge is involved
Pierre-Yves David <pierre-yves.david@octobus.net> [Sat, 09 Sep 2017 22:32:44 +0530] rev 2917
tests: add tests for showing stack when merge is involved This patch adds tests of showing stack when merges are involved. This will help us in changing the behaviour and realising that in later patches.
Mon, 04 Sep 2017 12:41:30 +0200 stack: move data computation on the object
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 04 Sep 2017 12:41:30 +0200] rev 2916
stack: move data computation on the object We gather multiple data about the stack on the object. Let us move this on the object and keep it cached there.
Mon, 04 Sep 2017 12:23:03 +0200 stack: replace 'getstack' with direct call to 'stack'
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 04 Sep 2017 12:23:03 +0200] rev 2915
stack: replace 'getstack' with direct call to 'stack' The dedicated function do not add any value. We can update all the callers.
Mon, 04 Sep 2017 12:19:49 +0200 stack: introduce a rich stack object
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 04 Sep 2017 12:19:49 +0200] rev 2914
stack: introduce a rich stack object The logic around stack object become more and more complex. We great and object to gather and abstract it.
Thu, 07 Sep 2017 16:45:57 +0200 tests: add tests for `hg stack` showing surprising behavior with gaps
Pulkit Goyal <7895pulkit@gmail.com> [Thu, 07 Sep 2017 16:45:57 +0200] rev 2913
tests: add tests for `hg stack` showing surprising behavior with gaps The test will help us to analyse in next commit if the things are fixed or not.
Sun, 10 Sep 2017 22:22:06 +0900 topic: check availability of obsutil.getmarkers() for portability
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 10 Sep 2017 22:22:06 +0900] rev 2912
topic: check availability of obsutil.getmarkers() for portability Before this patch, topic extension causes unintentional failure with Mercurial earlier than 4.3, because obsutil.getmarkers() has been available since Mercurial 4.3 (tests for topic on mercurial-4.* branches fail, too). This breaks "minimumhgversion = '4.0'" declaration of topic extension. This patch fixes this issue in a straightforward way for simplicity on stable branch. I'm planning to centralize such portability logic in topic extension into topic/compat.py or so on default branch for efficiency at runtime, like as evolve/compat.py.
Thu, 07 Sep 2017 16:45:53 +0200 tests: add more explicit test about empty topic from publishing
Pierre-Yves David <pierre-yves.david@octobus.net> [Thu, 07 Sep 2017 16:45:53 +0200] rev 2911
tests: add more explicit test about empty topic from publishing
Fri, 01 Sep 2017 19:29:04 +0200 convertbookmark: advertise the new command in the readme
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 01 Sep 2017 19:29:04 +0200] rev 2910
convertbookmark: advertise the new command in the readme The command is in a good enough shape now.
Fri, 01 Sep 2017 17:15:55 +0200 convertbookmark: properly convert stacked bookmarks
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 01 Sep 2017 17:15:55 +0200] rev 2909
convertbookmark: properly convert stacked bookmarks We ignores pure descendant when looking for revision to convert. This adds support for cases were a linear stack contains multiple bookmark (or un-bookmarked descendants exists). In this case, some changeset are left orphan, but we'll consider the issue as minor for now.
Fri, 01 Sep 2017 18:46:10 +0200 convertbookmark: perform all actions at the end
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 01 Sep 2017 18:46:10 +0200] rev 2908
convertbookmark: perform all actions at the end This will make the whole operation more deterministic and robust.
Fri, 01 Sep 2017 18:33:08 +0200 converbookmark: split target computation from actual update
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 01 Sep 2017 18:33:08 +0200] rev 2907
converbookmark: split target computation from actual update This will allow for further refactoring helping consistency.
Fri, 01 Sep 2017 17:09:17 +0200 convertbookmark: extract the revset into a module level constant
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 01 Sep 2017 17:09:17 +0200] rev 2906
convertbookmark: extract the revset into a module level constant This will make it easier to read and modify the query.
Fri, 01 Sep 2017 17:04:21 +0200 convertbookmark: properly exclude public changeset
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 01 Sep 2017 17:04:21 +0200] rev 2905
convertbookmark: properly exclude public changeset Public changeset are immutable and cannot have a topic anyway.
Fri, 01 Sep 2017 16:51:49 +0200 test: add a new root changeset to all debugconvertbookmark test case
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 01 Sep 2017 16:51:49 +0200] rev 2904
test: add a new root changeset to all debugconvertbookmark test case We'll make this root changeset public to check the debugconvertbookmark logic in that regards. It is added in its own changeset since it massively impact all output.
Fri, 01 Sep 2017 12:02:27 +0200 tests: import section in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 01 Sep 2017 12:02:27 +0200] rev 2903
tests: import section in 'test-topic-debugcb.t' We now have two levels of titles to clarify some aspect of the tests.
Fri, 01 Sep 2017 16:22:49 +0200 test: avoid using debugdrawdag in 'test-topic-debugcb.t'
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 01 Sep 2017 16:22:49 +0200] rev 2902
test: avoid using debugdrawdag in 'test-topic-debugcb.t' The 'debugdrawdag' utility adds local tags that prevent hidden changeset to get hidden. We will do without that extension for now.
Tue, 29 Aug 2017 18:13:33 +0530 tests: add more tests for debugconvertbookmark
Pulkit Goyal <7895pulkit@gmail.com> [Tue, 29 Aug 2017 18:13:33 +0530] rev 2901
tests: add more tests for debugconvertbookmark
Mon, 14 Aug 2017 14:36:11 +0530 convertbookmark: add logic to skip revisions with multiple bookmarks
Pulkit Goyal <7895pulkit@gmail.com> [Mon, 14 Aug 2017 14:36:11 +0530] rev 2900
convertbookmark: add logic to skip revisions with multiple bookmarks When a user tries to converts a bookmark to topic which is on a changeset with more bookmarks we skip that.
Fri, 01 Sep 2017 18:02:50 +0200 topics: add a new debugconvertbookmark command to convert bookmarks to topics
Pulkit Goyal <7895pulkit@gmail.com> [Fri, 01 Sep 2017 18:02:50 +0200] rev 2899
topics: add a new debugconvertbookmark command to convert bookmarks to topics This new command, aliased to debugcb converts bookmarks to topics. This command either accept name of a bookmark using flag '-b' or '--all'. If a bookmark is passed using '-b', the whole stack defined by that bookmark is converted to topics. If '--all' is passed, the above thing is repeated for every bookmark in the repository. If the revset which we are using unable to decides revisions of the stack and return an expty set, in that cases we are not deleting the bookmark as we are not writing any topics of the same name as that of bookmark. Also currently if a changeset has two bookmarks, than there is buggy behaviour. So these are known lackings in the current implementation which will be fixed in upcoming patches. This also adds tests for the same.
Fri, 01 Sep 2017 17:53:14 +0200 topic: support --rev argument and properly process then as user input
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 01 Sep 2017 17:53:14 +0200] rev 2898
topic: support --rev argument and properly process then as user input Revisions inputed by the users should be processed using `scmutil.revrange`. This will take alias into account and allow extensions to monitor the user inputs. As a side effect, the '_changetopics' function takes revisions as argument. make the API clearer.
Fri, 01 Sep 2017 17:37:47 +0200 topic: move a status message in the right scope
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 01 Sep 2017 17:37:47 +0200] rev 2897
topic: move a status message in the right scope The finally get runs on failure so we should not advertise rewrite topic in the case. In addition the 'rewrote' variable can be undefined in the finally.
Wed, 09 Aug 2017 11:32:19 +0200 obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net> [Wed, 09 Aug 2017 11:32:19 +0200] rev 2896
obsfate: use effect flag information for computing a better verb
Tue, 29 Aug 2017 17:30:07 +0200 compat: make it more clear that evolve need Mercurial >= minversion
Philippe Pepiot <phil@philpep.org> [Tue, 29 Aug 2017 17:30:07 +0200] rev 2895
compat: make it more clear that evolve need Mercurial >= minversion The message is more clear when mercurial isn't installed at all.
Wed, 30 Aug 2017 18:35:04 +0200 doc: record all the missings and strange bit we know
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 30 Aug 2017 18:35:04 +0200] rev 2894
doc: record all the missings and strange bit we know We know the doc is not as fresh as it could be. We make sure the reader is aware too.
Thu, 31 Aug 2017 17:00:09 +0200 directaccess: fix with tree without order
Boris Feld <boris.feld@octobus.net> [Thu, 31 Aug 2017 17:00:09 +0200] rev 2893
directaccess: fix with tree without order 1b28525e6698 removes order from tree, changing the indexes in gethashsymbols. Fix that
Fri, 01 Sep 2017 11:08:22 +0200 compat: adapt to test output changes
Boris Feld <boris.feld@octobus.net> [Fri, 01 Sep 2017 11:08:22 +0200] rev 2892
compat: adapt to test output changes different access pattern in 4.4 means different results. Make evolve works with mercurial core 72b5f4d53c58
Fri, 01 Sep 2017 11:07:28 +0200 compat: adapt to rebase change in coming 4.4
Boris Feld <boris.feld@octobus.net> [Fri, 01 Sep 2017 11:07:28 +0200] rev 2891
compat: adapt to rebase change in coming 4.4 Make evolve works with mercurial core 72b5f4d53c58
Thu, 31 Aug 2017 13:22:40 +0200 topics: import lock as lockmods
Pulkit Goyal <7895pulkit@gmail.com> [Thu, 31 Aug 2017 13:22:40 +0200] rev 2890
topics: import lock as lockmods We'll need a 'lock' variable in the next changeset. we move the module out of the way ahead of time for clarity.
Tue, 29 Aug 2017 19:12:00 +0530 topics: make sure we have some restrictions on topic names
Pulkit Goyal <7895pulkit@gmail.com> [Tue, 29 Aug 2017 19:12:00 +0530] rev 2889
topics: make sure we have some restrictions on topic names This patch makes sure we don't allow topic names with just whitespaces, and other checks which we do for a bookmark.
Tue, 29 Aug 2017 19:03:59 +0530 topic: add test showing no restrictions on topic names
Pulkit Goyal <7895pulkit@gmail.com> [Tue, 29 Aug 2017 19:03:59 +0530] rev 2888
topic: add test showing no restrictions on topic names Currently we don't have any restrictions on topic names and each of the topic name works. We want them to not work as some of them are used internally and only integers can be rev numbers too.
Wed, 30 Aug 2017 17:32:32 +0200 index: edit pass by native english speaker
Ryan McElroy <rmcelroy@fb.com> [Wed, 30 Aug 2017 17:32:32 +0200] rev 2887
index: edit pass by native english speaker
Wed, 30 Aug 2017 16:54:26 +0200 topic: reword and simplify explanation of "behind"
Aurélien Campéas [Wed, 30 Aug 2017 16:54:26 +0200] rev 2886
topic: reword and simplify explanation of "behind"
Wed, 30 Aug 2017 15:57:04 +0200 topic: tutorial grammar fixes
Aurélien Campéas [Wed, 30 Aug 2017 15:57:04 +0200] rev 2885
topic: tutorial grammar fixes
Wed, 30 Aug 2017 11:36:47 +0200 doc-front-page: link to the changeset evolution section in the document
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 30 Aug 2017 11:36:47 +0200] rev 2884
doc-front-page: link to the changeset evolution section in the document The section is unlikely to be perfect, but at least it exists.
Wed, 30 Aug 2017 11:26:00 +0200 doc-front-page: use a clearer statement about the experimental status
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 30 Aug 2017 11:26:00 +0200] rev 2883
doc-front-page: use a clearer statement about the experimental status This text comes form the Mercurial wiki.
Wed, 30 Aug 2017 11:25:51 +0200 doc-front-pagE: add a paragraph about "why the extension"
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 30 Aug 2017 11:25:51 +0200] rev 2882
doc-front-pagE: add a paragraph about "why the extension" Let us clarify why there is an extension in the first place.
Wed, 30 Aug 2017 11:25:27 +0200 doc-front-page: expand the paragraph about changeset evolution
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 30 Aug 2017 11:25:27 +0200] rev 2881
doc-front-page: expand the paragraph about changeset evolution We clarify the part of the explanation about the changeset evolution concept.
Wed, 30 Aug 2017 11:24:38 +0200 doc-front-page: rename the "next step" section
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 30 Aug 2017 11:24:38 +0200] rev 2880
doc-front-page: rename the "next step" section This are pointer to relevant section in the doc. It is a bit double usage with the table of content. We at least clarify the title.
Wed, 30 Aug 2017 10:30:48 +0200 doc-front-page: mention that "Changeset Evolution" is a specific concept
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 30 Aug 2017 10:30:48 +0200] rev 2879
doc-front-page: mention that "Changeset Evolution" is a specific concept It will get it own paragraph soon.
Wed, 30 Aug 2017 00:32:56 +0200 doc-front-page: include the index in the TOC
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 30 Aug 2017 00:32:56 +0200] rev 2878
doc-front-page: include the index in the TOC This will help important content to stand forward.
Wed, 30 Aug 2017 00:35:44 +0200 doc-front-page: add a title to the part about the extension
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 30 Aug 2017 00:35:44 +0200] rev 2877
doc-front-page: add a title to the part about the extension We'll rework this section more in depth, but I would like it to have a title first to have it show up in the table of content.
Tue, 29 Aug 2017 17:25:01 +0200 doc-front-page: add a feature summary at the beginning of the page
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 29 Aug 2017 17:25:01 +0200] rev 2876
doc-front-page: add a feature summary at the beginning of the page
Tue, 29 Aug 2017 17:11:18 +0200 doc-front-page: mention the mailing list in the documentation
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 29 Aug 2017 17:11:18 +0200] rev 2875
doc-front-page: mention the mailing list in the documentation It is an important tool to keep people up to date.
Tue, 29 Aug 2017 16:58:22 +0200 doc-front-page: move installation instruction earliero
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 29 Aug 2017 16:58:22 +0200] rev 2874
doc-front-page: move installation instruction earliero This is important for user.
Tue, 29 Aug 2017 16:50:05 +0200 doc-front-page: move introduction before the table of content
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 29 Aug 2017 16:50:05 +0200] rev 2873
doc-front-page: move introduction before the table of content This should make a friendlier landing.
Tue, 29 Aug 2017 16:15:02 +0200 doc: simplify the reference to in-core features
Philippe Pepiot <phil@philpep.org> [Tue, 29 Aug 2017 16:15:02 +0200] rev 2872
doc: simplify the reference to in-core features This should do the whole thing lighter.
Tue, 29 Aug 2017 16:14:28 +0200 doc: be less dramatic about changeset immutability
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 29 Aug 2017 16:14:28 +0200] rev 2871
doc: be less dramatic about changeset immutability Quoting Phillipe: "This is not a Tolkien Novel".
Tue, 29 Aug 2017 16:14:15 +0200 doc: clarify the introduction sentence
Philippe Pepiot <phil@philpep.org> [Tue, 29 Aug 2017 16:14:15 +0200] rev 2870
doc: clarify the introduction sentence
Mon, 28 Aug 2017 17:16:16 +0200 topics: allow use a --current when setting a topic
Pulkit Goyal <7895pulkit@gmail.com> [Mon, 28 Aug 2017 17:16:16 +0200] rev 2869
topics: allow use a --current when setting a topic This patch allow to use the current flag which can be used by user set existing revs to the current topic.
Mon, 28 Aug 2017 17:35:44 +0200 topic: make --clear + topicname invalid
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 28 Aug 2017 17:35:44 +0200] rev 2868
topic: make --clear + topicname invalid The two flags are mutually exclusive.
Mon, 28 Aug 2017 17:15:08 +0200 topics: add a current flag to display current topic
Pulkit Goyal <7895pulkit@gmail.com> [Mon, 28 Aug 2017 17:15:08 +0200] rev 2867
topics: add a current flag to display current topic This patch adds a current flag which can be used by user to display the current topic.
Mon, 28 Aug 2017 17:10:41 +0200 topics: add a missing trailing comma on list of flag
Pulkit Goyal <7895pulkit@gmail.com> [Mon, 28 Aug 2017 17:10:41 +0200] rev 2866
topics: add a missing trailing comma on list of flag This will make the next changeset easier to read.
Tue, 29 Aug 2017 14:19:31 +0200 doc: let mercurial find where evolve is installed
Philippe Pepiot <phil@philpep.org> [Tue, 29 Aug 2017 14:19:31 +0200] rev 2865
doc: let mercurial find where evolve is installed
Tue, 29 Aug 2017 14:27:08 +0200 doc: use pip to install evolve
Philippe Pepiot <phil@philpep.org> [Tue, 29 Aug 2017 14:27:08 +0200] rev 2864
doc: use pip to install evolve
Tue, 29 Aug 2017 12:20:30 +0200 doc: reword "target repository" to "remote repository"
Philippe Pepiot <phil@philpep.org> [Tue, 29 Aug 2017 12:20:30 +0200] rev 2863
doc: reword "target repository" to "remote repository"
Tue, 29 Aug 2017 12:18:42 +0200 doc: typo fixes
Philippe Pepiot <phil@philpep.org> [Tue, 29 Aug 2017 12:18:42 +0200] rev 2862
doc: typo fixes
Tue, 29 Aug 2017 12:17:48 +0200 doc: use "hidden" instead of "invisible"
Philippe Pepiot <phil@philpep.org> [Tue, 29 Aug 2017 12:17:48 +0200] rev 2861
doc: use "hidden" instead of "invisible"
Mon, 28 Aug 2017 19:23:16 +0530 tests: add whitespaces in test-topic.t to make it more readable
Pulkit Goyal <7895pulkit@gmail.com> [Mon, 28 Aug 2017 19:23:16 +0530] rev 2860
tests: add whitespaces in test-topic.t to make it more readable
Thu, 24 Aug 2017 11:00:13 -0700 evolve: undo change from "divergent" to "phasedivergent" for --divergent
Martin von Zweigbergk <martinvonz@google.com> [Thu, 24 Aug 2017 11:00:13 -0700] rev 2859
evolve: undo change from "divergent" to "phasedivergent" for --divergent Looks like an accidental update in feaa52680682 (log: bumped was renamed into phasedivergent, 2017-08-10).
Thu, 24 Aug 2017 10:57:32 -0700 messages: use hyphenated '{phase,content}-divergent' in user messages
Martin von Zweigbergk <martinvonz@google.com> [Thu, 24 Aug 2017 10:57:32 -0700] rev 2858
messages: use hyphenated '{phase,content}-divergent' in user messages The hyphenated version is more readable and it's what we use the {instabilities} template.
Thu, 24 Aug 2017 10:48:38 -0700 warning: use 'divergent', not 'contentdivergent' on old Mercurial
Martin von Zweigbergk <martinvonz@google.com> [Thu, 24 Aug 2017 10:48:38 -0700] rev 2857
warning: use 'divergent', not 'contentdivergent' on old Mercurial This was just an oversight in f6517779a7c4 (warning: rename warning message, 2017-08-24).
Thu, 24 Aug 2017 09:12:09 +0200 warning: rename warning message
Boris Feld <boris.feld@octobus.net> [Thu, 24 Aug 2017 09:12:09 +0200] rev 2856
warning: rename warning message divergent has been renamed into contentdivergent. Use their renamed counterpart in warning message for new unstable changesets. Renaming done according to https://www.mercurial-scm.org/wiki/CEDVocabulary
Thu, 24 Aug 2017 09:11:54 +0200 warning: rename bumped warning message
Boris Feld <boris.feld@octobus.net> [Thu, 24 Aug 2017 09:11:54 +0200] rev 2855
warning: rename bumped warning message bumped has been renamed into phasedivergent. Update the warning message when new phasedivergent changesets are detected. Renaming done according to https://www.mercurial-scm.org/wiki/CEDVocabulary
Thu, 24 Aug 2017 09:11:06 +0200 warning: rename unstable warning message
Boris Feld <boris.feld@octobus.net> [Thu, 24 Aug 2017 09:11:06 +0200] rev 2854
warning: rename unstable warning message unstable has been renamed into orphan. Update the warning message when new orphan changesets are detected. Renaming done according to https://www.mercurial-scm.org/wiki/CEDVocabulary
Wed, 23 Aug 2017 23:44:36 +0200 merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 23 Aug 2017 23:44:36 +0200] rev 2853
merge with stable
Mon, 21 Aug 2017 14:21:49 +0200 test: fix output of test-discovery-obshashrange.t stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 21 Aug 2017 14:21:49 +0200] rev 2852
test: fix output of test-discovery-obshashrange.t The username is now quoted in the output.
Tue, 22 Aug 2017 10:59:19 -0700 obscache: use _readmarkers() from core with correct signature
Martin von Zweigbergk <martinvonz@google.com> [Tue, 22 Aug 2017 10:59:19 -0700] rev 2851
obscache: use _readmarkers() from core with correct signature The copied _readmarkers() went stale with Mercurial core commit 5d3ba4395288 (obsstore: let read marker API take a range of offsets, 2017-06-04). At the same time, the Mercurial core version of the function gained the desired offset argument, so we can now use that function.
Mon, 14 Aug 2017 11:39:06 +0530 topics: take locks and start transaction before calling _changetopics
Pulkit Goyal <7895pulkit@gmail.com> [Mon, 14 Aug 2017 11:39:06 +0530] rev 2850
topics: take locks and start transaction before calling _changetopics This will help us in calling _changetopics in other transactions which already started. Currently the _changetopics creates its own transaction and hence can't be used it a same transaction with any other function or logic.
Mon, 21 Aug 2017 19:44:23 +0200 compat: fix instabilities compat
Boris Feld <boris.feld@octobus.net> [Mon, 21 Aug 2017 19:44:23 +0200] rev 2849
compat: fix instabilities compat We added an instabilities method for old version of Mercurial. But we returned an old value for orphan changesets, the one before the big evolve renaming. Fix the return value to match the new return values.
Mon, 21 Aug 2017 14:21:49 +0200 test: fix output of test-discovery-obshashrange.t
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 21 Aug 2017 14:21:49 +0200] rev 2848
test: fix output of test-discovery-obshashrange.t The username is now quoted in the output.
Fri, 11 Aug 2017 12:20:56 +0200 revset: bumped volatile set was deprecated
Boris Feld <boris.feld@octobus.net> [Fri, 11 Aug 2017 12:20:56 +0200] rev 2847
revset: bumped volatile set was deprecated Use phasedivergent volatile set instead. Match 07a76d4f2297 mercurial changeset.
Fri, 11 Aug 2017 12:12:03 +0200 revset: divergent volatile set was deprecated
Boris Feld <boris.feld@octobus.net> [Fri, 11 Aug 2017 12:12:03 +0200] rev 2846
revset: divergent volatile set was deprecated Use contentdivergent volatile set instead. Match 31c922423f3f mercurial changeset.
Fri, 11 Aug 2017 11:55:07 +0200 revset: unstable volatile set was deprecated
Boris Feld <boris.feld@octobus.net> [Fri, 11 Aug 2017 11:55:07 +0200] rev 2845
revset: unstable volatile set was deprecated Use orphan volatile set instead. Match 5579864798c6 mercurial changeset.
Fri, 11 Aug 2017 11:43:57 +0200 revset: bumped() is deprecated
Boris Feld <boris.feld@octobus.net> [Fri, 11 Aug 2017 11:43:57 +0200] rev 2844
revset: bumped() is deprecated Use phasedivergent() instead. Match bd71c06eb62f mercurial changeset.
Fri, 11 Aug 2017 11:30:34 +0200 revset: divergent() is deprecated
Boris Feld <boris.feld@octobus.net> [Fri, 11 Aug 2017 11:30:34 +0200] rev 2843
revset: divergent() is deprecated Use contentdivergent() instead. Match 4dd4757db73a mercurial changeset.
Fri, 11 Aug 2017 11:23:37 +0200 revset: unstable() is deprecated
Boris Feld <boris.feld@octobus.net> [Fri, 11 Aug 2017 11:23:37 +0200] rev 2842
revset: unstable() is deprecated Use orphan() instead. Match c8c04a2b7bb4 mercurial changeset.
Fri, 11 Aug 2017 10:52:44 +0200 obsolete: allprecursors was deprecated
Boris Feld <boris.feld@octobus.net> [Fri, 11 Aug 2017 10:52:44 +0200] rev 2841
obsolete: allprecursors was deprecated Use allpredecessors instead. Match e6d8ee3c9ec3 mercurial changeset.
Fri, 11 Aug 2017 10:41:11 +0200 context: precursors was deprecated
Boris Feld <boris.feld@octobus.net> [Fri, 11 Aug 2017 10:41:11 +0200] rev 2840
context: precursors was deprecated Use predecessors instead. Match d5acd967f95a mercurial changeset.
Fri, 11 Aug 2017 09:32:23 +0200 context: troubled was deprecated
Boris Feld <boris.feld@octobus.net> [Fri, 11 Aug 2017 09:32:23 +0200] rev 2839
context: troubled was deprecated Use isunstable instead. Match 52c5ff856b49ac8f2a4eadda6dc9dbb070f39a3f mercurial changeset.
Thu, 10 Aug 2017 20:40:57 +0200 context: unstable was deprecated
Boris Feld <boris.feld@octobus.net> [Thu, 10 Aug 2017 20:40:57 +0200] rev 2838
context: unstable was deprecated Use orphan instead. Match f163edb45c47 mercurial changeset.
Thu, 10 Aug 2017 20:31:39 +0200 context: troubles was deprecated
Boris Feld <boris.feld@octobus.net> [Thu, 10 Aug 2017 20:31:39 +0200] rev 2837
context: troubles was deprecated Use instabilities instead. Match ab0c55c2ad9a mercurial changeset.
Thu, 10 Aug 2017 19:31:55 +0200 log: bumped was renamed into phasedivergent
Boris Feld <boris.feld@octobus.net> [Thu, 10 Aug 2017 19:31:55 +0200] rev 2836
log: bumped was renamed into phasedivergent Bumped was renamed into phasedivergent, update tests. Match 9c27a2891b75 mercurial changeset.
Thu, 10 Aug 2017 17:57:50 +0200 log: divergent was renamed into contentdivergent
Boris Feld <boris.feld@octobus.net> [Thu, 10 Aug 2017 17:57:50 +0200] rev 2835
log: divergent was renamed into contentdivergent Divergent was renamed into contentdivergent, update tests. Match 2194a8723138 mercurial changeset.
Thu, 10 Aug 2017 17:37:31 +0200 log: unstable was renamed into orphan
Boris Feld <boris.feld@octobus.net> [Thu, 10 Aug 2017 17:37:31 +0200] rev 2834
log: unstable was renamed into orphan Unstable was renamed into orphan, update tests. Match 03039ff3082b mercurial changeset.
Thu, 10 Aug 2017 17:31:23 +0200 log: trouble was renamed into instability
Boris Feld <boris.feld@octobus.net> [Thu, 10 Aug 2017 17:31:23 +0200] rev 2833
log: trouble was renamed into instability Trouble was renamed into instability, update tests. Match 6f4bc9688ca9 mercurial changeset.
Wed, 09 Aug 2017 16:01:20 +0200 output: update obsfate / obslog output order
Boris Feld <boris.feld@octobus.net> [Wed, 09 Aug 2017 16:01:20 +0200] rev 2832
output: update obsfate / obslog output order Always display successors after the verb. So instead of "rewritten by boris as X", display "rewritten as X by boris".
Wed, 09 Aug 2017 13:21:44 +0200 branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 09 Aug 2017 13:21:44 +0200] rev 2831
branching: merge with stable
Fri, 30 Sep 2016 18:23:04 +0200 doc: add part about exchanging drafts in topic tutorial stable
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 30 Sep 2016 18:23:04 +0200] rev 2830
doc: add part about exchanging drafts in topic tutorial
Fri, 30 Sep 2016 18:22:30 +0200 doc: add stack part in topic tutorial stable
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 30 Sep 2016 18:22:30 +0200] rev 2829
doc: add stack part in topic tutorial
Wed, 09 Aug 2017 12:52:06 +0200 test: setup python path for topic tests stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Wed, 09 Aug 2017 12:52:06 +0200] rev 2828
test: setup python path for topic tests This make thing simpler and clearer.
Thu, 27 Jul 2017 17:38:37 +0200 doc: various improvements on topic tutorial stable
Boris Feld <boris.feld@octobus.net> [Thu, 27 Jul 2017 17:38:37 +0200] rev 2827
doc: various improvements on topic tutorial
Thu, 27 Jul 2017 17:22:44 +0200 doc: various little improvements for rst export stable
Boris Feld <boris.feld@octobus.net> [Thu, 27 Jul 2017 17:22:44 +0200] rev 2826
doc: various little improvements for rst export
Thu, 27 Jul 2017 17:16:02 +0200 doc: fix test2rst stable
Boris Feld <boris.feld@octobus.net> [Thu, 27 Jul 2017 17:16:02 +0200] rev 2825
doc: fix test2rst Previous versions used to break on multi-lines texts and miss entirely single lines of texts. Use a simplest version without regex.
Thu, 27 Jul 2017 11:39:51 +0200 docs: move the topic tutorial in the documentation stable
Boris Feld <boris.feld@octobus.net> [Thu, 27 Jul 2017 11:39:51 +0200] rev 2824
docs: move the topic tutorial in the documentation
Mon, 24 Jul 2017 16:55:56 +0200 test: fix typo in the topic tutorial stable
Boris Feld <boris.feld@octobus.net> [Mon, 24 Jul 2017 16:55:56 +0200] rev 2823
test: fix typo in the topic tutorial
Mon, 24 Jul 2017 16:44:37 +0200 test: fix typos in evolve tutorial stable
Boris Feld <boris.feld@octobus.net> [Mon, 24 Jul 2017 16:44:37 +0200] rev 2822
test: fix typos in evolve tutorial
Tue, 25 Jul 2017 20:16:33 +0200 topic: fix extension version variable stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 25 Jul 2017 20:16:33 +0200] rev 2821
topic: fix extension version variable For some reason, this variable use '__xxx__'.
Tue, 25 Jul 2017 16:58:31 +0200 branching: merge with stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 25 Jul 2017 16:58:31 +0200] rev 2820
branching: merge with stable
Tue, 25 Jul 2017 16:58:04 +0200 branching: merge with other stable head stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 25 Jul 2017 16:58:04 +0200] rev 2819
branching: merge with other stable head
Tue, 25 Jul 2017 16:56:27 +0200 debian: add a 6.6.0-1 changelog entry stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 25 Jul 2017 16:56:27 +0200] rev 2818
debian: add a 6.6.0-1 changelog entry I forgot to do so while building the version :-/
Tue, 25 Jul 2017 16:55:27 +0200 debian: fix 6.5.0-1 changelog entry stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 25 Jul 2017 16:55:27 +0200] rev 2817
debian: fix 6.5.0-1 changelog entry
Tue, 25 Jul 2017 16:36:58 +0200 packaging: update version to .dev
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 25 Jul 2017 16:36:58 +0200] rev 2816
packaging: update version to .dev This avoid misleading version number when investigating.
Tue, 25 Jul 2017 16:35:40 +0200 branching: merge back with stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 25 Jul 2017 16:35:40 +0200] rev 2815
branching: merge back with stable
Tue, 25 Jul 2017 16:30:44 +0200 packaging: mark the stable branch as bugfix version in development stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 25 Jul 2017 16:30:44 +0200] rev 2814
packaging: mark the stable branch as bugfix version in development
Tue, 25 Jul 2017 16:24:08 +0200 Added tag 6.6.0 for changeset cc3e09e033a3 stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 25 Jul 2017 16:24:08 +0200] rev 2813
Added tag 6.6.0 for changeset cc3e09e033a3
Tue, 25 Jul 2017 15:18:24 +0200 test-compat: merge with mercurial-3.9 mercurial-3.8
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 25 Jul 2017 15:18:24 +0200] rev 2812
test-compat: merge with mercurial-3.9
Tue, 25 Jul 2017 15:18:09 +0200 test-compat: merge with mercurial-4.0 mercurial-3.9
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 25 Jul 2017 15:18:09 +0200] rev 2811
test-compat: merge with mercurial-4.0
Tue, 25 Jul 2017 15:17:52 +0200 test-compat: merge with mercurial-4.1 mercurial-4.0
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 25 Jul 2017 15:17:52 +0200] rev 2810
test-compat: merge with mercurial-4.1
Tue, 25 Jul 2017 15:17:42 +0200 test-compat: merge with mercurial-4.2 mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 25 Jul 2017 15:17:42 +0200] rev 2809
test-compat: merge with mercurial-4.2
Tue, 25 Jul 2017 15:17:17 +0200 test-compat: merge with stable mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 25 Jul 2017 15:17:17 +0200] rev 2808
test-compat: merge with stable
Tue, 25 Jul 2017 15:15:42 +0200 packaging: prepare version 6.6.0 stable 6.6.0
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 25 Jul 2017 15:15:42 +0200] rev 2807
packaging: prepare version 6.6.0
Tue, 25 Jul 2017 15:08:05 +0200 readme: mention the documentation update stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 25 Jul 2017 15:08:05 +0200] rev 2806
readme: mention the documentation update
Sun, 23 Jul 2017 13:30:28 +0900 topic: make command names valid as expected, even if ui.strict=true stable
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Sun, 23 Jul 2017 13:30:28 +0900] rev 2805
topic: make command names valid as expected, even if ui.strict=true Before this patch, "hg topics" and "hg stack" cause unintentional "unknown command" failure, if ui.strict=true. In such case, "topics [TOPIC]" and "stack [TOPIC]" are required as a canonical name, because synopsis-like string is used as command name pattern of @command annotation for them. This patch also specifies additional "synopsis" for @command annotation, for intentional output in online help of these commands.
Tue, 25 Jul 2017 14:56:52 +0200 readme: mention the work on API deprecated in 4.3 stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 25 Jul 2017 14:56:52 +0200] rev 2804
readme: mention the work on API deprecated in 4.3
Tue, 25 Jul 2017 14:55:24 +0200 next: use the utility to retrieve the current topic stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 25 Jul 2017 14:55:24 +0200] rev 2803
next: use the utility to retrieve the current topic
Tue, 25 Jul 2017 04:02:16 +0200 test-compat: merge with mercurial-3.9 mercurial-3.8
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 25 Jul 2017 04:02:16 +0200] rev 2802
test-compat: merge with mercurial-3.9
Tue, 25 Jul 2017 04:01:10 +0200 test-compat: merge with mercurial-4.0 mercurial-3.9
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 25 Jul 2017 04:01:10 +0200] rev 2801
test-compat: merge with mercurial-4.0
Tue, 25 Jul 2017 04:00:17 +0200 test-compat: merge with mercurial-4.1 mercurial-4.0
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 25 Jul 2017 04:00:17 +0200] rev 2800
test-compat: merge with mercurial-4.1
Tue, 25 Jul 2017 03:59:22 +0200 test-compat: merge with mercurial-4.2 mercurial-4.1
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 25 Jul 2017 03:59:22 +0200] rev 2799
test-compat: merge with mercurial-4.2
Tue, 25 Jul 2017 03:41:15 +0200 test-compat: merge mercurial-4.2 with the new stable branch content mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 25 Jul 2017 03:41:15 +0200] rev 2798
test-compat: merge mercurial-4.2 with the new stable branch content
Tue, 25 Jul 2017 05:52:14 +0200 branching: default into stable stable
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 25 Jul 2017 05:52:14 +0200] rev 2797
branching: default into stable It is time for a new release
Tue, 25 Jul 2017 05:51:44 +0200 compat: handle pre-4.2 compatibility for accessing vfs
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 25 Jul 2017 05:51:44 +0200] rev 2796
compat: handle pre-4.2 compatibility for accessing vfs The vfs module is quite new.
Tue, 25 Jul 2017 05:14:37 +0200 compat: avoid using configoveride
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 25 Jul 2017 05:14:37 +0200] rev 2795
compat: avoid using configoveride This not supported before mercurial 4.1.
Tue, 25 Jul 2017 04:19:55 +0200 compat: use old style method to update bookmark
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 25 Jul 2017 04:19:55 +0200] rev 2794
compat: use old style method to update bookmark The '_del' and '_set' method are new additions in 4.3 we should not use them in the compatibility layers.
Tue, 25 Jul 2017 04:16:00 +0200 topic: wrap 'update' in a more flexible way
Pierre-Yves David <pierre-yves.david@octobus.net> [Tue, 25 Jul 2017 04:16:00 +0200] rev 2793
topic: wrap 'update' in a more flexible way This ensure compatibility with mercurial 4.1 and below
Fri, 21 Jul 2017 20:53:30 +0200 branching: open the mercurial 4.2 compatibility branch mercurial-4.2
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 21 Jul 2017 20:53:30 +0200] rev 2792
branching: open the mercurial 4.2 compatibility branch The freeze as started.
Mon, 24 Jul 2017 05:50:43 +0200 readme: add an entry about the unified message
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 24 Jul 2017 05:50:43 +0200] rev 2791
readme: add an entry about the unified message
Sun, 23 Jul 2017 21:21:16 +0200 touch: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 23 Jul 2017 21:21:16 +0200] rev 2790
touch: use precheck to validate revision This gives us standard check and standard error message.
Sun, 23 Jul 2017 21:21:11 +0200 prune: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 23 Jul 2017 21:21:11 +0200] rev 2789
prune: use precheck to validate revision This gives us standard check and standard error message.
Mon, 24 Jul 2017 01:45:17 +0200 uncommit: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 24 Jul 2017 01:45:17 +0200] rev 2788
uncommit: use precheck to validate revision This gives us standard check and standard error message.
Sun, 23 Jul 2017 21:20:46 +0200 amend: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 23 Jul 2017 21:20:46 +0200] rev 2787
amend: use precheck to validate revision This gives us standard check and standard error message.
Sun, 23 Jul 2017 20:33:19 +0200 split: use precheck to validate revision
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 23 Jul 2017 20:33:19 +0200] rev 2786
split: use precheck to validate revision This gives us standard check and standard error message.
Mon, 24 Jul 2017 01:45:03 +0200 precheck: handle rewrite attempt of nullrev
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 24 Jul 2017 01:45:03 +0200] rev 2785
precheck: handle rewrite attempt of nullrev This is a common breaking case, so we handle and test it in the generic code.
Sun, 23 Jul 2017 19:45:28 +0200 precheck: update the orphan message to something me generic
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 23 Jul 2017 19:45:28 +0200] rev 2784
precheck: update the orphan message to something me generic This will help to reuse it for other commands.
Sun, 23 Jul 2017 19:53:51 +0200 precheck: point to the instability doc when aborting
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 23 Jul 2017 19:53:51 +0200] rev 2783
precheck: point to the instability doc when aborting This will help user to understand what is going on.
Sun, 23 Jul 2017 19:52:06 +0200 evolve: document the various instability/troubles
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 23 Jul 2017 19:52:06 +0200] rev 2782
evolve: document the various instability/troubles We need something to point people at.
Sun, 23 Jul 2017 19:37:29 +0200 precheck: also check for unstability creation
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 23 Jul 2017 19:37:29 +0200] rev 2781
precheck: also check for unstability creation
Mon, 24 Jul 2017 03:04:20 +0200 prefetc: point at the offending changeset when aborting
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 24 Jul 2017 03:04:20 +0200] rev 2780
prefetc: point at the offending changeset when aborting We do our best to display comptact but usable information.
Mon, 24 Jul 2017 02:06:14 +0200 precheck: point to 'phase' help when aborting
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 24 Jul 2017 02:06:14 +0200] rev 2779
precheck: point to 'phase' help when aborting some of the error message already does that. It seems a good idea.
Mon, 24 Jul 2017 01:04:40 +0200 precheck: use 'changesets' in the message instead of 'revisions'
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 24 Jul 2017 01:04:40 +0200] rev 2778
precheck: use 'changesets' in the message instead of 'revisions' This match the message `hg commit --amend` issue in core.
Sun, 23 Jul 2017 19:35:36 +0200 rewriteutil: add a precheck function to validate rewrite beforehand
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 23 Jul 2017 19:35:36 +0200] rev 2777
rewriteutil: add a precheck function to validate rewrite beforehand For now this only checks for changeset mutability and this is only used by 'checkfold'. We'll expand the checking and usage as we go.
Mon, 24 Jul 2017 04:41:31 +0200 test: remove reference to the graphlog extension
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 24 Jul 2017 04:41:31 +0200] rev 2776
test: remove reference to the graphlog extension The feature is in core for ages.
Mon, 24 Jul 2017 00:11:02 +0200 test: use common setup for test-split.t
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 24 Jul 2017 00:11:02 +0200] rev 2775
test: use common setup for test-split.t This make things cleaner.
Mon, 24 Jul 2017 00:01:10 +0200 split: compute revision to split after locking
Pierre-Yves David <pierre-yves.david@octobus.net> [Mon, 24 Jul 2017 00:01:10 +0200] rev 2774
split: compute revision to split after locking This would avoid strange behavior from race condition.
Sun, 23 Jul 2017 20:25:26 +0200 split: basic code cleanup
Pierre-Yves David <pierre-yves.david@octobus.net> [Sun, 23 Jul 2017 20:25:26 +0200] rev 2773
split: basic code cleanup We remove a useless extra variable since another one already hold the same value.
(0) -3000 -1000 -480 +480 +1000 tip