# HG changeset patch # User Matt Mackall # Date 1160445865 18000 # Node ID 45f0c49f0449071e1baba9791d1e03cd5be8be28 # Parent 69b9471f26bb27333b4de1a61b1a797d1050391a fix workingfilectx parents and ancestor functions diff -r 69b9471f26bb -r 45f0c49f0449 mercurial/context.py --- 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: