diff -r 041d829575ed -r e9413a3be093 mercurial/context.py
--- a/mercurial/context.py	Sun Mar 25 21:32:16 2018 -0700
+++ b/mercurial/context.py	Sun Mar 25 21:28:30 2018 -0700
@@ -1701,7 +1701,7 @@
     def data(self):
         return self._repo.wread(self._path)
     def renamed(self):
-        rp = self._repo.dirstate.copied(self._path)
+        rp = self.copysource()
         if not rp:
             return None
         return rp, self._changectx._parents[0]._manifest.get(rp, nullid)
@@ -2147,7 +2147,7 @@
         return self._parent.exists(self._path)
 
     def renamed(self):
-        path = self._parent.copydata(self._path)
+        path = self.copysource()
         if not path:
             return None
         return path, self._changectx._parents[0]._manifest.get(path, nullid)