| Alphare |
| hg-reviewers |
In an ideal world, we would not have to do that. However, we are miles away from
being ready to not have to do it.
So we add this context manager alongside a long comment. This will help use to
get to the point were have two distinct API with strict rules about when to call
them.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/commands.py (15 lines) |
| try: | try: | ||||
| util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f)) | util.rename(a + b".resolve", scmutil.backuppath(ui, repo, f)) | ||||
| except OSError as inst: | except OSError as inst: | ||||
| if inst.errno != errno.ENOENT: | if inst.errno != errno.ENOENT: | ||||
| raise | raise | ||||
| ms.commit() | ms.commit() | ||||
| branchmerge = repo.dirstate.p2() != repo.nullid | branchmerge = repo.dirstate.p2() != repo.nullid | ||||
| # resolve is not doing a parent change here, however, `record updates` | |||||
| # will call some dirstate API that at intended for parent changes call. | |||||
| # Ideally we would not need this and could implement a lighter version | |||||
| # of the recordupdateslogic that will not have to deal with the part | |||||
| # related to parent changes. However this would requires that: | |||||
| # - we are sure we passed around enough information at update/merge | |||||
| # time to no longer needs it at `hg resolve time` | |||||
| # - we are sure we store that information well enough to be able to reuse it | |||||
| # - we are the necessary logic to reuse it right. | |||||
| # | |||||
| # All this should eventually happens, but in the mean time, we use this | |||||
| # context manager slightly out of the context it should be. | |||||
| with repo.dirstate.parentchange(): | |||||
| mergestatemod.recordupdates(repo, ms.actions(), branchmerge, None) | mergestatemod.recordupdates(repo, ms.actions(), branchmerge, None) | ||||
| if not didwork and pats: | if not didwork and pats: | ||||
| hint = None | hint = None | ||||
| if not any([p for p in pats if p.find(b':') >= 0]): | if not any([p for p in pats if p.find(b':') >= 0]): | ||||
| pats = [b'path:%s' % p for p in pats] | pats = [b'path:%s' % p for p in pats] | ||||
| m = scmutil.match(wctx, pats, opts) | m = scmutil.match(wctx, pats, opts) | ||||
| for f in ms: | for f in ms: | ||||
| if not m(f): | if not m(f): | ||||