Mercurial > public > mercurial-scm > hg
comparison mercurial/context.py @ 18858:f02045645d12
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 02 Apr 2013 01:15:31 -0500 |
parents | 4fb92f14a97a 50c922c1b514 |
children | d8ff607ef721 |
comparison
equal
deleted
inserted
replaced
18853:78d760aa3607 | 18858:f02045645d12 |
---|---|
289 def _fileinfo(self, path): | 289 def _fileinfo(self, path): |
290 if '_manifest' in self.__dict__: | 290 if '_manifest' in self.__dict__: |
291 try: | 291 try: |
292 return self._manifest[path], self._manifest.flags(path) | 292 return self._manifest[path], self._manifest.flags(path) |
293 except KeyError: | 293 except KeyError: |
294 raise error.LookupError(self._node, path, | 294 raise error.ManifestLookupError(self._node, path, |
295 _('not found in manifest')) | 295 _('not found in manifest')) |
296 if '_manifestdelta' in self.__dict__ or path in self.files(): | 296 if '_manifestdelta' in self.__dict__ or path in self.files(): |
297 if path in self._manifestdelta: | 297 if path in self._manifestdelta: |
298 return (self._manifestdelta[path], | 298 return (self._manifestdelta[path], |
299 self._manifestdelta.flags(path)) | 299 self._manifestdelta.flags(path)) |
300 node, flag = self._repo.manifest.find(self._changeset[0], path) | 300 node, flag = self._repo.manifest.find(self._changeset[0], path) |
301 if not node: | 301 if not node: |
302 raise error.LookupError(self._node, path, | 302 raise error.ManifestLookupError(self._node, path, |
303 _('not found in manifest')) | 303 _('not found in manifest')) |
304 | 304 |
305 return node, flag | 305 return node, flag |
306 | 306 |
307 def filenode(self, path): | 307 def filenode(self, path): |
308 return self._fileinfo(path)[0] | 308 return self._fileinfo(path)[0] |