comparison hgext/rebase.py @ 36927:17a744c5e270

rebase: also include commit of collapsed commits in single transaction

When rebase.singletransaction is set, we still used to create a second
transaction when committing with --collapse. It's simpler to create a
single transaction.

Note that in the affected .t file, the test that uses --collapse still
appears to create two transactions (it prints "rebase status stored"
twice). However, only a single transaction is actually created and the
second printout comes from cmdutil.commitforceeditor() that explicitly
calls tr.writepending().

Also note the that we now roll back any commits if the user closes the
commit message editor with an error code (or leaves the message
empty). That might be unfortunate, but it's consistent with how we
behave in the --no-collapse case (if the user passed --edit). If we
want to change that, I think it should be done consistently in a
separate patch.

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

36926:0dcf50dc90b6

                    extrafn=_makeextrafn(self.extrafns),
                    editor=editor,
                    keepbranches=self.keepbranchesf,
                    date=self.date, wctx=self.wctx)
            else:
                dsguard = None
                if ui.configbool('rebase', 'singletransaction'):
                    dsguard = dirstateguard.dirstateguard(repo, 'rebase')
                with util.acceptintervention(dsguard):
                    newnode = concludenode(repo, revtoreuse, p1, self.external,
                        commitmsg=commitmsg,
                        extrafn=_makeextrafn(self.extrafns),
                        editor=editor,
                        keepbranches=self.keepbranchesf,
                        date=self.date)
            if newnode is not None:
                newrev = repo[newnode].rev()
                for oldrev in self.state:
                    self.state[oldrev] = newrev

            dsguard = None
            if singletr and not inmemory:
                dsguard = dirstateguard.dirstateguard(repo, 'rebase')
            with util.acceptintervention(dsguard):
                rbsrt._performrebase(tr)

        rbsrt._finishrebase()

def _definedestmap(ui, repo, rbsrt, destf=None, srcf=None, basef=None,
                   revf=None, destspace=None):
    """use revisions argument to define destmap {srcrev: destrev}"""
    if revf is None:

36927:17a744c5e270

                    extrafn=_makeextrafn(self.extrafns),
                    editor=editor,
                    keepbranches=self.keepbranchesf,
                    date=self.date, wctx=self.wctx)
            else:
                newnode = concludenode(repo, revtoreuse, p1, self.external,
                    commitmsg=commitmsg,
                    extrafn=_makeextrafn(self.extrafns),
                    editor=editor,
                    keepbranches=self.keepbranchesf,
                    date=self.date)
            if newnode is not None:
                newrev = repo[newnode].rev()
                for oldrev in self.state:
                    self.state[oldrev] = newrev

            dsguard = None
            if singletr and not inmemory:
                dsguard = dirstateguard.dirstateguard(repo, 'rebase')
            with util.acceptintervention(dsguard):
                rbsrt._performrebase(tr)
                rbsrt._finishrebase()

def _definedestmap(ui, repo, rbsrt, destf=None, srcf=None, basef=None,
                   revf=None, destspace=None):
    """use revisions argument to define destmap {srcrev: destrev}"""
    if revf is None: