Show More
@@ -257,13 +257,13 b' class basectx(object):' | |||||
257 | return changectx(self._repo, nullrev) |
|
257 | return changectx(self._repo, nullrev) | |
258 |
|
258 | |||
259 | def _fileinfo(self, path): |
|
259 | def _fileinfo(self, path): | |
260 | if '_manifest' in self.__dict__: |
|
260 | if r'_manifest' in self.__dict__: | |
261 | try: |
|
261 | try: | |
262 | return self._manifest[path], self._manifest.flags(path) |
|
262 | return self._manifest[path], self._manifest.flags(path) | |
263 | except KeyError: |
|
263 | except KeyError: | |
264 | raise error.ManifestLookupError(self._node, path, |
|
264 | raise error.ManifestLookupError(self._node, path, | |
265 | _('not found in manifest')) |
|
265 | _('not found in manifest')) | |
266 | if '_manifestdelta' in self.__dict__ or path in self.files(): |
|
266 | if r'_manifestdelta' in self.__dict__ or path in self.files(): | |
267 | if path in self._manifestdelta: |
|
267 | if path in self._manifestdelta: | |
268 | return (self._manifestdelta[path], |
|
268 | return (self._manifestdelta[path], | |
269 | self._manifestdelta.flags(path)) |
|
269 | self._manifestdelta.flags(path)) | |
@@ -697,11 +697,11 b' class basefilectx(object):' | |||||
697 |
|
697 | |||
698 | @propertycache |
|
698 | @propertycache | |
699 | def _changeid(self): |
|
699 | def _changeid(self): | |
700 | if '_changeid' in self.__dict__: |
|
700 | if r'_changeid' in self.__dict__: | |
701 | return self._changeid |
|
701 | return self._changeid | |
702 | elif '_changectx' in self.__dict__: |
|
702 | elif r'_changectx' in self.__dict__: | |
703 | return self._changectx.rev() |
|
703 | return self._changectx.rev() | |
704 | elif '_descendantrev' in self.__dict__: |
|
704 | elif r'_descendantrev' in self.__dict__: | |
705 | # this file context was created from a revision with a known |
|
705 | # this file context was created from a revision with a known | |
706 | # descendant, we can (lazily) correct for linkrev aliases |
|
706 | # descendant, we can (lazily) correct for linkrev aliases | |
707 | return self._adjustlinkrev(self._descendantrev) |
|
707 | return self._adjustlinkrev(self._descendantrev) | |
@@ -710,7 +710,7 b' class basefilectx(object):' | |||||
710 |
|
710 | |||
711 | @propertycache |
|
711 | @propertycache | |
712 | def _filenode(self): |
|
712 | def _filenode(self): | |
713 | if '_fileid' in self.__dict__: |
|
713 | if r'_fileid' in self.__dict__: | |
714 | return self._filelog.lookup(self._fileid) |
|
714 | return self._filelog.lookup(self._fileid) | |
715 | else: |
|
715 | else: | |
716 | return self._changectx.filenode(self._path) |
|
716 | return self._changectx.filenode(self._path) | |
@@ -1396,7 +1396,7 b' class committablectx(basectx):' | |||||
1396 | return [] |
|
1396 | return [] | |
1397 |
|
1397 | |||
1398 | def flags(self, path): |
|
1398 | def flags(self, path): | |
1399 | if '_manifest' in self.__dict__: |
|
1399 | if r'_manifest' in self.__dict__: | |
1400 | try: |
|
1400 | try: | |
1401 | return self._manifest.flags(path) |
|
1401 | return self._manifest.flags(path) | |
1402 | except KeyError: |
|
1402 | except KeyError: |
@@ -245,7 +245,7 b' class baseset(abstractsmartset):' | |||||
245 | @util.propertycache |
|
245 | @util.propertycache | |
246 | def _list(self): |
|
246 | def _list(self): | |
247 | # _list is only lazily constructed if we have _set |
|
247 | # _list is only lazily constructed if we have _set | |
248 | assert '_set' in self.__dict__ |
|
248 | assert r'_set' in self.__dict__ | |
249 | return list(self._set) |
|
249 | return list(self._set) | |
250 |
|
250 | |||
251 | def __iter__(self): |
|
251 | def __iter__(self): |
General Comments 0
You need to be logged in to leave comments.
Login now