Show More
@@ -398,7 +398,7 b' class filectx(object):' | |||||
398 | ("bad args: changeid=%r, fileid=%r, changectx=%r" |
|
398 | ("bad args: changeid=%r, fileid=%r, changectx=%r" | |
399 | % (changeid, fileid, changectx)) |
|
399 | % (changeid, fileid, changectx)) | |
400 |
|
400 | |||
401 | if filelog: |
|
401 | if filelog is not None: | |
402 | self._filelog = filelog |
|
402 | self._filelog = filelog | |
403 |
|
403 | |||
404 | if changeid is not None: |
|
404 | if changeid is not None: | |
@@ -437,7 +437,9 b' class filectx(object):' | |||||
437 |
|
437 | |||
438 | @propertycache |
|
438 | @propertycache | |
439 | def _changeid(self): |
|
439 | def _changeid(self): | |
440 |
if '_change |
|
440 | if '_changeid' in self.__dict__: | |
|
441 | return self._changeid | |||
|
442 | elif '_changectx' in self.__dict__: | |||
441 | return self._changectx.rev() |
|
443 | return self._changectx.rev() | |
442 | else: |
|
444 | else: | |
443 | return self._filelog.linkrev(self._filerev) |
|
445 | return self._filelog.linkrev(self._filerev) | |
@@ -1167,7 +1169,7 b' class workingfilectx(filectx):' | |||||
1167 | self._changeid = None |
|
1169 | self._changeid = None | |
1168 | self._filerev = self._filenode = None |
|
1170 | self._filerev = self._filenode = None | |
1169 |
|
1171 | |||
1170 | if filelog: |
|
1172 | if filelog is not None: | |
1171 | self._filelog = filelog |
|
1173 | self._filelog = filelog | |
1172 | if workingctx: |
|
1174 | if workingctx: | |
1173 | self._changectx = workingctx |
|
1175 | self._changectx = workingctx |
General Comments 0
You need to be logged in to leave comments.
Login now