[PATCH 1 of 2 STABLE] rebase: remove second broken synopsis line (issue3172)

Patrick Mezard patrick at mezard.eu
Tue Jul 31 16:48:59 UTC 2012


# HG changeset patch
# User Patrick Mezard <patrick at mezard.eu>
# Date 1343751506 -7200
# Branch stable
# Node ID 5af184293999952aa1ad103d55353dc832c882a0
# Parent  7d2967de2c04489f9ce64308eb39d8a55d66af7c
rebase: remove second broken synopsis line (issue3172)

Displaying multiple synopsis in online help has been broken since Matt
RST refactoring, around ff26712a0c50. Rebase help is apparently the only
one using this trick, just drop the second synopsis and assume people
will understand as with graft help.

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -53,8 +53,7 @@
     ('c', 'continue', False, _('continue an interrupted rebase')),
     ('a', 'abort', False, _('abort an interrupted rebase'))] +
      templateopts,
-    _('hg rebase [-s REV | -b REV] [-d REV] [options]\n'
-      'hg rebase {-a|-c}'))
+    _('[-s REV | -b REV] [-d REV] [OPTION]'))
 def rebase(ui, repo, **opts):
     """move changeset (and descendants) to a different branch
 


More information about the Mercurial-devel mailing list