Show More
@@ -639,7 +639,7 b' class FilesController(base.BaseRepoContr' | |||||
639 | else: |
|
639 | else: | |
640 | fid = h.FID(diff2, node2.path) |
|
640 | fid = h.FID(diff2, node2.path) | |
641 | diff_limit = None if fulldiff else self.cut_off_limit |
|
641 | diff_limit = None if fulldiff else self.cut_off_limit | |
642 |
c.a_rev, c.cs_rev, a_path, diff, st, op = diffs. |
|
642 | c.a_rev, c.cs_rev, a_path, diff, st, op = diffs.html_diff(filenode_old=node1, | |
643 | filenode_new=node2, |
|
643 | filenode_new=node2, | |
644 | diff_limit=diff_limit, |
|
644 | diff_limit=diff_limit, | |
645 | ignore_whitespace=ignore_whitespace_diff, |
|
645 | ignore_whitespace=ignore_whitespace_diff, |
@@ -168,10 +168,10 b' def wrap_to_table(html):' | |||||
168 | </table>''' % html |
|
168 | </table>''' % html | |
169 |
|
169 | |||
170 |
|
170 | |||
171 |
def |
|
171 | def html_diff(filenode_old, filenode_new, diff_limit=None, | |
172 | ignore_whitespace=True, line_context=3): |
|
172 | ignore_whitespace=True, line_context=3): | |
173 | """ |
|
173 | """ | |
174 | Returns a file diff wrapped into a table. |
|
174 | Returns a file diff as HTML wrapped into a table. | |
175 | Checks for diff_limit and presents a message if the diff is too big. |
|
175 | Checks for diff_limit and presents a message if the diff is too big. | |
176 | """ |
|
176 | """ | |
177 | if filenode_old is None: |
|
177 | if filenode_old is None: |
General Comments 0
You need to be logged in to leave comments.
Login now