D6010: context: move equivalent renamed() implementations to superclass

martinvonz (Martin von Zweigbergk) phabricator at mercurial-scm.org
Sat Feb 23 12:09:05 EST 2019


martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  Now that renamed() in workingfilectx and in overlayfilectx are written
  in terms of copysource(), they are functionally identical and can be
  reused.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D6010

AFFECTED FILES
  mercurial/context.py

CHANGE DETAILS

diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -1664,6 +1664,12 @@
         # linked to self._changectx no matter if file is modified or not
         return self.rev()
 
+    def renamed(self):
+        path = self.copysource()
+        if not path:
+            return None
+        return path, self._changectx._parents[0]._manifest.get(path, nullid)
+
     def parents(self):
         '''return parent filectxs, following copies if necessary'''
         def filenode(ctx, path):
@@ -1700,11 +1706,6 @@
 
     def data(self):
         return self._repo.wread(self._path)
-    def renamed(self):
-        rp = self.copysource()
-        if not rp:
-            return None
-        return rp, self._changectx._parents[0]._manifest.get(rp, nullid)
     def copysource(self):
         return self._repo.dirstate.copied(self._path)
 
@@ -2146,12 +2147,6 @@
     def lexists(self):
         return self._parent.exists(self._path)
 
-    def renamed(self):
-        path = self.copysource()
-        if not path:
-            return None
-        return path, self._changectx._parents[0]._manifest.get(path, nullid)
-
     def copysource(self):
         return self._parent.copydata(self._path)
 



To: martinvonz, #hg-reviewers
Cc: mercurial-devel


More information about the Mercurial-devel mailing list