graft: clarify in help that `-r` is not just optional
authorMads Kiilerich <madski@unity3d.com>
Sun, 17 Jan 2016 19:33:02 +0100
changeset 27898 2cc44efcb7cf
parent 27897 2fdbf22a1b63
child 27899 78b9fdb844c1
graft: clarify in help that `-r` is not just optional Positional parameters are also treated as revisions, but the order of revisions matters and it will often be wrong if the user understands it as `-r` taking multiple revisions as `-r REV1 REV2`. (Alternatively, `-r` could be turned into a no-op flag as the documentation suggests. That would however be less "semantic markup" and I agree with the implementation in 55e7f352b1d3 but not the documentation.)
mercurial/commands.py
--- a/mercurial/commands.py	Thu Jan 14 13:44:01 2016 -0800
+++ b/mercurial/commands.py	Sun Jan 17 19:33:02 2016 +0100
@@ -3823,7 +3823,7 @@
      ('U', 'currentuser', False,
       _('record the current user as committer'), _('DATE'))]
     + commitopts2 + mergetoolopts  + dryrunopts,
-    _('[OPTION]... [-r] REV...'))
+    _('[OPTION]... [-r REV]... REV...'))
 def graft(ui, repo, *revs, **opts):
     '''copy changes from other branches onto the current branch