# HG changeset patch # User Mads Kiilerich # Date 1613647399 -3600 # Node ID 7d5e505174308d628ce1a039b35814d0af35a53d # Parent 6c1a8d17b2b962e9a99e2f7173e4940c02d8bef3 diffs: change name of high level function name for generating HTML diff to html_diff diff -r 6c1a8d17b2b9 -r 7d5e50517430 kallithea/controllers/files.py --- a/kallithea/controllers/files.py Wed Feb 17 15:03:14 2021 +0100 +++ b/kallithea/controllers/files.py Thu Feb 18 12:23:19 2021 +0100 @@ -639,7 +639,7 @@ else: fid = h.FID(diff2, node2.path) diff_limit = None if fulldiff else self.cut_off_limit - c.a_rev, c.cs_rev, a_path, diff, st, op = diffs.wrapped_diff(filenode_old=node1, + c.a_rev, c.cs_rev, a_path, diff, st, op = diffs.html_diff(filenode_old=node1, filenode_new=node2, diff_limit=diff_limit, ignore_whitespace=ignore_whitespace_diff, diff -r 6c1a8d17b2b9 -r 7d5e50517430 kallithea/lib/diffs.py --- a/kallithea/lib/diffs.py Wed Feb 17 15:03:14 2021 +0100 +++ b/kallithea/lib/diffs.py Thu Feb 18 12:23:19 2021 +0100 @@ -168,10 +168,10 @@ ''' % html -def wrapped_diff(filenode_old, filenode_new, diff_limit=None, +def html_diff(filenode_old, filenode_new, diff_limit=None, ignore_whitespace=True, line_context=3): """ - Returns a file diff wrapped into a table. + Returns a file diff as HTML wrapped into a table. Checks for diff_limit and presents a message if the diff is too big. """ if filenode_old is None: