| hg-reviewers |
Before this patch dryrun output contained "rebase aborted" every
time we run rebase in dryrun mode and this warning does not sound
safe from a user prespective.
| 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 (14 lines) | |||
| M | tests/test-rebase-inmemory.t (4 lines) |
| self.obsoletewithoutsuccessorindestination, | self.obsoletewithoutsuccessorindestination, | ||||
| obsoleteextinctsuccessors) = _computeobsoletenotrebased( | obsoleteextinctsuccessors) = _computeobsoletenotrebased( | ||||
| self.repo, obsoleteset, destmap) | self.repo, obsoleteset, destmap) | ||||
| skippedset = set(self.obsoletenotrebased) | skippedset = set(self.obsoletenotrebased) | ||||
| skippedset.update(self.obsoletewithoutsuccessorindestination) | skippedset.update(self.obsoletewithoutsuccessorindestination) | ||||
| skippedset.update(obsoleteextinctsuccessors) | skippedset.update(obsoleteextinctsuccessors) | ||||
| _checkobsrebase(self.repo, self.ui, obsoleteset, skippedset) | _checkobsrebase(self.repo, self.ui, obsoleteset, skippedset) | ||||
| def _prepareabortorcontinue(self, isabort, backup=True): | def _prepareabortorcontinue(self, isabort, backup=True, suppwarns=False): | ||||
| try: | try: | ||||
| self.restorestatus() | self.restorestatus() | ||||
| self.collapsemsg = restorecollapsemsg(self.repo, isabort) | self.collapsemsg = restorecollapsemsg(self.repo, isabort) | ||||
| except error.RepoLookupError: | except error.RepoLookupError: | ||||
| if isabort: | if isabort: | ||||
| clearstatus(self.repo) | clearstatus(self.repo) | ||||
| clearcollapsemsg(self.repo) | clearcollapsemsg(self.repo) | ||||
| self.repo.ui.warn(_('rebase aborted (no revision is removed,' | self.repo.ui.warn(_('rebase aborted (no revision is removed,' | ||||
| ' only broken state is cleared)\n')) | ' only broken state is cleared)\n')) | ||||
| return 0 | return 0 | ||||
| else: | else: | ||||
| msg = _('cannot continue inconsistent rebase') | msg = _('cannot continue inconsistent rebase') | ||||
| hint = _('use "hg rebase --abort" to clear broken state') | hint = _('use "hg rebase --abort" to clear broken state') | ||||
| raise error.Abort(msg, hint=hint) | raise error.Abort(msg, hint=hint) | ||||
| if isabort: | if isabort: | ||||
| return abort(self.repo, self.originalwd, self.destmap, self.state, | return abort(self.repo, self.originalwd, self.destmap, self.state, | ||||
| activebookmark=self.activebookmark, backup=backup) | activebookmark=self.activebookmark, backup=backup, | ||||
| suppwarns=suppwarns) | |||||
| def _preparenewrebase(self, destmap): | def _preparenewrebase(self, destmap): | ||||
| if not destmap: | if not destmap: | ||||
| return _nothingtorebase() | return _nothingtorebase() | ||||
| rebaseset = destmap.keys() | rebaseset = destmap.keys() | ||||
| allowunstable = obsolete.isenabled(self.repo, obsolete.allowunstableopt) | allowunstable = obsolete.isenabled(self.repo, obsolete.allowunstableopt) | ||||
| if (not (self.keepf or allowunstable) | if (not (self.keepf or allowunstable) | ||||
| except error.InMemoryMergeConflictsError: | except error.InMemoryMergeConflictsError: | ||||
| ui.status(_('hit a merge conflict\n')) | ui.status(_('hit a merge conflict\n')) | ||||
| return 1 | return 1 | ||||
| else: | else: | ||||
| ui.status(_('there will be no conflict, you can rebase\n')) | ui.status(_('there will be no conflict, you can rebase\n')) | ||||
| return 0 | return 0 | ||||
| finally: | finally: | ||||
| # no need to store backup in case of dryrun | # no need to store backup in case of dryrun | ||||
| rbsrt._prepareabortorcontinue(isabort=True, backup=False) | rbsrt._prepareabortorcontinue(isabort=True, backup=False, | ||||
| suppwarns=True) | |||||
| def _dorebase(ui, repo, inmemory=False, **opts): | def _dorebase(ui, repo, inmemory=False, **opts): | ||||
| rbsrt = rebaseruntime(repo, ui, inmemory, pycompat.byteskwargs(opts)) | rbsrt = rebaseruntime(repo, ui, inmemory, pycompat.byteskwargs(opts)) | ||||
| return _origrebase(ui, repo, rbsrt, inmemory=inmemory, **opts) | return _origrebase(ui, repo, rbsrt, inmemory=inmemory, **opts) | ||||
| def _origrebase(ui, repo, rbsrt, inmemory=False, leaveunfinished=False, **opts): | def _origrebase(ui, repo, rbsrt, inmemory=False, leaveunfinished=False, **opts): | ||||
| opts = pycompat.byteskwargs(opts) | opts = pycompat.byteskwargs(opts) | ||||
| with repo.wlock(), repo.lock(): | with repo.wlock(), repo.lock(): | ||||
| # We should be standing on the first as-of-yet unrebased commit. | # We should be standing on the first as-of-yet unrebased commit. | ||||
| firstunrebased = min([old for old, new in state.iteritems() | firstunrebased = min([old for old, new in state.iteritems() | ||||
| if new == nullrev]) | if new == nullrev]) | ||||
| if firstunrebased in parents: | if firstunrebased in parents: | ||||
| return True | return True | ||||
| return False | return False | ||||
| def abort(repo, originalwd, destmap, state, activebookmark=None, backup=True): | def abort(repo, originalwd, destmap, state, activebookmark=None, backup=True, | ||||
| suppwarns=False): | |||||
| '''Restore the repository to its original state. Additional args: | '''Restore the repository to its original state. Additional args: | ||||
| activebookmark: the name of the bookmark that should be active after the | activebookmark: the name of the bookmark that should be active after the | ||||
| restore''' | restore''' | ||||
| try: | try: | ||||
| # If the first commits in the rebased set get skipped during the rebase, | # If the first commits in the rebased set get skipped during the rebase, | ||||
| # their values within the state mapping will be the dest rev id. The | # their values within the state mapping will be the dest rev id. The | ||||
| repair.strip(repo.ui, repo, strippoints, backup=backup) | repair.strip(repo.ui, repo, strippoints, backup=backup) | ||||
| if activebookmark and activebookmark in repo._bookmarks: | if activebookmark and activebookmark in repo._bookmarks: | ||||
| bookmarks.activate(repo, activebookmark) | bookmarks.activate(repo, activebookmark) | ||||
| finally: | finally: | ||||
| clearstatus(repo) | clearstatus(repo) | ||||
| clearcollapsemsg(repo) | clearcollapsemsg(repo) | ||||
| if not suppwarns: | |||||
| repo.ui.warn(_('rebase aborted\n')) | repo.ui.warn(_('rebase aborted\n')) | ||||
| return 0 | return 0 | ||||
| def sortsource(destmap): | def sortsource(destmap): | ||||
| """yield source revisions in an order that we only rebase things once | """yield source revisions in an order that we only rebase things once | ||||
| If source and destination overlaps, we should filter out revisions | If source and destination overlaps, we should filter out revisions | ||||
| depending on other revisions which hasn't been rebased yet. | depending on other revisions which hasn't been rebased yet. | ||||
| [255] | [255] | ||||
| Check dryrun gives correct results when there is no conflict in rebasing | Check dryrun gives correct results when there is no conflict in rebasing | ||||
| $ hg rebase -s 2 -d 6 -n | $ hg rebase -s 2 -d 6 -n | ||||
| rebasing 2:177f92b77385 "c" | rebasing 2:177f92b77385 "c" | ||||
| rebasing 3:055a42cdd887 "d" | rebasing 3:055a42cdd887 "d" | ||||
| rebasing 4:e860deea161a "e" | rebasing 4:e860deea161a "e" | ||||
| there will be no conflict, you can rebase | there will be no conflict, you can rebase | ||||
| rebase aborted | |||||
| $ hg diff | $ hg diff | ||||
| $ hg status | $ hg status | ||||
| $ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n" | $ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n" | ||||
| @ 6:baf10c5166d4 test | @ 6:baf10c5166d4 test | ||||
| | g | | g | ||||
| | | | | ||||
| a | a | ||||
| Check dryrun working with --collapse when there is no conflict | Check dryrun working with --collapse when there is no conflict | ||||
| $ hg rebase -s 2 -d 6 -n --collapse | $ hg rebase -s 2 -d 6 -n --collapse | ||||
| rebasing 2:177f92b77385 "c" | rebasing 2:177f92b77385 "c" | ||||
| rebasing 3:055a42cdd887 "d" | rebasing 3:055a42cdd887 "d" | ||||
| rebasing 4:e860deea161a "e" | rebasing 4:e860deea161a "e" | ||||
| there will be no conflict, you can rebase | there will be no conflict, you can rebase | ||||
| rebase aborted | |||||
| Check dryrun gives correct results when there is conflict in rebasing | Check dryrun gives correct results when there is conflict in rebasing | ||||
| Make a conflict: | Make a conflict: | ||||
| $ hg up 6 -q | $ hg up 6 -q | ||||
| $ echo conflict>e | $ echo conflict>e | ||||
| $ hg ci -Aqm "conflict with e" | $ hg ci -Aqm "conflict with e" | ||||
| $ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n" | $ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n" | ||||
| @ 7:d2c195b28050 test | @ 7:d2c195b28050 test | ||||
| $ hg rebase -s 2 -d 7 -n | $ hg rebase -s 2 -d 7 -n | ||||
| rebasing 2:177f92b77385 "c" | rebasing 2:177f92b77385 "c" | ||||
| rebasing 3:055a42cdd887 "d" | rebasing 3:055a42cdd887 "d" | ||||
| rebasing 4:e860deea161a "e" | rebasing 4:e860deea161a "e" | ||||
| merging e | merging e | ||||
| transaction abort! | transaction abort! | ||||
| rollback completed | rollback completed | ||||
| hit a merge conflict | hit a merge conflict | ||||
| rebase aborted | |||||
| [1] | [1] | ||||
| $ hg diff | $ hg diff | ||||
| $ hg status | $ hg status | ||||
| $ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n" | $ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n" | ||||
| @ 7:d2c195b28050 test | @ 7:d2c195b28050 test | ||||
| | conflict with e | | conflict with e | ||||
| | | | | ||||
| o 6:baf10c5166d4 test | o 6:baf10c5166d4 test | ||||
| Check dryrun working with --collapse when there is conflicts | Check dryrun working with --collapse when there is conflicts | ||||
| $ hg rebase -s 2 -d 7 -n --collapse | $ hg rebase -s 2 -d 7 -n --collapse | ||||
| rebasing 2:177f92b77385 "c" | rebasing 2:177f92b77385 "c" | ||||
| rebasing 3:055a42cdd887 "d" | rebasing 3:055a42cdd887 "d" | ||||
| rebasing 4:e860deea161a "e" | rebasing 4:e860deea161a "e" | ||||
| merging e | merging e | ||||
| hit a merge conflict | hit a merge conflict | ||||
| rebase aborted | |||||
| [1] | [1] | ||||