Patchwork [1,of,2,STABLE] doc: unify help text for "--message" option

login
register
mail settings
Submitter Katsunori FUJIWARA
Date July 29, 2014, 3:19 p.m.
Message ID <eb34290835f26386a6a2.1406647162@feefifofum>
Download mbox | patch
Permalink /patch/5207/
State Accepted
Commit 59af0b21ec312099811b82fd0e3eacdf891574bb
Headers show

Comments

Katsunori FUJIWARA - July 29, 2014, 3:19 p.m.
# HG changeset patch
# User FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
# Date 1406646839 -32400
#      Wed Jul 30 00:13:59 2014 +0900
# Branch stable
# Node ID eb34290835f26386a6a2194b9db0a03b99825682
# Parent  ad56fc55cbc3870d257e163469c687088627283b
doc: unify help text for "--message" option

This patch changes help text for "--message" option of commands below
for unification.

  - sign (of gpg)
  - tag

This unification reduces translation cost, too.

This patch doesn't change the description for "--message" of "hg
rebase" below, because this should contain "collapse" word to explain
its purpose (only for "--collapse") clearly.

    use text as collapse commit message

Patch

diff --git a/hgext/gpg.py b/hgext/gpg.py
--- a/hgext/gpg.py
+++ b/hgext/gpg.py
@@ -203,7 +203,7 @@ 
           ('k', 'key', '',
            _('the key id to sign with'), _('ID')),
           ('m', 'message', '',
-           _('commit message'), _('TEXT')),
+           _('use text as commit message'), _('TEXT')),
           ('e', 'edit', False, _('invoke editor on commit messages')),
          ] + commands.commitopts2,
          _('hg sign [OPTION]... [REV]...'))
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -5696,7 +5696,7 @@ 
     ('', 'remove', None, _('remove a tag')),
     # -l/--local is already there, commitopts cannot be used
     ('e', 'edit', None, _('edit commit message')),
-    ('m', 'message', '', _('use <text> as commit message'), _('TEXT')),
+    ('m', 'message', '', _('use text as commit message'), _('TEXT')),
     ] + commitopts2,
     _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
 def tag(ui, repo, name1, *names, **opts):