rebase: move config override out of conclude[memory]node()

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

hgext/rebase.py

@@ -454,13 +454,13 class rebaseruntime(object):
         overrides = {('phases', 'new-commit'): destphase}
         if keepbranch:
             overrides[('ui', 'allowemptycommit')] = True
+        with repo.ui.configoverride(overrides, 'rebase'):
         if self.inmemory:
             newnode = concludememorynode(repo, ctx, p1, p2,
                 wctx=self.wctx,
                 extra=extra,
                 commitmsg=commitmsg,
                 editor=editor,
-                overrides=overrides,
                 date=self.date)
             mergemod.mergestate.clean(repo)
         else:
@@ -468,7 +468,6 class rebaseruntime(object):
                 extra=extra,
                 commitmsg=commitmsg,
                 editor=editor,
-                overrides=overrides,
                 date=self.date)
 
         if newnode is None:
@@ -1028,12 +1027,10 def externalparent(repo, state, destance
                      (max(destancestors),
                       ', '.join("%d" % p for p in sorted(parents))))
 
-def concludememorynode(repo, ctx, p1, p2, wctx, editor, extra, overrides, date,
-                       commitmsg):
+def concludememorynode(repo, ctx, p1, p2, wctx, editor, extra, date, commitmsg):
     '''Commit the memory changes with parents p1 and p2. Reuse commit info from
     ctx.
     Return node of committed revision.'''
-    with repo.ui.configoverride(overrides, 'rebase'):
         # Replicates the empty check in ``repo.commit``.
         if wctx.isempty() and not repo.ui.configbool('ui', 'allowemptycommit'):
             return None
@@ -1053,8 +1050,7 def concludememorynode(repo, ctx, p1, p2
         wctx.clean() # Might be reused
         return commitres
 
-def concludenode(repo, ctx, p1, p2, editor, extra, overrides, date,
-                 commitmsg):
+def concludenode(repo, ctx, p1, p2, editor, extra, date, commitmsg):
     '''Commit the wd changes with parents p1 and p2. Reuse commit info from ctx.
     Return node of committed revision.'''
     dsguard = util.nullcontextmanager()
@@ -1063,7 +1059,6 def concludenode(repo, ctx, p1, p2, edit
     with dsguard:
         repo.setparents(repo[p1].node(), repo[p2].node())
 
-        with repo.ui.configoverride(overrides, 'rebase'):
             # Commit might fail if unresolved files exist
             if date is None:
                 date = ctx.date()