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

Re: [PATCH v2 2/3] builtin: introduce diff-pairs command

From
Justin Tobler <jltobler@gmail.com>
Date
Feb 19, 2025, 22:38 UTC
Message-ID
<yz74evgjbmj24cakoaseq53ief3jyonujd2pevm5exwcs3kdvl@aqhsafm4hmmm>
In-Reply-To
<xmqq7c5lfvh8.fsf@gitster.g>
On 25/02/19 01:57PM, Junio C Hamano wrote:
Show 20 quoted lines
> Justin Tobler <jltobler@gmail.com> writes:
> 
> >> I think only accepting NUL terminated input is fine, but if we want to
> >> accept other formats we should  have a plan for how to do that in a
> >> backwards compatible way as we cannot use `-z` to distinguish between input
> >> formats.
> >
> > If in the future we want to support the normal format, we could introduce
> > an `--input-format=normal` option or something along those lines. 
> 
> Please don't.  Have an explicit '-z' option from the beginning, and
> if the initial version is incapable of reading from text input, then
> it is perfectly fine to have
> 
> 	if (!nul_termination)
> 		die(_("working without -z not supported (yet)");
> 
> Otherwise people have to remember that unlike everybody else that
> uses "-z" to signal NUL termination, this one alone wants to use a
> "--input-format" option that nobody else uses.
Thanks, I think this is a much better approach! :)
Show 53 quoted lines
> 
> >> > +	/* Don't allow pathspecs at all. */
> >> > +	if (revs.prune_data.nr)
> >> > +		usage_with_options(usage, options);
> 
> Hmph, this is very unfortuate.
> 
> The "--raw" format was originally designed as an interchange format
> between the frontend and backend.  
> 
> The frontend programs take two sets of contents stored in various
> places (like tree vs index, tree vs another tree) and express
> comparison of corresponding paths in (<from mode+contents> <to
> mode+contents> <path>) tuples" (a rough equivalent to what we
> internally have on the diff_queued_diff queue in core).
> 
> The "--raw" format was designed to "dump" what is in the
> diff_queued_diff list.
> 
> And then it would be passed to the single backend, that takes
> "--raw" format, pass them through the diffcore transform machinery
> (like matching removal and addition to detect renames), and produce
> various forms of output (like patch, diffstat, etc.).
> 
> To me, what you are writing is the output phase of that pipeline,
> i.e. the backend.  We do want to (evantually) be able to filter with
> pathspec, and all other things the current diff machinery does after
> the existing "all-in-one" "git diff" and "git diff-{files,index,tree}"
> commands do from their call to diffcore_std() and diffcore_flush().
> 
> The revisions option parsing machinery does accept options that
> would *not* make sense to expect for them to make any difference to
> the result of running "diff".  Rejecting them is a nice thing to
> have, e.g. "git diff --no-merges HEAD^ HEAD" does not error out, but
> some people may want it to barf (I don't care---I am not sick enough
> to give apparently nonsense options to random commands), but it is
> perfectly fine to start your implementation with "nonsense options
> may be ignored".
> 
> But in a "git diff-* -z | git diff-pairs -z" pipeline, I do not see
> a particular reason why you would want to forbid the downstream
> command to further limit the paths it processes with its own
> pathspec, e.g.
> 
>     git diff-tree -z --raw A B -- t/ | git diff-pairs -z t/helper/
> 
> sounds like a perfectly sensible request to grant.
> 
> My recommendation is to avoid deciding to reject things your initial
> implementation happens not to support (yet) too early.  In the end,
> we want this backend half just as powerful as, if not more than, the
> real "git diff" machinery that has both front- and backend in the
> same binary.

Ok, that makes sense. I was originally thinking pathspec limiting could just be handled upstream, but it probably doesn't make much to arbitrarily limit this functionality and remain more flexible. I'll do this in the next version.

Thanks -Justin

Previous: Junio C HamanoNext: Phillip Wood
Message 43 of 78 in “batch blob diff generation”
  1. 0/3 batch blob diff generationJustin Tobler, Dec 13, 2024
  2. 1/3 builtin: introduce diff-blob commandJustin Tobler, Dec 13, 2024
  3. 2/3 builtin/diff-blob: add "--stdin" optionJustin Tobler, Dec 13, 2024
  4. 3/3 builtin/diff-blob: Add "-z" optionJustin Tobler, Dec 13, 2024
  5. Jeff KingDec 13, 2024
  6. Junio C HamanoDec 13, 2024
  7. Jeff KingDec 13, 2024
  8. Junio C HamanoDec 15, 2024
  9. Junio C HamanoDec 15, 2024
  10. Jeff KingDec 16, 2024
  11. Junio C HamanoDec 16, 2024
  12. Jeff KingDec 18, 2024
  13. Junio C HamanoDec 18, 2024
  14. Jeff KingDec 20, 2024
  15. Jeff KingDec 20, 2024
  16. Justin ToblerDec 13, 2024
  17. Jeff KingDec 16, 2024
  18. Junio C HamanoDec 13, 2024
  19. Junio C HamanoDec 15, 2024
  20. Jeff KingDec 16, 2024
  21. 0/3 batch blob diff generationJustin Tobler, Feb 12, 2025
  22. 1/3 diff: return diff_filepair from diff queue helpersJustin Tobler, Feb 12, 2025
  23. Karthik NayakFeb 12, 2025
  24. Justin ToblerFeb 12, 2025
  25. Patrick SteinhardtFeb 12, 2025
  26. Justin ToblerFeb 12, 2025
  27. Patrick SteinhardtFeb 13, 2025
  28. 2/3 builtin: introduce diff-pairs commandJustin Tobler, Feb 12, 2025
  29. Patrick SteinhardtFeb 12, 2025
  30. Karthik NayakFeb 12, 2025
  31. Justin ToblerFeb 25, 2025
  32. Jean-Noël AvilaFeb 12, 2025
  33. Junio C HamanoFeb 12, 2025
  34. Justin ToblerFeb 19, 2025
  35. Junio C HamanoFeb 19, 2025
  36. Junio C HamanoFeb 19, 2025
  37. Justin ToblerFeb 20, 2025
  38. Justin ToblerFeb 20, 2025
  39. Junio C HamanoFeb 20, 2025
  40. Phillip WoodFeb 17, 2025
  41. Justin ToblerFeb 19, 2025
  42. Junio C HamanoFeb 19, 2025
  43. Justin ToblerFeb 19, 2025
  44. Phillip WoodFeb 26, 2025
  45. 3/3 builtin/diff-pairs: allow explicit diff queue flushJustin Tobler, Feb 12, 2025
  46. Patrick SteinhardtFeb 12, 2025
  47. Phillip WoodFeb 17, 2025
  48. Justin ToblerFeb 19, 2025
  49. 0/3 batch blob diff generationJustin Tobler, Feb 25, 2025
  50. 1/3 diff: return diff_filepair from diff queue helpersJustin Tobler, Feb 25, 2025
  51. Junio C HamanoFeb 26, 2025
  52. 2/3 builtin: introduce diff-pairs commandJustin Tobler, Feb 25, 2025
  53. Junio C HamanoFeb 26, 2025
  54. Justin ToblerFeb 27, 2025
  55. Karthik NayakFeb 27, 2025
  56. Justin ToblerFeb 27, 2025
  57. Patrick SteinhardtFeb 27, 2025
  58. Justin ToblerFeb 27, 2025
  59. 3/3 builtin/diff-pairs: allow explicit diff queue flushJustin Tobler, Feb 25, 2025
  60. phillip.wood123@gmail.comFeb 26, 2025
  61. Justin ToblerFeb 27, 2025
  62. 0/4 batch blob diff generationJustin Tobler, Feb 28, 2025
  63. 1/4 diff: return diff_filepair from diff queue helpersJustin Tobler, Feb 28, 2025
  64. 2/4 diff: add option to skip resolving diff statusesJustin Tobler, Feb 28, 2025
  65. Patrick SteinhardtFeb 28, 2025
  66. Justin ToblerFeb 28, 2025
  67. 3/4 builtin: introduce diff-pairs commandJustin Tobler, Feb 28, 2025
  68. Patrick SteinhardtFeb 28, 2025
  69. Justin ToblerFeb 28, 2025
  70. 4/4 builtin/diff-pairs: allow explicit diff queue flushJustin Tobler, Feb 28, 2025
  71. 0/4 batch blob diff generationJustin Tobler, Feb 28, 2025
  72. 1/4 diff: return diff_filepair from diff queue helpersJustin Tobler, Feb 28, 2025
  73. Junio C HamanoMar 3, 2025
  74. 2/4 diff: add option to skip resolving diff statusesJustin Tobler, Feb 28, 2025
  75. Junio C HamanoMar 3, 2025
  76. 3/4 builtin: introduce diff-pairs commandJustin Tobler, Feb 28, 2025
  77. Junio C HamanoMar 3, 2025
  78. 4/4 builtin/diff-pairs: allow explicit diff queue flushJustin Tobler, Feb 28, 2025

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.