| indygreg |
| hg-reviewers |
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/rebase.py (6 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| self.storestatus(tr=tr) | self.storestatus(tr=tr) | ||||
| storecollapsemsg(repo, self.collapsemsg) | storecollapsemsg(repo, self.collapsemsg) | ||||
| if len(repo[None].parents()) == 2: | if len(repo[None].parents()) == 2: | ||||
| repo.ui.debug('resuming interrupted rebase\n') | repo.ui.debug('resuming interrupted rebase\n') | ||||
| else: | else: | ||||
| try: | try: | ||||
| ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), | ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), | ||||
| 'rebase') | 'rebase') | ||||
| stats = rebasenode(repo, rev, p1, base, self.state, | stats = rebasenode(repo, rev, p1, base, self.collapsef, | ||||
| self.collapsef, dest, wctx=self.wctx) | dest, wctx=self.wctx) | ||||
| if stats and stats[3] > 0: | if stats and stats[3] > 0: | ||||
| if self.wctx.isinmemory(): | if self.wctx.isinmemory(): | ||||
| raise error.InMemoryMergeConflictsError() | raise error.InMemoryMergeConflictsError() | ||||
| else: | else: | ||||
| raise error.InterventionRequired( | raise error.InterventionRequired( | ||||
| _('unresolved conflicts (see hg ' | _('unresolved conflicts (see hg ' | ||||
| 'resolve, then hg rebase --continue)')) | 'resolve, then hg rebase --continue)')) | ||||
| finally: | finally: | ||||
| if date is None: | if date is None: | ||||
| date = ctx.date() | date = ctx.date() | ||||
| newnode = repo.commit(text=commitmsg, user=ctx.user(), | newnode = repo.commit(text=commitmsg, user=ctx.user(), | ||||
| date=date, extra=extra, editor=editor) | date=date, extra=extra, editor=editor) | ||||
| repo.dirstate.setbranch(repo[newnode].branch()) | repo.dirstate.setbranch(repo[newnode].branch()) | ||||
| return newnode | return newnode | ||||
| def rebasenode(repo, rev, p1, base, state, collapse, dest, wctx): | def rebasenode(repo, rev, p1, base, collapse, dest, wctx): | ||||
| 'Rebase a single revision rev on top of p1 using base as merge ancestor' | 'Rebase a single revision rev on top of p1 using base as merge ancestor' | ||||
| # Merge phase | # Merge phase | ||||
| # Update to destination and merge it with local | # Update to destination and merge it with local | ||||
| if wctx.isinmemory(): | if wctx.isinmemory(): | ||||
| wctx.setbase(repo[p1]) | wctx.setbase(repo[p1]) | ||||
| else: | else: | ||||
| if repo['.'].rev() != p1: | if repo['.'].rev() != p1: | ||||
| repo.ui.debug(" update to %d:%s\n" % (p1, repo[p1])) | repo.ui.debug(" update to %d:%s\n" % (p1, repo[p1])) | ||||