##// END OF EJS Templates
fix workingfilectx parents and ancestor functions
Matt Mackall -
r3298:45f0c49f default
parent child Browse files
Show More
@@ -414,7 +414,9 b' class workingfilectx(filectx):'
414 414 self._changectx = workingctx(repo)
415 415 return self._changectx
416 416 elif name == '_repopath':
417 self._repopath = self._repo.dirstate.copied(p) or self._path
417 self._repopath = (self._repo.dirstate.copied(self._path)
418 or self._path)
419 return self._repopath
418 420 elif name == '_filelog':
419 421 self._filelog = self._repo.file(self._repopath)
420 422 return self._filelog
@@ -449,7 +451,7 b' class workingfilectx(filectx):'
449 451 '''return parent filectxs, following copies if necessary'''
450 452 p = self._path
451 453 rp = self._repopath
452 pcl = self._workingctx._parents
454 pcl = self._changectx._parents
453 455 fl = self._filelog
454 456 pl = [ (rp, pcl[0]._manifest.get(rp, nullid), fl) ]
455 457 if len(pcl) > 1:
General Comments 0
You need to be logged in to leave comments. Login now