Mercurial > hg
comparison hgext/shelve.py @ 21852:37a5decc6924
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'.
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Fri, 20 Jun 2014 16:15:38 +0900 |
parents | aad28ff87788 |
children | dabf8fb8a91e d43d116a118c |
comparison
equal
deleted
inserted
replaced
21851:aad28ff87788 | 21852:37a5decc6924 |
---|---|
176 shelvedfiles.extend(flist) | 176 shelvedfiles.extend(flist) |
177 hasmq = util.safehasattr(repo, 'mq') | 177 hasmq = util.safehasattr(repo, 'mq') |
178 if hasmq: | 178 if hasmq: |
179 saved, repo.mq.checkapplied = repo.mq.checkapplied, False | 179 saved, repo.mq.checkapplied = repo.mq.checkapplied, False |
180 try: | 180 try: |
181 return repo.commit(message, user, opts.get('date'), match) | 181 return repo.commit(message, user, opts.get('date'), match, |
182 editor=cmdutil.getcommiteditor(**opts)) | |
182 finally: | 183 finally: |
183 if hasmq: | 184 if hasmq: |
184 repo.mq.checkapplied = saved | 185 repo.mq.checkapplied = saved |
185 | 186 |
186 if parent.node() != nullid: | 187 if parent.node() != nullid: |
633 _('delete all shelved changes')), | 634 _('delete all shelved changes')), |
634 ('', 'date', '', | 635 ('', 'date', '', |
635 _('shelve with the specified commit date'), _('DATE')), | 636 _('shelve with the specified commit date'), _('DATE')), |
636 ('d', 'delete', None, | 637 ('d', 'delete', None, |
637 _('delete the named shelved change(s)')), | 638 _('delete the named shelved change(s)')), |
639 ('e', 'edit', False, | |
640 _('invoke editor on commit messages')), | |
638 ('l', 'list', None, | 641 ('l', 'list', None, |
639 _('list current shelves')), | 642 _('list current shelves')), |
640 ('m', 'message', '', | 643 ('m', 'message', '', |
641 _('use text as shelve message'), _('TEXT')), | 644 _('use text as shelve message'), _('TEXT')), |
642 ('n', 'name', '', | 645 ('n', 'name', '', |
678 allowables = [ | 681 allowables = [ |
679 ('addremove', 'create'), # 'create' is pseudo action | 682 ('addremove', 'create'), # 'create' is pseudo action |
680 ('cleanup', 'cleanup'), | 683 ('cleanup', 'cleanup'), |
681 # ('date', 'create'), # ignored for passing '--date "0 0"' in tests | 684 # ('date', 'create'), # ignored for passing '--date "0 0"' in tests |
682 ('delete', 'delete'), | 685 ('delete', 'delete'), |
686 ('edit', 'create'), | |
683 ('list', 'list'), | 687 ('list', 'list'), |
684 ('message', 'create'), | 688 ('message', 'create'), |
685 ('name', 'create'), | 689 ('name', 'create'), |
686 ('patch', 'list'), | 690 ('patch', 'list'), |
687 ('stat', 'list'), | 691 ('stat', 'list'), |