This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7801

overlwayworkingctx: remove doubly bad reference to wrapped ctx for copies
ClosedPublic

Authored by martinvonz on Jan 6 2020, 7:58 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGf652b7ddc1d4: overlwayworkingctx: remove doubly bad reference to wrapped ctx for copies
Summary

_wrappedctx lives on overlwayworkingctx, not on the repo object, so
we should access it as ._wrappedctx, not ._repo._wrappedctx. More
importantly, the overlayworkingctx is relative to its base, not
including it, so the copies returned should not include copies made in
the base.

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (4 lines)

Diff 19123

mercurial/context.py

def removed(self): def removed(self):
return [ return [
f f
for f in self._cache.keys() for f in self._cache.keys()
if not self._cache[f][b'exists'] and self._existsinparent(f) if not self._cache[f][b'exists'] and self._existsinparent(f)
] ]
def p1copies(self): def p1copies(self):
copies = self._repo._wrappedctx.p1copies().copy() copies = {}
narrowmatch = self._repo.narrowmatch() narrowmatch = self._repo.narrowmatch()
for f in self._cache.keys(): for f in self._cache.keys():
if not narrowmatch(f): if not narrowmatch(f):
continue continue
copies.pop(f, None) # delete if it exists copies.pop(f, None) # delete if it exists
source = self._cache[f][b'copied'] source = self._cache[f][b'copied']
if source: if source:
copies[f] = source copies[f] = source
return copies return copies
def p2copies(self): def p2copies(self):
copies = self._repo._wrappedctx.p2copies().copy() copies = {}
narrowmatch = self._repo.narrowmatch() narrowmatch = self._repo.narrowmatch()
for f in self._cache.keys(): for f in self._cache.keys():
if not narrowmatch(f): if not narrowmatch(f):
continue continue
copies.pop(f, None) # delete if it exists copies.pop(f, None) # delete if it exists
source = self._cache[f][b'copied'] source = self._cache[f][b'copied']
if source: if source:
copies[f] = source copies[f] = source