Show More
@@ -1025,6 +1025,7 b' class queue(object):' | |||
|
1025 | 1025 | """ |
|
1026 | 1026 | msg = opts.get('msg') |
|
1027 | 1027 | edit = opts.get('edit') |
|
1028 | editform = opts.get('editform', 'mq.qnew') | |
|
1028 | 1029 | user = opts.get('user') |
|
1029 | 1030 | date = opts.get('date') |
|
1030 | 1031 | if date: |
@@ -1079,7 +1080,7 b' class queue(object):' | |||
|
1079 | 1080 | p.write("# Date %s %s\n\n" % date) |
|
1080 | 1081 | |
|
1081 | 1082 | defaultmsg = "[mq]: %s" % patchfn |
|
1082 | editor = cmdutil.getcommiteditor() | |
|
1083 | editor = cmdutil.getcommiteditor(editform=editform) | |
|
1083 | 1084 | if edit: |
|
1084 | 1085 | def finishdesc(desc): |
|
1085 | 1086 | if desc.rstrip(): |
@@ -1089,7 +1090,8 b' class queue(object):' | |||
|
1089 | 1090 | # i18n: this message is shown in editor with "HG: " prefix |
|
1090 | 1091 | extramsg = _('Leave message empty to use default message.') |
|
1091 | 1092 | editor = cmdutil.getcommiteditor(finishdesc=finishdesc, |
|
1092 |
extramsg=extramsg |
|
|
1093 | extramsg=extramsg, | |
|
1094 | editform=editform) | |
|
1093 | 1095 | commitmsg = msg |
|
1094 | 1096 | else: |
|
1095 | 1097 | commitmsg = msg or defaultmsg |
@@ -1485,6 +1487,7 b' class queue(object):' | |||
|
1485 | 1487 | return 1 |
|
1486 | 1488 | msg = opts.get('msg', '').rstrip() |
|
1487 | 1489 | edit = opts.get('edit') |
|
1490 | editform = opts.get('editform', 'mq.qrefresh') | |
|
1488 | 1491 | newuser = opts.get('user') |
|
1489 | 1492 | newdate = opts.get('date') |
|
1490 | 1493 | if newdate: |
@@ -1654,7 +1657,7 b' class queue(object):' | |||
|
1654 | 1657 | # might be nice to attempt to roll back strip after this |
|
1655 | 1658 | |
|
1656 | 1659 | defaultmsg = "[mq]: %s" % patchfn |
|
1657 | editor = cmdutil.getcommiteditor() | |
|
1660 | editor = cmdutil.getcommiteditor(editform=editform) | |
|
1658 | 1661 | if edit: |
|
1659 | 1662 | def finishdesc(desc): |
|
1660 | 1663 | if desc.rstrip(): |
@@ -1664,7 +1667,8 b' class queue(object):' | |||
|
1664 | 1667 | # i18n: this message is shown in editor with "HG: " prefix |
|
1665 | 1668 | extramsg = _('Leave message empty to use default message.') |
|
1666 | 1669 | editor = cmdutil.getcommiteditor(finishdesc=finishdesc, |
|
1667 |
extramsg=extramsg |
|
|
1670 | extramsg=extramsg, | |
|
1671 | editform=editform) | |
|
1668 | 1672 | message = msg or "\n".join(ph.message) |
|
1669 | 1673 | elif not msg: |
|
1670 | 1674 | if not ph.message: |
@@ -2585,7 +2589,8 b' def fold(ui, repo, *files, **opts):' | |||
|
2585 | 2589 | diffopts = q.patchopts(q.diffopts(), *patches) |
|
2586 | 2590 | wlock = repo.wlock() |
|
2587 | 2591 | try: |
|
2588 |
q.refresh(repo, msg=message, git=diffopts.git, edit=opts.get('edit') |
|
|
2592 | q.refresh(repo, msg=message, git=diffopts.git, edit=opts.get('edit'), | |
|
2593 | editform='mq.qfold') | |
|
2589 | 2594 | q.delete(repo, patches, opts) |
|
2590 | 2595 | q.savedirty() |
|
2591 | 2596 | finally: |
General Comments 0
You need to be logged in to leave comments.
Login now