diff --git a/hgext/rebase.py b/hgext/rebase.py --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -551,7 +551,6 @@ def _rebasenode(self, tr, rev, allowdivergence, progressfn): repo, ui, opts = self.repo, self.ui, self.opts - dest = self.destmap[rev] ctx = repo[rev] desc = _ctxdesc(ctx) if self.state[rev] == rev: @@ -604,16 +603,7 @@ else: overrides = {(b'ui', b'forcemerge'): opts.get(b'tool', b'')} with ui.configoverride(overrides, b'rebase'): - stats = rebasenode( - repo, - rev, - p1, - p2, - base, - self.collapsef, - dest, - wctx=self.wctx, - ) + stats = rebasenode(repo, rev, p1, p2, base, wctx=self.wctx) if stats.unresolvedcount > 0: if self.inmemory: raise error.InMemoryMergeConflictsError() @@ -1451,7 +1441,7 @@ return newnode -def rebasenode(repo, rev, p1, p2, base, collapse, dest, wctx): +def rebasenode(repo, rev, p1, p2, base, wctx): """Rebase a single revision rev on top of p1 using base as merge ancestor""" # Merge phase # Update to destination and merge it with local