changeset 21711:0986af9e7006

gpg: accept '--edit' like other commands creating new changeset After this patch, users can invoke editor for the commit message by '--edit' option regardless of '--message'.
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Sun, 01 Jun 2014 00:08:32 +0900
parents 14514dd542aa
children 51035af2c0bf
files hgext/gpg.py tests/test-gpg.t
diffstat 2 files changed, 13 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/gpg.py	Tue Jun 03 13:49:51 2014 -0700
+++ b/hgext/gpg.py	Sun Jun 01 00:08:32 2014 +0900
@@ -204,6 +204,7 @@
            _('the key id to sign with'), _('ID')),
           ('m', 'message', '',
            _('commit message'), _('TEXT')),
+          ('e', 'edit', False, _('invoke editor on commit messages')),
          ] + commands.commitopts2,
          _('hg sign [OPTION]... [REV]...'))
 def sign(ui, repo, *revs, **opts):
@@ -276,7 +277,8 @@
                              % hgnode.short(n)
                              for n in nodes])
     try:
-        repo.commit(message, opts['user'], opts['date'], match=msigs)
+        repo.commit(message, opts['user'], opts['date'], match=msigs,
+                    editor=cmdutil.getcommiteditor(**opts))
     except ValueError, inst:
         raise util.Abort(str(inst))
 
--- a/tests/test-gpg.t	Tue Jun 03 13:49:51 2014 -0700
+++ b/tests/test-gpg.t	Sun Jun 01 00:08:32 2014 +0900
@@ -16,8 +16,17 @@
 
   $ hg sigs
 
-  $ hg sign 0
+  $ HGEDITOR=cat hg sign -e 0
   signing 0:e63c23eaa88a
+  Added signature for changeset e63c23eaa88a
+  
+  
+  HG: Enter commit message.  Lines beginning with 'HG:' are removed.
+  HG: Leave message empty to abort commit.
+  HG: --
+  HG: user: test
+  HG: branch 'default'
+  HG: added .hgsigs
 
   $ hg sigs
   hgtest                             0:e63c23eaa88ae77967edcf4ea194d31167c478b0