Show More
@@ -490,14 +490,22 b' class changectx(basectx):' | |||||
490 | # In compatibility mode, we return copy data from the changeset if |
|
490 | # In compatibility mode, we return copy data from the changeset if | |
491 | # it was recorded there, and otherwise we fall back to getting it from |
|
491 | # it was recorded there, and otherwise we fall back to getting it from | |
492 | # the filelogs (below). |
|
492 | # the filelogs (below). | |
493 |
if |
|
493 | if source == 'changeset-only': | |
494 |
|
|
494 | if p1copies is None: | |
495 |
|
|
495 | p1copies = {} | |
496 |
|
496 | if p2copies is None: | ||
497 | # Otherwise (config said to read only from filelog, or we are in |
|
497 | p2copies = {} | |
498 | # compatiblity mode and there is not data in the changeset), we get |
|
498 | elif source == 'compatibility': | |
499 | # the copy metadata from the filelogs. |
|
499 | if p1copies is None: | |
500 | return super(changectx, self)._copies |
|
500 | # we are in compatiblity mode and there is not data in the | |
|
501 | # changeset), we get the copy metadata from the filelogs. | |||
|
502 | p1copies, p2copies = super(changectx, self)._copies | |||
|
503 | else: | |||
|
504 | # config said to read only from filelog, we get the copy metadata | |||
|
505 | # from the filelogs. | |||
|
506 | p1copies, p2copies = super(changectx, self)._copies | |||
|
507 | return p1copies, p2copies | |||
|
508 | ||||
501 | def description(self): |
|
509 | def description(self): | |
502 | return self._changeset.description |
|
510 | return self._changeset.description | |
503 | def branch(self): |
|
511 | def branch(self): |
General Comments 0
You need to be logged in to leave comments.
Login now