This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2760

rebase: also restore "ui.allowemptycommit" value
ClosedPublic

Authored by martinvonz on Mar 9 2018, 4:09 PM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHGcc2bfc7d5362: rebase: also restore "ui.allowemptycommit" value
rHG1bfe7e1d65fb: rebase: also restore "ui.allowemptycommit" value
Summary

It looks like this was lost when the code was converted to the
ui.configoverride() context manager in f255b1811f5e (rebase: get rid
of ui.backupconfig, 2017-03-16). (And then the bad example was
duplicated in 228916ca12b5 (rebase: add concludememorynode(), and call
it when rebasing in-memory, 2017-12-07).)

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Mar 9 2018, 4:09 PM
martinvonz updated this revision to Diff 6872.Mar 12 2018, 2:22 PM
yuja accepted this revision.Mar 13 2018, 10:48 AM
This revision is now accepted and ready to land.Mar 13 2018, 10:48 AM
Closed by commit rHG1bfe7e1d65fb: rebase: also restore "ui.allowemptycommit" value (authored by martinvonz). · Explain WhyMar 13 2018, 10:55 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (8 lines)

Diff 6788

hgext/rebase.py

commitmsg = ctx.description() commitmsg = ctx.description()
keepbranch = keepbranches and repo[p1].branch() != ctx.branch() keepbranch = keepbranches and repo[p1].branch() != ctx.branch()
extra = {'rebase_source': ctx.hex()} extra = {'rebase_source': ctx.hex()}
if extrafn: if extrafn:
extrafn(ctx, extra) extrafn(ctx, extra)
destphase = max(ctx.phase(), phases.draft) destphase = max(ctx.phase(), phases.draft)
overrides = {('phases', 'new-commit'): destphase} overrides = {('phases', 'new-commit'): destphase}
with repo.ui.configoverride(overrides, 'rebase'):
if keepbranch: if keepbranch:
repo.ui.setconfig('ui', 'allowemptycommit', True) overrides[('ui', 'allowemptycommit')] = True
with repo.ui.configoverride(overrides, 'rebase'):
# Replicates the empty check in ``repo.commit``. # Replicates the empty check in ``repo.commit``.
if wctx.isempty() and not repo.ui.configbool('ui', 'allowemptycommit'): if wctx.isempty() and not repo.ui.configbool('ui', 'allowemptycommit'):
return None return None
if date is None: if date is None:
date = ctx.date() date = ctx.date()
# By convention, ``extra['branch']`` (set by extrafn) clobbers # By convention, ``extra['branch']`` (set by extrafn) clobbers
commitmsg = ctx.description() commitmsg = ctx.description()
keepbranch = keepbranches and repo[p1].branch() != ctx.branch() keepbranch = keepbranches and repo[p1].branch() != ctx.branch()
extra = {'rebase_source': ctx.hex()} extra = {'rebase_source': ctx.hex()}
if extrafn: if extrafn:
extrafn(ctx, extra) extrafn(ctx, extra)
destphase = max(ctx.phase(), phases.draft) destphase = max(ctx.phase(), phases.draft)
overrides = {('phases', 'new-commit'): destphase} overrides = {('phases', 'new-commit'): destphase}
with repo.ui.configoverride(overrides, 'rebase'):
if keepbranch: if keepbranch:
repo.ui.setconfig('ui', 'allowemptycommit', True) overrides[('ui', 'allowemptycommit')] = True
with repo.ui.configoverride(overrides, 'rebase'):
# Commit might fail if unresolved files exist # Commit might fail if unresolved files exist
if date is None: if date is None:
date = ctx.date() date = ctx.date()
newnode = repo.commit(text=commitmsg, user=ctx.user(), newnode = repo.commit(text=commitmsg, user=ctx.user(),
date=date, extra=extra, editor=editor) date=date, extra=extra, editor=editor)
repo.dirstate.setbranch(repo[newnode].branch()) repo.dirstate.setbranch(repo[newnode].branch())
return newnode return newnode