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

[PATCH v4 0/6] Xdiff cleanup part 3

From
Ezekiel Newren via GitGitGadget <gitgitgadget@gmail.com>
Date
Mar 30, 2026, 16:59 UTC
Message-ID
<pull.2156.v4.git.git.1774890003.gitgitgadget@gmail.com>
In-Reply-To
<pull.2156.v3.git.git.1774639433.gitgitgadget@gmail.com>
Changes in v3:
 * run make DEVELOPER=1 on each commit and fix all compiler issues
v2 is a radical departure from v1 Changes in v2:
 * make the flow of xdl_cleanup_records() easier to follow

There is no performance or behavioral change introduced in this patch series.

=== original cover letter bellow ===
Patch series summary:
 * patch 1: Introduce the ivec type
 * patch 2: Create the function xdl_do_classic_diff()
 * patches 3-4: generic cleanup
 * patches 5-8: convert from dstart/dend (in xdfile_t) to
   delta_start/delta_end (in xdfenv_t)
 * patches 9-10: move xdl_cleanup_records(), and related, from xprepare.c to
   xdiffi.c
Things that will be addressed in future patch series:
 * Make xdl_cleanup_records() easier to read
 * convert recs/nrec into an ivec
 * convert changed to an ivec
 * remove reference_index/nreff from xdfile_t and turn it into an ivec
 * splitting minimal_perfect_hash out as its own ivec
 * improve the performance of the classifier and parsing/hashing lines

=== before this patch series typedef struct s_xdfile { xrecord_t *recs; size_t nrec; ptrdiff_t dstart, dend; bool *changed; size_t *reference_index; size_t nreff; } xdfile_t;

typedef struct s_xdfenv { xdfile_t xdf1, xdf2; } xdfenv_t;

=== after this patch series typedef struct s_xdfile { xrecord_t *recs; size_t nrec; bool *changed; size_t *reference_index; size_t nreff; } xdfile_t;

typedef struct s_xdfenv { xdfile_t xdf1, xdf2; size_t delta_start, delta_end; size_t mph_size; } xdfenv_t;

Ezekiel Newren (6):
  xdiff/xdl_cleanup_records: delete local recs pointer
  xdiff: use unambiguous types in xdl_bogo_sqrt()
  xdiff/xdl_cleanup_records: use unambiguous types
  xdiff/xdl_cleanup_records: make limits more clear
  xdiff/xdl_cleanup_records: make setting action easier to follow
  xdiff/xdl_cleanup_records: simplify INVESTIGATE handling for clarity
 xdiff/xdiffi.c   |  2 +-
 xdiff/xprepare.c | 84 ++++++++++++++++++++++++++++++++----------------
 xdiff/xutils.c   |  4 +--
 xdiff/xutils.h   |  2 +-
 4 files changed, 60 insertions(+), 32 deletions(-)
base-commit: ca1db8a0f7dc0dbea892e99f5b37c5fe5861be71
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-2156%2Fezekielnewren%2Fxdiff-cleanup-3-v4
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-2156/ezekielnewren/xdiff-cleanup-3-v4
Pull-Request: https://github.com/git/git/pull/2156
Range-diff vs v3:
 1:  da32a9747c = 1:  da32a9747c xdiff/xdl_cleanup_records: delete local recs pointer
 2:  86b0ad100c = 2:  86b0ad100c xdiff: use unambiguous types in xdl_bogo_sqrt()
 3:  39a35365ae = 3:  39a35365ae xdiff/xdl_cleanup_records: use unambiguous types
 4:  86dd98db9b ! 4:  75fe3ea125 xdiff/xdl_cleanup_records: make limits more clear
     @@ xdiff/xprepare.c: static int xdl_cleanup_records(xdlclassifier_t *cf, xdfile_t *
       
      +	if (need_min) {
      +		/* i.e. infinity */
     -+		mlim1 = SIZE_MAX;
     -+		mlim2 = SIZE_MAX;
     ++		mlim1 = PTRDIFF_MAX;
     ++		mlim2 = PTRDIFF_MAX;
      +	} else {
      +		mlim1 = XDL_MIN(xdl_bogosqrt(xdf1->nrec), XDL_MAX_EQLIMIT);
      +		mlim2 = XDL_MIN(xdl_bogosqrt(xdf2->nrec), XDL_MAX_EQLIMIT);
 5:  ecc25be32f = 5:  0cf1412d01 xdiff/xdl_cleanup_records: make setting action easier to follow
 6:  8f4def8814 = 6:  fd14ccafc4 xdiff/xdl_cleanup_records: simplify INVESTIGATE handling for clarity
-- 
gitgitgadget
Previous: Ezekiel Newren via GitGitGadgetNext: Ezekiel Newren via GitGitGadget
Message 82 of 124 in “Xdiff cleanup part 3”
  1. 00/10 Xdiff cleanup part 3Ezekiel Newren via GitGitGadget, Jan 2, 2026
  2. 01/10 ivec: introduce the C side of ivecEzekiel Newren via GitGitGadget, Jan 2, 2026
  3. Junio C HamanoJan 4, 2026
  4. Ezekiel NewrenJan 17, 2026
  5. Phillip WoodJan 8, 2026
  6. Ezekiel NewrenJan 15, 2026
  7. Phillip WoodJan 16, 2026
  8. René ScharfeJan 16, 2026
  9. Phillip WoodJan 17, 2026
  10. Ezekiel NewrenJan 17, 2026
  11. René ScharfeJan 18, 2026
  12. Ezekiel NewrenJan 17, 2026
  13. Ezekiel NewrenJan 17, 2026
  14. Phillip WoodJan 17, 2026
  15. Jeff KingJan 19, 2026
  16. Ezekiel NewrenJan 19, 2026
  17. Jeff KingJan 19, 2026
  18. D. Ben KnobleJan 20, 2026
  19. Ezekiel NewrenJan 21, 2026
  20. Jeff KingJan 21, 2026
  21. Junio C HamanoJan 21, 2026
  22. Ezekiel NewrenJan 21, 2026
  23. Phillip WoodJan 20, 2026
  24. Phillip WoodJan 20, 2026
  25. Ezekiel NewrenJan 21, 2026
  26. Phillip WoodJan 28, 2026
  27. René ScharfeJan 16, 2026
  28. Ezekiel NewrenJan 17, 2026
  29. René ScharfeJan 18, 2026
  30. 02/10 xdiff: make classic diff explicit by creating xdl_do_classic_diff()Ezekiel Newren via GitGitGadget, Jan 2, 2026
  31. Phillip WoodJan 20, 2026
  32. Ezekiel NewrenJan 21, 2026
  33. 03/10 xdiff: don't waste time guessing the number of linesEzekiel Newren via GitGitGadget, Jan 2, 2026
  34. Phillip WoodJan 20, 2026
  35. Ezekiel NewrenJan 21, 2026
  36. Phillip WoodJan 22, 2026
  37. 04/10 xdiff: let patience and histogram benefit from xdl_trim_ends()Ezekiel Newren via GitGitGadget, Jan 2, 2026
  38. Phillip WoodJan 20, 2026
  39. Phillip WoodJan 21, 2026
  40. 05/10 xdiff: use xdfenv_t in xdl_trim_ends() and xdl_cleanup_records()Ezekiel Newren via GitGitGadget, Jan 2, 2026
  41. Phillip WoodJan 20, 2026
  42. 06/10 xdiff: cleanup xdl_trim_ends()Ezekiel Newren via GitGitGadget, Jan 2, 2026
  43. Phillip WoodJan 20, 2026
  44. 07/10 xdiff: replace xdfile_t.dstart with xdfenv_t.delta_startEzekiel Newren via GitGitGadget, Jan 2, 2026
  45. Phillip WoodJan 20, 2026
  46. Phillip WoodJan 28, 2026
  47. 08/10 xdiff: replace xdfile_t.dend with xdfenv_t.delta_endEzekiel Newren via GitGitGadget, Jan 2, 2026
  48. 09/10 xdiff: remove dependence on xdlclassifier from xdl_cleanup_records()Ezekiel Newren via GitGitGadget, Jan 2, 2026
  49. René ScharfeJan 16, 2026
  50. Ezekiel NewrenJan 17, 2026
  51. René ScharfeJan 18, 2026
  52. Phillip WoodJan 21, 2026
  53. 10/10 xdiff: move xdl_cleanup_records() from xprepare.c to xdiffi.cEzekiel Newren via GitGitGadget, Jan 2, 2026
  54. Phillip WoodJan 21, 2026
  55. Phillip WoodJan 28, 2026
  56. Junio C HamanoJan 4, 2026
  57. Yee Cheng ChinJan 4, 2026
  58. Phillip WoodJan 28, 2026
  59. Junio C HamanoMar 6, 2026
  60. Ezekiel NewrenMar 9, 2026
  61. Junio C HamanoMar 9, 2026
  62. 0/5 Xdiff cleanup part 3Ezekiel Newren via GitGitGadget, Mar 25, 2026
  63. 1/5 xdiff/xdl_cleanup_records: delete local recs pointerEzekiel Newren via GitGitGadget, Mar 25, 2026
  64. 2/5 xdiff/xdl_cleanup_records: make limits more clearEzekiel Newren via GitGitGadget, Mar 25, 2026
  65. 3/5 xdiff/xdl_cleanup_records: make setting action easier to followEzekiel Newren via GitGitGadget, Mar 25, 2026
  66. 4/5 xdiff/xdl_cleanup_records: simplify INVESTIGATE handling for clarityEzekiel Newren via GitGitGadget, Mar 25, 2026
  67. 5/5 xdiff/xdl_cleanup_records: use unambiguous typesEzekiel Newren via GitGitGadget, Mar 25, 2026
  68. Junio C HamanoMar 25, 2026
  69. SZEDER GáborMar 26, 2026
  70. 0/6 Xdiff cleanup part 3Ezekiel Newren via GitGitGadget, Mar 27, 2026
  71. 1/6 xdiff/xdl_cleanup_records: delete local recs pointerEzekiel Newren via GitGitGadget, Mar 27, 2026
  72. 2/6 xdiff: use unambiguous types in xdl_bogo_sqrt()Ezekiel Newren via GitGitGadget, Mar 27, 2026
  73. 3/6 xdiff/xdl_cleanup_records: use unambiguous typesEzekiel Newren via GitGitGadget, Mar 27, 2026
  74. 4/6 xdiff/xdl_cleanup_records: make limits more clearEzekiel Newren via GitGitGadget, Mar 27, 2026
  75. Junio C HamanoMar 27, 2026
  76. Junio C HamanoMar 27, 2026
  77. Ezekiel NewrenMar 30, 2026
  78. Junio C HamanoMar 30, 2026
  79. Ezekiel NewrenMar 31, 2026
  80. 5/6 xdiff/xdl_cleanup_records: make setting action easier to followEzekiel Newren via GitGitGadget, Mar 27, 2026
  81. 6/6 xdiff/xdl_cleanup_records: simplify INVESTIGATE handling for clarityEzekiel Newren via GitGitGadget, Mar 27, 2026
  82. 0/6 Xdiff cleanup part 3Ezekiel Newren via GitGitGadget, Mar 30, 2026
  83. 1/6 xdiff/xdl_cleanup_records: delete local recs pointerEzekiel Newren via GitGitGadget, Mar 30, 2026
  84. Ezekiel NewrenMar 30, 2026
  85. Junio C HamanoMar 30, 2026
  86. 2/6 xdiff: use unambiguous types in xdl_bogo_sqrt()Ezekiel Newren via GitGitGadget, Mar 30, 2026
  87. Junio C HamanoMar 30, 2026
  88. 3/6 xdiff/xdl_cleanup_records: use unambiguous typesEzekiel Newren via GitGitGadget, Mar 30, 2026
  89. 4/6 xdiff/xdl_cleanup_records: make limits more clearEzekiel Newren via GitGitGadget, Mar 30, 2026
  90. Phillip WoodMar 31, 2026
  91. Junio C HamanoMar 31, 2026
  92. Ezekiel NewrenApr 14, 2026
  93. Junio C HamanoApr 14, 2026
  94. Phillip WoodApr 15, 2026
  95. 5/6 xdiff/xdl_cleanup_records: make setting action easier to followEzekiel Newren via GitGitGadget, Mar 30, 2026
  96. Junio C HamanoMar 30, 2026
  97. Phillip WoodMar 31, 2026
  98. 6/6 xdiff/xdl_cleanup_records: simplify INVESTIGATE handling for clarityEzekiel Newren via GitGitGadget, Mar 30, 2026
  99. Phillip WoodMar 31, 2026
  100. Phillip WoodApr 1, 2026
  101. Junio C HamanoMar 30, 2026
  102. Phillip WoodMar 31, 2026
  103. 0/6 Xdiff cleanup part 3Ezekiel Newren via GitGitGadget, Apr 8, 2026
  104. 1/6 xdiff/xdl_cleanup_records: delete local recs pointerEzekiel Newren via GitGitGadget, Apr 8, 2026
  105. 2/6 xdiff: use unambiguous types in xdl_bogo_sqrt()Ezekiel Newren via GitGitGadget, Apr 8, 2026
  106. 3/6 xdiff/xdl_cleanup_records: use unambiguous typesEzekiel Newren via GitGitGadget, Apr 8, 2026
  107. 4/6 xdiff/xdl_cleanup_records: make limits more clearEzekiel Newren via GitGitGadget, Apr 8, 2026
  108. Phillip WoodApr 14, 2026
  109. 5/6 xdiff/xdl_cleanup_records: make setting action easier to followEzekiel Newren via GitGitGadget, Apr 8, 2026
  110. 6/6 xdiff/xdl_cleanup_records: put braces around the else clauseEzekiel Newren via GitGitGadget, Apr 8, 2026
  111. Junio C HamanoApr 8, 2026
  112. Phillip WoodApr 9, 2026
  113. Phillip WoodApr 14, 2026
  114. Junio C HamanoApr 14, 2026
  115. 0/6 Xdiff cleanup part 3Ezekiel Newren via GitGitGadget, Apr 29, 2026
  116. 1/6 xdiff/xdl_cleanup_records: delete local recs pointerEzekiel Newren via GitGitGadget, Apr 29, 2026
  117. 2/6 xdiff: use unambiguous types in xdl_bogo_sqrt()Ezekiel Newren via GitGitGadget, Apr 29, 2026
  118. 3/6 xdiff/xdl_cleanup_records: use unambiguous typesEzekiel Newren via GitGitGadget, Apr 29, 2026
  119. 4/6 xdiff/xdl_cleanup_records: make limits more clearEzekiel Newren via GitGitGadget, Apr 29, 2026
  120. 5/6 xdiff/xdl_cleanup_records: make setting action easier to followEzekiel Newren via GitGitGadget, Apr 29, 2026
  121. 6/6 xdiff/xdl_cleanup_records: make execution of action easier to followEzekiel Newren via GitGitGadget, Apr 29, 2026
  122. Phillip WoodApr 30, 2026
  123. Ezekiel NewrenApr 30, 2026
  124. Junio C HamanoMay 4, 2026

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.