git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v3 5/8] gitweb: Use print_diff_chunk() for both side-by-side and inline diffs

From
Jakub Narebski <jnareb@gmail.com>
Date
Apr 5, 2012, 23:26 UTC
Message-ID
<201204060126.38337.jnareb@gmail.com>
In-Reply-To
<1333569433-3245-6-git-send-email-michal.kiedrowicz@gmail.com>
Michał Kiedrowicz wrote:
Show 29 quoted lines
> This renames print_sidebyside_diff_chunk() to print_diff_chunk() and
> makes use of it for both side-by-side and inline diffs.  Now diff lines
> are always accumulated before they are printed.  This opens the
> possibility to preprocess diff output before it's printed, which is
> needed for diff refinement highlightning (implemented in incoming
> patches).
> 
> If print_diff_chunk() was left as is, the new function
> print_inline_diff_lines() could reorder diff lines.  It first prints all
> context lines, then all removed lines and finally all added lines.  If
> the diff output consisted of mixed added and removed lines, gitweb would
> reorder these lines.  This is true for combined diff output, for
> example:
> 
> 	 - removed line for first parent
> 	 + added line for first parent
> 	  -removed line for second parent
> 	 ++added line for both parents
> 
> would be rendered as:
> 
> 	- removed line for first parent
> 	 -removed line for second parent
> 	+ added line for first parent
> 	++added line for both parents
> 
> To prevent gitweb from reordering lines, print_diff_chunk() calls
> print_diff_lines() as soon as it detects that both added and removed
> lines are present and there was a class change.
                                                 , and at the end of hunk.
I think it is worth adding the above to the commit message.
-- 
Jakub Narebski
Poland
Previous: Michał KiedrowiczNext: Michal Kiedrowicz
Message 14 of 19 in “Highlight interesting parts of diff”
  1. 0/8 Highlight interesting parts of diffMichał Kiedrowicz, Apr 4, 2012
  2. 1/8 gitweb: Use descriptive names in esc_html_hl_regions()Michał Kiedrowicz, Apr 4, 2012
  3. Junio C HamanoApr 4, 2012
  4. Michal KiedrowiczApr 5, 2012
  5. 2/8 gitweb: esc_html_hl_regions(): Don't create empty <span> elementsMichał Kiedrowicz, Apr 4, 2012
  6. 3/8 gitweb: Pass esc_html_hl_regions() options to esc_html()Michał Kiedrowicz, Apr 4, 2012
  7. 4/8 gitweb: Extract print_sidebyside_diff_lines()Michał Kiedrowicz, Apr 4, 2012
  8. Junio C HamanoApr 4, 2012
  9. Jakub NarebskiApr 4, 2012
  10. Michal KiedrowiczApr 5, 2012
  11. Jakub NarebskiApr 5, 2012
  12. Michal KiedrowiczApr 6, 2012
  13. 5/8 gitweb: Use print_diff_chunk() for both side-by-side and inline diffsMichał Kiedrowicz, Apr 4, 2012
  14. Jakub NarebskiApr 5, 2012
  15. Michal KiedrowiczApr 6, 2012
  16. 6/8 gitweb: Push formatting diff lines to print_diff_chunk()Michał Kiedrowicz, Apr 4, 2012
  17. 7/8 gitweb: Highlight interesting parts of diffMichał Kiedrowicz, Apr 4, 2012
  18. Michal KiedrowiczApr 5, 2012
  19. 8/8 gitweb: Refinement highlightning in combined diffsMichał Kiedrowicz, Apr 4, 2012

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.