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

Re: [PATCH v3 0/6] use the pager in 'add -p'

From
PWPhillip Wood <phillip.wood123@gmail.com>
Date
Jun 10, 2024, 14:09 UTC
Message-ID
<9f1884ae-0f9f-4d9f-a262-b6929b81d7d8@gmail.com>
In-Reply-To
<219a195c-74d0-4c21-bf54-0752bb5b01df@gmail.com>
Hi Rubén
On 09/06/2024 08:44, Rubén Justo wrote:
Show 26 quoted lines
> On Sat, Jun 08, 2024 at 07:54:34AM +0200, Dragan Simic wrote:
> 
>> When "|xyz" is used instead, the version of the hunk with no coloring
>> escape sequences should be piped to xyz.
> 
> That is a sane and conservative approach, and I'm not opposed.  However,
> giving the colorful version though a custom pager is a good thing to
> have, I think, i.e: allowing a simple "head" without losing the
> coloring.
> 
> Let's recap a bit.
> 
> Initially, this series aimed to enable sending chunks to the pager
> during "add -p" sessions.
> 
> To reduce the blast radius of spawning a pager for each chunk, we
> introduced a new command "P".
> 
> Junio suggested opening up the command to allow specifying a custom
> pager, in the form of "P<program>".
> 
> The "P" command started to resemble a lot to the common pipe operator.
> Thus, we shifted to "|<program>".
> 
> Some concerns were raised about controlling when to send coloring escape
> sequences.

I'm still not really convinced that the escape sequences are a problem. As Peff has pointed out [1] this new command exists primarily to display the current hunk. I've asked for concrete examples of programs that it would be useful to run from "git add -p" where the escape codes are a problem [2,3]. Sadly the replies talked in generic terms about an imaginary program without any reference to displaying or processing a hunk from "git add -p". Without a clear use case for stripping the escape codes I think we should add a single command that pipes the colored output to a user specified program. We can make it clear in the documentation that the input to the user's command will contain escape sequences unless they pass "-c color.diff=false" when starting "git add -p". If it becomes clear that there is a use for the plain output we can add that at a later stage.

Best Wishes
Phillip

[1] https://lore.kernel.org/git/20240605090935.GF2345232@coredump.intra.peff.net [2] https://lore.kernel.org/git/a2a59f5e-fd55-41d3-8472-b99256e1f428@gmail.com> [3] https://lore.kernel.org/git/1ae0715d-df76-4019-995e-f00f3506f2ac@gmail.com

Show 13 quoted lines
> Several ideas were discussed to address this, including
> introducing a new command ">", a modifier for "|": "||", and others.
> Alternatively, we could leave it up to the user to filter as needed.
> Or, simply, do not send escape codes at all.
> 
> So, looking back at the ideas discussed in the thread, perhaps a
> reasonable next step might be to reintroduce the 'P<program>' command
> and let '|<program>' be the way to send raw, uncolored, chunks.
> 
> This approach makes sense to me.  I'll wait a bit before sending a
> reroll to gather feedback, though.
> 
> Thanks.
Previous: Dragan SimicNext: Junio C Hamano
Message 101 of 113 in “use the pager in 'add -p'”
  1. 0/5 use the pager in 'add -p'Rubén Justo, May 19, 2024
  2. 1/5 add-patch: test for 'p' commandRubén Justo, May 19, 2024
  3. 2/5 pager: do not close fd 2 unnecessarilyRubén Justo, May 19, 2024
  4. Junio C HamanoMay 20, 2024
  5. Rubén JustoMay 20, 2024
  6. Junio C HamanoMay 21, 2024
  7. Rubén JustoMay 21, 2024
  8. Junio C HamanoMay 21, 2024
  9. Rubén JustoMay 22, 2024
  10. Junio C HamanoMay 22, 2024
  11. Rubén JustoMay 26, 2024
  12. Junio C HamanoMay 26, 2024
  13. 3/5 pager: introduce wait_for_pagerRubén Justo, May 19, 2024
  14. 4/5 test-terminal: introduce --no-stdin-ptyRubén Justo, May 19, 2024
  15. 5/5 add-patch: render hunks through the pagerRubén Justo, May 19, 2024
  16. Junio C HamanoMay 20, 2024
  17. Dragan SimicMay 20, 2024
  18. Rubén JustoMay 20, 2024
  19. Dragan SimicMay 20, 2024
  20. Rubén JustoMay 21, 2024
  21. Jeff KingMay 21, 2024
  22. Rubén JustoMay 21, 2024
  23. Jeff KingMay 23, 2024
  24. Junio C HamanoMay 23, 2024
  25. Dragan SimicMay 23, 2024
  26. Junio C HamanoMay 23, 2024
  27. Dragan SimicMay 23, 2024
  28. Dragan SimicMay 23, 2024
  29. Junio C HamanoMay 23, 2024
  30. Dragan SimicMay 23, 2024
  31. Jeff KingMay 25, 2024
  32. Rubén JustoMay 23, 2024
  33. Dragan SimicMay 23, 2024
  34. Rubén JustoMay 20, 2024
  35. Junio C HamanoMay 20, 2024
  36. Rubén JustoMay 20, 2024
  37. 0/5 use the pager in 'add -p'Rubén Justo, May 21, 2024
  38. 1/5 add-patch: test for 'p' commandRubén Justo, May 21, 2024
  39. 2/5 pager: do not close fd 2 unnecessarilyRubén Justo, May 21, 2024
  40. 3/5 pager: introduce wait_for_pagerRubén Justo, May 21, 2024
  41. 4/5 test-terminal: introduce --no-stdin-ptyRubén Justo, May 21, 2024
  42. 5/5 add-patch: render hunks through the pagerRubén Justo, May 21, 2024
  43. Dragan SimicMay 22, 2024
  44. Junio C HamanoMay 22, 2024
  45. Rubén JustoMay 22, 2024
  46. Dragan SimicMay 22, 2024
  47. 0/6 use the pager in 'add -p'Rubén Justo, Jun 2, 2024
  48. 1/6 add-patch: test for 'p' commandRubén Justo, Jun 2, 2024
  49. 2/6 pager: do not close fd 2 unnecessarilyRubén Justo, Jun 2, 2024
  50. 3/6 pager: introduce wait_for_pagerRubén Justo, Jun 2, 2024
  51. 4/6 pager: introduce setup_custom_pagerRubén Justo, Jun 2, 2024
  52. 5/6 test-terminal: introduce --no-stdin-ptyRubén Justo, Jun 2, 2024
  53. 6/6 add-patch: introduce the command '|'Rubén Justo, Jun 2, 2024
  54. Junio C HamanoJun 2, 2024
  55. Junio C HamanoJun 2, 2024
  56. Rubén JustoJun 2, 2024
  57. Rubén JustoJun 2, 2024
  58. Dragan SimicJun 2, 2024
  59. Junio C HamanoJun 3, 2024
  60. Dragan SimicJun 3, 2024
  61. Junio C HamanoJun 3, 2024
  62. Dragan SimicJun 4, 2024
  63. Dragan SimicJun 2, 2024
  64. Junio C HamanoJun 3, 2024
  65. Dragan SimicJun 4, 2024
  66. Dragan SimicJun 4, 2024
  67. Rubén JustoJun 3, 2024
  68. Dragan SimicJun 4, 2024
  69. 0/6 use the pager in 'add -p'Rubén Justo, Jun 3, 2024
  70. 1/6 add-patch: test for 'p' commandRubén Justo, Jun 3, 2024
  71. 2/6 pager: do not close fd 2 unnecessarilyRubén Justo, Jun 3, 2024
  72. Junio C HamanoJun 4, 2024
  73. 3/6 pager: introduce wait_for_pagerRubén Justo, Jun 3, 2024
  74. Phillip WoodJun 4, 2024
  75. Junio C HamanoJun 4, 2024
  76. Rubén JustoJun 5, 2024
  77. Junio C HamanoJun 4, 2024
  78. 4/6 pager: introduce setup_custom_pagerRubén Justo, Jun 3, 2024
  79. Junio C HamanoJun 4, 2024
  80. 5/6 test-terminal: introduce --no-stdin-ptyRubén Justo, Jun 3, 2024
  81. Phillip WoodJun 4, 2024
  82. Jeff KingJun 4, 2024
  83. Junio C HamanoJun 5, 2024
  84. Jeff KingJun 6, 2024
  85. Rubén JustoJun 5, 2024
  86. Jeff KingJun 6, 2024
  87. Rubén JustoJun 9, 2024
  88. 6/6 add-patch: introduce the command '|'Rubén Justo, Jun 3, 2024
  89. Junio C HamanoJun 4, 2024
  90. Dragan SimicJun 4, 2024
  91. Junio C HamanoJun 5, 2024
  92. Jeff KingJun 4, 2024
  93. Junio C HamanoJun 4, 2024
  94. Jeff KingJun 5, 2024
  95. Phillip WoodJun 5, 2024
  96. Dragan SimicJun 8, 2024
  97. Rubén JustoJun 9, 2024
  98. Dragan SimicJun 9, 2024
  99. Rubén JustoJun 10, 2024
  100. Dragan SimicJun 10, 2024
  101. Phillip WoodJun 10, 2024
  102. Junio C HamanoJun 10, 2024
  103. Rubén JustoJun 10, 2024
  104. Junio C HamanoJun 10, 2024
  105. Dragan SimicJun 10, 2024
  106. Dragan SimicJun 10, 2024
  107. Junio C HamanoJun 10, 2024
  108. Dragan SimicJun 10, 2024
  109. phillip.wood123@gmail.comJun 9, 2024
  110. Dragan SimicJun 9, 2024
  111. Phillip WoodJun 10, 2024
  112. Dragan SimicJun 10, 2024
  113. Junio C HamanoJun 5, 2024

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.