This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6647

copies: remove unnecessary override of p[12]copies() in workingctx
ClosedPublic

Authored by martinvonz on Jul 15 2019, 6:36 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG97b03f0e7c7b: copies: remove unnecessary override of p[12]copies() in workingctx
Summary

The implementation is identical to the version inherited from basectx.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Jul 15 2019, 6:36 PM
pulkit accepted this revision.Jul 17 2019, 1:18 AM
This revision is now accepted and ready to land.Jul 17 2019, 1:18 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (4 lines)

Diff 15925

mercurial/context.py

for dst, src in self._repo.dirstate.copies().items(): for dst, src in self._repo.dirstate.copies().items():
if not narrowmatch(dst): if not narrowmatch(dst):
continue continue
if src in p1manifest: if src in p1manifest:
p1copies[dst] = src p1copies[dst] = src
elif src in p2manifest: elif src in p2manifest:
p2copies[dst] = src p2copies[dst] = src
return p1copies, p2copies return p1copies, p2copies
def p1copies(self):
return self._copies[0]
def p2copies(self):
return self._copies[1]
@propertycache @propertycache
def _manifest(self): def _manifest(self):
"""generate a manifest corresponding to the values in self._status """generate a manifest corresponding to the values in self._status
This reuse the file nodeid from parent, but we use special node This reuse the file nodeid from parent, but we use special node
identifiers for added and modified files. This is used by manifests identifiers for added and modified files. This is used by manifests
merge to see that files are different and by update logic to avoid merge to see that files are different and by update logic to avoid