equal
deleted
inserted
replaced
2540 parents = (self._repo[parents[0]], self._repo[parents[1]]) |
2540 parents = (self._repo[parents[0]], self._repo[parents[1]]) |
2541 |
2541 |
2542 files = self.files() |
2542 files = self.files() |
2543 |
2543 |
2544 def getfile(repo, memctx, path): |
2544 def getfile(repo, memctx, path): |
2545 if self._cache[path][b'exists']: |
2545 if path not in self._cache: |
|
2546 return self.filectx(path) |
|
2547 elif self._cache[path][b'exists']: |
2546 return memfilectx( |
2548 return memfilectx( |
2547 repo, |
2549 repo, |
2548 memctx, |
2550 memctx, |
2549 path, |
2551 path, |
2550 self._cache[path][b'data'], |
2552 self._cache[path][b'data'], |