Mercurial > hg
comparison hgext/rebase.py @ 40819:cb372d09d30a
merge with stable
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Tue, 04 Dec 2018 17:13:01 -0500 |
| parents | ea84c2b286a2 6f679f25fd4d |
| children | c8eb8d1fc6cf |
comparison
equal
deleted
inserted
replaced
| 40811:e13ab4acf555 | 40819:cb372d09d30a |
|---|---|
| 540 ui.status(_('rebasing %s\n') % desc) | 540 ui.status(_('rebasing %s\n') % desc) |
| 541 progressfn(ctx) | 541 progressfn(ctx) |
| 542 p1, p2, base = defineparents(repo, rev, self.destmap, | 542 p1, p2, base = defineparents(repo, rev, self.destmap, |
| 543 self.state, self.skipped, | 543 self.state, self.skipped, |
| 544 self.obsoletenotrebased) | 544 self.obsoletenotrebased) |
| 545 if len(repo[None].parents()) == 2: | 545 if not self.inmemory and len(repo[None].parents()) == 2: |
| 546 repo.ui.debug('resuming interrupted rebase\n') | 546 repo.ui.debug('resuming interrupted rebase\n') |
| 547 else: | 547 else: |
| 548 overrides = {('ui', 'forcemerge'): opts.get('tool', '')} | 548 overrides = {('ui', 'forcemerge'): opts.get('tool', '')} |
| 549 with ui.configoverride(overrides, 'rebase'): | 549 with ui.configoverride(overrides, 'rebase'): |
| 550 stats = rebasenode(repo, rev, p1, base, self.collapsef, | 550 stats = rebasenode(repo, rev, p1, base, self.collapsef, |
| 865 with ui.configoverride(overrides, 'rebase'): | 865 with ui.configoverride(overrides, 'rebase'): |
| 866 return _dorebase(ui, repo, action, opts, inmemory=inmemory) | 866 return _dorebase(ui, repo, action, opts, inmemory=inmemory) |
| 867 except error.InMemoryMergeConflictsError: | 867 except error.InMemoryMergeConflictsError: |
| 868 ui.warn(_('hit merge conflicts; re-running rebase without in-memory' | 868 ui.warn(_('hit merge conflicts; re-running rebase without in-memory' |
| 869 ' merge\n')) | 869 ' merge\n')) |
| 870 _dorebase(ui, repo, action='abort', opts={}) | 870 # TODO: Make in-memory merge not use the on-disk merge state, so |
| 871 # we don't have to clean it here | |
| 872 mergemod.mergestate.clean(repo) | |
| 873 clearstatus(repo) | |
| 874 clearcollapsemsg(repo) | |
| 871 return _dorebase(ui, repo, action, opts, inmemory=False) | 875 return _dorebase(ui, repo, action, opts, inmemory=False) |
| 872 else: | 876 else: |
| 873 return _dorebase(ui, repo, action, opts) | 877 return _dorebase(ui, repo, action, opts) |
| 874 | 878 |
| 875 def _dryrunrebase(ui, repo, action, opts): | 879 def _dryrunrebase(ui, repo, action, opts): |