| pulkit |
| hg-reviewers |
It would be nice to later be able to call wctx.setparents() whether
wctx is a workingctx or an overlayworkingctx.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/context.py (17 lines) | |||
| M | mercurial/localrepo.py (15 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | martinvonz | ||
| Closed | martinvonz | ||
| Closed | martinvonz |
| unfi = self._repo.unfiltered() | unfi = self._repo.unfiltered() | ||||
| return [ | return [ | ||||
| changectx( | changectx( | ||||
| self._repo, unfi.changelog.rev(n), n, maybe_filtered=False | self._repo, unfi.changelog.rev(n), n, maybe_filtered=False | ||||
| ) | ) | ||||
| for n in p | for n in p | ||||
| ] | ] | ||||
| def setparents(self, p1node, p2node=nullid): | |||||
| dirstate = self._repo.dirstate | |||||
| with dirstate.parentchange(): | |||||
| copies = dirstate.setparents(p1node, p2node) | |||||
| pctx = self._repo[p1node] | |||||
| if copies: | |||||
| # Adjust copy records, the dirstate cannot do it, it | |||||
| # requires access to parents manifests. Preserve them | |||||
| # only for entries added to first parent. | |||||
| for f in copies: | |||||
| if f not in pctx and copies[f] in pctx: | |||||
| dirstate.copy(copies[f], f) | |||||
| if p2node == nullid: | |||||
| for f, s in sorted(dirstate.copies().items()): | |||||
| if f not in pctx and s not in pctx: | |||||
| dirstate.copy(None, f) | |||||
| def _fileinfo(self, path): | def _fileinfo(self, path): | ||||
| # populate __dict__['_manifest'] as workingctx has no _manifestdelta | # populate __dict__['_manifest'] as workingctx has no _manifestdelta | ||||
| self._manifest | self._manifest | ||||
| return super(workingctx, self)._fileinfo(path) | return super(workingctx, self)._fileinfo(path) | ||||
| def _buildflagfunc(self): | def _buildflagfunc(self): | ||||
| # Create a fallback function for getting file flags when the | # Create a fallback function for getting file flags when the | ||||
| # filesystem doesn't support them | # filesystem doesn't support them | ||||
| if self.sharedpath != self.path: | if self.sharedpath != self.path: | ||||
| return b'store' | return b'store' | ||||
| return None | return None | ||||
| def wjoin(self, f, *insidef): | def wjoin(self, f, *insidef): | ||||
| return self.vfs.reljoin(self.root, f, *insidef) | return self.vfs.reljoin(self.root, f, *insidef) | ||||
| def setparents(self, p1, p2=nullid): | def setparents(self, p1, p2=nullid): | ||||
| with self.dirstate.parentchange(): | self[None].setparents(p1, p2) | ||||
| copies = self.dirstate.setparents(p1, p2) | |||||
| pctx = self[p1] | |||||
| if copies: | |||||
| # Adjust copy records, the dirstate cannot do it, it | |||||
| # requires access to parents manifests. Preserve them | |||||
| # only for entries added to first parent. | |||||
| for f in copies: | |||||
| if f not in pctx and copies[f] in pctx: | |||||
| self.dirstate.copy(copies[f], f) | |||||
| if p2 == nullid: | |||||
| for f, s in sorted(self.dirstate.copies().items()): | |||||
| if f not in pctx and s not in pctx: | |||||
| self.dirstate.copy(None, f) | |||||
| def filectx(self, path, changeid=None, fileid=None, changectx=None): | def filectx(self, path, changeid=None, fileid=None, changectx=None): | ||||
| """changeid must be a changeset revision, if specified. | """changeid must be a changeset revision, if specified. | ||||
| fileid can be a file revision or node.""" | fileid can be a file revision or node.""" | ||||
| return context.filectx( | return context.filectx( | ||||
| self, path, changeid, fileid, changectx=changectx | self, path, changeid, fileid, changectx=changectx | ||||
| ) | ) | ||||