Show More
@@ -563,6 +563,19 b' def _reorder_filelog_parents(repo, fl, t' | |||
|
563 | 563 | |
|
564 | 564 | |
|
565 | 565 | def _is_revision_affected(fl, filerev, metadata_cache=None): |
|
566 | full_text = lambda: fl._revlog.rawdata(filerev) | |
|
567 | parent_revs = lambda: fl._revlog.parentrevs(filerev) | |
|
568 | return _is_revision_affected_inner( | |
|
569 | full_text, parent_revs, filerev, metadata_cache | |
|
570 | ) | |
|
571 | ||
|
572 | ||
|
573 | def _is_revision_affected_inner( | |
|
574 | full_text, | |
|
575 | parents_revs, | |
|
576 | filerev, | |
|
577 | metadata_cache=None, | |
|
578 | ): | |
|
566 | 579 | """Mercurial currently (5.9rc0) uses `p1 == nullrev and p2 != nullrev` as a |
|
567 | 580 | special meaning compared to the reverse in the context of filelog-based |
|
568 | 581 | copytracing. issue6528 exists because new code assumed that parent ordering |
@@ -570,7 +583,7 b' def _is_revision_affected(fl, filerev, m' | |||
|
570 | 583 | it's only used for filelog-based copytracing) and its parents are in the |
|
571 | 584 | "wrong" order.""" |
|
572 | 585 | try: |
|
573 |
raw_text = f |
|
|
586 | raw_text = full_text() | |
|
574 | 587 | except error.CensoredNodeError: |
|
575 | 588 | # We don't care about censored nodes as they never carry metadata |
|
576 | 589 | return False |
@@ -578,7 +591,7 b' def _is_revision_affected(fl, filerev, m' | |||
|
578 | 591 | if metadata_cache is not None: |
|
579 | 592 | metadata_cache[filerev] = has_meta |
|
580 | 593 | if has_meta: |
|
581 |
(p1, p2) = |
|
|
594 | (p1, p2) = parents_revs() | |
|
582 | 595 | if p1 != nullrev and p2 == nullrev: |
|
583 | 596 | return True |
|
584 | 597 | return False |
General Comments 0
You need to be logged in to leave comments.
Login now