This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3856

rebase: split _origrebase() for conveniece in dryrun
ClosedPublic

Authored by khanchi97 on Jun 28 2018, 4:10 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG9c3b48fb7ac5: rebase: split _origrebase() for conveniece in dryrun
Summary

This patch split _origrebase() method by extracting rbsrt part
from that to make it easy to implement dryrun in more elegant way
than before.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

khanchi97 created this revision.Jun 28 2018, 4:10 PM
khanchi97 updated this revision to Diff 9356.Jun 29 2018, 2:09 PM
Closed by commit rHG9c3b48fb7ac5: rebase: split _origrebase() for conveniece in dryrun (authored by khanchi97). · Explain WhyJun 29 2018, 9:47 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (20 lines)

Diff 9356

hgext/rebase.py

if dryrun: if dryrun:
return _dryrunrebase(ui, repo, **opts) return _dryrunrebase(ui, repo, **opts)
elif inmemory: elif inmemory:
try: try:
# in-memory merge doesn't support conflicts, so if we hit any, abort # in-memory merge doesn't support conflicts, so if we hit any, abort
# and re-run as an on-disk merge. # and re-run as an on-disk merge.
overrides = {('rebase', 'singletransaction'): True} overrides = {('rebase', 'singletransaction'): True}
with ui.configoverride(overrides, 'rebase'): with ui.configoverride(overrides, 'rebase'):
return _origrebase(ui, repo, inmemory=inmemory, **opts) return _dorebase(ui, repo, inmemory=inmemory, **opts)
except error.InMemoryMergeConflictsError: except error.InMemoryMergeConflictsError:
ui.warn(_('hit merge conflicts; re-running rebase without in-memory' ui.warn(_('hit merge conflicts; re-running rebase without in-memory'
' merge\n')) ' merge\n'))
_origrebase(ui, repo, abort=True) _dorebase(ui, repo, abort=True)
return _origrebase(ui, repo, inmemory=False, **opts) return _dorebase(ui, repo, inmemory=False, **opts)
else: else:
return _origrebase(ui, repo, **opts) return _dorebase(ui, repo, **opts)
def _dryrunrebase(ui, repo, **opts): def _dryrunrebase(ui, repo, **opts):
rbsrt = rebaseruntime(repo, ui, inmemory=True, opts=opts) rbsrt = rebaseruntime(repo, ui, inmemory=True, opts=opts)
with repo.wlock(), repo.lock(): with repo.wlock(), repo.lock():
try: try:
overrides = {('rebase', 'singletransaction'): True} overrides = {('rebase', 'singletransaction'): True}
with ui.configoverride(overrides, 'rebase'): with ui.configoverride(overrides, 'rebase'):
_origrebase(ui, repo, inmemory=True, rbsrt=rbsrt, _origrebase(ui, repo, rbsrt, inmemory=True,
leaveunfinished=True, **opts) leaveunfinished=True, **opts)
except error.InMemoryMergeConflictsError: except error.InMemoryMergeConflictsError:
ui.status(_('hit a merge conflict\n')) ui.status(_('hit a merge conflict\n'))
return 1 return 1
else: else:
ui.status(_('there will be no conflict, you can rebase\n')) ui.status(_('there will be no conflict, you can rebase\n'))
return 0 return 0
finally: finally:
rbsrt._prepareabortorcontinue(isabort=True) rbsrt._prepareabortorcontinue(isabort=True)
def _origrebase(ui, repo, inmemory=False, leaveunfinished=False, rbsrt=None, def _dorebase(ui, repo, inmemory=False, **opts):
**opts):
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
if not rbsrt:
rbsrt = rebaseruntime(repo, ui, inmemory, opts) rbsrt = rebaseruntime(repo, ui, inmemory, opts)
return _origrebase(ui, repo, rbsrt, inmemory=inmemory, **opts)
def _origrebase(ui, repo, rbsrt, inmemory=False, leaveunfinished=False, **opts):
with repo.wlock(), repo.lock(): with repo.wlock(), repo.lock():
# Validate input and define rebasing points # Validate input and define rebasing points
destf = opts.get('dest', None) destf = opts.get('dest', None)
srcf = opts.get('source', None) srcf = opts.get('source', None)
basef = opts.get('base', None) basef = opts.get('base', None)
revf = opts.get('rev', []) revf = opts.get('rev', [])
# search default destination in this space # search default destination in this space
# used in the 'hg pull --rebase' case, see issue 5214. # used in the 'hg pull --rebase' case, see issue 5214.