Patchwork D6009: context: rewrite renamed() in terms of new copysource() where appropriate

login
register
mail settings
Submitter phabricator
Date Feb. 24, 2019, 8:24 a.m.
Message ID <235c325fba284e14a71ba2a03b1160ad@localhost.localdomain>
Download mbox | patch
Permalink /patch/38894/
State Not Applicable
Headers show

Comments

phabricator - Feb. 24, 2019, 8:24 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGe9413a3be093: context: rewrite renamed() in terms of new copysource() where appropriate (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D6009?vs=14197&id=14212

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

AFFECTED FILES
  mercurial/context.py

CHANGE DETAILS




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

Patch

diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -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)