equal
deleted
inserted
replaced
2837 return None |
2837 return None |
2838 |
2838 |
2839 user = opts.get('user') or old.user() |
2839 user = opts.get('user') or old.user() |
2840 date = opts.get('date') or old.date() |
2840 date = opts.get('date') or old.date() |
2841 editform = mergeeditform(old, 'commit.amend') |
2841 editform = mergeeditform(old, 'commit.amend') |
2842 editor = getcommiteditor(editform=editform, **opts) |
2842 editor = getcommiteditor(editform=editform, |
|
2843 **pycompat.strkwargs(opts)) |
2843 if not message: |
2844 if not message: |
2844 editor = getcommiteditor(edit=True, editform=editform) |
2845 editor = getcommiteditor(edit=True, editform=editform) |
2845 message = old.description() |
2846 message = old.description() |
2846 |
2847 |
2847 pureextra = extra.copy() |
2848 pureextra = extra.copy() |