Show More
@@ -452,9 +452,14 b' class filectx(object):' | |||||
452 | """ |
|
452 | """ | |
453 |
|
453 | |||
454 | actx = self.changectx().ancestor(fc2.changectx()) |
|
454 | actx = self.changectx().ancestor(fc2.changectx()) | |
455 | if self.path() in actx: |
|
455 | ||
|
456 | # the trivial case: changesets are unrelated, files must be too | |||
|
457 | if not actx: | |||
|
458 | return None | |||
|
459 | ||||
|
460 | # the easy case: no (relevant) renames | |||
|
461 | if fc2.path() == self.path() and self.path() in actx: | |||
456 | return actx[self.path()] |
|
462 | return actx[self.path()] | |
457 |
|
||||
458 | acache = {} |
|
463 | acache = {} | |
459 |
|
464 | |||
460 | # prime the ancestor cache for the working directory |
|
465 | # prime the ancestor cache for the working directory |
General Comments 0
You need to be logged in to leave comments.
Login now