Mercurial > hg
comparison hgext/rebase.py @ 39133:06baaf43c959
rebase: call _dorebase() properly
This fixes a regression from e9e742bd0501 where we failed to pass
all necessary arguments to _dorebase().
Differential Revision: https://phab.mercurial-scm.org/D4302
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Thu, 16 Aug 2018 18:53:51 +0000 |
| parents | ffb34ee6de9e |
| children | 485a3349d5ee |
comparison
equal
deleted
inserted
replaced
| 39132:873f3a56993f | 39133:06baaf43c959 |
|---|---|
| 862 with ui.configoverride(overrides, 'rebase'): | 862 with ui.configoverride(overrides, 'rebase'): |
| 863 return _dorebase(ui, repo, action, opts, inmemory=inmemory) | 863 return _dorebase(ui, repo, action, opts, inmemory=inmemory) |
| 864 except error.InMemoryMergeConflictsError: | 864 except error.InMemoryMergeConflictsError: |
| 865 ui.warn(_('hit merge conflicts; re-running rebase without in-memory' | 865 ui.warn(_('hit merge conflicts; re-running rebase without in-memory' |
| 866 ' merge\n')) | 866 ' merge\n')) |
| 867 _dorebase(ui, repo, action='abort') | 867 _dorebase(ui, repo, 'abort', opts) |
| 868 return _dorebase(ui, repo, action, opts, inmemory=False) | 868 return _dorebase(ui, repo, action, opts, inmemory=False) |
| 869 else: | 869 else: |
| 870 return _dorebase(ui, repo, action, opts) | 870 return _dorebase(ui, repo, action, opts) |
| 871 | 871 |
| 872 def _dryrunrebase(ui, repo, action, opts): | 872 def _dryrunrebase(ui, repo, action, opts): |