Mercurial > hg-stable

changeset 44040:f652b7ddc1d4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
overlwayworkingctx: remove doubly bad reference to wrapped ctx for copies `_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. Differential Revision: https://phab.mercurial-scm.org/D7801
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 27 Dec 2019 14:08:02 -0800
parents 0750cbffdb3b
children 58db8f63f4e2
files mercurial/context.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/context.py	Fri Dec 27 12:41:56 2019 -0800
+++ b/mercurial/context.py	Fri Dec 27 14:08:02 2019 -0800
@@ -2224,7 +2224,7 @@
         ]
 
     def p1copies(self):
-        copies = self._repo._wrappedctx.p1copies().copy()
+        copies = {}
         narrowmatch = self._repo.narrowmatch()
         for f in self._cache.keys():
             if not narrowmatch(f):
@@ -2236,7 +2236,7 @@
         return copies
 
     def p2copies(self):
-        copies = self._repo._wrappedctx.p2copies().copy()
+        copies = {}
         narrowmatch = self._repo.narrowmatch()
         for f in self._cache.keys():
             if not narrowmatch(f):