Uniformisation of commit help for -m and -l.

 Addition of the -m and -l options for hg import.
 'hg tag' still lacks the --logfile option which short form conflicts with
 its --local option.

hgext/mq.py

@@ -2103,9 +2103,8 b' cmdtable = {'
     'qfold':
         (fold,
          [('e', 'edit', None, _('edit patch header')),
-          ('k', 'keep', None, _('keep folded patch files')),
-          ('m', 'message', '', _('set patch header to <text>')),
-          ('l', 'logfile', '', _('set patch header to contents of <file>'))],
+          ('k', 'keep', None, _('keep folded patch files'))
+          ] + commands.commitopts,
          'hg qfold [-e] [-m <text>] [-l <file] PATCH...'),
     'qguard': (guard, [('l', 'list', None, _('list all patches and guards')),
                        ('n', 'none', None, _('drop all guards'))],
@@ -2127,9 +2126,8 b' cmdtable = {'
     "qnew":
         (new,
          [('e', 'edit', None, _('edit commit message')),
-          ('m', 'message', '', _('use <text> as commit message')),
-          ('l', 'logfile', '', _('read the commit message from <file>')),
-          ('f', 'force', None, _('import uncommitted changes into patch'))],
+          ('f', 'force', None, _('import uncommitted changes into patch'))
+          ] + commands.commitopts,
          'hg qnew [-e] [-m TEXT] [-l FILE] [-f] PATCH'),
     "qnext": (next, [] + seriesopts, 'hg qnext [-s]'),
     "qprev": (prev, [] + seriesopts, 'hg qprev [-s]'),
@@ -2150,12 +2148,11 b' cmdtable = {'
     "^qrefresh":
         (refresh,
          [('e', 'edit', None, _('edit commit message')),
-          ('m', 'message', '', _('change commit message to <text>')),
-          ('l', 'logfile', '', _('change commit message to <file> content')),
           ('g', 'git', None, _('use git extended diff format')),
           ('s', 'short', None, 'refresh only files already in the patch'),
           ('I', 'include', [], _('include names matching the given patterns')),
-          ('X', 'exclude', [], _('exclude names matching the given patterns'))],
+          ('X', 'exclude', [], _('exclude names matching the given patterns'))
+          ] + commands.commitopts,
          'hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] FILES...'),
     'qrename|qmv':
         (rename, [], 'hg qrename PATCH1 [PATCH2]'),
@@ -2166,12 +2163,10 b' cmdtable = {'
          'hg qrestore [-d] [-u] REV'),
     "qsave":
         (save,
-         [('m', 'message', '', _('use <text> as commit message')),
-          ('l', 'logfile', '', _('read the commit message from <file>')),
-          ('c', 'copy', None, 'copy patch directory'),
+         [('c', 'copy', None, 'copy patch directory'),
           ('n', 'name', '', 'copy directory name'),
           ('e', 'empty', None, 'clear queue status file'),
-          ('f', 'force', None, 'force copy')],
+          ('f', 'force', None, 'force copy')] + commands.commitopts,
          'hg qsave [-m TEXT] [-l FILE] [-c] [-n NAME] [-e] [-f]'),
     "qselect": (select,
                 [('n', 'none', None, _('disable all guards')),

mercurial/commands.py

@@ -1492,9 +1492,10 b' def import_(ui, repo, patch1, *patches, '
             raise util.Abort(_('no diffs found'))
 
         try:
-            if opts['message']:
+            cmdline_message = logmessage(opts)
+            if cmdline_message:
                 # pickup the cmdline msg
-                message = opts['message']
+                message = cmdline_message
             elif message:
                 # pickup the patch msg
                 message = message.strip()
@@ -2586,6 +2587,11 b' walkopts = ['
     ('X', 'exclude', [], _('exclude names matching the given patterns')),
 ]
 
+commitopts = [
+    ('m', 'message', '', _('use <text> as commit message')),
+    ('l', 'logfile', '', _('read commit message from <file>')),
+]
+
 table = {
     "^add": (add, walkopts + dryrunopts, _('hg add [OPTION]... [FILE]...')),
     "addremove":
@@ -2617,12 +2623,10 b' table = {'
         (backout,
          [('', 'merge', None,
            _('merge with old dirstate parent after backout')),
-          ('m', 'message', '', _('use <text> as commit message')),
-          ('l', 'logfile', '', _('read commit message from <file>')),
           ('d', 'date', '', _('record datecode as commit date')),
           ('', 'parent', '', _('parent to choose when backing out merge')),
           ('u', 'user', '', _('record user as committer')),
-         ] + walkopts,
+         ] + walkopts + commitopts,
          _('hg backout [OPTION]... REV')),
     "branch": (branch, [], _('hg branch [NAME]')),
     "branches": (branches, [], _('hg branches')),
@@ -2656,11 +2660,9 b' table = {'
         (commit,
          [('A', 'addremove', None,
            _('mark new/missing files as added/removed before committing')),
-          ('m', 'message', '', _('use <text> as commit message')),
-          ('l', 'logfile', '', _('read the commit message from <file>')),
           ('d', 'date', '', _('record datecode as commit date')),
           ('u', 'user', '', _('record user as commiter')),
-         ] + walkopts,
+         ] + walkopts + commitopts,
          _('hg commit [OPTION]... [FILE]...')),
     "copy|cp":
         (copy,
@@ -2743,10 +2745,9 b' table = {'
          [('p', 'strip', 1,
            _('directory strip option for patch. This has the same\n'
              'meaning as the corresponding patch option')),
-          ('m', 'message', '', _('use <text> as commit message')),
           ('b', 'base', '', _('base path (DEPRECATED)')),
           ('f', 'force', None,
-           _('skip check for outstanding uncommitted changes'))],
+           _('skip check for outstanding uncommitted changes'))] + commitopts,
          _('hg import [-p NUM] [-m MESSAGE] [-f] PATCH...')),
     "incoming|in": (incoming,
          [('M', 'no-merges', None, _('do not show merges')),
@@ -2838,9 +2839,8 b' table = {'
          [('p', 'parent', [], _('parent')),
           ('d', 'date', '', _('date code')),
           ('u', 'user', '', _('user')),
-          ('F', 'files', '', _('file list')),
-          ('m', 'message', '', _('commit message')),
-          ('l', 'logfile', '', _('commit message file'))],
+          ('F', 'files', '', _('file list'))
+          ] + commitopts,
          _('hg debugrawcommit [OPTION]... [FILE]...')),
     "recover": (recover, [], _('hg recover')),
     "^remove|rm":