Mercurial > hg

changeset 51631:bf1d26bd5b6a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
obsolete: quote the feature name This makes it at least somewhat clearer that hg is talking about some specific feature and not just outdated code.
author Joerg Sonnenberger <joerg@bec.de>
date Mon, 10 Jun 2024 13:45:57 +0200
parents 513597087b89
children 9c668377aa9f
files i18n/ja.po i18n/pt_BR.po mercurial/obsolete.py setup.py tests/test-phabricator.t
diffstat 5 files changed, 21 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/i18n/ja.po	Mon Jun 10 12:12:56 2024 +0200
+++ b/i18n/ja.po	Mon Jun 10 13:45:57 2024 +0200
@@ -34780,8 +34780,8 @@
 msgstr "廃止マーカの作成機能は無効化されています"
 
 #, python-format
-msgid "obsolete feature not enabled but %i markers found!\n"
-msgstr "obsolete 機能は無効ですが、 %i 個の廃止情報マーカが存在します!\n"
+msgid "\"obsolete\" feature not enabled but %i markers found!\n"
+msgstr "\"obsolete\" 機能は無効ですが、 %i 個の廃止情報マーカが存在します!\n"
 
 #, python-format
 msgid "unknown key: %r"
--- a/i18n/pt_BR.po	Mon Jun 10 12:12:56 2024 +0200
+++ b/i18n/pt_BR.po	Mon Jun 10 13:45:57 2024 +0200
@@ -36049,9 +36049,9 @@
 "repositório"
 
 #, python-format
-msgid "obsolete feature not enabled but %i markers found!\n"
-msgstr ""
-"a funcionalidade obsolete não está habilitada, mas foram encontradas %i "
+msgid "\"obsolete\" feature not enabled but %i markers found!\n"
+msgstr ""
+"a funcionalidade \"obsolete\" não está habilitada, mas foram encontradas %i "
 "marcações!\n"
 
 #, python-format
--- a/mercurial/obsolete.py	Mon Jun 10 12:12:56 2024 +0200
+++ b/mercurial/obsolete.py	Mon Jun 10 13:45:57 2024 +0200
@@ -818,7 +818,7 @@
     store = obsstore(repo, repo.svfs, readonly=readonly, **kwargs)
     if store and readonly:
         ui.warn(
-            _(b'obsolete feature not enabled but %i markers found!\n')
+            _(b'"obsolete" feature not enabled but %i markers found!\n')
             % len(list(store))
         )
     return store
--- a/setup.py	Mon Jun 10 12:12:56 2024 +0200
+++ b/setup.py	Mon Jun 10 13:45:57 2024 +0200
@@ -252,7 +252,10 @@
         if (
             not e.startswith(b'not trusting file')
             and not e.startswith(b'warning: Not importing')
-            and not e.startswith(b'obsolete feature not enabled')
+            and not (
+                e.startswith(b'obsolete feature not enabled')
+                or e.startswith(b'"obsolete" feature not enabled')
+            )
             and not e.startswith(b'*** failed to import extension')
             and not e.startswith(b'devel-warn:')
             and not (
--- a/tests/test-phabricator.t	Mon Jun 10 12:12:56 2024 +0200
+++ b/tests/test-phabricator.t	Mon Jun 10 13:45:57 2024 +0200
@@ -730,7 +730,7 @@
   $ hg amend --config experimental.evolution=all --config extensions.amend=
   1 new orphan changesets
   $ hg up 3
-  obsolete feature not enabled but 1 markers found!
+  "obsolete" feature not enabled but 1 markers found!
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg rebase --config experimental.evolution=all --config extensions.rebase=
   note: not rebasing 2:832553266fe8 "two: second commit to review", already in destination as 4:0124e5474c88 tip "two: second commit to review"
@@ -741,7 +741,7 @@
 
   $ echo y | hg phabsend --fold --confirm -r 1:: \
   >          --test-vcr "$VCR/phabsend-fold-updated.json"
-  obsolete feature not enabled but 2 markers found!
+  "obsolete" feature not enabled but 2 markers found!
   602c4e738243 mapped to old nodes ['602c4e738243']
   0124e5474c88 mapped to old nodes ['832553266fe8']
   e4edb1fe3565 mapped to old nodes ['921f8265efbd']
@@ -752,11 +752,11 @@
   D8387 - updated - 1:602c4e738243 "one: first commit to review"
   D8387 - updated - 4:0124e5474c88 "two: second commit to review"
   D8387 - updated - 5:e4edb1fe3565 tip "3: a commit with no detailed message"
-  obsolete feature not enabled but 2 markers found! (?)
+  "obsolete" feature not enabled but 2 markers found! (?)
   updating local commit list for D8387
   new commits: ['602c4e738243', '0124e5474c88', 'e4edb1fe3565']
   $ hg log -Tcompact
-  obsolete feature not enabled but 2 markers found!
+  "obsolete" feature not enabled but 2 markers found!
   5[tip]   e4edb1fe3565   1970-01-01 00:00 +0000   test
     3: a commit with no detailed message
   
@@ -773,17 +773,17 @@
 updated, and nothing is changed locally afterward.
 
   $ hg phabsend --fold -r 1:: --test-vcr "$VCR/phabsend-fold-no-changes.json"
-  obsolete feature not enabled but 2 markers found!
+  "obsolete" feature not enabled but 2 markers found!
   602c4e738243 mapped to old nodes ['602c4e738243']
   0124e5474c88 mapped to old nodes ['0124e5474c88']
   e4edb1fe3565 mapped to old nodes ['e4edb1fe3565']
   D8387 - updated - 1:602c4e738243 "one: first commit to review"
   D8387 - updated - 4:0124e5474c88 "two: second commit to review"
   D8387 - updated - 5:e4edb1fe3565 tip "3: a commit with no detailed message"
-  obsolete feature not enabled but 2 markers found! (?)
+  "obsolete" feature not enabled but 2 markers found! (?)
   local commit list for D8387 is already up-to-date
   $ hg log -Tcompact
-  obsolete feature not enabled but 2 markers found!
+  "obsolete" feature not enabled but 2 markers found!
   5[tip]   e4edb1fe3565   1970-01-01 00:00 +0000   test
     3: a commit with no detailed message
   
@@ -800,7 +800,7 @@
 
   $ echo 'another mod' > file2.txt
   $ hg ci -m 'four: extend the fold range'
-  obsolete feature not enabled but 2 markers found!
+  "obsolete" feature not enabled but 2 markers found!
   $ hg phabsend --fold -r 1:: --test-vcr "$VCR/phabsend-fold-extend-end.json" \
   >             --config experimental.evolution=all
   602c4e738243 mapped to old nodes ['602c4e738243']
@@ -817,7 +817,7 @@
   
   Differential Revision: https://phab.mercurial-scm.org/D8387
   $ hg log -T'{rev} {if(phabreview, "{phabreview.url} {phabreview.id}")}\n' -r 1::
-  obsolete feature not enabled but 3 markers found!
+  "obsolete" feature not enabled but 3 markers found!
   1 https://phab.mercurial-scm.org/D8387 D8387
   4 https://phab.mercurial-scm.org/D8387 D8387
   5 https://phab.mercurial-scm.org/D8387 D8387
@@ -846,7 +846,7 @@
   new commits: ['15e9b14b4b4c', '6320b7d714cf', '3ee132d41dbc', '30682b960804', 'ac7db67f0991']
 
   $ hg log -T '{rev}:{node|short}\n{indent(desc, "  ")}\n'
-  obsolete feature not enabled but 8 markers found!
+  "obsolete" feature not enabled but 8 markers found!
   12:ac7db67f0991
     four: extend the fold range
   
@@ -962,7 +962,7 @@
   new commits: ['15e9b14b4b4c', '6320b7d714cf', '3ee132d41dbc', '30682b960804', 'e919cdf3d4fe']
 
   $ hg log -r tip -v
-  obsolete feature not enabled but 12 markers found!
+  "obsolete" feature not enabled but 12 markers found!
   changeset:   16:e919cdf3d4fe
   tag:         tip
   parent:      11:30682b960804