Show More
@@ -2106,9 +2106,10 b' def amend(ui, repo, commitfunc, old, ext' | |||||
2106 |
|
2106 | |||
2107 | user = opts.get('user') or old.user() |
|
2107 | user = opts.get('user') or old.user() | |
2108 | date = opts.get('date') or old.date() |
|
2108 | date = opts.get('date') or old.date() | |
2109 |
editor = |
|
2109 | editform = 'commit.amend' | |
|
2110 | editor = getcommiteditor(editform=editform, **opts) | |||
2110 | if not message: |
|
2111 | if not message: | |
2111 | editor = getcommiteditor(edit=True) |
|
2112 | editor = getcommiteditor(edit=True, editform=editform) | |
2112 | message = old.description() |
|
2113 | message = old.description() | |
2113 |
|
2114 | |||
2114 | pureextra = extra.copy() |
|
2115 | pureextra = extra.copy() |
@@ -1449,9 +1449,11 b' def commit(ui, repo, *pats, **opts):' | |||||
1449 | repo.baseui.setconfig('phases', 'new-commit', 'secret', |
|
1449 | repo.baseui.setconfig('phases', 'new-commit', 'secret', | |
1450 | 'commit') |
|
1450 | 'commit') | |
1451 |
|
1451 | |||
|
1452 | editform = 'commit.normal' | |||
|
1453 | editor = cmdutil.getcommiteditor(editform=editform, **opts) | |||
1452 | return repo.commit(message, opts.get('user'), opts.get('date'), |
|
1454 | return repo.commit(message, opts.get('user'), opts.get('date'), | |
1453 | match, |
|
1455 | match, | |
1454 |
editor= |
|
1456 | editor=editor, | |
1455 | extra=extra) |
|
1457 | extra=extra) | |
1456 | finally: |
|
1458 | finally: | |
1457 | ui.setconfig('phases', 'new-commit', oldcommitphase, 'commit') |
|
1459 | ui.setconfig('phases', 'new-commit', oldcommitphase, 'commit') |
General Comments 0
You need to be logged in to leave comments.
Login now