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

[PATCH v4 17/28] trailer: teach iterator about non-trailer lines

From
LGLinus Arver via GitGitGadget <gitgitgadget@gmail.com>
Date
Feb 6, 2024, 05:12 UTC
Message-ID
<6f17c022b15479191a1a965d762b6b8a956532e4.1707196348.git.gitgitgadget@gmail.com>
In-Reply-To
<pull.1632.v4.git.1707196348.gitgitgadget@gmail.com>
From: Linus Arver <linusa@google.com>

Previously the iterator did not iterate over non-trailer lines. This was somewhat unfortunate, because trailer blocks could have non-trailer lines in them since 146245063e (trailer: allow non-trailers in trailer block, 2016-10-21), which was before the iterator was created in f0939a0eb1 (trailer: add interface for iterating over commit trailers, 2020-09-27).

So if trailer API users wanted to iterate over all lines in a trailer block (including non-trailer lines), they could not use the iterator and were forced to use the lower-level trailer_info struct directly (which provides a raw string array that includes all lines in the trailer block).

Change the iterator's behavior so that we also iterate over non-trailer lines, instead of skipping over them. The new "raw" member of the iterator allows API users to access previously inaccessible non-trailer lines. Reword the variable "trailer" to just "line" because this variable can now hold both trailer lines _and_ non-trailer lines.

The new "raw" member is important because anyone currently not using the iterator is using trailer_info's raw string array directly to access lines to check what the combined key + value looks like. If we didn't provide a "raw" member here, iterator users would have to re-construct the unparsed line by concatenating the key and value back together again --- which places an undue burden for iterator users.

The next patch demonstrates the use of the iterator in sequencer.c as an example of where "raw" will be useful, so that it can start using the iterator.

For the existing use of the iterator in builtin/shortlog.c, we don't have to change the code there because that code does

    trailer_iterator_init(&iter, body);
    while (trailer_iterator_advance(&iter)) {
        const char *value = iter.val.buf;
        if (!string_list_has_string(&log->trailers, iter.key.buf))
            continue;
        ...
and the
        if (!string_list_has_string(&log->trailers, iter.key.buf))

condition already skips over non-trailer lines (iter.key.buf is empty for non-trailer lines, making the comparison still work unmodified even with this patch).

Signed-off-by: Linus Arver <linusa@google.com>
---
 trailer.c | 12 +++++-------
 trailer.h |  8 ++++++++
 2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/trailer.c b/trailer.c
index 4f3318802d1..2cc4a910411 100644
--- a/trailer.c
+++ b/trailer.c
@@ -1147,17 +1147,15 @@ void trailer_iterator_init(struct trailer_iterator *iter, const char *msg)
 
 int trailer_iterator_advance(struct trailer_iterator *iter)
 {
-	while (iter->internal.cur < iter->internal.info.trailer_nr) {
-		char *trailer = iter->internal.info.trailers[iter->internal.cur++];
-		int separator_pos = find_separator(trailer, separators);
-
-		if (separator_pos < 1)
-			continue; /* not a real trailer */
+	if (iter->internal.cur < iter->internal.info.trailer_nr) {
+		char *line = iter->internal.info.trailers[iter->internal.cur++];
+		int separator_pos = find_separator(line, separators);
 
+		iter->raw = line;
 		strbuf_reset(&iter->key);
 		strbuf_reset(&iter->val);
 		parse_trailer(&iter->key, &iter->val, NULL,
-			      trailer, separator_pos);
+			      line, separator_pos);
 		/* Always unfold values during iteration. */
 		unfold_value(&iter->val);
 		return 1;
diff --git a/trailer.h b/trailer.h
index 9f42aa75994..ebafa3657e4 100644
--- a/trailer.h
+++ b/trailer.h
@@ -125,6 +125,14 @@ void format_trailers_from_commit(const struct process_trailer_options *,
  *   trailer_iterator_release(&iter);
  */
 struct trailer_iterator {
+	/*
+	 * Raw line (e.g., "foo: bar baz") before being parsed as a trailer
+	 * key/val pair as part of a trailer block. A trailer block can be
+	 * either 100% trailer lines, or mixed in with non-trailer lines (in
+	 * which case at least 25% must be trailer lines).
+	 */
+	const char *raw;
+
 	struct strbuf key;
 	struct strbuf val;
 
-- 
gitgitgadget
Previous: Linus ArverNext: Linus Arver via GitGitGadget
Message 129 of 202 in “Enrich Trailer API”
  1. 00/10 Enrich Trailer APILinus Arver via GitGitGadget, Jan 10, 2024
  2. 01/10 trailer: move process_trailers() to interpret-trailers.cLinus Arver via GitGitGadget, Jan 10, 2024
  3. Junio C HamanoJan 18, 2024
  4. Linus ArverJan 19, 2024
  5. 02/10 trailer: include "trailer" term in API functionsLinus Arver via GitGitGadget, Jan 10, 2024
  6. Junio C HamanoJan 18, 2024
  7. Linus ArverJan 19, 2024
  8. Junio C HamanoJan 19, 2024
  9. 03/10 trailer: unify trailer formatting machineryLinus Arver via GitGitGadget, Jan 10, 2024
  10. Junio C HamanoJan 18, 2024
  11. Linus ArverJan 19, 2024
  12. 04/10 trailer: delete obsolete formatting functionsLinus Arver via GitGitGadget, Jan 10, 2024
  13. Junio C HamanoJan 19, 2024
  14. 05/10 sequencer: use the trailer iteratorLinus Arver via GitGitGadget, Jan 10, 2024
  15. Junio C HamanoJan 19, 2024
  16. Linus ArverJan 20, 2024
  17. Linus ArverJan 22, 2024
  18. 06/10 trailer: make trailer_info struct privateLinus Arver via GitGitGadget, Jan 10, 2024
  19. Junio C HamanoJan 19, 2024
  20. Josh SteadmonJan 25, 2024
  21. Junio C HamanoJan 25, 2024
  22. 07/10 trailer: spread usage of "trailer_block" languageLinus Arver via GitGitGadget, Jan 10, 2024
  23. Junio C HamanoJan 19, 2024
  24. Linus ArverJan 20, 2024
  25. 08/10 trailer: prepare to move parse_trailers_from_command_line_args() to builtinLinus Arver via GitGitGadget, Jan 10, 2024
  26. Josh SteadmonJan 25, 2024
  27. Linus ArverJan 26, 2024
  28. 09/10 trailer: move arg handling to interpret-trailers.cLinus Arver via GitGitGadget, Jan 10, 2024
  29. Junio C HamanoJan 19, 2024
  30. Linus ArverJan 20, 2024
  31. 10/10 trailer: delete obsolete argument handling code from APILinus Arver via GitGitGadget, Jan 10, 2024
  32. Junio C HamanoJan 10, 2024
  33. Linus ArverJan 13, 2024
  34. Linus ArverJan 14, 2024
  35. Josh SteadmonJan 25, 2024
  36. 00/10 Enrich Trailer APILinus Arver via GitGitGadget, Jan 26, 2024
  37. 01/10 trailer: prepare to expose functions as part of APILinus Arver via GitGitGadget, Jan 26, 2024
  38. Josh SteadmonJan 30, 2024
  39. Linus ArverJan 30, 2024
  40. 02/10 trailer: move interpret_trailers() to interpret-trailers.cLinus Arver via GitGitGadget, Jan 26, 2024
  41. 03/10 trailer: unify trailer formatting machineryLinus Arver via GitGitGadget, Jan 26, 2024
  42. Josh SteadmonJan 30, 2024
  43. Linus ArverJan 30, 2024
  44. 04/10 trailer: delete obsolete formatting functionsLinus Arver via GitGitGadget, Jan 26, 2024
  45. 05/10 sequencer: use the trailer iteratorLinus Arver via GitGitGadget, Jan 26, 2024
  46. 06/10 trailer: make trailer_info struct privateLinus Arver via GitGitGadget, Jan 26, 2024
  47. 07/10 trailer: spread usage of "trailer_block" languageLinus Arver via GitGitGadget, Jan 26, 2024
  48. 08/10 trailer: prepare to move parse_trailers_from_command_line_args() to builtinLinus Arver via GitGitGadget, Jan 26, 2024
  49. 09/10 trailer: move arg handling to interpret-trailers.cLinus Arver via GitGitGadget, Jan 26, 2024
  50. Linus ArverJan 28, 2024
  51. Linus ArverJan 28, 2024
  52. 10/10 trailer: delete obsolete argument handling code from APILinus Arver via GitGitGadget, Jan 26, 2024
  53. 00/10 Enrich Trailer APILinus Arver via GitGitGadget, Jan 31, 2024
  54. 01/10 trailer: prepare to expose functions as part of APILinus Arver via GitGitGadget, Jan 31, 2024
  55. 02/10 trailer: move interpret_trailers() to interpret-trailers.cLinus Arver via GitGitGadget, Jan 31, 2024
  56. Junio C HamanoJan 31, 2024
  57. Linus ArverJan 31, 2024
  58. 03/10 trailer: unify trailer formatting machineryLinus Arver via GitGitGadget, Jan 31, 2024
  59. Josh SteadmonJan 31, 2024
  60. Linus ArverJan 31, 2024
  61. Junio C HamanoFeb 1, 2024
  62. Linus ArverFeb 1, 2024
  63. Junio C HamanoJan 31, 2024
  64. Junio C HamanoJan 31, 2024
  65. Linus ArverFeb 1, 2024
  66. Junio C HamanoFeb 1, 2024
  67. Junio C HamanoFeb 1, 2024
  68. Linus ArverFeb 1, 2024
  69. Junio C HamanoFeb 1, 2024
  70. Linus ArverFeb 2, 2024
  71. Junio C HamanoFeb 2, 2024
  72. Linus ArverJan 31, 2024
  73. 04/10 sequencer: use the trailer iteratorLinus Arver via GitGitGadget, Jan 31, 2024
  74. Junio C HamanoFeb 1, 2024
  75. Linus ArverFeb 1, 2024
  76. Linus ArverFeb 3, 2024
  77. 05/10 trailer: make trailer_info struct privateLinus Arver via GitGitGadget, Jan 31, 2024
  78. Junio C HamanoFeb 1, 2024
  79. Linus ArverFeb 3, 2024
  80. Junio C HamanoFeb 3, 2024
  81. 06/10 trailer: spread usage of "trailer_block" languageLinus Arver via GitGitGadget, Jan 31, 2024
  82. Junio C HamanoFeb 1, 2024
  83. Linus ArverFeb 3, 2024
  84. 07/10 trailer: prepare to move parse_trailers_from_command_line_args() to builtinLinus Arver via GitGitGadget, Jan 31, 2024
  85. Junio C HamanoFeb 1, 2024
  86. 08/10 trailer: move arg handling to interpret-trailers.cLinus Arver via GitGitGadget, Jan 31, 2024
  87. Junio C HamanoFeb 1, 2024
  88. Linus ArverFeb 3, 2024
  89. Linus ArverFeb 6, 2024
  90. 09/10 trailer: delete obsolete argument handling code from APILinus Arver via GitGitGadget, Jan 31, 2024
  91. Junio C HamanoFeb 1, 2024
  92. Linus ArverFeb 3, 2024
  93. 10/10 trailer: introduce "template" term for readabilityLinus Arver via GitGitGadget, Jan 31, 2024
  94. 00/28 Enrich Trailer APILinus Arver via GitGitGadget, Feb 6, 2024
  95. 01/28 trailer: free trailer_info _after_ all related usageLinus Arver via GitGitGadget, Feb 6, 2024
  96. 02/28 shortlog: add test for de-duplicating folded trailersLinus Arver via GitGitGadget, Feb 6, 2024
  97. 03/28 trailer: prepare to expose functions as part of APILinus Arver via GitGitGadget, Feb 6, 2024
  98. 04/28 trailer: move interpret_trailers() to interpret-trailers.cLinus Arver via GitGitGadget, Feb 6, 2024
  99. 05/28 trailer: start preparing for formatting unificationLinus Arver via GitGitGadget, Feb 6, 2024
  100. 06/28 trailer_info_get(): reorder parametersLinus Arver via GitGitGadget, Feb 6, 2024
  101. 07/28 format_trailers(): use strbuf instead of FILELinus Arver via GitGitGadget, Feb 6, 2024
  102. 08/28 format_trailer_info(): move "fast path" to callerLinus Arver via GitGitGadget, Feb 6, 2024
  103. 09/28 format_trailers_from_commit(): indirectly call trailer_info_get()Linus Arver via GitGitGadget, Feb 6, 2024
  104. 10/28 format_trailer_info(): use trailer_item objectsLinus Arver via GitGitGadget, Feb 6, 2024
  105. Junio C HamanoFeb 9, 2024
  106. Linus ArverFeb 13, 2024
  107. 11/28 format_trailer_info(): drop redundant unfold_value()Linus Arver via GitGitGadget, Feb 6, 2024
  108. Junio C HamanoFeb 9, 2024
  109. 12/28 format_trailer_info(): append newline for non-trailer linesLinus Arver via GitGitGadget, Feb 6, 2024
  110. Junio C HamanoFeb 9, 2024
  111. Christian CouderFeb 12, 2024
  112. Linus ArverFeb 13, 2024
  113. 13/28 trailer: begin formatting unificationLinus Arver via GitGitGadget, Feb 6, 2024
  114. 14/28 format_trailer_info(): teach it about opts->trim_emptyLinus Arver via GitGitGadget, Feb 6, 2024
  115. Christian CouderFeb 12, 2024
  116. Linus ArverFeb 13, 2024
  117. Christian CouderFeb 13, 2024
  118. 15/28 format_trailer_info(): avoid double-printing the separatorLinus Arver via GitGitGadget, Feb 6, 2024
  119. Christian CouderFeb 12, 2024
  120. Linus ArverFeb 13, 2024
  121. Christian CouderFeb 13, 2024
  122. Linus ArverFeb 13, 2024
  123. Linus ArverMar 15, 2024
  124. Kristoffer HaugsbakkFeb 13, 2024
  125. 16/28 trailer: finish formatting unificationLinus Arver via GitGitGadget, Feb 6, 2024
  126. Junio C HamanoFeb 9, 2024
  127. Christian CouderFeb 12, 2024
  128. Linus ArverFeb 13, 2024
  129. 17/28 trailer: teach iterator about non-trailer linesLinus Arver via GitGitGadget, Feb 6, 2024
  130. 18/28 sequencer: use the trailer iteratorLinus Arver via GitGitGadget, Feb 6, 2024
  131. 19/28 trailer: make trailer_info struct privateLinus Arver via GitGitGadget, Feb 6, 2024
  132. Junio C HamanoFeb 9, 2024
  133. Linus ArverFeb 13, 2024
  134. Christian CouderFeb 12, 2024
  135. Linus ArverFeb 13, 2024
  136. 20/28 trailer: retire trailer_info_get() from APILinus Arver via GitGitGadget, Feb 6, 2024
  137. 21/28 trailer: spread usage of "trailer_block" languageLinus Arver via GitGitGadget, Feb 6, 2024
  138. Christian CouderFeb 12, 2024
  139. Linus ArverFeb 13, 2024
  140. 22/28 trailer: prepare to delete "parse_trailers_from_command_line_args()"Linus Arver via GitGitGadget, Feb 6, 2024
  141. Christian CouderFeb 12, 2024
  142. Linus ArverFeb 13, 2024
  143. 23/28 trailer: add new helper functions to APILinus Arver via GitGitGadget, Feb 6, 2024
  144. Christian CouderFeb 12, 2024
  145. Linus ArverFeb 13, 2024
  146. 24/28 trailer_add_arg_item(): drop new_trailer_item usageLinus Arver via GitGitGadget, Feb 6, 2024
  147. 25/28 trailer: deprecate "new_trailer_item" struct from APILinus Arver via GitGitGadget, Feb 6, 2024
  148. 26/28 trailer: unify "--trailer ..." arg handlingLinus Arver via GitGitGadget, Feb 6, 2024
  149. Christian CouderFeb 12, 2024
  150. Linus ArverFeb 13, 2024
  151. 27/28 trailer_set_*(): put out parameter at the endLinus Arver via GitGitGadget, Feb 6, 2024
  152. Christian CouderFeb 12, 2024
  153. Linus ArverFeb 13, 2024
  154. 28/28 trailer: introduce "template" term for readabilityLinus Arver via GitGitGadget, Feb 6, 2024
  155. Christian CouderFeb 12, 2024
  156. Linus ArverFeb 13, 2024
  157. Christian CouderFeb 12, 2024
  158. Junio C HamanoFeb 13, 2024
  159. Christian CouderFeb 13, 2024
  160. Junio C HamanoFeb 13, 2024
  161. Christian CouderFeb 13, 2024
  162. Linus ArverFeb 16, 2024
  163. Linus ArverFeb 13, 2024
  164. Junio C HamanoFeb 13, 2024
  165. Kristoffer HaugsbakkFeb 13, 2024
  166. Christian CouderFeb 13, 2024
  167. Linus ArverFeb 16, 2024
  168. 0/9 Enrich Trailer APILinus Arver via GitGitGadget, Feb 16, 2024
  169. 1/9 trailer: free trailer_info _after_ all related usageLinus Arver via GitGitGadget, Feb 16, 2024
  170. 2/9 shortlog: add test for de-duplicating folded trailersLinus Arver via GitGitGadget, Feb 16, 2024
  171. 3/9 trailer: prepare to expose functions as part of APILinus Arver via GitGitGadget, Feb 16, 2024
  172. Christian CouderFeb 19, 2024
  173. Linus ArverFeb 29, 2024
  174. Junio C HamanoFeb 29, 2024
  175. Linus ArverFeb 29, 2024
  176. 4/9 trailer: move interpret_trailers() to interpret-trailers.cLinus Arver via GitGitGadget, Feb 16, 2024
  177. 5/9 trailer: start preparing for formatting unificationLinus Arver via GitGitGadget, Feb 16, 2024
  178. Christian CouderFeb 19, 2024
  179. Linus ArverFeb 29, 2024
  180. 6/9 trailer_info_get(): reorder parametersLinus Arver via GitGitGadget, Feb 16, 2024
  181. 7/9 format_trailers(): use strbuf instead of FILELinus Arver via GitGitGadget, Feb 16, 2024
  182. 8/9 format_trailer_info(): move "fast path" to callerLinus Arver via GitGitGadget, Feb 16, 2024
  183. 9/9 format_trailers_from_commit(): indirectly call trailer_info_get()Linus Arver via GitGitGadget, Feb 16, 2024
  184. Christian CouderFeb 19, 2024
  185. Linus ArverFeb 29, 2024
  186. Christian CouderFeb 19, 2024
  187. 0/9 Enrich Trailer APILinus Arver via GitGitGadget, Mar 1, 2024
  188. 1/9 trailer: free trailer_info _after_ all related usageLinus Arver via GitGitGadget, Mar 1, 2024
  189. 2/9 shortlog: add test for de-duplicating folded trailersLinus Arver via GitGitGadget, Mar 1, 2024
  190. 3/9 trailer: rename functions to use 'trailer'Linus Arver via GitGitGadget, Mar 1, 2024
  191. 4/9 trailer: move interpret_trailers() to interpret-trailers.cLinus Arver via GitGitGadget, Mar 1, 2024
  192. 5/9 trailer: reorder format_trailers_from_commit() parametersLinus Arver via GitGitGadget, Mar 1, 2024
  193. 6/9 trailer_info_get(): reorder parametersLinus Arver via GitGitGadget, Mar 1, 2024
  194. 7/9 format_trailers(): use strbuf instead of FILELinus Arver via GitGitGadget, Mar 1, 2024
  195. 8/9 format_trailer_info(): move "fast path" to callerLinus Arver via GitGitGadget, Mar 1, 2024
  196. 9/9 format_trailers_from_commit(): indirectly call trailer_info_get()Linus Arver via GitGitGadget, Mar 1, 2024
  197. Junio C HamanoMar 5, 2024
  198. Josh SteadmonMar 5, 2024
  199. Junio C HamanoMar 5, 2024
  200. Christian CouderMar 6, 2024
  201. Junio C HamanoMar 6, 2024
  202. Junio C HamanoMar 6, 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.