equal
deleted
inserted
replaced
2748 |
2748 |
2749 ui.note(_('amending changeset %s\n') % old) |
2749 ui.note(_('amending changeset %s\n') % old) |
2750 base = old.p1() |
2750 base = old.p1() |
2751 |
2751 |
2752 newid = None |
2752 newid = None |
2753 with repo.wlock(), repo.lock(), repo.transaction('amend') as tr: |
2753 with repo.wlock(), repo.lock(), repo.transaction('amend'): |
2754 # See if we got a message from -m or -l, if not, open the editor |
2754 # See if we got a message from -m or -l, if not, open the editor |
2755 # with the message of the changeset to amend |
2755 # with the message of the changeset to amend |
2756 message = logmessage(ui, opts) |
2756 message = logmessage(ui, opts) |
2757 # ensure logfile does not conflict with later enforcement of the |
2757 # ensure logfile does not conflict with later enforcement of the |
2758 # message. potential logfile content has been processed by |
2758 # message. potential logfile content has been processed by |
2766 repo._bookmarks.active = None |
2766 repo._bookmarks.active = None |
2767 opts['message'] = 'temporary amend commit for %s' % old |
2767 opts['message'] = 'temporary amend commit for %s' % old |
2768 node = commit(ui, repo, commitfunc, pats, opts) |
2768 node = commit(ui, repo, commitfunc, pats, opts) |
2769 finally: |
2769 finally: |
2770 repo._bookmarks.active = activebookmark |
2770 repo._bookmarks.active = activebookmark |
2771 repo._bookmarks.recordchange(tr) |
|
2772 ui.callhooks = True |
2771 ui.callhooks = True |
2773 ctx = repo[node] |
2772 ctx = repo[node] |
2774 |
2773 |
2775 # Participating changesets: |
2774 # Participating changesets: |
2776 # |
2775 # |