comparison hgext/rebase.py @ 37031:74f91bec6991

rebase: register status file generator only once when using single transaction

rebase.storestatus() behaved differently depending on whether a
transaction is passed to it. If a transaction is passed, it registers
a "file generator" that runs when the transaction commits. If no
transaction was passed, it writes the rebase state immediately. This
imprecise timing of the writing makes it hard to reason about, so
let's make it more explicit which behavior we're getting by checking
if we have a transaction before calling it. For the single-transaction
case, move the call to storestatus(tr) early and do it only once since
it's only going to write the file (at most) once anyway.

Differential Revision: https://phab.mercurial-scm.org/D2912

37030:9cc9b3e155f8

            bookmarks.deactivate(repo)

        # Store the state before we begin so users can run 'hg rebase --abort'
        # if we fail before the transaction closes.
        self.storestatus()

        cands = [k for k, v in self.state.iteritems() if v == revtodo]
        total = len(cands)
        posholder = [0]
        def progress(ctx):

            ui.status(_('rebasing %s\n') % desc)
            progressfn(ctx)
            p1, p2, base = defineparents(repo, rev, self.destmap,
                                         self.state, self.skipped,
                                         self.obsoletenotrebased)
            self.storestatus(tr=tr)
            if len(repo[None].parents()) == 2:
                repo.ui.debug('resuming interrupted rebase\n')
            else:
                overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
                with ui.configoverride(overrides, 'rebase'):

37031:74f91bec6991

            bookmarks.deactivate(repo)

        # Store the state before we begin so users can run 'hg rebase --abort'
        # if we fail before the transaction closes.
        self.storestatus()
        if tr:
            # When using single transaction, store state when transaction
            # commits.
            self.storestatus(tr)

        cands = [k for k, v in self.state.iteritems() if v == revtodo]
        total = len(cands)
        posholder = [0]
        def progress(ctx):

            ui.status(_('rebasing %s\n') % desc)
            progressfn(ctx)
            p1, p2, base = defineparents(repo, rev, self.destmap,
                                         self.state, self.skipped,
                                         self.obsoletenotrebased)
            if not tr:
                self.storestatus()
            if len(repo[None].parents()) == 2:
                repo.ui.debug('resuming interrupted rebase\n')
            else:
                overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
                with ui.configoverride(overrides, 'rebase'):