Patchwork [2,of,5] devel: fix a typo in a deprecation warning

login
register
mail settings
Submitter Pierre-Yves David
Date May 11, 2016, 7:38 a.m.
Message ID <0dc5ffb53bf7ba1a1aac.1462952330@nodosa.octopoid.net>
Download mbox | patch
Permalink /patch/15011/
State Accepted
Commit ff07da10de4cb08cdd71ecdc72e95a9bbf3079df
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 1462952099 -7200
#      Wed May 11 09:34:59 2016 +0200
# Node ID 0dc5ffb53bf7ba1a1aacbd65cacdc4dfcbf5ee57
# Parent  d350afe79ad8823269282253f749c857d8f5e113
# EXP-Topic deprecate
devel: fix a typo in a deprecation warning

Credit goes to Sean Farley for spotting it.

Patch

diff -r d350afe79ad8 -r 0dc5ffb53bf7 mercurial/revset.py
--- a/mercurial/revset.py	Wed May 11 09:31:47 2016 +0200
+++ b/mercurial/revset.py	Wed May 11 09:34:59 2016 +0200
@@ -333,7 +333,7 @@  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.deprecwarn('revset "%s" use list instead of smartset'
+        repo.ui.deprecwarn('revset "%s" uses list instead of smartset'
                            % x[1][1],
                            '3.9')
     return baseset(s)
diff -r d350afe79ad8 -r 0dc5ffb53bf7 tests/test-devel-warnings.t
--- a/tests/test-devel-warnings.t	Wed May 11 09:31:47 2016 +0200
+++ b/tests/test-devel-warnings.t	Wed May 11 09:34:59 2016 +0200
@@ -122,7 +122,7 @@ 
   [255]
 
   $ hg log -r "oldstyle()" -T '{rev}\n'
-  devel-warn: revset "oldstyle" use list instead of smartset
+  devel-warn: revset "oldstyle" uses list instead of smartset
   (compatibility will be dropped after Mercurial-3.9, update your code.) at: *mercurial/revset.py:* (mfunc) (glob)
   0
   $ hg oldanddeprecated
@@ -144,7 +144,7 @@ 
    */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
+  1970/01/01 00:00:00 bob @cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b (5000)> devel-warn: revset "oldstyle" uses 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