1 #include "git-compat-util.h"
3 #include "environment.h"
5 #include "string-list.h"
6 #include "run-command.h"
11 * Copyright (c) 2013, 2014 Christian Couder <chriscool@tuxfamily.org>
19 enum trailer_where where
;
20 enum trailer_if_exists if_exists
;
21 enum trailer_if_missing if_missing
;
24 static struct conf_info default_conf_info
;
27 struct list_head list
;
29 * If this is not a trailer line, the line is stored in value
30 * (excluding the terminating newline) and token is NULL.
37 struct list_head list
;
40 struct conf_info conf
;
43 static LIST_HEAD(conf_head
);
45 static char *separators
= ":";
47 static int configured
;
49 #define TRAILER_ARG_STRING "$ARG"
51 static const char *git_generated_prefixes
[] = {
53 "(cherry picked from commit ",
57 /* Iterate over the elements of the list. */
58 #define list_for_each_dir(pos, head, is_reverse) \
59 for (pos = is_reverse ? (head)->prev : (head)->next; \
61 pos = is_reverse ? pos->prev : pos->next)
63 static int after_or_end(enum trailer_where where
)
65 return (where
== WHERE_AFTER
) || (where
== WHERE_END
);
69 * Return the length of the string not including any final
70 * punctuation. E.g., the input "Signed-off-by:" would return
71 * 13, stripping the trailing punctuation but retaining
72 * internal punctuation.
74 static size_t token_len_without_separator(const char *token
, size_t len
)
76 while (len
> 0 && !isalnum(token
[len
- 1]))
81 static int same_token(struct trailer_item
*a
, struct arg_item
*b
)
83 size_t a_len
, b_len
, min_len
;
88 a_len
= token_len_without_separator(a
->token
, strlen(a
->token
));
89 b_len
= token_len_without_separator(b
->token
, strlen(b
->token
));
90 min_len
= (a_len
> b_len
) ? b_len
: a_len
;
92 return !strncasecmp(a
->token
, b
->token
, min_len
);
95 static int same_value(struct trailer_item
*a
, struct arg_item
*b
)
97 return !strcasecmp(a
->value
, b
->value
);
100 static int same_trailer(struct trailer_item
*a
, struct arg_item
*b
)
102 return same_token(a
, b
) && same_value(a
, b
);
105 static inline int is_blank_line(const char *str
)
108 while (*s
&& *s
!= '\n' && isspace(*s
))
110 return !*s
|| *s
== '\n';
113 static inline void strbuf_replace(struct strbuf
*sb
, const char *a
, const char *b
)
115 const char *ptr
= strstr(sb
->buf
, a
);
117 strbuf_splice(sb
, ptr
- sb
->buf
, strlen(a
), b
, strlen(b
));
120 static void free_trailer_item(struct trailer_item
*item
)
127 static void free_arg_item(struct arg_item
*item
)
129 free(item
->conf
.name
);
130 free(item
->conf
.key
);
131 free(item
->conf
.command
);
132 free(item
->conf
.cmd
);
138 static char last_non_space_char(const char *s
)
141 for (i
= strlen(s
) - 1; i
>= 0; i
--)
147 static void print_tok_val(struct strbuf
*out
, const char *tok
, const char *val
)
152 strbuf_addf(out
, "%s\n", val
);
156 c
= last_non_space_char(tok
);
159 if (strchr(separators
, c
))
160 strbuf_addf(out
, "%s%s\n", tok
, val
);
162 strbuf_addf(out
, "%s%c %s\n", tok
, separators
[0], val
);
165 void format_trailers(const struct process_trailer_options
*opts
,
166 struct list_head
*trailers
,
169 struct list_head
*pos
;
170 struct trailer_item
*item
;
171 list_for_each(pos
, trailers
) {
172 item
= list_entry(pos
, struct trailer_item
, list
);
173 if ((!opts
->trim_empty
|| strlen(item
->value
) > 0) &&
174 (!opts
->only_trailers
|| item
->token
))
175 print_tok_val(out
, item
->token
, item
->value
);
179 static struct trailer_item
*trailer_from_arg(struct arg_item
*arg_tok
)
181 struct trailer_item
*new_item
= xcalloc(1, sizeof(*new_item
));
182 new_item
->token
= arg_tok
->token
;
183 new_item
->value
= arg_tok
->value
;
184 arg_tok
->token
= arg_tok
->value
= NULL
;
185 free_arg_item(arg_tok
);
189 static void add_arg_to_input_list(struct trailer_item
*on_tok
,
190 struct arg_item
*arg_tok
)
192 int aoe
= after_or_end(arg_tok
->conf
.where
);
193 struct trailer_item
*to_add
= trailer_from_arg(arg_tok
);
195 list_add(&to_add
->list
, &on_tok
->list
);
197 list_add_tail(&to_add
->list
, &on_tok
->list
);
200 static int check_if_different(struct trailer_item
*in_tok
,
201 struct arg_item
*arg_tok
,
203 struct list_head
*head
)
205 enum trailer_where where
= arg_tok
->conf
.where
;
206 struct list_head
*next_head
;
208 if (same_trailer(in_tok
, arg_tok
))
211 * if we want to add a trailer after another one,
212 * we have to check those before this one
214 next_head
= after_or_end(where
) ? in_tok
->list
.prev
216 if (next_head
== head
)
218 in_tok
= list_entry(next_head
, struct trailer_item
, list
);
223 static char *apply_command(struct conf_info
*conf
, const char *arg
)
225 struct strbuf cmd
= STRBUF_INIT
;
226 struct strbuf buf
= STRBUF_INIT
;
227 struct child_process cp
= CHILD_PROCESS_INIT
;
231 strbuf_addstr(&cmd
, conf
->cmd
);
232 strvec_push(&cp
.args
, cmd
.buf
);
234 strvec_push(&cp
.args
, arg
);
235 } else if (conf
->command
) {
236 strbuf_addstr(&cmd
, conf
->command
);
238 strbuf_replace(&cmd
, TRAILER_ARG_STRING
, arg
);
239 strvec_push(&cp
.args
, cmd
.buf
);
241 strvec_pushv(&cp
.env
, (const char **)local_repo_env
);
245 if (capture_command(&cp
, &buf
, 1024)) {
246 error(_("running trailer command '%s' failed"), cmd
.buf
);
247 strbuf_release(&buf
);
248 result
= xstrdup("");
251 result
= strbuf_detach(&buf
, NULL
);
254 strbuf_release(&cmd
);
258 static void apply_item_command(struct trailer_item
*in_tok
, struct arg_item
*arg_tok
)
260 if (arg_tok
->conf
.command
|| arg_tok
->conf
.cmd
) {
262 if (arg_tok
->value
&& arg_tok
->value
[0]) {
263 arg
= arg_tok
->value
;
265 if (in_tok
&& in_tok
->value
)
266 arg
= xstrdup(in_tok
->value
);
270 arg_tok
->value
= apply_command(&arg_tok
->conf
, arg
);
275 static void apply_arg_if_exists(struct trailer_item
*in_tok
,
276 struct arg_item
*arg_tok
,
277 struct trailer_item
*on_tok
,
278 struct list_head
*head
)
280 switch (arg_tok
->conf
.if_exists
) {
281 case EXISTS_DO_NOTHING
:
282 free_arg_item(arg_tok
);
285 apply_item_command(in_tok
, arg_tok
);
286 add_arg_to_input_list(on_tok
, arg_tok
);
287 list_del(&in_tok
->list
);
288 free_trailer_item(in_tok
);
291 apply_item_command(in_tok
, arg_tok
);
292 add_arg_to_input_list(on_tok
, arg_tok
);
294 case EXISTS_ADD_IF_DIFFERENT
:
295 apply_item_command(in_tok
, arg_tok
);
296 if (check_if_different(in_tok
, arg_tok
, 1, head
))
297 add_arg_to_input_list(on_tok
, arg_tok
);
299 free_arg_item(arg_tok
);
301 case EXISTS_ADD_IF_DIFFERENT_NEIGHBOR
:
302 apply_item_command(in_tok
, arg_tok
);
303 if (check_if_different(on_tok
, arg_tok
, 0, head
))
304 add_arg_to_input_list(on_tok
, arg_tok
);
306 free_arg_item(arg_tok
);
309 BUG("trailer.c: unhandled value %d",
310 arg_tok
->conf
.if_exists
);
314 static void apply_arg_if_missing(struct list_head
*head
,
315 struct arg_item
*arg_tok
)
317 enum trailer_where where
;
318 struct trailer_item
*to_add
;
320 switch (arg_tok
->conf
.if_missing
) {
321 case MISSING_DO_NOTHING
:
322 free_arg_item(arg_tok
);
325 where
= arg_tok
->conf
.where
;
326 apply_item_command(NULL
, arg_tok
);
327 to_add
= trailer_from_arg(arg_tok
);
328 if (after_or_end(where
))
329 list_add_tail(&to_add
->list
, head
);
331 list_add(&to_add
->list
, head
);
334 BUG("trailer.c: unhandled value %d",
335 arg_tok
->conf
.if_missing
);
339 static int find_same_and_apply_arg(struct list_head
*head
,
340 struct arg_item
*arg_tok
)
342 struct list_head
*pos
;
343 struct trailer_item
*in_tok
;
344 struct trailer_item
*on_tok
;
346 enum trailer_where where
= arg_tok
->conf
.where
;
347 int middle
= (where
== WHERE_AFTER
) || (where
== WHERE_BEFORE
);
348 int backwards
= after_or_end(where
);
349 struct trailer_item
*start_tok
;
351 if (list_empty(head
))
354 start_tok
= list_entry(backwards
? head
->prev
: head
->next
,
358 list_for_each_dir(pos
, head
, backwards
) {
359 in_tok
= list_entry(pos
, struct trailer_item
, list
);
360 if (!same_token(in_tok
, arg_tok
))
362 on_tok
= middle
? in_tok
: start_tok
;
363 apply_arg_if_exists(in_tok
, arg_tok
, on_tok
, head
);
369 void process_trailers_lists(struct list_head
*head
,
370 struct list_head
*arg_head
)
372 struct list_head
*pos
, *p
;
373 struct arg_item
*arg_tok
;
375 list_for_each_safe(pos
, p
, arg_head
) {
377 arg_tok
= list_entry(pos
, struct arg_item
, list
);
381 applied
= find_same_and_apply_arg(head
, arg_tok
);
384 apply_arg_if_missing(head
, arg_tok
);
388 int trailer_set_where(enum trailer_where
*item
, const char *value
)
391 *item
= WHERE_DEFAULT
;
392 else if (!strcasecmp("after", value
))
394 else if (!strcasecmp("before", value
))
395 *item
= WHERE_BEFORE
;
396 else if (!strcasecmp("end", value
))
398 else if (!strcasecmp("start", value
))
405 int trailer_set_if_exists(enum trailer_if_exists
*item
, const char *value
)
408 *item
= EXISTS_DEFAULT
;
409 else if (!strcasecmp("addIfDifferent", value
))
410 *item
= EXISTS_ADD_IF_DIFFERENT
;
411 else if (!strcasecmp("addIfDifferentNeighbor", value
))
412 *item
= EXISTS_ADD_IF_DIFFERENT_NEIGHBOR
;
413 else if (!strcasecmp("add", value
))
415 else if (!strcasecmp("replace", value
))
416 *item
= EXISTS_REPLACE
;
417 else if (!strcasecmp("doNothing", value
))
418 *item
= EXISTS_DO_NOTHING
;
424 int trailer_set_if_missing(enum trailer_if_missing
*item
, const char *value
)
427 *item
= MISSING_DEFAULT
;
428 else if (!strcasecmp("doNothing", value
))
429 *item
= MISSING_DO_NOTHING
;
430 else if (!strcasecmp("add", value
))
437 static void duplicate_conf(struct conf_info
*dst
, const struct conf_info
*src
)
440 dst
->name
= xstrdup_or_null(src
->name
);
441 dst
->key
= xstrdup_or_null(src
->key
);
442 dst
->command
= xstrdup_or_null(src
->command
);
443 dst
->cmd
= xstrdup_or_null(src
->cmd
);
446 static struct arg_item
*get_conf_item(const char *name
)
448 struct list_head
*pos
;
449 struct arg_item
*item
;
451 /* Look up item with same name */
452 list_for_each(pos
, &conf_head
) {
453 item
= list_entry(pos
, struct arg_item
, list
);
454 if (!strcasecmp(item
->conf
.name
, name
))
458 /* Item does not already exists, create it */
459 CALLOC_ARRAY(item
, 1);
460 duplicate_conf(&item
->conf
, &default_conf_info
);
461 item
->conf
.name
= xstrdup(name
);
463 list_add_tail(&item
->list
, &conf_head
);
468 enum trailer_info_type
{ TRAILER_KEY
, TRAILER_COMMAND
, TRAILER_CMD
,
469 TRAILER_WHERE
, TRAILER_IF_EXISTS
, TRAILER_IF_MISSING
};
473 enum trailer_info_type type
;
474 } trailer_config_items
[] = {
475 { "key", TRAILER_KEY
},
476 { "command", TRAILER_COMMAND
},
477 { "cmd", TRAILER_CMD
},
478 { "where", TRAILER_WHERE
},
479 { "ifexists", TRAILER_IF_EXISTS
},
480 { "ifmissing", TRAILER_IF_MISSING
}
483 static int git_trailer_default_config(const char *conf_key
, const char *value
,
484 const struct config_context
*ctx UNUSED
,
487 const char *trailer_item
, *variable_name
;
489 if (!skip_prefix(conf_key
, "trailer.", &trailer_item
))
492 variable_name
= strrchr(trailer_item
, '.');
493 if (!variable_name
) {
494 if (!strcmp(trailer_item
, "where")) {
495 if (trailer_set_where(&default_conf_info
.where
,
497 warning(_("unknown value '%s' for key '%s'"),
499 } else if (!strcmp(trailer_item
, "ifexists")) {
500 if (trailer_set_if_exists(&default_conf_info
.if_exists
,
502 warning(_("unknown value '%s' for key '%s'"),
504 } else if (!strcmp(trailer_item
, "ifmissing")) {
505 if (trailer_set_if_missing(&default_conf_info
.if_missing
,
507 warning(_("unknown value '%s' for key '%s'"),
509 } else if (!strcmp(trailer_item
, "separators")) {
511 return config_error_nonbool(conf_key
);
512 separators
= xstrdup(value
);
518 static int git_trailer_config(const char *conf_key
, const char *value
,
519 const struct config_context
*ctx UNUSED
,
522 const char *trailer_item
, *variable_name
;
523 struct arg_item
*item
;
524 struct conf_info
*conf
;
526 enum trailer_info_type type
;
529 if (!skip_prefix(conf_key
, "trailer.", &trailer_item
))
532 variable_name
= strrchr(trailer_item
, '.');
537 for (i
= 0; i
< ARRAY_SIZE(trailer_config_items
); i
++) {
538 if (strcmp(trailer_config_items
[i
].name
, variable_name
))
540 name
= xstrndup(trailer_item
, variable_name
- trailer_item
- 1);
541 type
= trailer_config_items
[i
].type
;
548 item
= get_conf_item(name
);
555 warning(_("more than one %s"), conf_key
);
557 return config_error_nonbool(conf_key
);
558 conf
->key
= xstrdup(value
);
560 case TRAILER_COMMAND
:
562 warning(_("more than one %s"), conf_key
);
564 return config_error_nonbool(conf_key
);
565 conf
->command
= xstrdup(value
);
569 warning(_("more than one %s"), conf_key
);
571 return config_error_nonbool(conf_key
);
572 conf
->cmd
= xstrdup(value
);
575 if (trailer_set_where(&conf
->where
, value
))
576 warning(_("unknown value '%s' for key '%s'"), value
, conf_key
);
578 case TRAILER_IF_EXISTS
:
579 if (trailer_set_if_exists(&conf
->if_exists
, value
))
580 warning(_("unknown value '%s' for key '%s'"), value
, conf_key
);
582 case TRAILER_IF_MISSING
:
583 if (trailer_set_if_missing(&conf
->if_missing
, value
))
584 warning(_("unknown value '%s' for key '%s'"), value
, conf_key
);
587 BUG("trailer.c: unhandled type %d", type
);
592 void trailer_config_init(void)
597 /* Default config must be setup first */
598 default_conf_info
.where
= WHERE_END
;
599 default_conf_info
.if_exists
= EXISTS_ADD_IF_DIFFERENT_NEIGHBOR
;
600 default_conf_info
.if_missing
= MISSING_ADD
;
601 git_config(git_trailer_default_config
, NULL
);
602 git_config(git_trailer_config
, NULL
);
606 static const char *token_from_item(struct arg_item
*item
, char *tok
)
609 return item
->conf
.key
;
612 return item
->conf
.name
;
615 static int token_matches_item(const char *tok
, struct arg_item
*item
, size_t tok_len
)
617 if (!strncasecmp(tok
, item
->conf
.name
, tok_len
))
619 return item
->conf
.key
? !strncasecmp(tok
, item
->conf
.key
, tok_len
) : 0;
623 * If the given line is of the form
624 * "<token><optional whitespace><separator>..." or "<separator>...", return the
625 * location of the separator. Otherwise, return -1. The optional whitespace
626 * is allowed there primarily to allow things like "Bug #43" where <token> is
627 * "Bug" and <separator> is "#".
629 * The separator-starts-line case (in which this function returns 0) is
630 * distinguished from the non-well-formed-line case (in which this function
631 * returns -1) because some callers of this function need such a distinction.
633 static ssize_t
find_separator(const char *line
, const char *separators
)
635 int whitespace_found
= 0;
637 for (c
= line
; *c
; c
++) {
638 if (strchr(separators
, *c
))
640 if (!whitespace_found
&& (isalnum(*c
) || *c
== '-'))
642 if (c
!= line
&& (*c
== ' ' || *c
== '\t')) {
643 whitespace_found
= 1;
652 * Obtain the token, value, and conf from the given trailer.
654 * separator_pos must not be 0, since the token cannot be an empty string.
656 * If separator_pos is -1, interpret the whole trailer as a token.
658 static void parse_trailer(struct strbuf
*tok
, struct strbuf
*val
,
659 const struct conf_info
**conf
, const char *trailer
,
660 ssize_t separator_pos
)
662 struct arg_item
*item
;
664 struct list_head
*pos
;
666 if (separator_pos
!= -1) {
667 strbuf_add(tok
, trailer
, separator_pos
);
669 strbuf_addstr(val
, trailer
+ separator_pos
+ 1);
672 strbuf_addstr(tok
, trailer
);
676 /* Lookup if the token matches something in the config */
677 tok_len
= token_len_without_separator(tok
->buf
, tok
->len
);
679 *conf
= &default_conf_info
;
680 list_for_each(pos
, &conf_head
) {
681 item
= list_entry(pos
, struct arg_item
, list
);
682 if (token_matches_item(tok
->buf
, item
, tok_len
)) {
683 char *tok_buf
= strbuf_detach(tok
, NULL
);
686 strbuf_addstr(tok
, token_from_item(item
, tok_buf
));
693 static struct trailer_item
*add_trailer_item(struct list_head
*head
, char *tok
,
696 struct trailer_item
*new_item
= xcalloc(1, sizeof(*new_item
));
697 new_item
->token
= tok
;
698 new_item
->value
= val
;
699 list_add_tail(&new_item
->list
, head
);
703 static void add_arg_item(struct list_head
*arg_head
, char *tok
, char *val
,
704 const struct conf_info
*conf
,
705 const struct new_trailer_item
*new_trailer_item
)
707 struct arg_item
*new_item
= xcalloc(1, sizeof(*new_item
));
708 new_item
->token
= tok
;
709 new_item
->value
= val
;
710 duplicate_conf(&new_item
->conf
, conf
);
711 if (new_trailer_item
) {
712 if (new_trailer_item
->where
!= WHERE_DEFAULT
)
713 new_item
->conf
.where
= new_trailer_item
->where
;
714 if (new_trailer_item
->if_exists
!= EXISTS_DEFAULT
)
715 new_item
->conf
.if_exists
= new_trailer_item
->if_exists
;
716 if (new_trailer_item
->if_missing
!= MISSING_DEFAULT
)
717 new_item
->conf
.if_missing
= new_trailer_item
->if_missing
;
719 list_add_tail(&new_item
->list
, arg_head
);
722 void parse_trailers_from_config(struct list_head
*config_head
)
724 struct arg_item
*item
;
725 struct list_head
*pos
;
727 /* Add an arg item for each configured trailer with a command */
728 list_for_each(pos
, &conf_head
) {
729 item
= list_entry(pos
, struct arg_item
, list
);
730 if (item
->conf
.command
)
731 add_arg_item(config_head
,
732 xstrdup(token_from_item(item
, NULL
)),
738 void parse_trailers_from_command_line_args(struct list_head
*arg_head
,
739 struct list_head
*new_trailer_head
)
741 struct strbuf tok
= STRBUF_INIT
;
742 struct strbuf val
= STRBUF_INIT
;
743 const struct conf_info
*conf
;
744 struct list_head
*pos
;
747 * In command-line arguments, '=' is accepted (in addition to the
748 * separators that are defined).
750 char *cl_separators
= xstrfmt("=%s", separators
);
752 /* Add an arg item for each trailer on the command line */
753 list_for_each(pos
, new_trailer_head
) {
754 struct new_trailer_item
*tr
=
755 list_entry(pos
, struct new_trailer_item
, list
);
756 ssize_t separator_pos
= find_separator(tr
->text
, cl_separators
);
758 if (separator_pos
== 0) {
759 struct strbuf sb
= STRBUF_INIT
;
760 strbuf_addstr(&sb
, tr
->text
);
762 error(_("empty trailer token in trailer '%.*s'"),
763 (int) sb
.len
, sb
.buf
);
766 parse_trailer(&tok
, &val
, &conf
, tr
->text
,
768 add_arg_item(arg_head
,
769 strbuf_detach(&tok
, NULL
),
770 strbuf_detach(&val
, NULL
),
778 static const char *next_line(const char *str
)
780 const char *nl
= strchrnul(str
, '\n');
785 * Return the position of the start of the last line. If len is 0, return -1.
787 static ssize_t
last_line(const char *buf
, size_t len
)
795 * Skip the last character (in addition to the null terminator),
796 * because if the last character is a newline, it is considered as part
797 * of the last line anyway.
801 for (; i
>= 0; i
--) {
809 * Find the end of the log message as an offset from the start of the input
810 * (where callers of this function are interested in looking for a trailers
811 * block in the same input). We have to consider two categories of content that
812 * can come at the end of the input which we want to ignore (because they don't
813 * belong in the log message):
815 * (1) the "patch part" which begins with a "---" divider and has patch
816 * information (like the output of git-format-patch), and
818 * (2) any trailing comment lines, blank lines like in the output of "git
819 * commit -v", or stuff below the "cut" (scissor) line.
821 * As a formula, the situation looks like this:
823 * INPUT = LOG MESSAGE + IGNORED
825 * where IGNORED can be either of the two categories described above. It may be
826 * that there is nothing to ignore. Now it may be the case that the LOG MESSAGE
827 * contains a trailer block, but that's not the concern of this function.
829 static size_t find_end_of_log_message(const char *input
, int no_divider
)
834 /* Assume the naive end of the input is already what we want. */
837 /* Optionally skip over any patch part ("---" line and below). */
839 for (s
= input
; *s
; s
= next_line(s
)) {
842 if (skip_prefix(s
, "---", &v
) && isspace(*v
)) {
849 /* Skip over other ignorable bits. */
850 return end
- ignored_log_message_bytes(input
, end
);
854 * Return the position of the first trailer line or len if there are no
857 static size_t find_trailer_block_start(const char *buf
, size_t len
)
860 ssize_t end_of_title
, l
;
862 int recognized_prefix
= 0, trailer_lines
= 0, non_trailer_lines
= 0;
864 * Number of possible continuation lines encountered. This will be
865 * reset to 0 if we encounter a trailer (since those lines are to be
866 * considered continuations of that trailer), and added to
867 * non_trailer_lines if we encounter a non-trailer (since those lines
868 * are to be considered non-trailers).
870 int possible_continuation_lines
= 0;
872 /* The first paragraph is the title and cannot be trailers */
873 for (s
= buf
; s
< buf
+ len
; s
= next_line(s
)) {
874 if (s
[0] == comment_line_char
)
876 if (is_blank_line(s
))
879 end_of_title
= s
- buf
;
882 * Get the start of the trailers by looking starting from the end for a
883 * blank line before a set of non-blank lines that (i) are all
884 * trailers, or (ii) contains at least one Git-generated trailer and
885 * consists of at least 25% trailers.
887 for (l
= last_line(buf
, len
);
889 l
= last_line(buf
, l
)) {
890 const char *bol
= buf
+ l
;
892 ssize_t separator_pos
;
894 if (bol
[0] == comment_line_char
) {
895 non_trailer_lines
+= possible_continuation_lines
;
896 possible_continuation_lines
= 0;
899 if (is_blank_line(bol
)) {
902 non_trailer_lines
+= possible_continuation_lines
;
903 if (recognized_prefix
&&
904 trailer_lines
* 3 >= non_trailer_lines
)
905 return next_line(bol
) - buf
;
906 else if (trailer_lines
&& !non_trailer_lines
)
907 return next_line(bol
) - buf
;
912 for (p
= git_generated_prefixes
; *p
; p
++) {
913 if (starts_with(bol
, *p
)) {
915 possible_continuation_lines
= 0;
916 recognized_prefix
= 1;
917 goto continue_outer_loop
;
921 separator_pos
= find_separator(bol
, separators
);
922 if (separator_pos
>= 1 && !isspace(bol
[0])) {
923 struct list_head
*pos
;
926 possible_continuation_lines
= 0;
927 if (recognized_prefix
)
929 list_for_each(pos
, &conf_head
) {
930 struct arg_item
*item
;
931 item
= list_entry(pos
, struct arg_item
, list
);
932 if (token_matches_item(bol
, item
,
934 recognized_prefix
= 1;
938 } else if (isspace(bol
[0]))
939 possible_continuation_lines
++;
942 non_trailer_lines
+= possible_continuation_lines
;
943 possible_continuation_lines
= 0;
952 static int ends_with_blank_line(const char *buf
, size_t len
)
954 ssize_t ll
= last_line(buf
, len
);
957 return is_blank_line(buf
+ ll
);
960 static void unfold_value(struct strbuf
*val
)
962 struct strbuf out
= STRBUF_INIT
;
965 strbuf_grow(&out
, val
->len
);
967 while (i
< val
->len
) {
968 char c
= val
->buf
[i
++];
970 /* Collapse continuation down to a single space. */
971 while (i
< val
->len
&& isspace(val
->buf
[i
]))
973 strbuf_addch(&out
, ' ');
975 strbuf_addch(&out
, c
);
979 /* Empty lines may have left us with whitespace cruft at the edges */
982 /* output goes back to val as if we modified it in-place */
983 strbuf_swap(&out
, val
);
984 strbuf_release(&out
);
988 * Parse trailers in "str", populating the trailer info and "head"
989 * linked list structure.
991 void parse_trailers(const struct process_trailer_options
*opts
,
992 struct trailer_info
*info
,
994 struct list_head
*head
)
996 struct strbuf tok
= STRBUF_INIT
;
997 struct strbuf val
= STRBUF_INIT
;
1000 trailer_info_get(opts
, str
, info
);
1002 for (i
= 0; i
< info
->trailer_nr
; i
++) {
1004 char *trailer
= info
->trailers
[i
];
1005 if (trailer
[0] == comment_line_char
)
1007 separator_pos
= find_separator(trailer
, separators
);
1008 if (separator_pos
>= 1) {
1009 parse_trailer(&tok
, &val
, NULL
, trailer
,
1013 add_trailer_item(head
,
1014 strbuf_detach(&tok
, NULL
),
1015 strbuf_detach(&val
, NULL
));
1016 } else if (!opts
->only_trailers
) {
1017 strbuf_addstr(&val
, trailer
);
1018 strbuf_strip_suffix(&val
, "\n");
1019 add_trailer_item(head
,
1021 strbuf_detach(&val
, NULL
));
1026 void free_trailers(struct list_head
*trailers
)
1028 struct list_head
*pos
, *p
;
1029 list_for_each_safe(pos
, p
, trailers
) {
1031 free_trailer_item(list_entry(pos
, struct trailer_item
, list
));
1035 void trailer_info_get(const struct process_trailer_options
*opts
,
1037 struct trailer_info
*info
)
1039 size_t end_of_log_message
= 0, trailer_block_start
= 0;
1040 struct strbuf
**trailer_lines
, **ptr
;
1041 char **trailer_strings
= NULL
;
1042 size_t nr
= 0, alloc
= 0;
1045 trailer_config_init();
1047 end_of_log_message
= find_end_of_log_message(str
, opts
->no_divider
);
1048 trailer_block_start
= find_trailer_block_start(str
, end_of_log_message
);
1050 trailer_lines
= strbuf_split_buf(str
+ trailer_block_start
,
1051 end_of_log_message
- trailer_block_start
,
1054 for (ptr
= trailer_lines
; *ptr
; ptr
++) {
1055 if (last
&& isspace((*ptr
)->buf
[0])) {
1056 struct strbuf sb
= STRBUF_INIT
;
1057 strbuf_attach(&sb
, *last
, strlen(*last
), strlen(*last
));
1058 strbuf_addbuf(&sb
, *ptr
);
1059 *last
= strbuf_detach(&sb
, NULL
);
1062 ALLOC_GROW(trailer_strings
, nr
+ 1, alloc
);
1063 trailer_strings
[nr
] = strbuf_detach(*ptr
, NULL
);
1064 last
= find_separator(trailer_strings
[nr
], separators
) >= 1
1065 ? &trailer_strings
[nr
]
1069 strbuf_list_free(trailer_lines
);
1071 info
->blank_line_before_trailer
= ends_with_blank_line(str
,
1072 trailer_block_start
);
1073 info
->trailer_block_start
= trailer_block_start
;
1074 info
->trailer_block_end
= end_of_log_message
;
1075 info
->trailers
= trailer_strings
;
1076 info
->trailer_nr
= nr
;
1079 void trailer_info_release(struct trailer_info
*info
)
1082 for (i
= 0; i
< info
->trailer_nr
; i
++)
1083 free(info
->trailers
[i
]);
1084 free(info
->trailers
);
1087 static void format_trailer_info(const struct process_trailer_options
*opts
,
1088 const struct trailer_info
*info
,
1091 size_t origlen
= out
->len
;
1094 for (i
= 0; i
< info
->trailer_nr
; i
++) {
1095 char *trailer
= info
->trailers
[i
];
1096 ssize_t separator_pos
= find_separator(trailer
, separators
);
1098 if (separator_pos
>= 1) {
1099 struct strbuf tok
= STRBUF_INIT
;
1100 struct strbuf val
= STRBUF_INIT
;
1102 parse_trailer(&tok
, &val
, NULL
, trailer
, separator_pos
);
1103 if (!opts
->filter
|| opts
->filter(&tok
, opts
->filter_data
)) {
1107 if (opts
->separator
&& out
->len
!= origlen
)
1108 strbuf_addbuf(out
, opts
->separator
);
1109 if (!opts
->value_only
)
1110 strbuf_addbuf(out
, &tok
);
1111 if (!opts
->key_only
&& !opts
->value_only
) {
1112 if (opts
->key_value_separator
)
1113 strbuf_addbuf(out
, opts
->key_value_separator
);
1115 strbuf_addstr(out
, ": ");
1117 if (!opts
->key_only
)
1118 strbuf_addbuf(out
, &val
);
1119 if (!opts
->separator
)
1120 strbuf_addch(out
, '\n');
1122 strbuf_release(&tok
);
1123 strbuf_release(&val
);
1125 } else if (!opts
->only_trailers
) {
1126 if (opts
->separator
&& out
->len
!= origlen
) {
1127 strbuf_addbuf(out
, opts
->separator
);
1129 strbuf_addstr(out
, trailer
);
1130 if (opts
->separator
) {
1138 void format_trailers_from_commit(const struct process_trailer_options
*opts
,
1142 LIST_HEAD(trailer_objects
);
1143 struct trailer_info info
;
1145 parse_trailers(opts
, &info
, msg
, &trailer_objects
);
1147 /* If we want the whole block untouched, we can take the fast path. */
1148 if (!opts
->only_trailers
&& !opts
->unfold
&& !opts
->filter
&&
1149 !opts
->separator
&& !opts
->key_only
&& !opts
->value_only
&&
1150 !opts
->key_value_separator
) {
1151 strbuf_add(out
, msg
+ info
.trailer_block_start
,
1152 info
.trailer_block_end
- info
.trailer_block_start
);
1154 format_trailer_info(opts
, &info
, out
);
1156 free_trailers(&trailer_objects
);
1157 trailer_info_release(&info
);
1160 void trailer_iterator_init(struct trailer_iterator
*iter
, const char *msg
)
1162 struct process_trailer_options opts
= PROCESS_TRAILER_OPTIONS_INIT
;
1163 strbuf_init(&iter
->key
, 0);
1164 strbuf_init(&iter
->val
, 0);
1165 opts
.no_divider
= 1;
1166 trailer_info_get(&opts
, msg
, &iter
->internal
.info
);
1167 iter
->internal
.cur
= 0;
1170 int trailer_iterator_advance(struct trailer_iterator
*iter
)
1172 while (iter
->internal
.cur
< iter
->internal
.info
.trailer_nr
) {
1173 char *trailer
= iter
->internal
.info
.trailers
[iter
->internal
.cur
++];
1174 int separator_pos
= find_separator(trailer
, separators
);
1176 if (separator_pos
< 1)
1177 continue; /* not a real trailer */
1179 strbuf_reset(&iter
->key
);
1180 strbuf_reset(&iter
->val
);
1181 parse_trailer(&iter
->key
, &iter
->val
, NULL
,
1182 trailer
, separator_pos
);
1183 /* Always unfold values during iteration. */
1184 unfold_value(&iter
->val
);
1190 void trailer_iterator_release(struct trailer_iterator
*iter
)
1192 trailer_info_release(&iter
->internal
.info
);
1193 strbuf_release(&iter
->val
);
1194 strbuf_release(&iter
->key
);