This patch series is the first 9 patches of a larger cleanup/bugfix series
(henceforth "larger series") I've been working on. The main goal of this
series is to begin the process of "libifying" the trailer API. By "API" I
mean the interface exposed in trailer.h. The larger series brings a number
of additional cleanups (exposing and fixing some bugs along the way), and
builds on top of this series.
When the larger series is merged, we will be in a good state to additionally
pursue the following goals:
1. "API reuse inside Git": make the API expressive enough to eliminate any
need by other parts of Git to use the interpret-trailers builtin as a
subprocess (instead they could just use the API directly);
2. "API stability": add unit tests to codify the expected behavior of API
functions; and
3. "API documentation": create developer-focused documentation to explain
how to use the API effectively, noting any API limitations or
anti-patterns.
In the future after libification is "complete", users external to Git will
be able to use the same trailer processing API used by the
interpret-trailers builtin. For example, a web server may want to parse
trailers the same way that Git would parse them, without having to call
interpret-trailers as a subprocess. This use case was the original
motivation behind my work in this area.
With the libification-focused goals out of the way, let's turn to this patch
series in more detail.
In summary this series breaks up "process_trailers()" into smaller pieces,
exposing many of the parts relevant to trailer-related processing in
trailer.h. This will force us to eventually introduce unit tests for these
API functions, but that is a good thing for API stability. We also perform
some preparatory refactors in order to help us unify the trailer formatting
machinery toward the end of this series.
Notable changes in v5
=====================
* Removed patches 10+ from this series. Thanks to Christian for the
suggestion.
* Reworded the log message of patch 09 to reflect the above arrangement, as
suggested by Christian.
Notable changes in v4
=====================
* Patches 3, 4, 5, and 8 have been broken up into smaller steps. There are
28 instead of 10 patches now, but these 28 should be much easier to
review than the (previously condensed) 10.
* NEW Patch 1: "trailer: free trailer_info after all related usage" fixes
awkward use-after-free coding style
* NEW Patch 2: "shortlog: add test for de-duplicating folded trailers"
increases test coverage related to trailer iterators and "unfold_value()"
* NEW Patch 27: "trailer_set_*(): put out parameter at the end" is a small
refactor to reorder parameters.
* Patches 5-16: These smaller patches make up Patch 3 from v3.
* Patches 17-18: These smaller patches make up Patch 4 from v3.
* Patches 19-20: These smaller patches make up Patch 5 from v3.
* Patches 23-26: These smaller patches make up Patch 8 from v3.
* Anonymize unambiguous parameters in <trailer.h>.
Notable changes in v3
=====================
* Squashed Patch 4 into Patch 3 ("trailer: unify trailer formatting
machinery"), to avoid breaking the build ("-Werror=unused-function"
violations)
* NEW (Patch 10): Introduce "trailer template" terminology for readability
(no behavioral change)
* (API function) Rename default_separators() to
trailer_default_separators()
* (API function) Rename new_trailers_clear() to free_trailer_templates()
* trailer.h: for single-parameter functions, anonymize the parameter name
to reduce verbosity
Notable changes in v2
=====================
* (cover letter) Discuss goals of the larger series in more detail,
especially the pimpl idiom
* (cover letter) List bug fixes pending in the larger series that depend on
this series
* Reorder function parameters to have trailer options at the beginning (and
out parameters toward the end)
* "sequencer: use the trailer iterator": prefer C string instead of strbuf
for new "raw" field
* Patch 1 (was Patch 2) also renames ensure_configured() to
trailer_config_init() (forgot to rename this one previously)
Linus Arver (9):
trailer: free trailer_info _after_ all related usage
shortlog: add test for de-duplicating folded trailers
trailer: prepare to expose functions as part of API
trailer: move interpret_trailers() to interpret-trailers.c
trailer: start preparing for formatting unification
trailer_info_get(): reorder parameters
format_trailers(): use strbuf instead of FILE
format_trailer_info(): move "fast path" to caller
format_trailers_from_commit(): indirectly call trailer_info_get()
builtin/interpret-trailers.c | 101 ++++++++++++++++++-
pretty.c | 2 +-
ref-filter.c | 2 +-
sequencer.c | 2 +-
t/t4201-shortlog.sh | 32 +++++++
trailer.c | 181 +++++++++--------------------------
trailer.h | 31 ++++--
7 files changed, 204 insertions(+), 147 deletions(-)
base-commit: a54a84b333adbecf7bc4483c0e36ed5878cac17b
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1632%2Flistx%2Ftrailer-api-refactor-part-1-v5
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1632/listx/trailer-api-refactor-part-1-v5
Pull-Request: https://github.com/gitgitgadget/git/pull/1632
Range-diff vs v4:
1: 652df25f30e = 1: 652df25f30e trailer: free trailer_info _after_ all related usage
2: fdccaca2ba0 = 2: fdccaca2ba0 shortlog: add test for de-duplicating folded trailers
3: 4372af244f0 = 3: 4372af244f0 trailer: prepare to expose functions as part of API
4: 4073b8eb510 = 4: 4073b8eb510 trailer: move interpret_trailers() to interpret-trailers.c
5: b2a0f7829a1 = 5: b2a0f7829a1 trailer: start preparing for formatting unification
6: c1760f80356 = 6: c1760f80356 trailer_info_get(): reorder parameters
7: 9dc912b5bc5 = 7: 9dc912b5bc5 format_trailers(): use strbuf instead of FILE
8: b97c06d8bc3 = 8: b97c06d8bc3 format_trailer_info(): move "fast path" to caller
9: 6906910417a ! 9: 7c656b3f775 format_trailers_from_commit(): indirectly call trailer_info_get()
@@ Commit message
format_trailer_info() only looks at the "trailers" string array, not the
trailer_item objects which parse_trailers() populates.
- In the next patch, we'll change format_trailer_info() to use the parsed
+ In a future patch, we'll change format_trailer_info() to use the parsed
trailer_item objects instead of the string array.
Signed-off-by: Linus Arver <linusa@xxxxxxxxxx>
10: f5b7ba08aa7 < -: ----------- format_trailer_info(): use trailer_item objects
11: 457f2a839d5 < -: ----------- format_trailer_info(): drop redundant unfold_value()
12: a72eca301f7 < -: ----------- format_trailer_info(): append newline for non-trailer lines
13: ad77c33e457 < -: ----------- trailer: begin formatting unification
14: 11f854399db < -: ----------- format_trailer_info(): teach it about opts->trim_empty
15: ba1f387747b < -: ----------- format_trailer_info(): avoid double-printing the separator
16: 31725832224 < -: ----------- trailer: finish formatting unification
17: 6f17c022b15 < -: ----------- trailer: teach iterator about non-trailer lines
18: cc92dfb0bda < -: ----------- sequencer: use the trailer iterator
19: f5f0d06613f < -: ----------- trailer: make trailer_info struct private
20: 607ae7a90cd < -: ----------- trailer: retire trailer_info_get() from API
21: 38f4b4c4135 < -: ----------- trailer: spread usage of "trailer_block" language
22: 94bf182e3ff < -: ----------- trailer: prepare to delete "parse_trailers_from_command_line_args()"
23: 3bfe4809ecb < -: ----------- trailer: add new helper functions to API
24: 80e1958bb8d < -: ----------- trailer_add_arg_item(): drop new_trailer_item usage
25: a9080597a28 < -: ----------- trailer: deprecate "new_trailer_item" struct from API
26: 9720526dd8a < -: ----------- trailer: unify "--trailer ..." arg handling
27: 26df2514acb < -: ----------- trailer_set_*(): put out parameter at the end
28: 14927038d85 < -: ----------- trailer: introduce "template" term for readability
--
gitgitgadget
