convert: better grouping of command line flags in help

We normally put related command line flags after one another.

hgext/convert/__init__.py

@@ -265,14 +265,14 b' cmdtable = {'
         (convert,
          [('A', 'authors', '',
            _('username mapping filename'), _('FILE')),
+          ('s', 'source-type', '',
+           _('source repository type'), _('TYPE')),
           ('d', 'dest-type', '',
            _('destination repository type'), _('TYPE')),
+          ('r', 'rev', '',
+           _('import up to target revision REV'), _('REV')),
           ('', 'filemap', '',
            _('remap file names using contents of file'), _('FILE')),
-          ('r', 'rev', '',
-           _('import up to target revision REV'), _('REV')),
-          ('s', 'source-type', '',
-           _('source repository type'), _('TYPE')),
           ('', 'splicemap', '',
            _('splice synthesized history into place'), _('FILE')),
           ('', 'branchmap', '',

tests/test-convert.out

@@ -225,10 +225,10 b' convert a foreign SCM repository to a Me'
 options:
 
  -A --authors FILE      username mapping filename
+ -s --source-type TYPE  source repository type
  -d --dest-type TYPE    destination repository type
+ -r --rev REV           import up to target revision REV
     --filemap FILE      remap file names using contents of file
- -r --rev REV           import up to target revision REV
- -s --source-type TYPE  source repository type
     --splicemap FILE    splice synthesized history into place
     --branchmap FILE    change branch names while converting
     --branchsort        try to sort changesets by branches