This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3855

rebase: extract dryrun as a function
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGc92fdc27cbdd: rebase: extract dryrun as a function
Summary

To avoid more number of indented blocks and make it easier to add
additional functionality in dryrun, extracted as a function.

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

khanchi97 created this revision.Jun 28 2018, 4:10 PM
yuja added a subscriber: yuja.Jun 29 2018, 9:03 AM
rbsrt = rebaseruntime(repo, ui, inmemory, opts)
with repo.wlock(), repo.lock():
    try:
  • overrides = {('rebase', 'singletransaction'): True}
  • with ui.configoverride(overrides, 'rebase'):
  • _origrebase(ui, repo, inmemory=True, rbsrt=rbsrt,
  • leaveunfinished=True, **opts)

+ _dryrunrebase(ui, repo, rbsrt, **opts)

except error.InMemoryMergeConflictsError:
    ui.status(_('hit a merge conflict\n'))
    return 1

Oops, I meant the whole dryrun process could be extracted to a function
because it's getting bigger.

if dryrun:
    return _dryrunrebase(...)
else:
    ...

But feel free to ignore my suggestion if there's a reason to not move
everything.

khanchi97 added a comment.Jun 29 2018, 2:02 PM
In D3855#60250, @yuja wrote:
rbsrt = rebaseruntime(repo, ui, inmemory, opts)
with repo.wlock(), repo.lock():
    try:
  • overrides = {('rebase', 'singletransaction'): True}
  • with ui.configoverride(overrides, 'rebase'):
  • _origrebase(ui, repo, inmemory=True, rbsrt=rbsrt,
  • leaveunfinished=True, **opts)

+ _dryrunrebase(ui, repo, rbsrt, **opts)

except error.InMemoryMergeConflictsError:
    ui.status(_('hit a merge conflict\n'))
    return 1

Oops, I meant the whole dryrun process could be extracted to a function
because it's getting bigger.

if dryrun:
    return _dryrunrebase(...)
else:
    ...

But feel free to ignore my suggestion if there's a reason to not move
everything.

Aha, I thought you were pointing out to only "try:" block for more no. of indented blocks. I will update this.

khanchi97 updated this revision to Diff 9355.Jun 29 2018, 2:08 PM
Closed by commit rHGc92fdc27cbdd: rebase: extract dryrun as a function (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 (35 lines)

Diff 9370

hgext/rebase.py

if key != r'auto_orphans' and opts.get(key): if key != r'auto_orphans' and opts.get(key):
raise error.Abort(_('--auto-orphans is incompatible with %s') % raise error.Abort(_('--auto-orphans is incompatible with %s') %
('--' + pycompat.bytestr(key))) ('--' + pycompat.bytestr(key)))
userrevs = list(repo.revs(opts.get(r'auto_orphans'))) userrevs = list(repo.revs(opts.get(r'auto_orphans')))
opts[r'rev'] = [revsetlang.formatspec('%ld and orphan()', userrevs)] opts[r'rev'] = [revsetlang.formatspec('%ld and orphan()', userrevs)]
opts[r'dest'] = '_destautoorphanrebase(SRC)' opts[r'dest'] = '_destautoorphanrebase(SRC)'
if dryrun: if dryrun:
return _dryrunrebase(ui, repo, **opts)
elif inmemory:
try:
# in-memory merge doesn't support conflicts, so if we hit any, abort
# and re-run as an on-disk merge.
overrides = {('rebase', 'singletransaction'): True}
with ui.configoverride(overrides, 'rebase'):
return _origrebase(ui, repo, inmemory=inmemory, **opts)
except error.InMemoryMergeConflictsError:
ui.warn(_('hit merge conflicts; re-running rebase without in-memory'
' merge\n'))
_origrebase(ui, repo, abort=True)
return _origrebase(ui, repo, inmemory=False, **opts)
else:
return _origrebase(ui, repo, **opts)
def _dryrunrebase(ui, repo, **opts):
rbsrt = rebaseruntime(repo, ui, inmemory=True, rbsrt = rebaseruntime(repo, ui, inmemory=True,
opts=pycompat.byteskwargs(opts)) opts=pycompat.byteskwargs(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, inmemory=True, rbsrt=rbsrt,
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)
elif inmemory:
try:
# in-memory merge doesn't support conflicts, so if we hit any, abort
# and re-run as an on-disk merge.
overrides = {('rebase', 'singletransaction'): True}
with ui.configoverride(overrides, 'rebase'):
return _origrebase(ui, repo, inmemory=inmemory, **opts)
except error.InMemoryMergeConflictsError:
ui.warn(_('hit merge conflicts; re-running rebase without in-memory'
' merge\n'))
_origrebase(ui, repo, abort=True)
return _origrebase(ui, repo, inmemory=False, **opts)
else:
return _origrebase(ui, repo, **opts)
def _origrebase(ui, repo, inmemory=False, leaveunfinished=False, rbsrt=None, def _origrebase(ui, repo, inmemory=False, leaveunfinished=False, rbsrt=None,
**opts): **opts):
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
if not rbsrt: if not rbsrt:
rbsrt = rebaseruntime(repo, ui, inmemory, opts) rbsrt = rebaseruntime(repo, ui, inmemory, opts)
with repo.wlock(), repo.lock(): with repo.wlock(), repo.lock():