D2760: rebase: also restore "ui.allowemptycommit" value
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Tue Mar 13 14:55:19 UTC 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG1bfe7e1d65fb: rebase: also restore "ui.allowemptycommit" value (authored by martinvonz, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D2760?vs=6872&id=6986
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, yuja
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list