martinvonz created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers.
REVISION SUMMARY It looks like this was lost when the code was converted to the ui.configoverride() context manager in https://phab.mercurial-scm.org/rHGf255b1811f5e454d8d0add4a1190effc82b301be (rebase: get rid of ui.backupconfig, 2017-03-16). (And then the bad example was duplicated in https://phab.mercurial-scm.org/rHG228916ca12b54b78faccd5c4abc54cba68606637 (rebase: add concludememorynode(), and call it when rebasing in-memory, 2017-12-07).) REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D2760 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py b/hgext/rebase.py --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -1054,9 +1054,9 @@ destphase = max(ctx.phase(), phases.draft) overrides = {('phases', 'new-commit'): destphase} + if keepbranch: + overrides[('ui', 'allowemptycommit')] = True with repo.ui.configoverride(overrides, 'rebase'): - if keepbranch: - repo.ui.setconfig('ui', 'allowemptycommit', True) # Replicates the empty check in ``repo.commit``. if wctx.isempty() and not repo.ui.configbool('ui', 'allowemptycommit'): return None @@ -1096,9 +1096,9 @@ destphase = max(ctx.phase(), phases.draft) overrides = {('phases', 'new-commit'): destphase} + if keepbranch: + overrides[('ui', 'allowemptycommit')] = True with repo.ui.configoverride(overrides, 'rebase'): - if keepbranch: - repo.ui.setconfig('ui', 'allowemptycommit', True) # Commit might fail if unresolved files exist if date is None: date = ctx.date() To: martinvonz, #hg-reviewers Cc: mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
