##// END OF EJS Templates
context: rewrite renamed() in terms of new copysource() where appropriate...
Martin von Zweigbergk -
r41935:e9413a3b default
parent child Browse files
Show More
@@ -1701,7 +1701,7 b' class workingfilectx(committablefilectx)'
1701 def data(self):
1701 def data(self):
1702 return self._repo.wread(self._path)
1702 return self._repo.wread(self._path)
1703 def renamed(self):
1703 def renamed(self):
1704 rp = self._repo.dirstate.copied(self._path)
1704 rp = self.copysource()
1705 if not rp:
1705 if not rp:
1706 return None
1706 return None
1707 return rp, self._changectx._parents[0]._manifest.get(rp, nullid)
1707 return rp, self._changectx._parents[0]._manifest.get(rp, nullid)
@@ -2147,7 +2147,7 b' class overlayworkingfilectx(committablef'
2147 return self._parent.exists(self._path)
2147 return self._parent.exists(self._path)
2148
2148
2149 def renamed(self):
2149 def renamed(self):
2150 path = self._parent.copydata(self._path)
2150 path = self.copysource()
2151 if not path:
2151 if not path:
2152 return None
2152 return None
2153 return path, self._changectx._parents[0]._manifest.get(path, nullid)
2153 return path, self._changectx._parents[0]._manifest.get(path, nullid)
General Comments 0
You need to be logged in to leave comments. Login now