| quark |
| hg-reviewers |
This patch takes the benefit of functionality which we added in
scmutil.cleanupnodes() and passes a formatter instance if the changes flag is
passed.
| Lint Skipped |
| Unit Tests Skipped |
Per discussion at D581, we probably want to go the -T '{changes|json}' approach instead of -T json --changes.
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/rebase.py (14 lines) | |||
| M | tests/test-rebase-base.t (43 lines) |
| newwd = self.state.get(self.originalwd, self.originalwd) | newwd = self.state.get(self.originalwd, self.originalwd) | ||||
| if newwd < 0: | if newwd < 0: | ||||
| # original directory is a parent of rebase set root or ignored | # original directory is a parent of rebase set root or ignored | ||||
| newwd = self.originalwd | newwd = self.originalwd | ||||
| if newwd not in [c.rev() for c in repo[None].parents()]: | if newwd not in [c.rev() for c in repo[None].parents()]: | ||||
| ui.note(_("update back to initial working directory parent\n")) | ui.note(_("update back to initial working directory parent\n")) | ||||
| hg.updaterepo(repo, newwd, False) | hg.updaterepo(repo, newwd, False) | ||||
| fm = None | |||||
| if opts.get('changes'): | |||||
| fm = ui.formatter('rebase', opts) | |||||
| if not self.keepf: | if not self.keepf: | ||||
| collapsedas = None | collapsedas = None | ||||
| if self.collapsef: | if self.collapsef: | ||||
| collapsedas = newnode | collapsedas = newnode | ||||
| clearrebased(ui, repo, self.destmap, self.state, self.skipped, | clearrebased(ui, repo, self.destmap, self.state, self.skipped, | ||||
| collapsedas) | collapsedas, fm=fm) | ||||
| if fm: | |||||
| fm.end() | |||||
| clearstatus(repo) | clearstatus(repo) | ||||
| clearcollapsemsg(repo) | clearcollapsemsg(repo) | ||||
| ui.note(_("rebase completed\n")) | ui.note(_("rebase completed\n")) | ||||
| util.unlinkpath(repo.sjoin('undo'), ignoremissing=True) | util.unlinkpath(repo.sjoin('undo'), ignoremissing=True) | ||||
| if self.skipped: | if self.skipped: | ||||
| skippedlen = len(self.skipped) | skippedlen = len(self.skipped) | ||||
| ('l', 'logfile', '', | ('l', 'logfile', '', | ||||
| _('read collapse commit message from file'), _('FILE')), | _('read collapse commit message from file'), _('FILE')), | ||||
| ('k', 'keep', False, _('keep original changesets')), | ('k', 'keep', False, _('keep original changesets')), | ||||
| ('', 'keepbranches', False, _('keep original branch names')), | ('', 'keepbranches', False, _('keep original branch names')), | ||||
| ('D', 'detach', False, _('(DEPRECATED)')), | ('D', 'detach', False, _('(DEPRECATED)')), | ||||
| ('i', 'interactive', False, _('(DEPRECATED)')), | ('i', 'interactive', False, _('(DEPRECATED)')), | ||||
| ('t', 'tool', '', _('specify merge tool')), | ('t', 'tool', '', _('specify merge tool')), | ||||
| ('c', 'continue', False, _('continue an interrupted rebase')), | ('c', 'continue', False, _('continue an interrupted rebase')), | ||||
| ('', 'changes', False, _('show the node changes (EXPERIMENTAl)')), | |||||
| ('a', 'abort', False, _('abort an interrupted rebase'))] + | ('a', 'abort', False, _('abort an interrupted rebase'))] + | ||||
| templateopts, | templateopts, | ||||
| _('[-s REV | -b REV] [-d REV] [OPTION]')) | _('[-s REV | -b REV] [-d REV] [OPTION]')) | ||||
| def rebase(ui, repo, **opts): | def rebase(ui, repo, **opts): | ||||
| """move changeset (and descendants) to a different branch | """move changeset (and descendants) to a different branch | ||||
| Rebase uses repeated merging to graft changesets from one part of | Rebase uses repeated merging to graft changesets from one part of | ||||
| history (the source) onto another (the destination). This can be | history (the source) onto another (the destination). This can be | ||||
| return None | return None | ||||
| for rev in sorted(state): | for rev in sorted(state): | ||||
| parents = [p for p in repo.changelog.parentrevs(rev) if p != nullrev] | parents = [p for p in repo.changelog.parentrevs(rev) if p != nullrev] | ||||
| # if all parents of this revision are done, then so is this revision | # if all parents of this revision are done, then so is this revision | ||||
| if parents and all((state.get(p) == p for p in parents)): | if parents and all((state.get(p) == p for p in parents)): | ||||
| state[rev] = rev | state[rev] = rev | ||||
| return originalwd, destmap, state | return originalwd, destmap, state | ||||
| def clearrebased(ui, repo, destmap, state, skipped, collapsedas=None): | def clearrebased(ui, repo, destmap, state, skipped, collapsedas=None, fm=None): | ||||
| """dispose of rebased revision at the end of the rebase | """dispose of rebased revision at the end of the rebase | ||||
| If `collapsedas` is not None, the rebase was a collapse whose result if the | If `collapsedas` is not None, the rebase was a collapse whose result if the | ||||
| `collapsedas` node.""" | `collapsedas` node.""" | ||||
| tonode = repo.changelog.node | tonode = repo.changelog.node | ||||
| # Move bookmark of skipped nodes to destination. This cannot be handled | # Move bookmark of skipped nodes to destination. This cannot be handled | ||||
| # by scmutil.cleanupnodes since it will treat rev as removed (no successor) | # by scmutil.cleanupnodes since it will treat rev as removed (no successor) | ||||
| # and move bookmark backwards. | # and move bookmark backwards. | ||||
| bmchanges = [(name, tonode(state[rev])) | bmchanges = [(name, tonode(state[rev])) | ||||
| for rev in skipped | for rev in skipped | ||||
| for name in repo.nodebookmarks(tonode(rev))] | for name in repo.nodebookmarks(tonode(rev))] | ||||
| if bmchanges: | if bmchanges: | ||||
| with repo.transaction('rebase') as tr: | with repo.transaction('rebase') as tr: | ||||
| repo._bookmarks.applychanges(repo, tr, bmchanges) | repo._bookmarks.applychanges(repo, tr, bmchanges) | ||||
| mapping = {} | mapping = {} | ||||
| for rev, newrev in sorted(state.items()): | for rev, newrev in sorted(state.items()): | ||||
| if newrev >= 0 and newrev != rev: | if newrev >= 0 and newrev != rev: | ||||
| if rev in skipped: | if rev in skipped: | ||||
| succs = () | succs = () | ||||
| elif collapsedas is not None: | elif collapsedas is not None: | ||||
| succs = (collapsedas,) | succs = (collapsedas,) | ||||
| else: | else: | ||||
| succs = (tonode(newrev),) | succs = (tonode(newrev),) | ||||
| mapping[tonode(rev)] = succs | mapping[tonode(rev)] = succs | ||||
| scmutil.cleanupnodes(repo, mapping, 'rebase') | scmutil.cleanupnodes(repo, mapping, 'rebase', fm=fm) | ||||
| def pullrebase(orig, ui, repo, *args, **opts): | def pullrebase(orig, ui, repo, *args, **opts): | ||||
| 'Call rebase after pull if the latter has been invoked with --rebase' | 'Call rebase after pull if the latter has been invoked with --rebase' | ||||
| ret = None | ret = None | ||||
| if opts.get('rebase'): | if opts.get('rebase'): | ||||
| if ui.configbool('commands', 'rebase.requiredest'): | if ui.configbool('commands', 'rebase.requiredest'): | ||||
| msg = _('rebase destination required by configuration') | msg = _('rebase destination required by configuration') | ||||
| hint = _('use hg pull followed by hg rebase -d DEST') | hint = _('use hg pull followed by hg rebase -d DEST') | ||||
| o 3: B | o 3: B | ||||
| | | | | ||||
| o 2: Z | o 2: Z | ||||
| | | | | ||||
| o 1: Y | o 1: Y | ||||
| | | | | ||||
| o 0: A | o 0: A | ||||
| Enabling obsolete markers | |||||
| $ cat >> $HGRCPATH << EOF | |||||
| > [experimental] | |||||
| > stabilization=createmarkers,exchange | |||||
| > EOF | |||||
| Testing the --changes flag | |||||
| $ hg rebase -s 4 -d 2 --changes | |||||
| rebasing 4:abc67d0cf023 "C" | |||||
| rebasing 5:a701fddfacec "D" (tip) | |||||
| a701fddfacec -> 003ba25ccc56 | |||||
| abc67d0cf023 -> 2e4b11ea9404 | |||||
| $ hg tglog | |||||
| o 7: D | |||||
| | | |||||
| o 6: C | |||||
| | | |||||
| | o 3: B | |||||
| |/ | |||||
| o 2: Z | |||||
| | | |||||
| o 1: Y | |||||
| | | |||||
| o 0: A | |||||
| Only json output using `--changes -q -Tjson` | |||||
| $ hg rebase -s 6 -d 3 --changes -q -Tjson | |||||
| [ | |||||
| { | |||||
| "newnode": "38bd5f90ba6afc7ea705c11010eeef01bd3fb2f8", | |||||
| "oldnode": "003ba25ccc5677a25f8a186751b789f2da5aad53" | |||||
| }, | |||||
| { | |||||
| "newnode": "583565ab89ac6de0871825d399e305b01d364312", | |||||
| "oldnode": "2e4b11ea9404550c296bd4d3aedf1f22fdd1af8b" | |||||
| } | |||||
| ] | |||||
| $ cd .. | $ cd .. | ||||