741 from the root of the repository will be commited. |
741 from the root of the repository will be commited. |
742 |
742 |
743 The HGEDITOR or EDITOR environment variables are used to start an |
743 The HGEDITOR or EDITOR environment variables are used to start an |
744 editor to add a commit comment. |
744 editor to add a commit comment. |
745 """ |
745 """ |
746 if opts['text']: |
746 message = opts['message'] |
747 ui.warn(_("Warning: -t and --text is deprecated," |
|
748 " please use -m or --message instead.\n")) |
|
749 message = opts['message'] or opts['text'] |
|
750 logfile = opts['logfile'] |
747 logfile = opts['logfile'] |
751 |
748 |
752 if message and logfile: |
749 if message and logfile: |
753 raise util.Abort(_('options --message and --logfile are mutually ' |
750 raise util.Abort(_('options --message and --logfile are mutually ' |
754 'exclusive')) |
751 'exclusive')) |
2186 (commit, |
2183 (commit, |
2187 [('A', 'addremove', None, _('run addremove during commit')), |
2184 [('A', 'addremove', None, _('run addremove during commit')), |
2188 ('I', 'include', [], _('include names matching the given patterns')), |
2185 ('I', 'include', [], _('include names matching the given patterns')), |
2189 ('X', 'exclude', [], _('exclude names matching the given patterns')), |
2186 ('X', 'exclude', [], _('exclude names matching the given patterns')), |
2190 ('m', 'message', "", _('use <text> as commit message')), |
2187 ('m', 'message', "", _('use <text> as commit message')), |
2191 ('t', 'text', "", _('commit message (deprecated: use -m)')), |
|
2192 ('l', 'logfile', "", _('read the commit message from <file>')), |
2188 ('l', 'logfile', "", _('read the commit message from <file>')), |
2193 ('d', 'date', "", _('record datecode as commit date')), |
2189 ('d', 'date', "", _('record datecode as commit date')), |
2194 ('u', 'user', "", _('record user as commiter'))], |
2190 ('u', 'user', "", _('record user as commiter'))], |
2195 _('hg commit [OPTION]... [FILE]...')), |
2191 _('hg commit [OPTION]... [FILE]...')), |
2196 "copy|cp": (copy, |
2192 "copy|cp": (copy, |