This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1233

rebase: do not bail on uncomitted changes if rebasing in-memory
ClosedPublic

Authored by phillco on Oct 26 2017, 12:48 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGaa660c1203a9: rebase: do not bail on uncomitted changes if rebasing in-memory
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

phillco updated this revision to Diff 4043.Dec 1 2017, 3:09 AM
phillco updated this revision to Diff 4179.Dec 7 2017, 4:22 PM
durin42 accepted this revision.Dec 7 2017, 4:33 PM
This revision is now accepted and ready to land.Dec 7 2017, 4:33 PM
phillco updated this revision to Diff 4198.Dec 7 2017, 4:44 PM
Closed by commit rHGaa660c1203a9: rebase: do not bail on uncomitted changes if rebasing in-memory (authored by phillco). · Explain WhyDec 7 2017, 5:14 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (10 lines)

Diff 4221

hgext/rebase.py

ms = mergemod.mergestate.read(repo) ms = mergemod.mergestate.read(repo)
mergeutil.checkunresolved(ms) mergeutil.checkunresolved(ms)
retcode = rbsrt._prepareabortorcontinue(abortf) retcode = rbsrt._prepareabortorcontinue(abortf)
if retcode is not None: if retcode is not None:
return retcode return retcode
else: else:
destmap = _definedestmap(ui, repo, destf, srcf, basef, revf, destmap = _definedestmap(ui, repo, destf, srcf, basef, revf,
destspace=destspace) destspace=destspace,
inmemory=opts['inmemory'])
retcode = rbsrt._preparenewrebase(destmap) retcode = rbsrt._preparenewrebase(destmap)
if retcode is not None: if retcode is not None:
return retcode return retcode
tr = None tr = None
dsguard = None dsguard = None
singletr = ui.configbool('rebase', 'singletransaction') singletr = ui.configbool('rebase', 'singletransaction')
if singletr: if singletr:
tr = repo.transaction('rebase') tr = repo.transaction('rebase')
with util.acceptintervention(tr): with util.acceptintervention(tr):
if singletr: if singletr:
dsguard = dirstateguard.dirstateguard(repo, 'rebase') dsguard = dirstateguard.dirstateguard(repo, 'rebase')
with util.acceptintervention(dsguard): with util.acceptintervention(dsguard):
rbsrt._performrebase(tr) rbsrt._performrebase(tr)
rbsrt._finishrebase() rbsrt._finishrebase()
def _definedestmap(ui, repo, destf=None, srcf=None, basef=None, revf=None, def _definedestmap(ui, repo, destf=None, srcf=None, basef=None, revf=None,
destspace=None): destspace=None, inmemory=False):
"""use revisions argument to define destmap {srcrev: destrev}""" """use revisions argument to define destmap {srcrev: destrev}"""
if revf is None: if revf is None:
revf = [] revf = []
# destspace is here to work around issues with `hg pull --rebase` see # destspace is here to work around issues with `hg pull --rebase` see
# issue5214 for details # issue5214 for details
if srcf and basef: if srcf and basef:
raise error.Abort(_('cannot specify both a source and a base')) raise error.Abort(_('cannot specify both a source and a base'))
if revf and basef: if revf and basef:
raise error.Abort(_('cannot specify both a revision and a base')) raise error.Abort(_('cannot specify both a revision and a base'))
if revf and srcf: if revf and srcf:
raise error.Abort(_('cannot specify both a revision and a source')) raise error.Abort(_('cannot specify both a revision and a source'))
if not inmemory:
cmdutil.checkunfinished(repo) cmdutil.checkunfinished(repo)
cmdutil.bailifchanged(repo) cmdutil.bailifchanged(repo)
if ui.configbool('commands', 'rebase.requiredest') and not destf: if ui.configbool('commands', 'rebase.requiredest') and not destf:
raise error.Abort(_('you must specify a destination'), raise error.Abort(_('you must specify a destination'),
hint=_('use: hg rebase -d REV')) hint=_('use: hg rebase -d REV'))
dest = None dest = None
if revf: if revf: