Patchwork D8759: status: match category text in the option description

login
register
mail settings
Submitter phabricator
Date July 16, 2020, 1:57 p.m.
Message ID <differential-rev-PHID-DREV-jwmawbww6l45pfpkyzlw-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/46765/
State Superseded
Headers show

Comments

phabricator - July 16, 2020, 1:57 p.m.
joerg.sonnenberger created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  The ! category in the main status help text is defined as "missing", so
  use the same text for the help text of --delete.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D8759

AFFECTED FILES
  mercurial/commands.py
  tests/test-alias.t
  tests/test-help.t

CHANGE DETAILS




To: joerg.sonnenberger, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/tests/test-help.t b/tests/test-help.t
--- a/tests/test-help.t
+++ b/tests/test-help.t
@@ -730,7 +730,7 @@ 
    -m --modified            show only modified files
    -a --added               show only added files
    -r --removed             show only removed files
-   -d --deleted             show only deleted (but tracked) files
+   -d --deleted             show only missing files
    -c --clean               show only files without changes
    -u --unknown             show only unknown (not tracked) files
    -i --ignored             show only ignored files
diff --git a/tests/test-alias.t b/tests/test-alias.t
--- a/tests/test-alias.t
+++ b/tests/test-alias.t
@@ -182,7 +182,7 @@ 
    -m --modified            show only modified files
    -a --added               show only added files
    -r --removed             show only removed files
-   -d --deleted             show only deleted (but tracked) files
+   -d --deleted             show only missing files
    -c --clean               show only files without changes
    -u --unknown             show only unknown (not tracked) files
    -i --ignored             show only ignored files
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -6662,7 +6662,7 @@ 
         (b'm', b'modified', None, _(b'show only modified files')),
         (b'a', b'added', None, _(b'show only added files')),
         (b'r', b'removed', None, _(b'show only removed files')),
-        (b'd', b'deleted', None, _(b'show only deleted (but tracked) files')),
+        (b'd', b'deleted', None, _(b'show only missing files')),
         (b'c', b'clean', None, _(b'show only files without changes')),
         (b'u', b'unknown', None, _(b'show only unknown (not tracked) files')),
         (b'i', b'ignored', None, _(b'show only ignored files')),