Show More
@@ -575,12 +575,12 b' def diffs(web, ctx, basectx, files, styl' | |||
|
575 | 575 | linerange, lineidprefix) |
|
576 | 576 | return templateutil.mappinggenerator(_diffsgen, args=args, name='diffblock') |
|
577 | 577 | |
|
578 |
def _compline( |
|
|
578 | def _compline(type, leftlineno, leftline, rightlineno, rightline): | |
|
579 | 579 | lineid = leftlineno and ("l%d" % leftlineno) or '' |
|
580 | 580 | lineid += rightlineno and ("r%d" % rightlineno) or '' |
|
581 | 581 | llno = '%d' % leftlineno if leftlineno else '' |
|
582 | 582 | rlno = '%d' % rightlineno if rightlineno else '' |
|
583 | return tmpl.generate('comparisonline', { | |
|
583 | return { | |
|
584 | 584 | 'type': type, |
|
585 | 585 | 'lineid': lineid, |
|
586 | 586 | 'leftlineno': leftlineno, |
@@ -589,46 +589,48 b' def _compline(tmpl, type, leftlineno, le' | |||
|
589 | 589 | 'rightlineno': rightlineno, |
|
590 | 590 | 'rightlinenumber': "% 6s" % rlno, |
|
591 | 591 | 'rightline': rightline or '', |
|
592 |
} |
|
|
592 | } | |
|
593 | 593 | |
|
594 |
def _getcompblock( |
|
|
594 | def _getcompblockgen(context, leftlines, rightlines, opcodes): | |
|
595 | 595 | for type, llo, lhi, rlo, rhi in opcodes: |
|
596 | 596 | len1 = lhi - llo |
|
597 | 597 | len2 = rhi - rlo |
|
598 | 598 | count = min(len1, len2) |
|
599 | 599 | for i in xrange(count): |
|
600 |
yield _compline(t |
|
|
601 | type=type, | |
|
600 | yield _compline(type=type, | |
|
602 | 601 | leftlineno=llo + i + 1, |
|
603 | 602 | leftline=leftlines[llo + i], |
|
604 | 603 | rightlineno=rlo + i + 1, |
|
605 | 604 | rightline=rightlines[rlo + i]) |
|
606 | 605 | if len1 > len2: |
|
607 | 606 | for i in xrange(llo + count, lhi): |
|
608 |
yield _compline(t |
|
|
609 | type=type, | |
|
607 | yield _compline(type=type, | |
|
610 | 608 | leftlineno=i + 1, |
|
611 | 609 | leftline=leftlines[i], |
|
612 | 610 | rightlineno=None, |
|
613 | 611 | rightline=None) |
|
614 | 612 | elif len2 > len1: |
|
615 | 613 | for i in xrange(rlo + count, rhi): |
|
616 |
yield _compline(t |
|
|
617 | type=type, | |
|
614 | yield _compline(type=type, | |
|
618 | 615 | leftlineno=None, |
|
619 | 616 | leftline=None, |
|
620 | 617 | rightlineno=i + 1, |
|
621 | 618 | rightline=rightlines[i]) |
|
622 | 619 | |
|
620 | def _getcompblock(leftlines, rightlines, opcodes): | |
|
621 | args = (leftlines, rightlines, opcodes) | |
|
622 | return templateutil.mappinggenerator(_getcompblockgen, args=args, | |
|
623 | name='comparisonline') | |
|
624 | ||
|
623 | 625 | def compare(tmpl, context, leftlines, rightlines): |
|
624 | 626 | '''Generator function that provides side-by-side comparison data.''' |
|
625 | 627 | s = difflib.SequenceMatcher(None, leftlines, rightlines) |
|
626 | 628 | if context < 0: |
|
627 |
l = _getcompblock( |
|
|
629 | l = _getcompblock(leftlines, rightlines, s.get_opcodes()) | |
|
628 | 630 | yield tmpl.generate('comparisonblock', {'lines': l}) |
|
629 | 631 | else: |
|
630 | 632 | for oc in s.get_grouped_opcodes(n=context): |
|
631 |
l = _getcompblock( |
|
|
633 | l = _getcompblock(leftlines, rightlines, oc) | |
|
632 | 634 | yield tmpl.generate('comparisonblock', {'lines': l}) |
|
633 | 635 | |
|
634 | 636 | def diffstatgen(ctx, basectx): |
General Comments 0
You need to be logged in to leave comments.
Login now