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

Re: [PATCH v2 3/4] add -p: handle `diff-so-fancy`'s hunk headers better

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Aug 30, 2022, 14:14 UTC
Message-ID
<p11s25nn-15qr-o2q1-5700-1q581sr9331n@tzk.qr>
In-Reply-To
<xmqqilmbotl0.fsf@gitster.g>
Hi Junio,
On Mon, 29 Aug 2022, Junio C Hamano wrote:
Show 13 quoted lines
> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>
> > Here is why: in the _regular_ case, i.e. when we have a colored hunk
> > header like `@@ -936 +936 @@ wow()`, we manage to parse the line range,
> > and then record the offset of the extra part that starts afterwards.
> >
> > This extra part is non-empty, therefore we add an extra space.
> >
> > But that part already starts with a space, so now we end up with two
> > spaces.
>
> In other words, this breaks because the original code depended on
> having the extra whitespace before the "funcname" part.
Yes.
Show 6 quoted lines
> Stepping back a bit, if the final goal for the UI generation out of
> this string is to append the material with a whitespace before it
> for better visual separation, then the original should probably have
> (at least conceptually) lstrip'ed the leading whitespaces from the
> string it found after " @@" and then appended the result to where it
> is showing, with its own single whitespace as a prefix.

Yes, with one twist: ANSI escape sequences can make lstrip'ing non-trivial (granted, the line range parser totally ignores the fact that `@@<RESET> ` is a totally legitimate end of a colored line range).

Show 7 quoted lines
> It would have prevented this bug from happening by future-proofing, and
> made the final output nicer, as any excess whitespaces between the " @@"
> and "funcname" would have been turned into a single SP.
>
> The "prepend one iff it does not already begin with a whitespace" is
> a (at least mentally to the developer) less expensive approach that
> is fine, too.
Yes, it is definitely less expensive.

Ciao, Dscho

Previous: Junio C HamanoNext: Johannes Schindelin via GitGitGadget
Message 20 of 67 in “built-in add -p: support diff-so-fancy better”
  1. 0/3 built-in add -p: support diff-so-fancy betterJohannes Schindelin via GitGitGadget, Aug 23, 2022
  2. 3/3 add -p: handle `diff-so-fancy`'s hunk headers betterJohannes Schindelin via GitGitGadget, Aug 23, 2022
  3. 1/3 t3701: redefine what is "bogus" output of a diff filterJohannes Schindelin via GitGitGadget, Aug 23, 2022
  4. 2/3 add -p: gracefully ignore unparseable hunk headers in colored diffsJohannes Schindelin via GitGitGadget, Aug 23, 2022
  5. Philippe BlainAug 24, 2022
  6. Johannes SchindelinAug 24, 2022
  7. Philippe BlainAug 24, 2022
  8. Philippe BlainAug 24, 2022
  9. Junio C HamanoAug 24, 2022
  10. Johannes SchindelinAug 24, 2022
  11. Junio C HamanoAug 24, 2022
  12. 0/4 built-in add -p: support diff-so-fancy betterJohannes Schindelin via GitGitGadget, Aug 24, 2022
  13. 1/4 t3701: redefine what is "bogus" output of a diff filterJohannes Schindelin via GitGitGadget, Aug 24, 2022
  14. 2/4 add -p: gracefully ignore unparseable hunk headers in colored diffsJohannes Schindelin via GitGitGadget, Aug 24, 2022
  15. Junio C HamanoAug 29, 2022
  16. 3/4 add -p: handle `diff-so-fancy`'s hunk headers betterJohannes Schindelin via GitGitGadget, Aug 24, 2022
  17. Junio C HamanoAug 29, 2022
  18. Johannes SchindelinAug 29, 2022
  19. Junio C HamanoAug 29, 2022
  20. Johannes SchindelinAug 30, 2022
  21. 4/4 add -p: ignore dirty submodulesJohannes Schindelin via GitGitGadget, Aug 24, 2022
  22. Junio C HamanoAug 24, 2022
  23. Philippe BlainAug 25, 2022
  24. Johannes SchindelinAug 26, 2022
  25. Philippe BlainAug 26, 2022
  26. 0/5 built-in add -p: support diff-so-fancy betterJohannes Schindelin via GitGitGadget, Aug 29, 2022
  27. 1/5 t3701: redefine what is "bogus" output of a diff filterJohannes Schindelin via GitGitGadget, Aug 29, 2022
  28. Phillip WoodAug 30, 2022
  29. Junio C HamanoAug 30, 2022
  30. Phillip WoodAug 31, 2022
  31. Jeff KingAug 31, 2022
  32. Jeff KingAug 31, 2022
  33. Johannes SchindelinAug 31, 2022
  34. 2/5 add -p: gracefully ignore unparseable hunk headers in colored diffsJohannes Schindelin via GitGitGadget, Aug 29, 2022
  35. 4/5 add -p: handle `diff-so-fancy`'s hunk headers betterJohannes Schindelin via GitGitGadget, Aug 29, 2022
  36. Phillip WoodAug 30, 2022
  37. 3/5 add -p: insert space in colored hunk header as neededJohannes Schindelin via GitGitGadget, Aug 29, 2022
  38. 5/5 add -p: ignore dirty submodulesJohannes Schindelin via GitGitGadget, Aug 29, 2022
  39. Phillip WoodAug 30, 2022
  40. Johannes SchindelinAug 31, 2022
  41. Junio C HamanoAug 31, 2022
  42. Johannes SchindelinAug 31, 2022
  43. Junio C HamanoAug 29, 2022
  44. Johannes SchindelinAug 30, 2022
  45. Phillip WoodAug 30, 2022
  46. Johannes SchindelinAug 31, 2022
  47. 0/3 built-in add -p: support diff-so-fancy betterJohannes Schindelin via GitGitGadget, Aug 31, 2022
  48. 2/3 add -p: gracefully handle unparseable hunk headers in colored diffsJohannes Schindelin via GitGitGadget, Aug 31, 2022
  49. Phillip WoodSep 1, 2022
  50. Johannes SchindelinSep 1, 2022
  51. 3/3 add -p: ignore dirty submodulesJohannes Schindelin via GitGitGadget, Aug 31, 2022
  52. Jeff KingSep 1, 2022
  53. Jeff KingSep 1, 2022
  54. Junio C HamanoSep 1, 2022
  55. Johannes SchindelinSep 2, 2022
  56. 1/3 add -p: detect more mismatches between plain vs colored diffsJohannes Schindelin via GitGitGadget, Aug 31, 2022
  57. Phillip WoodSep 1, 2022
  58. Phillip WoodSep 1, 2022
  59. Junio C HamanoSep 1, 2022
  60. 0/3 built-in add -p: support diff-so-fancy betterJohannes Schindelin via GitGitGadget, Sep 1, 2022
  61. 1/3 add -p: detect more mismatches between plain vs colored diffsJohannes Schindelin via GitGitGadget, Sep 1, 2022
  62. 3/3 add -p: ignore dirty submodulesJohannes Schindelin via GitGitGadget, Sep 1, 2022
  63. Junio C HamanoSep 1, 2022
  64. 2/3 add -p: gracefully handle unparseable hunk headers in colored diffsJohannes Schindelin via GitGitGadget, Sep 1, 2022
  65. Phillip WoodSep 1, 2022
  66. Phillip WoodSep 1, 2022
  67. Junio C HamanoSep 1, 2022

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.