equal
deleted
inserted
replaced
2053 if parents[1] is None: |
2053 if parents[1] is None: |
2054 parents = (self._repo[parents[0]], None) |
2054 parents = (self._repo[parents[0]], None) |
2055 else: |
2055 else: |
2056 parents = (self._repo[parents[0]], self._repo[parents[1]]) |
2056 parents = (self._repo[parents[0]], self._repo[parents[1]]) |
2057 |
2057 |
2058 files = self._cache.keys() |
2058 files = self.files() |
2059 def getfile(repo, memctx, path): |
2059 def getfile(repo, memctx, path): |
2060 if self._cache[path]['exists']: |
2060 if self._cache[path]['exists']: |
2061 return memfilectx(repo, memctx, path, |
2061 return memfilectx(repo, memctx, path, |
2062 self._cache[path]['data'], |
2062 self._cache[path]['data'], |
2063 'l' in self._cache[path]['flags'], |
2063 'l' in self._cache[path]['flags'], |