Patchwork D9563: diff: update synopsis to use --from/--to instead of -r

login
register
mail settings
Submitter phabricator
Date Dec. 10, 2020, 11:01 p.m.
Message ID <differential-rev-PHID-DREV-3lqp46gped5tqtxt5m6n-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/47861/
State Superseded
Headers show

Comments

phabricator - Dec. 10, 2020, 11:01 p.m.
martinvonz created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

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

CHANGE DETAILS




To: martinvonz, #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
@@ -629,7 +629,7 @@ 
   (some details hidden, use --verbose to show complete help)
 
   $ hg help diff
-  hg diff [OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...
+  hg diff [OPTION]... ([-c REV] | [--from REV1] [--to REV2]) [FILE]...
   
   diff repository (or selected files)
   
@@ -666,8 +666,8 @@ 
   options ([+] can be repeated):
   
    -r --rev REV [+]         revision
-      --from REV            revision to diff from
-      --to REV              revision to diff to
+      --from REV1           revision to diff from
+      --to REV2             revision to diff to
    -c --change REV          change made by revision
    -a --text                treat all files as text
    -g --git                 use git extended diff format
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -2456,15 +2456,15 @@ 
     b'diff',
     [
         (b'r', b'rev', [], _(b'revision'), _(b'REV')),
-        (b'', b'from', b'', _(b'revision to diff from'), _(b'REV')),
-        (b'', b'to', b'', _(b'revision to diff to'), _(b'REV')),
+        (b'', b'from', b'', _(b'revision to diff from'), _(b'REV1')),
+        (b'', b'to', b'', _(b'revision to diff to'), _(b'REV2')),
         (b'c', b'change', b'', _(b'change made by revision'), _(b'REV')),
     ]
     + diffopts
     + diffopts2
     + walkopts
     + subrepoopts,
-    _(b'[OPTION]... ([-c REV] | [-r REV1 [-r REV2]]) [FILE]...'),
+    _(b'[OPTION]... ([-c REV] | [--from REV1] [--to REV2]) [FILE]...'),
     helpcategory=command.CATEGORY_FILE_CONTENTS,
     helpbasic=True,
     inferrepo=True,