This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4302

rebase: call _dorebase() properly
ClosedPublic

Authored by indygreg on Aug 16 2018, 2:53 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG06baaf43c959: rebase: call _dorebase() properly
Summary

This fixes a regression from e9e742bd0501 where we failed to pass
all necessary arguments to _dorebase().

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Aug 16 2018, 2:53 PM
Closed by commit rHG06baaf43c959: rebase: call _dorebase() properly (authored by indygreg). · Explain WhyAug 16 2018, 3:01 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (2 lines)

Diff 10395

hgext/rebase.py

# 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 _dorebase(ui, repo, action, opts, inmemory=inmemory) return _dorebase(ui, repo, action, opts, inmemory=inmemory)
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'))
_dorebase(ui, repo, action='abort') _dorebase(ui, repo, 'abort', opts)
return _dorebase(ui, repo, action, opts, inmemory=False) return _dorebase(ui, repo, action, opts, inmemory=False)
else: else:
return _dorebase(ui, repo, action, opts) return _dorebase(ui, repo, action, opts)
def _dryrunrebase(ui, repo, action, opts): def _dryrunrebase(ui, repo, action, opts):
rbsrt = rebaseruntime(repo, ui, inmemory=True, opts=opts) rbsrt = rebaseruntime(repo, ui, inmemory=True, opts=opts)
confirm = opts.get('confirm') confirm = opts.get('confirm')
if confirm: if confirm: