Show More
@@ -927,6 +927,7 b' def annotate(web, req, tmpl):' | |||||
927 | "file": f.path(), |
|
927 | "file": f.path(), | |
928 | "targetline": targetline, |
|
928 | "targetline": targetline, | |
929 | "line": l, |
|
929 | "line": l, | |
|
930 | "lineno": lineno + 1, | |||
930 | "lineid": "l%d" % (lineno + 1), |
|
931 | "lineid": "l%d" % (lineno + 1), | |
931 | "linenumber": "% 6d" % (lineno + 1), |
|
932 | "linenumber": "% 6d" % (lineno + 1), | |
932 | "revdate": f.date()} |
|
933 | "revdate": f.date()} |
@@ -352,7 +352,7 b' def diffs(repo, tmpl, ctx, basectx, file' | |||||
352 | blockcount = countgen() |
|
352 | blockcount = countgen() | |
353 | def prettyprintlines(diff, blockno): |
|
353 | def prettyprintlines(diff, blockno): | |
354 | for lineno, l in enumerate(diff.splitlines(True)): |
|
354 | for lineno, l in enumerate(diff.splitlines(True)): | |
355 | lineno = "%d.%d" % (blockno, lineno + 1) |
|
355 | difflineno = "%d.%d" % (blockno, lineno + 1) | |
356 | if l.startswith('+'): |
|
356 | if l.startswith('+'): | |
357 | ltype = "difflineplus" |
|
357 | ltype = "difflineplus" | |
358 | elif l.startswith('-'): |
|
358 | elif l.startswith('-'): | |
@@ -363,8 +363,9 b' def diffs(repo, tmpl, ctx, basectx, file' | |||||
363 | ltype = "diffline" |
|
363 | ltype = "diffline" | |
364 | yield tmpl(ltype, |
|
364 | yield tmpl(ltype, | |
365 | line=l, |
|
365 | line=l, | |
366 |
line |
|
366 | lineno=lineno + 1, | |
367 |
line |
|
367 | lineid="l%s" % difflineno, | |
|
368 | linenumber="% 8s" % difflineno) | |||
368 |
|
369 | |||
369 | if files: |
|
370 | if files: | |
370 | m = match.exact(repo.root, repo.getcwd(), files) |
|
371 | m = match.exact(repo.root, repo.getcwd(), files) | |
@@ -405,8 +406,10 b' def compare(tmpl, context, leftlines, ri' | |||||
405 | return tmpl('comparisonline', |
|
406 | return tmpl('comparisonline', | |
406 | type=type, |
|
407 | type=type, | |
407 | lineid=lineid, |
|
408 | lineid=lineid, | |
|
409 | leftlineno=leftlineno, | |||
408 | leftlinenumber="% 6s" % (leftlineno or ''), |
|
410 | leftlinenumber="% 6s" % (leftlineno or ''), | |
409 | leftline=leftline or '', |
|
411 | leftline=leftline or '', | |
|
412 | rightlineno=rightlineno, | |||
410 | rightlinenumber="% 6s" % (rightlineno or ''), |
|
413 | rightlinenumber="% 6s" % (rightlineno or ''), | |
411 | rightline=rightline or '') |
|
414 | rightline=rightline or '') | |
412 |
|
415 |
General Comments 0
You need to be logged in to leave comments.
Login now