| pulkit |
| hg-reviewers |
This seemed to be about checking that the user hasn't updated away
when we asked them to resolve merge conflicts. These days we call
cmdutil.checkunfinished() and refuse to update, so the user
shouldn't be able to get into this state.
test-rebase-interruptions.t actually has some tests where it
disables the rebase extension in order to be allowed to do some of
these updates. That still passes, but I wouldn't personally haved
cared if that failed.
| 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 (28 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| ] | ] | ||||
| updateifonnodes = set(rebased) | updateifonnodes = set(rebased) | ||||
| updateifonnodes.update(self.destmap.values()) | updateifonnodes.update(self.destmap.values()) | ||||
| updateifonnodes.add(self.originalwd) | updateifonnodes.add(self.originalwd) | ||||
| shouldupdate = repo[b'.'].rev() in updateifonnodes | shouldupdate = repo[b'.'].rev() in updateifonnodes | ||||
| # Update away from the rebase if necessary | # Update away from the rebase if necessary | ||||
| if shouldupdate or needupdate(repo, self.state): | if shouldupdate: | ||||
| mergemod.update( | mergemod.update( | ||||
| repo, self.originalwd, branchmerge=False, force=True | repo, self.originalwd, branchmerge=False, force=True | ||||
| ) | ) | ||||
| # Strip from the first rebased revision | # Strip from the first rebased revision | ||||
| if rebased: | if rebased: | ||||
| repair.strip(repo.ui, repo, strippoints, backup=backup) | repair.strip(repo.ui, repo, strippoints, backup=backup) | ||||
| b" unrebased descendants" | b" unrebased descendants" | ||||
| ), | ), | ||||
| hint=_( | hint=_( | ||||
| b'either enable obsmarkers to allow unstable ' | b'either enable obsmarkers to allow unstable ' | ||||
| b'revisions or use --keep to keep original ' | b'revisions or use --keep to keep original ' | ||||
| b'changesets' | b'changesets' | ||||
| ), | ), | ||||
| ) | ) | ||||
| if needupdate(repo, rbsrt.state): | |||||
| # update to the current working revision | # update to the current working revision | ||||
| # to clear interrupted merge | # to clear interrupted merge | ||||
| hg.updaterepo(repo, rbsrt.originalwd, overwrite=True) | hg.updaterepo(repo, rbsrt.originalwd, overwrite=True) | ||||
| rbsrt._finishrebase() | rbsrt._finishrebase() | ||||
| return 0 | return 0 | ||||
| elif inmemory: | elif inmemory: | ||||
| try: | try: | ||||
| # in-memory merge doesn't support conflicts, so if we hit any, abort | # in-memory merge doesn't support conflicts, so if we hit any, abort | ||||
| # and re-run as an on-disk merge. | # and re-run as an on-disk merge. | ||||
| overrides = {(b'rebase', b'singletransaction'): True} | overrides = {(b'rebase', b'singletransaction'): True} | ||||
| with ui.configoverride(overrides, b'rebase'): | with ui.configoverride(overrides, b'rebase'): | ||||
| """Remove the status files""" | """Remove the status files""" | ||||
| # Make sure the active transaction won't write the state file | # Make sure the active transaction won't write the state file | ||||
| tr = repo.currenttransaction() | tr = repo.currenttransaction() | ||||
| if tr: | if tr: | ||||
| tr.removefilegenerator(b'rebasestate') | tr.removefilegenerator(b'rebasestate') | ||||
| repo.vfs.unlinkpath(b"rebasestate", ignoremissing=True) | repo.vfs.unlinkpath(b"rebasestate", ignoremissing=True) | ||||
| def needupdate(repo, state): | |||||
| '''check whether we should `update --clean` away from a merge, or if | |||||
| somehow the working dir got forcibly updated, e.g. by older hg''' | |||||
| parents = [p.rev() for p in repo[None].parents()] | |||||
| # Are we in a merge state at all? | |||||
| if len(parents) < 2: | |||||
| return False | |||||
| # We should be standing on the first as-of-yet unrebased commit. | |||||
| firstunrebased = min( | |||||
| [old for old, new in pycompat.iteritems(state) if new == nullrev] | |||||
| ) | |||||
| if firstunrebased in parents: | |||||
| return True | |||||
| return False | |||||
| 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. | ||||
| Yield a sorted list of revisions each time. | Yield a sorted list of revisions each time. | ||||