| pulkit |
| hg-reviewers |
We have had this higher-level function (higher than merge.update(),
that is) for a while. Let's simply some callers by using it. I don't
know why I didn't do this when I introduced the function.
After this patch, there are no remaining callers that call
hg.updaterepo() with overwrite=True. We'll clean that up soon.
| 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 (2 lines) | |||
| M | hgext/transplant.py (2 lines) | |||
| M | mercurial/cmdutil.py (5 lines) | |||
| M | mercurial/commands.py (2 lines) | |||
| M | mercurial/hg.py (2 lines) | |||
| M | mercurial/subrepo.py (6 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 |
| 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' | ||||
| ), | ), | ||||
| ) | ) | ||||
| # 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) | mergemod.clean_update(repo[rbsrt.originalwd]) | ||||
| 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'): | ||||
| # TODO: get rid of this meaningless try/finally enclosing. | # TODO: get rid of this meaningless try/finally enclosing. | ||||
| # this is kept only to reduce changes in a patch. | # this is kept only to reduce changes in a patch. | ||||
| pass | pass | ||||
| def stop(self, ui, repo): | def stop(self, ui, repo): | ||||
| """logic to stop an interrupted transplant""" | """logic to stop an interrupted transplant""" | ||||
| if self.canresume(): | if self.canresume(): | ||||
| startctx = repo[b'.'] | startctx = repo[b'.'] | ||||
| hg.updaterepo(repo, startctx.node(), overwrite=True) | merge.clean_update(startctx) | ||||
| ui.status(_(b"stopped the interrupted transplant\n")) | ui.status(_(b"stopped the interrupted transplant\n")) | ||||
| ui.status( | ui.status( | ||||
| _(b"working directory is now at %s\n") % startctx.hex()[:12] | _(b"working directory is now at %s\n") % startctx.hex()[:12] | ||||
| ) | ) | ||||
| self.unlog() | self.unlog() | ||||
| return 0 | return 0 | ||||
| def readseries(self): | def readseries(self): | ||||
| # changeset from which graft operation was started | # changeset from which graft operation was started | ||||
| if len(newnodes) > 0: | if len(newnodes) > 0: | ||||
| startctx = repo[newnodes[0]].p1() | startctx = repo[newnodes[0]].p1() | ||||
| else: | else: | ||||
| startctx = repo[b'.'] | startctx = repo[b'.'] | ||||
| # whether to strip or not | # whether to strip or not | ||||
| cleanup = False | cleanup = False | ||||
| from . import hg | |||||
| if newnodes: | if newnodes: | ||||
| newnodes = [repo[r].rev() for r in newnodes] | newnodes = [repo[r].rev() for r in newnodes] | ||||
| cleanup = True | cleanup = True | ||||
| # checking that none of the newnodes turned public or is public | # checking that none of the newnodes turned public or is public | ||||
| immutable = [c for c in newnodes if not repo[c].mutable()] | immutable = [c for c in newnodes if not repo[c].mutable()] | ||||
| if immutable: | if immutable: | ||||
| repo.ui.warn( | repo.ui.warn( | ||||
| b"new changesets detected on destination " | b"new changesets detected on destination " | ||||
| b"branch, can't strip\n" | b"branch, can't strip\n" | ||||
| ) | ) | ||||
| ) | ) | ||||
| cleanup = False | cleanup = False | ||||
| if cleanup: | if cleanup: | ||||
| with repo.wlock(), repo.lock(): | with repo.wlock(), repo.lock(): | ||||
| hg.updaterepo(repo, startctx.node(), overwrite=True) | mergemod.clean_update(startctx) | ||||
| # stripping the new nodes created | # stripping the new nodes created | ||||
| strippoints = [ | strippoints = [ | ||||
| c.node() for c in repo.set(b"roots(%ld)", newnodes) | c.node() for c in repo.set(b"roots(%ld)", newnodes) | ||||
| ] | ] | ||||
| repair.strip(repo.ui, repo, strippoints, backup=False) | repair.strip(repo.ui, repo, strippoints, backup=False) | ||||
| if not cleanup: | if not cleanup: | ||||
| # we don't update to the startnode if we can't strip | # we don't update to the startnode if we can't strip | ||||
| startctx = repo[b'.'] | startctx = repo[b'.'] | ||||
| hg.updaterepo(repo, startctx.node(), overwrite=True) | mergemod.clean_update(startctx) | ||||
| ui.status(_(b"graft aborted\n")) | ui.status(_(b"graft aborted\n")) | ||||
| ui.status(_(b"working directory is now at %s\n") % startctx.hex()[:12]) | ui.status(_(b"working directory is now at %s\n") % startctx.hex()[:12]) | ||||
| graftstate.delete() | graftstate.delete() | ||||
| return 0 | return 0 | ||||
| def readgraftstate(repo, graftstate): | def readgraftstate(repo, graftstate): | ||||
| return 0 | return 0 | ||||
| def _stopgraft(ui, repo, graftstate): | def _stopgraft(ui, repo, graftstate): | ||||
| """stop the interrupted graft""" | """stop the interrupted graft""" | ||||
| if not graftstate.exists(): | if not graftstate.exists(): | ||||
| raise error.Abort(_(b"no interrupted graft found")) | raise error.Abort(_(b"no interrupted graft found")) | ||||
| pctx = repo[b'.'] | pctx = repo[b'.'] | ||||
| hg.updaterepo(repo, pctx.node(), overwrite=True) | mergemod.clean_update(pctx) | ||||
| graftstate.delete() | graftstate.delete() | ||||
| ui.status(_(b"stopped the interrupted graft\n")) | ui.status(_(b"stopped the interrupted graft\n")) | ||||
| ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12]) | ui.status(_(b"working directory is now at %s\n") % pctx.hex()[:12]) | ||||
| return 0 | return 0 | ||||
| statemod.addunfinished( | statemod.addunfinished( | ||||
| b'graft', | b'graft', | ||||
| # naming conflict in clone() | # naming conflict in clone() | ||||
| _update = update | _update = update | ||||
| def clean(repo, node, show_stats=True, quietempty=False): | def clean(repo, node, show_stats=True, quietempty=False): | ||||
| """forcibly switch the working directory to node, clobbering changes""" | """forcibly switch the working directory to node, clobbering changes""" | ||||
| stats = updaterepo(repo, node, True) | stats = mergemod.clean_update(repo[node]) | ||||
| assert stats.unresolvedcount == 0 | assert stats.unresolvedcount == 0 | ||||
| if show_stats: | if show_stats: | ||||
| _showstats(repo, stats, quietempty) | _showstats(repo, stats, quietempty) | ||||
| # naming conflict in updatetotally() | # naming conflict in updatetotally() | ||||
| _clean = clean | _clean = clean | ||||
| from .i18n import _ | from .i18n import _ | ||||
| from . import ( | from . import ( | ||||
| cmdutil, | cmdutil, | ||||
| encoding, | encoding, | ||||
| error, | error, | ||||
| exchange, | exchange, | ||||
| logcmdutil, | logcmdutil, | ||||
| match as matchmod, | match as matchmod, | ||||
| merge as merge, | |||||
| node, | node, | ||||
| pathutil, | pathutil, | ||||
| phases, | phases, | ||||
| pycompat, | pycompat, | ||||
| scmutil, | scmutil, | ||||
| subrepoutil, | subrepoutil, | ||||
| util, | util, | ||||
| vfs as vfsmod, | vfs as vfsmod, | ||||
| urepo = repo.unfiltered() | urepo = repo.unfiltered() | ||||
| ctx = urepo[revision] | ctx = urepo[revision] | ||||
| if ctx.hidden(): | if ctx.hidden(): | ||||
| urepo.ui.warn( | urepo.ui.warn( | ||||
| _(b'revision %s in subrepository "%s" is hidden\n') | _(b'revision %s in subrepository "%s" is hidden\n') | ||||
| % (revision[0:12], self._path) | % (revision[0:12], self._path) | ||||
| ) | ) | ||||
| repo = urepo | repo = urepo | ||||
| hg.updaterepo(repo, revision, overwrite) | if overwrite: | ||||
| merge.clean_update(repo[revision]) | |||||
| else: | |||||
| hg.updaterepo(repo, revision, False) | |||||
| @annotatesubrepoerror | @annotatesubrepoerror | ||||
| def merge(self, state): | def merge(self, state): | ||||
| self._get(state) | self._get(state) | ||||
| cur = self._repo[b'.'] | cur = self._repo[b'.'] | ||||
| dst = self._repo[state[1]] | dst = self._repo[state[1]] | ||||
| anc = dst.ancestor(cur) | anc = dst.ancestor(cur) | ||||