Patchwork [1,of,5] devel: officially deprecate old style revset

login
register
mail settings
Submitter Pierre-Yves David
Date May 11, 2016, 7:38 a.m.
Message ID <d350afe79ad882326928.1462952329@nodosa.octopoid.net>
Download mbox | patch
Permalink /patch/15012/
State Accepted
Commit b175d9cc3ee8f8ec5a441dd683d8ddf51ba5bf1b
Headers show

Comments

Pierre-Yves David - May 11, 2016, 7:38 a.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Date 1462951907 -7200
#      Wed May 11 09:31:47 2016 +0200
# Node ID d350afe79ad8823269282253f749c857d8f5e113
# Parent  3fd94f603190e50690e654fc211ba9801ff2c457
# EXP-Topic deprecate
devel: officially deprecate old style revset

When we introduce the develwarning, we did not had an official deprecation API
and infrastructure. We can now officially deprecate the old way with a version
deadline.
timeless - May 11, 2016, 11:03 a.m.
On Wed, May 11, 2016 at 3:38 AM, Pierre-Yves David
<pierre-yves.david@ens-lyon.org> wrote:
> When we introduce the develwarning, we did not had an official deprecation API

When we introduced develwarning, we did not have an official deprecation API
Pierre-Yves David - May 11, 2016, 12:03 p.m.
On 05/11/2016 01:03 PM, timeless wrote:
> On Wed, May 11, 2016 at 3:38 AM, Pierre-Yves David
> <pierre-yves.david@ens-lyon.org> wrote:
>> When we introduce the develwarning, we did not had an official deprecation API
> When we introduced develwarning, we did not have an official deprecation API
Sure, can this be fixed in flight?
timeless - May 11, 2016, 12:16 p.m.
The same sort of fixes should be done for more than one commit message
in the series. And I'm not crew, so I can't do it :)

On Wed, May 11, 2016 at 8:03 AM, Pierre-Yves David
<pierre-yves.david@ens-lyon.org> wrote:
> On 05/11/2016 01:03 PM, timeless wrote:
>>
>> On Wed, May 11, 2016 at 3:38 AM, Pierre-Yves David
>> <pierre-yves.david@ens-lyon.org> wrote:
>>>
>>> When we introduce the develwarning, we did not had an official
>>> deprecation API
>>
>> When we introduced develwarning, we did not have an official deprecation
>> API
>
> Sure, can this be fixed in flight?

Patch

diff -r 3fd94f603190 -r d350afe79ad8 mercurial/revset.py
--- a/mercurial/revset.py	Sun May 08 10:43:41 2016 +0200
+++ b/mercurial/revset.py	Wed May 11 09:31:47 2016 +0200
@@ -333,9 +333,9 @@  def getset(repo, subset, x):
     # else case should not happen, because all non-func are internal,
     # ignoring for now.
     if x[0] == 'func' and x[1][0] == 'symbol' and x[1][1] in symbols:
-        repo.ui.develwarn('revset "%s" use list instead of smartset, '
-                          '(upgrade your code)' % x[1][1],
-                          config='old-revset')
+        repo.ui.deprecwarn('revset "%s" use list instead of smartset'
+                           % x[1][1],
+                           '3.9')
     return baseset(s)
 
 def _getrevsource(repo, r):
diff -r 3fd94f603190 -r d350afe79ad8 tests/test-devel-warnings.t
--- a/tests/test-devel-warnings.t	Sun May 08 10:43:41 2016 +0200
+++ b/tests/test-devel-warnings.t	Wed May 11 09:31:47 2016 +0200
@@ -122,7 +122,8 @@ 
   [255]
 
   $ hg log -r "oldstyle()" -T '{rev}\n'
-  devel-warn: revset "oldstyle" use list instead of smartset, (upgrade your code) at: */mercurial/revset.py:* (mfunc) (glob)
+  devel-warn: revset "oldstyle" use list instead of smartset
+  (compatibility will be dropped after Mercurial-3.9, update your code.) at: *mercurial/revset.py:* (mfunc) (glob)
   0
   $ hg oldanddeprecated
   devel-warn: foorbar is deprecated, go shopping
@@ -143,7 +144,8 @@ 
    */mercurial/util.py:* in check (glob)
    $TESTTMP/buggylocking.py:* in oldanddeprecated (glob)
   $ hg blackbox -l 9
-  1970/01/01 00:00:00 bob @cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b (5000)> devel-warn: revset "oldstyle" use list instead of smartset, (upgrade your code) at: */mercurial/revset.py:* (mfunc) (glob)
+  1970/01/01 00:00:00 bob @cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b (5000)> devel-warn: revset "oldstyle" use list instead of smartset
+  (compatibility will be dropped after Mercurial-3.9, update your code.) at: *mercurial/revset.py:* (mfunc) (glob)
   1970/01/01 00:00:00 bob @cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b (5000)> log -r oldstyle() -T {rev}\n exited 0 after * seconds (glob)
   1970/01/01 00:00:00 bob @cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b (5000)> oldanddeprecated
   1970/01/01 00:00:00 bob @cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b (5000)> devel-warn: foorbar is deprecated, go shopping