comparison mercurial/commands.py @ 25694:5ede49f4383a

amend: stop updating the bookmarks twice

There was code to move the bookmarks around both in the 'cmdutil' help and in
the main 'commit' function. We kill the 'commit' version as it is performed
outside the transaction.

The debug note is moved into cmdutil.

25693:a6c1eac2fb1e

                               opts.get('user') or old.user(),
                               opts.get('date') or old.date(),
                               match,
                               extra=extra)

        active = repo._activebookmark
        marks = old.bookmarks()
        node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
        if node == old.node():
            ui.status(_("nothing changed\n"))
            return 1
        elif marks:
            ui.debug('moving bookmarks %r from %s to %s\n' %
                     (marks, old.hex(), hex(node)))
            newmarks = repo._bookmarks
            for bm in marks:
                newmarks[bm] = node
                if bm == active:
                    bookmarks.activate(repo, bm)
            newmarks.write()
    else:
        def commitfunc(ui, repo, message, match, opts):
            backup = ui.backupconfig('phases', 'new-commit')
            baseui = repo.baseui
            basebackup = baseui.backupconfig('phases', 'new-commit')

25694:5ede49f4383a

                               opts.get('user') or old.user(),
                               opts.get('date') or old.date(),
                               match,
                               extra=extra)

        node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
        if node == old.node():
            ui.status(_("nothing changed\n"))
            return 1
    else:
        def commitfunc(ui, repo, message, match, opts):
            backup = ui.backupconfig('phases', 'new-commit')
            baseui = repo.baseui
            basebackup = baseui.backupconfig('phases', 'new-commit')