Mercurial > hg

changeset 3298:45f0c49f0449

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix workingfilectx parents and ancestor functions
author Matt Mackall <mpm@selenic.com>
date Mon, 09 Oct 2006 21:04:25 -0500
parents 69b9471f26bb
children e7abcf3a7c5f
files mercurial/context.py
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/context.py	Mon Oct 09 20:32:03 2006 -0500
+++ b/mercurial/context.py	Mon Oct 09 21:04:25 2006 -0500
@@ -414,7 +414,9 @@
             self._changectx = workingctx(repo)
             return self._changectx
         elif name == '_repopath':
-            self._repopath = self._repo.dirstate.copied(p) or self._path
+            self._repopath = (self._repo.dirstate.copied(self._path)
+                              or self._path)
+            return self._repopath
         elif name == '_filelog':
             self._filelog = self._repo.file(self._repopath)
             return self._filelog
@@ -449,7 +451,7 @@
         '''return parent filectxs, following copies if necessary'''
         p = self._path
         rp = self._repopath
-        pcl = self._workingctx._parents
+        pcl = self._changectx._parents
         fl = self._filelog
         pl = [ (rp, pcl[0]._manifest.get(rp, nullid), fl) ]
         if len(pcl) > 1: