rebase: correct help text

Show the correct parameters in help text

hgext/rebase.py

@@ -427,15 +427,15 b' cmdtable = {'
 "rebase":
         (rebase,
         [
-        ('', 'keep', False, _('keep original revisions')),
-        ('', 'keepbranches', False, _('keep original branches')),
         ('s', 'source', '', _('rebase from a given revision')),
         ('b', 'base', '', _('rebase from the base of a given revision')),
         ('d', 'dest', '', _('rebase onto a given revision')),
         ('', 'collapse', False, _('collapse the rebased revisions')),
+        ('', 'keep', False, _('keep original revisions')),
+        ('', 'keepbranches', False, _('keep original branches')),
         ('c', 'continue', False, _('continue an interrupted rebase')),
         ('a', 'abort', False, _('abort an interrupted rebase')),] +
          templateopts,
-        _('hg rebase [-s rev | -b rev] [-d rev] [--collapse] | [-c] | [-a] | '
-                                                                '[--keep]')),
+        _('hg rebase [-s rev | -b rev] [-d rev] [--collapse] [--keep] '
+                            '[--keepbranches] | [-c] | [-a]')),
 }

tests/test-rebase-parameters.out

@@ -2,7 +2,7 b''
 
 % Use continue and abort
 hg rebase: cannot use both abort and continue
-hg rebase [-s rev | -b rev] [-d rev] [--collapse] | [-c] | [-a] | [--keep]
+hg rebase [-s rev | -b rev] [-d rev] [--collapse] [--keep] [--keepbranches] | [-c] | [-a]
 
 move changeset (and descendants) to a different branch
 
@@ -15,12 +15,12 b' move changeset (and descendants) to a di'
 
 options:
 
-    --keep          keep original revisions
-    --keepbranches  keep original branches
  -s --source        rebase from a given revision
  -b --base          rebase from the base of a given revision
  -d --dest          rebase onto a given revision
     --collapse      collapse the rebased revisions
+    --keep          keep original revisions
+    --keepbranches  keep original branches
  -c --continue      continue an interrupted rebase
  -a --abort         abort an interrupted rebase
     --style         display using template map file
@@ -30,7 +30,7 b' use "hg -v help rebase" to show global o'
 
 % Use continue and collapse
 hg rebase: cannot use collapse with continue or abort
-hg rebase [-s rev | -b rev] [-d rev] [--collapse] | [-c] | [-a] | [--keep]
+hg rebase [-s rev | -b rev] [-d rev] [--collapse] [--keep] [--keepbranches] | [-c] | [-a]
 
 move changeset (and descendants) to a different branch
 
@@ -43,12 +43,12 b' move changeset (and descendants) to a di'
 
 options:
 
-    --keep          keep original revisions
-    --keepbranches  keep original branches
  -s --source        rebase from a given revision
  -b --base          rebase from the base of a given revision
  -d --dest          rebase onto a given revision
     --collapse      collapse the rebased revisions
+    --keep          keep original revisions
+    --keepbranches  keep original branches
  -c --continue      continue an interrupted rebase
  -a --abort         abort an interrupted rebase
     --style         display using template map file
@@ -58,7 +58,7 b' use "hg -v help rebase" to show global o'
 
 % Use continue/abort and dest/source
 hg rebase: abort and continue do not allow specifying revisions
-hg rebase [-s rev | -b rev] [-d rev] [--collapse] | [-c] | [-a] | [--keep]
+hg rebase [-s rev | -b rev] [-d rev] [--collapse] [--keep] [--keepbranches] | [-c] | [-a]
 
 move changeset (and descendants) to a different branch
 
@@ -71,12 +71,12 b' move changeset (and descendants) to a di'
 
 options:
 
-    --keep          keep original revisions
-    --keepbranches  keep original branches
  -s --source        rebase from a given revision
  -b --base          rebase from the base of a given revision
  -d --dest          rebase onto a given revision
     --collapse      collapse the rebased revisions
+    --keep          keep original revisions
+    --keepbranches  keep original branches
  -c --continue      continue an interrupted rebase
  -a --abort         abort an interrupted rebase
     --style         display using template map file
@@ -86,7 +86,7 b' use "hg -v help rebase" to show global o'
 
 % Use source and base
 hg rebase: cannot specify both a revision and a base
-hg rebase [-s rev | -b rev] [-d rev] [--collapse] | [-c] | [-a] | [--keep]
+hg rebase [-s rev | -b rev] [-d rev] [--collapse] [--keep] [--keepbranches] | [-c] | [-a]
 
 move changeset (and descendants) to a different branch
 
@@ -99,12 +99,12 b' move changeset (and descendants) to a di'
 
 options:
 
-    --keep          keep original revisions
-    --keepbranches  keep original branches
  -s --source        rebase from a given revision
  -b --base          rebase from the base of a given revision
  -d --dest          rebase onto a given revision
     --collapse      collapse the rebased revisions
+    --keep          keep original revisions
+    --keepbranches  keep original branches
  -c --continue      continue an interrupted rebase
  -a --abort         abort an interrupted rebase
     --style         display using template map file