comparison hgext/histedit.py @ 38504:3beb0ea083df

histedit: use hg.updaterepo() to avoid ui.{push|pop}buffer() hack

In some parts of code, we call hg.update() and surround that with
ui.pushbuffer() and ui.popbuffer() to suppress the output returned by
hg.update().

We have hg.updaterepo() which does not writes to UI and can be used instead.

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

38503:077301ac69dc

        """
        return False

    def finishfold(self, ui, repo, ctx, oldctx, newnode, internalchanges):
        parent = ctx.parents()[0].node()
        repo.ui.pushbuffer()
        hg.update(repo, parent)
        repo.ui.popbuffer()
        ### prepare new commit data
        commitopts = {}
        commitopts['user'] = ctx.user()
        # commit message
        if not self.mergedescs():

        with repo.ui.configoverride(overrides, 'histedit'):
            n = collapse(repo, ctx, repo[newnode], commitopts,
                         skipprompt=self.skipprompt())
        if n is None:
            return ctx, []
        repo.ui.pushbuffer()
        hg.update(repo, n)
        repo.ui.popbuffer()
        replacements = [(oldctx.node(), (newnode,)),
                        (ctx.node(), (n,)),
                        (newnode, (n,)),
                       ]
        for ich in internalchanges:

    state.write()

def _finishhistedit(ui, repo, state, fm):
    """This action runs when histedit is finishing its session"""
    repo.ui.pushbuffer()
    hg.update(repo, state.parentctxnode, quietempty=True)
    repo.ui.popbuffer()

    mapping, tmpnodes, created, ntm = processreplacement(state)
    if mapping:
        for prec, succs in mapping.iteritems():
            if not succs:

38504:3beb0ea083df

        """
        return False

    def finishfold(self, ui, repo, ctx, oldctx, newnode, internalchanges):
        parent = ctx.parents()[0].node()
        hg.updaterepo(repo, parent, False)
        ### prepare new commit data
        commitopts = {}
        commitopts['user'] = ctx.user()
        # commit message
        if not self.mergedescs():

        with repo.ui.configoverride(overrides, 'histedit'):
            n = collapse(repo, ctx, repo[newnode], commitopts,
                         skipprompt=self.skipprompt())
        if n is None:
            return ctx, []
        hg.updaterepo(repo, n, False)
        replacements = [(oldctx.node(), (newnode,)),
                        (ctx.node(), (n,)),
                        (newnode, (n,)),
                       ]
        for ich in internalchanges:

    state.write()

def _finishhistedit(ui, repo, state, fm):
    """This action runs when histedit is finishing its session"""
    hg.updaterepo(repo, state.parentctxnode, False)

    mapping, tmpnodes, created, ntm = processreplacement(state)
    if mapping:
        for prec, succs in mapping.iteritems():
            if not succs: