# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1572605649 -25200
# Node ID 5113b38cb6778b5aa6229a9c06d3653ae5dfe6a9
# Parent  fcefc052a3b10aa4e41e4109c3848c18c88a8ebd
evolve: use more often seen metavariables in command synopsis strings

Also use ellipsis when multiple options are acceptable.

diff -r fcefc052a3b1 -r 5113b38cb677 hgext3rd/evolve/cmdrewrite.py
--- a/hgext3rd/evolve/cmdrewrite.py	Fri Nov 01 17:52:43 2019 +0700
+++ b/hgext3rd/evolve/cmdrewrite.py	Fri Nov 01 17:54:09 2019 +0700
@@ -454,7 +454,7 @@
      (b'', b'revert', False, _(b'discard working directory changes after uncommit')),
      (b'n', b'note', b'', _(b'store a note on uncommit'), _(b'TEXT')),
      ] + commands.walkopts + commitopts + commitopts2 + commitopts3,
-    _(b'[OPTION]... [NAME]'))
+    _(b'[OPTION]... [FILE]...'))
 def uncommit(ui, repo, *pats, **opts):
     """move changes from parent revision to working directory
 
@@ -689,7 +689,7 @@
      (b'', b'from', None, _(b"fold revisions linearly to working copy parent")),
      (b'n', b'note', b'', _(b'store a note on fold'), _(b'TEXT')),
      ] + commitopts + commitopts2 + commitopts3,
-    _(b'hg fold [OPTION]... [-r] REV'),
+    _(b'hg fold [OPTION]... [-r] REV...'),
     helpbasic=True)
 def fold(ui, repo, *revs, **opts):
     """fold multiple revisions into a single one
@@ -820,7 +820,7 @@
      (b'', b'fold', None, _(b"also fold specified revisions into one")),
      (b'n', b'note', b'', _(b'store a note on metaedit'), _(b'TEXT')),
      ] + commitopts + commitopts2 + commitopts3,
-    _(b'hg metaedit [OPTION]... [-r] [REV]'))
+    _(b'hg metaedit [OPTION]... [[-r] REV]...'))
 def metaedit(ui, repo, *revs, **opts):
     """edit commit information
 
@@ -977,7 +977,7 @@
       _(b"record a split (one precursor, multiple successors)")),
      (b'B', b'bookmark', [], _(b"remove revs only reachable from given"
                                b" bookmark"), _(b'BOOKMARK'))] + metadataopts,
-    _(b'[OPTION] [-r] REV...'),
+    _(b'[OPTION]... [-r] REV...'),
     helpbasic=True)
 # XXX -U  --noupdate option to prevent wc update and or bookmarks update ?
 def cmdprune(ui, repo, *revs, **opts):
@@ -1171,7 +1171,7 @@
      (b'r', b'rev', [], _(b"revision to split"), _(b'REV')),
      (b'n', b'note', b'', _(b"store a note on split"), _(b'TEXT')),
      ] + commitopts + commitopts2 + commitopts3,
-    _(b'hg split [OPTION] [-r REV] [FILES]'),
+    _(b'hg split [OPTION]... [-r REV] [FILE]...'),
     helpbasic=True)
 def cmdsplit(ui, repo, *pats, **opts):
     """split a changeset into smaller changesets
@@ -1347,7 +1347,7 @@
       b'mark the new revision as successor of the old one potentially creating '
       b'divergence')],
     # allow to choose the seed ?
-    _(b'[-r] revs'))
+    _(b'[OPTION]... [-r] REV...'))
 def touch(ui, repo, *revs, **opts):
     """create successors identical to their predecessors but the changeset ID
 
@@ -1448,7 +1448,7 @@
      (b'c', b'continue', False, b'continue interrupted pick'),
      (b'a', b'abort', False, b'abort interrupted pick'),
      ] + mergetoolopts,
-    _(b'[-r] rev'))
+    _(b'[OPTION]... [-r] REV'))
 def cmdpick(ui, repo, *revs, **opts):
     """move a commit on the top of working directory parent and updates to it."""
 
diff -r fcefc052a3b1 -r 5113b38cb677 hgext3rd/evolve/obshistory.py
--- a/hgext3rd/evolve/obshistory.py	Fri Nov 01 17:52:43 2019 +0700
+++ b/hgext3rd/evolve/obshistory.py	Fri Nov 01 17:54:09 2019 +0700
@@ -50,7 +50,7 @@
      (b'p', b'patch', False, _(b'show the patch between two obs versions')),
      (b'f', b'filternonlocal', False, _(b'filter out non local commits')),
      ] + commands.formatteropts,
-    _(b'hg olog [OPTION]... [REV]'))
+    _(b'hg olog [OPTION]... [[-r] REV]...'))
 def cmdobshistory(ui, repo, *revs, **opts):
     """show the obsolescence history of the specified revisions
 
diff -r fcefc052a3b1 -r 5113b38cb677 tests/test-pick.t
--- a/tests/test-pick.t	Fri Nov 01 17:52:43 2019 +0700
+++ b/tests/test-pick.t	Fri Nov 01 17:54:09 2019 +0700
@@ -25,7 +25,7 @@
   $ hg init repo
   $ cd repo
   $ hg help pick
-  hg pick [-r] rev
+  hg pick [OPTION]... [-r] REV
   
   aliases: grab
   
diff -r fcefc052a3b1 -r 5113b38cb677 tests/test-tutorial.t
--- a/tests/test-tutorial.t	Fri Nov 01 17:52:43 2019 +0700
+++ b/tests/test-tutorial.t	Fri Nov 01 17:54:09 2019 +0700
@@ -913,7 +913,7 @@
 of the `uncommit` command to splitting a change.
 
   $ hg help uncommit
-  hg uncommit [OPTION]... [NAME]
+  hg uncommit [OPTION]... [FILE]...
   
   move changes from parent revision to working directory
   
@@ -958,7 +958,7 @@
 The tutorial part is not written yet but can use `hg fold`:
 
   $ hg help fold
-  hg fold [OPTION]... [-r] REV
+  hg fold [OPTION]... [-r] REV...
   
   aliases: squash