Patchwork [2,of,2,V4] shelve: accept '--edit' like other commands creating new changeset

login
register
mail settings
Submitter Katsunori FUJIWARA
Date June 11, 2014, 1:50 p.m.
Message ID <37d5808bcba4864410c5.1402494646@feefifofum>
Download mbox | patch
Permalink /patch/4972/
State Superseded
Headers show

Comments

Katsunori FUJIWARA - June 11, 2014, 1:50 p.m.
# HG changeset patch
# User FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
# Date 1402494363 -32400
#      Wed Jun 11 22:46:03 2014 +0900
# Node ID 37d5808bcba4864410c58e4aec90713feeedc0ed
# Parent  af2b2360b9dc87167b8ffe729342794b8acd115a
shelve: 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'.

Patch

diff --git a/hgext/shelve.py b/hgext/shelve.py
--- a/hgext/shelve.py
+++ b/hgext/shelve.py
@@ -178,7 +178,8 @@ 
         if hasmq:
             saved, repo.mq.checkapplied = repo.mq.checkapplied, False
         try:
-            return repo.commit(message, user, opts.get('date'), match)
+            return repo.commit(message, user, opts.get('date'), match,
+                               editor=cmdutil.getcommiteditor(**opts))
         finally:
             if hasmq:
                 repo.mq.checkapplied = saved
@@ -635,6 +636,8 @@ 
            _('shelve with the specified commit date'), _('DATE')),
           ('d', 'delete', None,
            _('delete the named shelved change(s)')),
+          ('e', 'edit', False,
+           _('invoke editor on commit messages')),
           ('l', 'list', None,
            _('list current shelves')),
           ('m', 'message', '',
@@ -680,6 +683,7 @@ 
         'cleanup': 'cleanup',
 #        'date': 'create', # ignored for passing '--date "0 0"' always in tests
         'delete': 'delete',
+        'edit': 'create',
         'list': 'list',
         'message': 'create',
         'name': 'create',
diff --git a/tests/test-shelve.t b/tests/test-shelve.t
--- a/tests/test-shelve.t
+++ b/tests/test-shelve.t
@@ -16,8 +16,10 @@ 
   $ hg addremove -q
 
 shelving in an empty repo should be possible
-
-  $ hg shelve
+(this tests also that editor is not invoked, if '--edit' is not
+specified)
+
+  $ HGEDITOR=cat hg shelve
   shelved as default
   0 files updated, 0 files merged, 5 files removed, 0 files unresolved
 
@@ -132,6 +134,7 @@ 
   [255]
 
 named shelves, specific filenames, and "commit messages" should all work
+(this tests also that editor is invoked, if '--edit' is specified)
 
   $ hg status -C
   M a/a
@@ -140,7 +143,16 @@ 
   A c.copy
     c
   R b/b
-  $ hg shelve -q -n wibble -m wat a
+  $ HGEDITOR=cat hg shelve -q -n wibble -m wat -e a
+  wat
+  
+  
+  HG: Enter commit message.  Lines beginning with 'HG:' are removed.
+  HG: Leave message empty to abort commit.
+  HG: --
+  HG: user: shelve@localhost
+  HG: branch 'default'
+  HG: changed a/a
 
 expect "a" to no longer be present, but status otherwise unchanged