Reading diff output is sometimes very hard, even if it's colored, especially if lines differ only in few characters. This is often true when a commit fixes a typo or renames some variables or functions. This patch series teaches gitweb to highlight fragments that are different between old and new line. This should mimic the same feature in Trac or GitHub. Changes since v1: * Rebased on origin/master. * Added two patches at the beginning of the series. First one is a small fix and second one adds a feature to esc_html_hl_regions() that will be needed by later patches. * Squashed patch "gitweb: Format diff lines just before printing" and reworked changes to format_diff_line(). Now it accepts both raw line that needs to be html_esc()'ed and already escaped line. * Squashed changes in CSS with previous patch as proposed by Jakub. * Dropped esc_html_mark_change() and started using esc_html_hl_regions() because it was merged to origin/master. * Fixed highlightning for combined diffs with more than two parents. * Fixed indentation (tabs -> spaces) in conditions. * Ensured that patches with "\ No newline at end of file" are properly displayed. * Ensured that binary patches are not supported in HTML format, thus this series canot break it :) (answering Jakub's questions) * Reworded some commit messages and fixed typos. * Renamed few variables after comments from Jakub. * Added some comments to the code. * Added Acked-by from Jakub for few patches. Michał Kiedrowicz (8): gitweb: esc_html_hl_regions(): Don't create empty <span> elements gitweb: Pass esc_html_hl_regions() options to esc_html() gitweb: Extract print_sidebyside_diff_lines() gitweb: Use print_diff_chunk() for both side-by-side and inline diffs gitweb: Move HTML-formatting diff line back to process_diff_line() gitweb: Push formatting diff lines to print_diff_chunk() gitweb: Highlight interesting parts of diff gitweb: Refinement highlightning in combined diffs gitweb/gitweb.perl | 299 +++++++++++++++++++++++++++++++++------------- gitweb/static/gitweb.css | 8 ++ 2 files changed, 225 insertions(+), 82 deletions(-) -- 1.7.8.4 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html