Show More
@@ -414,7 +414,9 b' class workingfilectx(filectx):' | |||||
414 | self._changectx = workingctx(repo) |
|
414 | self._changectx = workingctx(repo) | |
415 | return self._changectx |
|
415 | return self._changectx | |
416 | elif name == '_repopath': |
|
416 | elif name == '_repopath': | |
417 |
self._repopath = self._repo.dirstate.copied( |
|
417 | self._repopath = (self._repo.dirstate.copied(self._path) | |
|
418 | or self._path) | |||
|
419 | return self._repopath | |||
418 | elif name == '_filelog': |
|
420 | elif name == '_filelog': | |
419 | self._filelog = self._repo.file(self._repopath) |
|
421 | self._filelog = self._repo.file(self._repopath) | |
420 | return self._filelog |
|
422 | return self._filelog | |
@@ -449,7 +451,7 b' class workingfilectx(filectx):' | |||||
449 | '''return parent filectxs, following copies if necessary''' |
|
451 | '''return parent filectxs, following copies if necessary''' | |
450 | p = self._path |
|
452 | p = self._path | |
451 | rp = self._repopath |
|
453 | rp = self._repopath | |
452 |
pcl = self._ |
|
454 | pcl = self._changectx._parents | |
453 | fl = self._filelog |
|
455 | fl = self._filelog | |
454 | pl = [ (rp, pcl[0]._manifest.get(rp, nullid), fl) ] |
|
456 | pl = [ (rp, pcl[0]._manifest.get(rp, nullid), fl) ] | |
455 | if len(pcl) > 1: |
|
457 | if len(pcl) > 1: |
General Comments 0
You need to be logged in to leave comments.
Login now