2024-08-13 17:14:21 +08:00
|
|
|
#define USE_THE_REPOSITORY_VARIABLE
|
|
|
|
|
2023-03-21 14:26:04 +08:00
|
|
|
#include "git-compat-util.h"
|
2017-06-15 02:07:36 +08:00
|
|
|
#include "config.h"
|
2023-03-21 14:25:57 +08:00
|
|
|
#include "environment.h"
|
2023-03-21 14:25:54 +08:00
|
|
|
#include "gettext.h"
|
2014-10-14 02:16:26 +08:00
|
|
|
#include "string-list.h"
|
2014-10-14 02:16:31 +08:00
|
|
|
#include "run-command.h"
|
2014-11-09 17:23:42 +08:00
|
|
|
#include "commit.h"
|
2014-10-14 02:16:28 +08:00
|
|
|
#include "trailer.h"
|
2016-10-21 05:39:47 +08:00
|
|
|
#include "list.h"
|
2014-10-14 02:16:23 +08:00
|
|
|
/*
|
|
|
|
* Copyright (c) 2013, 2014 Christian Couder <chriscool@tuxfamily.org>
|
|
|
|
*/
|
|
|
|
|
2024-10-13 19:58:42 +08:00
|
|
|
struct trailer_block {
|
trailer: make trailer_info struct private
In 13211ae23f (trailer: separate public from internal portion of
trailer_iterator, 2023-09-09) we moved trailer_info behind an anonymous
struct to discourage use by trailer.h API users. However it still left
open the possibility of external use of trailer_info itself. Now that
there are no external users of trailer_info, we can make this struct
private.
Make this struct private by putting its definition inside trailer.c.
This has two benefits:
(1) it makes the surface area of the public facing
interface (trailer.h) smaller, and
(2) external API users are unable to peer inside this struct (because
it is only ever exposed as an opaque pointer).
There are a few disadvantages:
(A) every time the member of the struct is accessed an extra pointer
dereference must be done, and
(B) for users of trailer_info outside trailer.c, this struct can no
longer be allocated on the stack and may only be allocated on the
heap (because its definition is hidden away in trailer.c) and
appropriately deallocated by the user, and
(C) without good documentation on the API, the opaque struct is
hostile to programmers by going opposite to the "Show me your
data structures, and I won't usually need your code; it'll
be obvious." mantra [2].
(The disadvantages have already been observed in the two preparatory
commits that precede this one.) This commit believes that the benefits
outweigh the disadvantages for designing APIs, as explained below.
Making trailer_info private exposes existing deficiencies in the API.
This is because users of this struct had full access to its internals,
so there wasn't much need to actually design it to be "complete" in the
sense that API users only needed to use what was provided by the API.
For example, the location of the trailer block (start/end offsets
relative to the start of the input text) was accessible by looking at
these struct members directly. Now that the struct is private, we have
to expose new API functions to allow clients to access this
information (see builtin/interpret-trailers.c).
The idea in this commit to hide implementation details behind an "opaque
pointer" is also known as the "pimpl" (pointer to implementation) idiom
in C++ and is a common pattern in that language (where, for example,
abstract classes only have pointers to concrete classes).
However, the original inspiration to use this idiom does not come from
C++, but instead the book "C Interfaces and Implementations: Techniques
for Creating Reusable Software" [1]. This book recommends opaque
pointers as a good design principle for designing C libraries, using the
term "interface" as the functions defined in *.h (header) files and
"implementation" as the corresponding *.c file which define the
interfaces.
The book says this about opaque pointers:
... clients can manipulate such pointers freely, but they can’t
dereference them; that is, they can’t look at the innards of the
structure pointed to by them. Only the implementation has that
privilege. Opaque pointers hide representation details and help
catch errors.
In our case, "struct trailer_info" is now hidden from clients, and the
ways in which this opaque pointer can be used is limited to the richness
of <trailer.h>. In other words, <trailer.h> exclusively controls exactly
how "trailer_info" pointers are to be used.
[1] Hanson, David R. "C Interfaces and Implementations: Techniques for
Creating Reusable Software". Addison Wesley, 1997. p. 22
[2] Raymond, Eric S. "The Cathedral and the Bazaar: Musings on Linux and
Open Source by an Accidental Revolutionary". O'Reilly, 1999.
Helped-by: Junio C Hamano <gitster@pobox.com>
Helped-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Linus Arver <linus@ucla.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2024-05-02 12:54:24 +08:00
|
|
|
/*
|
|
|
|
* True if there is a blank line before the location pointed to by
|
2024-10-13 19:58:42 +08:00
|
|
|
* "start".
|
trailer: make trailer_info struct private
In 13211ae23f (trailer: separate public from internal portion of
trailer_iterator, 2023-09-09) we moved trailer_info behind an anonymous
struct to discourage use by trailer.h API users. However it still left
open the possibility of external use of trailer_info itself. Now that
there are no external users of trailer_info, we can make this struct
private.
Make this struct private by putting its definition inside trailer.c.
This has two benefits:
(1) it makes the surface area of the public facing
interface (trailer.h) smaller, and
(2) external API users are unable to peer inside this struct (because
it is only ever exposed as an opaque pointer).
There are a few disadvantages:
(A) every time the member of the struct is accessed an extra pointer
dereference must be done, and
(B) for users of trailer_info outside trailer.c, this struct can no
longer be allocated on the stack and may only be allocated on the
heap (because its definition is hidden away in trailer.c) and
appropriately deallocated by the user, and
(C) without good documentation on the API, the opaque struct is
hostile to programmers by going opposite to the "Show me your
data structures, and I won't usually need your code; it'll
be obvious." mantra [2].
(The disadvantages have already been observed in the two preparatory
commits that precede this one.) This commit believes that the benefits
outweigh the disadvantages for designing APIs, as explained below.
Making trailer_info private exposes existing deficiencies in the API.
This is because users of this struct had full access to its internals,
so there wasn't much need to actually design it to be "complete" in the
sense that API users only needed to use what was provided by the API.
For example, the location of the trailer block (start/end offsets
relative to the start of the input text) was accessible by looking at
these struct members directly. Now that the struct is private, we have
to expose new API functions to allow clients to access this
information (see builtin/interpret-trailers.c).
The idea in this commit to hide implementation details behind an "opaque
pointer" is also known as the "pimpl" (pointer to implementation) idiom
in C++ and is a common pattern in that language (where, for example,
abstract classes only have pointers to concrete classes).
However, the original inspiration to use this idiom does not come from
C++, but instead the book "C Interfaces and Implementations: Techniques
for Creating Reusable Software" [1]. This book recommends opaque
pointers as a good design principle for designing C libraries, using the
term "interface" as the functions defined in *.h (header) files and
"implementation" as the corresponding *.c file which define the
interfaces.
The book says this about opaque pointers:
... clients can manipulate such pointers freely, but they can’t
dereference them; that is, they can’t look at the innards of the
structure pointed to by them. Only the implementation has that
privilege. Opaque pointers hide representation details and help
catch errors.
In our case, "struct trailer_info" is now hidden from clients, and the
ways in which this opaque pointer can be used is limited to the richness
of <trailer.h>. In other words, <trailer.h> exclusively controls exactly
how "trailer_info" pointers are to be used.
[1] Hanson, David R. "C Interfaces and Implementations: Techniques for
Creating Reusable Software". Addison Wesley, 1997. p. 22
[2] Raymond, Eric S. "The Cathedral and the Bazaar: Musings on Linux and
Open Source by an Accidental Revolutionary". O'Reilly, 1999.
Helped-by: Junio C Hamano <gitster@pobox.com>
Helped-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Linus Arver <linus@ucla.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2024-05-02 12:54:24 +08:00
|
|
|
*/
|
|
|
|
int blank_line_before_trailer;
|
|
|
|
|
|
|
|
/*
|
2024-10-13 19:58:42 +08:00
|
|
|
* The locations of the start and end positions of the trailer block
|
|
|
|
* found, as offsets from the beginning of the source text from which
|
|
|
|
* this trailer block was parsed. If no trailer block is found, these
|
|
|
|
* are both set to 0.
|
trailer: make trailer_info struct private
In 13211ae23f (trailer: separate public from internal portion of
trailer_iterator, 2023-09-09) we moved trailer_info behind an anonymous
struct to discourage use by trailer.h API users. However it still left
open the possibility of external use of trailer_info itself. Now that
there are no external users of trailer_info, we can make this struct
private.
Make this struct private by putting its definition inside trailer.c.
This has two benefits:
(1) it makes the surface area of the public facing
interface (trailer.h) smaller, and
(2) external API users are unable to peer inside this struct (because
it is only ever exposed as an opaque pointer).
There are a few disadvantages:
(A) every time the member of the struct is accessed an extra pointer
dereference must be done, and
(B) for users of trailer_info outside trailer.c, this struct can no
longer be allocated on the stack and may only be allocated on the
heap (because its definition is hidden away in trailer.c) and
appropriately deallocated by the user, and
(C) without good documentation on the API, the opaque struct is
hostile to programmers by going opposite to the "Show me your
data structures, and I won't usually need your code; it'll
be obvious." mantra [2].
(The disadvantages have already been observed in the two preparatory
commits that precede this one.) This commit believes that the benefits
outweigh the disadvantages for designing APIs, as explained below.
Making trailer_info private exposes existing deficiencies in the API.
This is because users of this struct had full access to its internals,
so there wasn't much need to actually design it to be "complete" in the
sense that API users only needed to use what was provided by the API.
For example, the location of the trailer block (start/end offsets
relative to the start of the input text) was accessible by looking at
these struct members directly. Now that the struct is private, we have
to expose new API functions to allow clients to access this
information (see builtin/interpret-trailers.c).
The idea in this commit to hide implementation details behind an "opaque
pointer" is also known as the "pimpl" (pointer to implementation) idiom
in C++ and is a common pattern in that language (where, for example,
abstract classes only have pointers to concrete classes).
However, the original inspiration to use this idiom does not come from
C++, but instead the book "C Interfaces and Implementations: Techniques
for Creating Reusable Software" [1]. This book recommends opaque
pointers as a good design principle for designing C libraries, using the
term "interface" as the functions defined in *.h (header) files and
"implementation" as the corresponding *.c file which define the
interfaces.
The book says this about opaque pointers:
... clients can manipulate such pointers freely, but they can’t
dereference them; that is, they can’t look at the innards of the
structure pointed to by them. Only the implementation has that
privilege. Opaque pointers hide representation details and help
catch errors.
In our case, "struct trailer_info" is now hidden from clients, and the
ways in which this opaque pointer can be used is limited to the richness
of <trailer.h>. In other words, <trailer.h> exclusively controls exactly
how "trailer_info" pointers are to be used.
[1] Hanson, David R. "C Interfaces and Implementations: Techniques for
Creating Reusable Software". Addison Wesley, 1997. p. 22
[2] Raymond, Eric S. "The Cathedral and the Bazaar: Musings on Linux and
Open Source by an Accidental Revolutionary". O'Reilly, 1999.
Helped-by: Junio C Hamano <gitster@pobox.com>
Helped-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Linus Arver <linus@ucla.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2024-05-02 12:54:24 +08:00
|
|
|
*/
|
2024-10-13 19:58:42 +08:00
|
|
|
size_t start, end;
|
trailer: make trailer_info struct private
In 13211ae23f (trailer: separate public from internal portion of
trailer_iterator, 2023-09-09) we moved trailer_info behind an anonymous
struct to discourage use by trailer.h API users. However it still left
open the possibility of external use of trailer_info itself. Now that
there are no external users of trailer_info, we can make this struct
private.
Make this struct private by putting its definition inside trailer.c.
This has two benefits:
(1) it makes the surface area of the public facing
interface (trailer.h) smaller, and
(2) external API users are unable to peer inside this struct (because
it is only ever exposed as an opaque pointer).
There are a few disadvantages:
(A) every time the member of the struct is accessed an extra pointer
dereference must be done, and
(B) for users of trailer_info outside trailer.c, this struct can no
longer be allocated on the stack and may only be allocated on the
heap (because its definition is hidden away in trailer.c) and
appropriately deallocated by the user, and
(C) without good documentation on the API, the opaque struct is
hostile to programmers by going opposite to the "Show me your
data structures, and I won't usually need your code; it'll
be obvious." mantra [2].
(The disadvantages have already been observed in the two preparatory
commits that precede this one.) This commit believes that the benefits
outweigh the disadvantages for designing APIs, as explained below.
Making trailer_info private exposes existing deficiencies in the API.
This is because users of this struct had full access to its internals,
so there wasn't much need to actually design it to be "complete" in the
sense that API users only needed to use what was provided by the API.
For example, the location of the trailer block (start/end offsets
relative to the start of the input text) was accessible by looking at
these struct members directly. Now that the struct is private, we have
to expose new API functions to allow clients to access this
information (see builtin/interpret-trailers.c).
The idea in this commit to hide implementation details behind an "opaque
pointer" is also known as the "pimpl" (pointer to implementation) idiom
in C++ and is a common pattern in that language (where, for example,
abstract classes only have pointers to concrete classes).
However, the original inspiration to use this idiom does not come from
C++, but instead the book "C Interfaces and Implementations: Techniques
for Creating Reusable Software" [1]. This book recommends opaque
pointers as a good design principle for designing C libraries, using the
term "interface" as the functions defined in *.h (header) files and
"implementation" as the corresponding *.c file which define the
interfaces.
The book says this about opaque pointers:
... clients can manipulate such pointers freely, but they can’t
dereference them; that is, they can’t look at the innards of the
structure pointed to by them. Only the implementation has that
privilege. Opaque pointers hide representation details and help
catch errors.
In our case, "struct trailer_info" is now hidden from clients, and the
ways in which this opaque pointer can be used is limited to the richness
of <trailer.h>. In other words, <trailer.h> exclusively controls exactly
how "trailer_info" pointers are to be used.
[1] Hanson, David R. "C Interfaces and Implementations: Techniques for
Creating Reusable Software". Addison Wesley, 1997. p. 22
[2] Raymond, Eric S. "The Cathedral and the Bazaar: Musings on Linux and
Open Source by an Accidental Revolutionary". O'Reilly, 1999.
Helped-by: Junio C Hamano <gitster@pobox.com>
Helped-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Linus Arver <linus@ucla.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2024-05-02 12:54:24 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Array of trailers found.
|
|
|
|
*/
|
|
|
|
char **trailers;
|
|
|
|
size_t trailer_nr;
|
|
|
|
};
|
|
|
|
|
2014-10-14 02:16:23 +08:00
|
|
|
struct conf_info {
|
|
|
|
char *name;
|
|
|
|
char *key;
|
|
|
|
char *command;
|
trailer: add new .cmd config option
The `trailer.<token>.command` configuration variable
specifies a command (run via the shell, so it does not have
to be a single name or path to the command, but can be a
shell script), and the first occurrence of substring $ARG is
replaced with the value given to the `interpret-trailer`
command for the token in a '--trailer <token>=<value>' argument.
This has three downsides:
* The use of $ARG in the mechanism misleads the users that
the value is passed in the shell variable, and tempt them
to use $ARG more than once, but that would not work, as
the second and subsequent $ARG are not replaced.
* Because $ARG is textually replaced without regard to the
shell language syntax, even '$ARG' (inside a single-quote
pair), which a user would expect to stay intact, would be
replaced, and worse, if the value had an unmatched single
quote (imagine a name like "O'Connor", substituted into
NAME='$ARG' to make it NAME='O'Connor'), it would result in
a broken command that is not syntactically correct (or
worse).
* The first occurrence of substring `$ARG` will be replaced
with the empty string, in the command when the command is
first called to add a trailer with the specified <token>.
This is a bad design, the nature of automatic execution
causes it to add a trailer that we don't expect.
Introduce a new `trailer.<token>.cmd` configuration that
takes higher precedence to deprecate and eventually remove
`trailer.<token>.command`, which passes the value as an
argument to the command. Instead of "$ARG", users can
refer to the value as positional argument, $1, in their
scripts. At the same time, in order to allow
`git interpret-trailers` to better simulate the behavior
of `git command -s`, 'trailer.<token>.cmd' will not
automatically execute.
Helped-by: Junio C Hamano <gitster@pobox.com>
Helped-by: Christian Couder <christian.couder@gmail.com>
Signed-off-by: ZheNing Hu <adlternative@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-05-03 23:41:05 +08:00
|
|
|
char *cmd;
|
2017-07-24 16:22:43 +08:00
|
|
|
enum trailer_where where;
|
|
|
|
enum trailer_if_exists if_exists;
|
|
|
|
enum trailer_if_missing if_missing;
|
2014-10-14 02:16:23 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
static struct conf_info default_conf_info;
|
|
|
|
|
|
|
|
struct trailer_item {
|
2016-10-21 05:39:47 +08:00
|
|
|
struct list_head list;
|
2016-10-22 01:55:01 +08:00
|
|
|
/*
|
|
|
|
* If this is not a trailer line, the line is stored in value
|
|
|
|
* (excluding the terminating newline) and token is NULL.
|
|
|
|
*/
|
2016-10-15 01:37:58 +08:00
|
|
|
char *token;
|
|
|
|
char *value;
|
2016-10-21 05:39:49 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
struct arg_item {
|
|
|
|
struct list_head list;
|
|
|
|
char *token;
|
|
|
|
char *value;
|
2014-10-14 02:16:23 +08:00
|
|
|
struct conf_info conf;
|
|
|
|
};
|
|
|
|
|
2016-10-21 05:39:47 +08:00
|
|
|
static LIST_HEAD(conf_head);
|
2014-10-14 02:16:23 +08:00
|
|
|
|
2024-06-07 14:37:39 +08:00
|
|
|
static const char *separators = ":";
|
2014-10-14 02:16:23 +08:00
|
|
|
|
2016-11-03 01:29:19 +08:00
|
|
|
static int configured;
|
|
|
|
|
2014-10-14 02:16:31 +08:00
|
|
|
#define TRAILER_ARG_STRING "$ARG"
|
|
|
|
|
2016-10-22 01:55:01 +08:00
|
|
|
static const char *git_generated_prefixes[] = {
|
|
|
|
"Signed-off-by: ",
|
|
|
|
"(cherry picked from commit ",
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
2016-10-21 05:39:47 +08:00
|
|
|
/* Iterate over the elements of the list. */
|
|
|
|
#define list_for_each_dir(pos, head, is_reverse) \
|
|
|
|
for (pos = is_reverse ? (head)->prev : (head)->next; \
|
|
|
|
pos != (head); \
|
|
|
|
pos = is_reverse ? pos->prev : pos->next)
|
|
|
|
|
2017-07-24 16:22:43 +08:00
|
|
|
static int after_or_end(enum trailer_where where)
|
2014-10-14 02:16:23 +08:00
|
|
|
{
|
|
|
|
return (where == WHERE_AFTER) || (where == WHERE_END);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Return the length of the string not including any final
|
|
|
|
* punctuation. E.g., the input "Signed-off-by:" would return
|
|
|
|
* 13, stripping the trailing punctuation but retaining
|
|
|
|
* internal punctuation.
|
|
|
|
*/
|
|
|
|
static size_t token_len_without_separator(const char *token, size_t len)
|
|
|
|
{
|
|
|
|
while (len > 0 && !isalnum(token[len - 1]))
|
|
|
|
len--;
|
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
2016-10-21 05:39:49 +08:00
|
|
|
static int same_token(struct trailer_item *a, struct arg_item *b)
|
2014-10-14 02:16:23 +08:00
|
|
|
{
|
2016-10-22 01:55:01 +08:00
|
|
|
size_t a_len, b_len, min_len;
|
|
|
|
|
|
|
|
if (!a->token)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
a_len = token_len_without_separator(a->token, strlen(a->token));
|
|
|
|
b_len = token_len_without_separator(b->token, strlen(b->token));
|
|
|
|
min_len = (a_len > b_len) ? b_len : a_len;
|
2014-10-14 02:16:23 +08:00
|
|
|
|
|
|
|
return !strncasecmp(a->token, b->token, min_len);
|
|
|
|
}
|
|
|
|
|
2016-10-21 05:39:49 +08:00
|
|
|
static int same_value(struct trailer_item *a, struct arg_item *b)
|
2014-10-14 02:16:23 +08:00
|
|
|
{
|
|
|
|
return !strcasecmp(a->value, b->value);
|
|
|
|
}
|
|
|
|
|
2016-10-21 05:39:49 +08:00
|
|
|
static int same_trailer(struct trailer_item *a, struct arg_item *b)
|
2014-10-14 02:16:23 +08:00
|
|
|
{
|
|
|
|
return same_token(a, b) && same_value(a, b);
|
|
|
|
}
|
2014-10-14 02:16:24 +08:00
|
|
|
|
2016-11-03 01:29:18 +08:00
|
|
|
static inline int is_blank_line(const char *str)
|
2014-10-14 02:16:27 +08:00
|
|
|
{
|
|
|
|
const char *s = str;
|
2016-11-03 01:29:18 +08:00
|
|
|
while (*s && *s != '\n' && isspace(*s))
|
2014-10-14 02:16:27 +08:00
|
|
|
s++;
|
2016-11-03 01:29:18 +08:00
|
|
|
return !*s || *s == '\n';
|
2014-10-14 02:16:27 +08:00
|
|
|
}
|
|
|
|
|
2014-10-14 02:16:31 +08:00
|
|
|
static inline void strbuf_replace(struct strbuf *sb, const char *a, const char *b)
|
|
|
|
{
|
|
|
|
const char *ptr = strstr(sb->buf, a);
|
|
|
|
if (ptr)
|
|
|
|
strbuf_splice(sb, ptr - sb->buf, strlen(a), b, strlen(b));
|
|
|
|
}
|
|
|
|
|
2014-10-14 02:16:24 +08:00
|
|
|
static void free_trailer_item(struct trailer_item *item)
|
2016-10-21 05:39:49 +08:00
|
|
|
{
|
|
|
|
free(item->token);
|
|
|
|
free(item->value);
|
|
|
|
free(item);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void free_arg_item(struct arg_item *item)
|
2014-10-14 02:16:24 +08:00
|
|
|
{
|
|
|
|
free(item->conf.name);
|
|
|
|
free(item->conf.key);
|
|
|
|
free(item->conf.command);
|
trailer: add new .cmd config option
The `trailer.<token>.command` configuration variable
specifies a command (run via the shell, so it does not have
to be a single name or path to the command, but can be a
shell script), and the first occurrence of substring $ARG is
replaced with the value given to the `interpret-trailer`
command for the token in a '--trailer <token>=<value>' argument.
This has three downsides:
* The use of $ARG in the mechanism misleads the users that
the value is passed in the shell variable, and tempt them
to use $ARG more than once, but that would not work, as
the second and subsequent $ARG are not replaced.
* Because $ARG is textually replaced without regard to the
shell language syntax, even '$ARG' (inside a single-quote
pair), which a user would expect to stay intact, would be
replaced, and worse, if the value had an unmatched single
quote (imagine a name like "O'Connor", substituted into
NAME='$ARG' to make it NAME='O'Connor'), it would result in
a broken command that is not syntactically correct (or
worse).
* The first occurrence of substring `$ARG` will be replaced
with the empty string, in the command when the command is
first called to add a trailer with the specified <token>.
This is a bad design, the nature of automatic execution
causes it to add a trailer that we don't expect.
Introduce a new `trailer.<token>.cmd` configuration that
takes higher precedence to deprecate and eventually remove
`trailer.<token>.command`, which passes the value as an
argument to the command. Instead of "$ARG", users can
refer to the value as positional argument, $1, in their
scripts. At the same time, in order to allow
`git interpret-trailers` to better simulate the behavior
of `git command -s`, 'trailer.<token>.cmd' will not
automatically execute.
Helped-by: Junio C Hamano <gitster@pobox.com>
Helped-by: Christian Couder <christian.couder@gmail.com>
Signed-off-by: ZheNing Hu <adlternative@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-05-03 23:41:05 +08:00
|
|
|
free(item->conf.cmd);
|
2016-10-15 01:37:58 +08:00
|
|
|
free(item->token);
|
|
|
|
free(item->value);
|
2014-10-14 02:16:24 +08:00
|
|
|
free(item);
|
|
|
|
}
|
|
|
|
|
2014-10-14 02:16:28 +08:00
|
|
|
static char last_non_space_char(const char *s)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
for (i = strlen(s) - 1; i >= 0; i--)
|
|
|
|
if (!isspace(s[i]))
|
|
|
|
return s[i];
|
|
|
|
return '\0';
|
|
|
|
}
|
|
|
|
|
2016-10-21 05:39:49 +08:00
|
|
|
static struct trailer_item *trailer_from_arg(struct arg_item *arg_tok)
|
2014-10-14 02:16:24 +08:00
|
|
|
{
|
2021-03-06 19:26:19 +08:00
|
|
|
struct trailer_item *new_item = xcalloc(1, sizeof(*new_item));
|
2018-02-15 02:59:50 +08:00
|
|
|
new_item->token = arg_tok->token;
|
|
|
|
new_item->value = arg_tok->value;
|
2016-10-21 05:39:49 +08:00
|
|
|
arg_tok->token = arg_tok->value = NULL;
|
|
|
|
free_arg_item(arg_tok);
|
2018-02-15 02:59:50 +08:00
|
|
|
return new_item;
|
2014-10-14 02:16:24 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void add_arg_to_input_list(struct trailer_item *on_tok,
|
2016-10-21 05:39:49 +08:00
|
|
|
struct arg_item *arg_tok)
|
2016-10-21 05:39:47 +08:00
|
|
|
{
|
2016-10-21 05:39:49 +08:00
|
|
|
int aoe = after_or_end(arg_tok->conf.where);
|
|
|
|
struct trailer_item *to_add = trailer_from_arg(arg_tok);
|
|
|
|
if (aoe)
|
|
|
|
list_add(&to_add->list, &on_tok->list);
|
2016-10-21 05:39:47 +08:00
|
|
|
else
|
2016-10-21 05:39:49 +08:00
|
|
|
list_add_tail(&to_add->list, &on_tok->list);
|
2014-10-14 02:16:24 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static int check_if_different(struct trailer_item *in_tok,
|
2016-10-21 05:39:49 +08:00
|
|
|
struct arg_item *arg_tok,
|
2016-10-21 05:39:47 +08:00
|
|
|
int check_all,
|
|
|
|
struct list_head *head)
|
2014-10-14 02:16:24 +08:00
|
|
|
{
|
2017-07-24 16:22:43 +08:00
|
|
|
enum trailer_where where = arg_tok->conf.where;
|
2016-10-21 05:39:47 +08:00
|
|
|
struct list_head *next_head;
|
2014-10-14 02:16:24 +08:00
|
|
|
do {
|
|
|
|
if (same_trailer(in_tok, arg_tok))
|
|
|
|
return 0;
|
|
|
|
/*
|
|
|
|
* if we want to add a trailer after another one,
|
|
|
|
* we have to check those before this one
|
|
|
|
*/
|
2016-10-21 05:39:47 +08:00
|
|
|
next_head = after_or_end(where) ? in_tok->list.prev
|
|
|
|
: in_tok->list.next;
|
|
|
|
if (next_head == head)
|
|
|
|
break;
|
|
|
|
in_tok = list_entry(next_head, struct trailer_item, list);
|
2014-10-14 02:16:24 +08:00
|
|
|
} while (check_all);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
trailer: add new .cmd config option
The `trailer.<token>.command` configuration variable
specifies a command (run via the shell, so it does not have
to be a single name or path to the command, but can be a
shell script), and the first occurrence of substring $ARG is
replaced with the value given to the `interpret-trailer`
command for the token in a '--trailer <token>=<value>' argument.
This has three downsides:
* The use of $ARG in the mechanism misleads the users that
the value is passed in the shell variable, and tempt them
to use $ARG more than once, but that would not work, as
the second and subsequent $ARG are not replaced.
* Because $ARG is textually replaced without regard to the
shell language syntax, even '$ARG' (inside a single-quote
pair), which a user would expect to stay intact, would be
replaced, and worse, if the value had an unmatched single
quote (imagine a name like "O'Connor", substituted into
NAME='$ARG' to make it NAME='O'Connor'), it would result in
a broken command that is not syntactically correct (or
worse).
* The first occurrence of substring `$ARG` will be replaced
with the empty string, in the command when the command is
first called to add a trailer with the specified <token>.
This is a bad design, the nature of automatic execution
causes it to add a trailer that we don't expect.
Introduce a new `trailer.<token>.cmd` configuration that
takes higher precedence to deprecate and eventually remove
`trailer.<token>.command`, which passes the value as an
argument to the command. Instead of "$ARG", users can
refer to the value as positional argument, $1, in their
scripts. At the same time, in order to allow
`git interpret-trailers` to better simulate the behavior
of `git command -s`, 'trailer.<token>.cmd' will not
automatically execute.
Helped-by: Junio C Hamano <gitster@pobox.com>
Helped-by: Christian Couder <christian.couder@gmail.com>
Signed-off-by: ZheNing Hu <adlternative@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-05-03 23:41:05 +08:00
|
|
|
static char *apply_command(struct conf_info *conf, const char *arg)
|
2014-10-14 02:16:31 +08:00
|
|
|
{
|
|
|
|
struct strbuf cmd = STRBUF_INIT;
|
|
|
|
struct strbuf buf = STRBUF_INIT;
|
2014-11-09 21:49:58 +08:00
|
|
|
struct child_process cp = CHILD_PROCESS_INIT;
|
2016-10-15 01:37:58 +08:00
|
|
|
char *result;
|
2014-10-14 02:16:31 +08:00
|
|
|
|
trailer: add new .cmd config option
The `trailer.<token>.command` configuration variable
specifies a command (run via the shell, so it does not have
to be a single name or path to the command, but can be a
shell script), and the first occurrence of substring $ARG is
replaced with the value given to the `interpret-trailer`
command for the token in a '--trailer <token>=<value>' argument.
This has three downsides:
* The use of $ARG in the mechanism misleads the users that
the value is passed in the shell variable, and tempt them
to use $ARG more than once, but that would not work, as
the second and subsequent $ARG are not replaced.
* Because $ARG is textually replaced without regard to the
shell language syntax, even '$ARG' (inside a single-quote
pair), which a user would expect to stay intact, would be
replaced, and worse, if the value had an unmatched single
quote (imagine a name like "O'Connor", substituted into
NAME='$ARG' to make it NAME='O'Connor'), it would result in
a broken command that is not syntactically correct (or
worse).
* The first occurrence of substring `$ARG` will be replaced
with the empty string, in the command when the command is
first called to add a trailer with the specified <token>.
This is a bad design, the nature of automatic execution
causes it to add a trailer that we don't expect.
Introduce a new `trailer.<token>.cmd` configuration that
takes higher precedence to deprecate and eventually remove
`trailer.<token>.command`, which passes the value as an
argument to the command. Instead of "$ARG", users can
refer to the value as positional argument, $1, in their
scripts. At the same time, in order to allow
`git interpret-trailers` to better simulate the behavior
of `git command -s`, 'trailer.<token>.cmd' will not
automatically execute.
Helped-by: Junio C Hamano <gitster@pobox.com>
Helped-by: Christian Couder <christian.couder@gmail.com>
Signed-off-by: ZheNing Hu <adlternative@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-05-03 23:41:05 +08:00
|
|
|
if (conf->cmd) {
|
|
|
|
strbuf_addstr(&cmd, conf->cmd);
|
|
|
|
strvec_push(&cp.args, cmd.buf);
|
|
|
|
if (arg)
|
|
|
|
strvec_push(&cp.args, arg);
|
|
|
|
} else if (conf->command) {
|
|
|
|
strbuf_addstr(&cmd, conf->command);
|
|
|
|
if (arg)
|
|
|
|
strbuf_replace(&cmd, TRAILER_ARG_STRING, arg);
|
|
|
|
strvec_push(&cp.args, cmd.buf);
|
|
|
|
}
|
2022-06-02 17:09:50 +08:00
|
|
|
strvec_pushv(&cp.env, (const char **)local_repo_env);
|
2014-10-14 02:16:31 +08:00
|
|
|
cp.no_stdin = 1;
|
|
|
|
cp.use_shell = 1;
|
|
|
|
|
2015-03-23 11:54:00 +08:00
|
|
|
if (capture_command(&cp, &buf, 1024)) {
|
2016-02-27 14:42:10 +08:00
|
|
|
error(_("running trailer command '%s' failed"), cmd.buf);
|
2014-10-14 02:16:31 +08:00
|
|
|
strbuf_release(&buf);
|
|
|
|
result = xstrdup("");
|
2015-03-23 11:54:00 +08:00
|
|
|
} else {
|
|
|
|
strbuf_trim(&buf);
|
2014-10-14 02:16:31 +08:00
|
|
|
result = strbuf_detach(&buf, NULL);
|
2015-03-23 11:54:00 +08:00
|
|
|
}
|
2014-10-14 02:16:31 +08:00
|
|
|
|
|
|
|
strbuf_release(&cmd);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2016-10-21 05:39:49 +08:00
|
|
|
static void apply_item_command(struct trailer_item *in_tok, struct arg_item *arg_tok)
|
2014-10-14 02:16:31 +08:00
|
|
|
{
|
trailer: add new .cmd config option
The `trailer.<token>.command` configuration variable
specifies a command (run via the shell, so it does not have
to be a single name or path to the command, but can be a
shell script), and the first occurrence of substring $ARG is
replaced with the value given to the `interpret-trailer`
command for the token in a '--trailer <token>=<value>' argument.
This has three downsides:
* The use of $ARG in the mechanism misleads the users that
the value is passed in the shell variable, and tempt them
to use $ARG more than once, but that would not work, as
the second and subsequent $ARG are not replaced.
* Because $ARG is textually replaced without regard to the
shell language syntax, even '$ARG' (inside a single-quote
pair), which a user would expect to stay intact, would be
replaced, and worse, if the value had an unmatched single
quote (imagine a name like "O'Connor", substituted into
NAME='$ARG' to make it NAME='O'Connor'), it would result in
a broken command that is not syntactically correct (or
worse).
* The first occurrence of substring `$ARG` will be replaced
with the empty string, in the command when the command is
first called to add a trailer with the specified <token>.
This is a bad design, the nature of automatic execution
causes it to add a trailer that we don't expect.
Introduce a new `trailer.<token>.cmd` configuration that
takes higher precedence to deprecate and eventually remove
`trailer.<token>.command`, which passes the value as an
argument to the command. Instead of "$ARG", users can
refer to the value as positional argument, $1, in their
scripts. At the same time, in order to allow
`git interpret-trailers` to better simulate the behavior
of `git command -s`, 'trailer.<token>.cmd' will not
automatically execute.
Helped-by: Junio C Hamano <gitster@pobox.com>
Helped-by: Christian Couder <christian.couder@gmail.com>
Signed-off-by: ZheNing Hu <adlternative@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-05-03 23:41:05 +08:00
|
|
|
if (arg_tok->conf.command || arg_tok->conf.cmd) {
|
2024-11-05 14:17:12 +08:00
|
|
|
char *value_to_free = NULL;
|
|
|
|
char *arg;
|
|
|
|
|
2014-10-14 02:16:31 +08:00
|
|
|
if (arg_tok->value && arg_tok->value[0]) {
|
|
|
|
arg = arg_tok->value;
|
|
|
|
} else {
|
|
|
|
if (in_tok && in_tok->value)
|
|
|
|
arg = xstrdup(in_tok->value);
|
|
|
|
else
|
|
|
|
arg = xstrdup("");
|
2024-11-05 14:17:12 +08:00
|
|
|
value_to_free = arg_tok->value;
|
2014-10-14 02:16:31 +08:00
|
|
|
}
|
2024-11-05 14:17:12 +08:00
|
|
|
|
trailer: add new .cmd config option
The `trailer.<token>.command` configuration variable
specifies a command (run via the shell, so it does not have
to be a single name or path to the command, but can be a
shell script), and the first occurrence of substring $ARG is
replaced with the value given to the `interpret-trailer`
command for the token in a '--trailer <token>=<value>' argument.
This has three downsides:
* The use of $ARG in the mechanism misleads the users that
the value is passed in the shell variable, and tempt them
to use $ARG more than once, but that would not work, as
the second and subsequent $ARG are not replaced.
* Because $ARG is textually replaced without regard to the
shell language syntax, even '$ARG' (inside a single-quote
pair), which a user would expect to stay intact, would be
replaced, and worse, if the value had an unmatched single
quote (imagine a name like "O'Connor", substituted into
NAME='$ARG' to make it NAME='O'Connor'), it would result in
a broken command that is not syntactically correct (or
worse).
* The first occurrence of substring `$ARG` will be replaced
with the empty string, in the command when the command is
first called to add a trailer with the specified <token>.
This is a bad design, the nature of automatic execution
causes it to add a trailer that we don't expect.
Introduce a new `trailer.<token>.cmd` configuration that
takes higher precedence to deprecate and eventually remove
`trailer.<token>.command`, which passes the value as an
argument to the command. Instead of "$ARG", users can
refer to the value as positional argument, $1, in their
scripts. At the same time, in order to allow
`git interpret-trailers` to better simulate the behavior
of `git command -s`, 'trailer.<token>.cmd' will not
automatically execute.
Helped-by: Junio C Hamano <gitster@pobox.com>
Helped-by: Christian Couder <christian.couder@gmail.com>
Signed-off-by: ZheNing Hu <adlternative@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-05-03 23:41:05 +08:00
|
|
|
arg_tok->value = apply_command(&arg_tok->conf, arg);
|
2024-11-05 14:17:12 +08:00
|
|
|
|
|
|
|
free(value_to_free);
|
|
|
|
free(arg);
|
2014-10-14 02:16:31 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-10-14 02:16:24 +08:00
|
|
|
static void apply_arg_if_exists(struct trailer_item *in_tok,
|
2016-10-21 05:39:49 +08:00
|
|
|
struct arg_item *arg_tok,
|
2014-10-14 02:16:24 +08:00
|
|
|
struct trailer_item *on_tok,
|
2016-10-21 05:39:47 +08:00
|
|
|
struct list_head *head)
|
2014-10-14 02:16:24 +08:00
|
|
|
{
|
|
|
|
switch (arg_tok->conf.if_exists) {
|
|
|
|
case EXISTS_DO_NOTHING:
|
2016-10-21 05:39:49 +08:00
|
|
|
free_arg_item(arg_tok);
|
2014-10-14 02:16:24 +08:00
|
|
|
break;
|
|
|
|
case EXISTS_REPLACE:
|
2014-10-14 02:16:31 +08:00
|
|
|
apply_item_command(in_tok, arg_tok);
|
2016-10-21 05:39:47 +08:00
|
|
|
add_arg_to_input_list(on_tok, arg_tok);
|
|
|
|
list_del(&in_tok->list);
|
2014-10-14 02:16:24 +08:00
|
|
|
free_trailer_item(in_tok);
|
|
|
|
break;
|
|
|
|
case EXISTS_ADD:
|
2014-10-14 02:16:31 +08:00
|
|
|
apply_item_command(in_tok, arg_tok);
|
2016-10-21 05:39:47 +08:00
|
|
|
add_arg_to_input_list(on_tok, arg_tok);
|
2014-10-14 02:16:24 +08:00
|
|
|
break;
|
|
|
|
case EXISTS_ADD_IF_DIFFERENT:
|
2014-10-14 02:16:31 +08:00
|
|
|
apply_item_command(in_tok, arg_tok);
|
2016-10-21 05:39:47 +08:00
|
|
|
if (check_if_different(in_tok, arg_tok, 1, head))
|
|
|
|
add_arg_to_input_list(on_tok, arg_tok);
|
2014-10-14 02:16:24 +08:00
|
|
|
else
|
2016-10-21 05:39:49 +08:00
|
|
|
free_arg_item(arg_tok);
|
2014-10-14 02:16:24 +08:00
|
|
|
break;
|
|
|
|
case EXISTS_ADD_IF_DIFFERENT_NEIGHBOR:
|
2014-10-14 02:16:31 +08:00
|
|
|
apply_item_command(in_tok, arg_tok);
|
2016-10-21 05:39:47 +08:00
|
|
|
if (check_if_different(on_tok, arg_tok, 0, head))
|
|
|
|
add_arg_to_input_list(on_tok, arg_tok);
|
2014-10-14 02:16:24 +08:00
|
|
|
else
|
2016-10-21 05:39:49 +08:00
|
|
|
free_arg_item(arg_tok);
|
2014-10-14 02:16:24 +08:00
|
|
|
break;
|
2017-08-01 17:03:32 +08:00
|
|
|
default:
|
2018-05-02 17:38:39 +08:00
|
|
|
BUG("trailer.c: unhandled value %d",
|
2017-08-01 17:03:32 +08:00
|
|
|
arg_tok->conf.if_exists);
|
2014-10-14 02:16:24 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-10-21 05:39:47 +08:00
|
|
|
static void apply_arg_if_missing(struct list_head *head,
|
2016-10-21 05:39:49 +08:00
|
|
|
struct arg_item *arg_tok)
|
2014-10-14 02:16:24 +08:00
|
|
|
{
|
2017-07-24 16:22:43 +08:00
|
|
|
enum trailer_where where;
|
2016-10-21 05:39:49 +08:00
|
|
|
struct trailer_item *to_add;
|
2014-10-14 02:16:24 +08:00
|
|
|
|
|
|
|
switch (arg_tok->conf.if_missing) {
|
|
|
|
case MISSING_DO_NOTHING:
|
2016-10-21 05:39:49 +08:00
|
|
|
free_arg_item(arg_tok);
|
2014-10-14 02:16:24 +08:00
|
|
|
break;
|
|
|
|
case MISSING_ADD:
|
|
|
|
where = arg_tok->conf.where;
|
2014-10-14 02:16:31 +08:00
|
|
|
apply_item_command(NULL, arg_tok);
|
2016-10-21 05:39:49 +08:00
|
|
|
to_add = trailer_from_arg(arg_tok);
|
2016-10-21 05:39:47 +08:00
|
|
|
if (after_or_end(where))
|
2016-10-21 05:39:49 +08:00
|
|
|
list_add_tail(&to_add->list, head);
|
2016-10-21 05:39:47 +08:00
|
|
|
else
|
2016-10-21 05:39:49 +08:00
|
|
|
list_add(&to_add->list, head);
|
2017-08-01 17:03:32 +08:00
|
|
|
break;
|
|
|
|
default:
|
2018-05-02 17:38:39 +08:00
|
|
|
BUG("trailer.c: unhandled value %d",
|
2017-08-01 17:03:32 +08:00
|
|
|
arg_tok->conf.if_missing);
|
2014-10-14 02:16:24 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-10-21 05:39:47 +08:00
|
|
|
static int find_same_and_apply_arg(struct list_head *head,
|
2016-10-21 05:39:49 +08:00
|
|
|
struct arg_item *arg_tok)
|
2014-10-14 02:16:24 +08:00
|
|
|
{
|
2016-10-21 05:39:47 +08:00
|
|
|
struct list_head *pos;
|
2014-10-14 02:16:24 +08:00
|
|
|
struct trailer_item *in_tok;
|
|
|
|
struct trailer_item *on_tok;
|
|
|
|
|
2017-07-24 16:22:43 +08:00
|
|
|
enum trailer_where where = arg_tok->conf.where;
|
2014-10-14 02:16:24 +08:00
|
|
|
int middle = (where == WHERE_AFTER) || (where == WHERE_BEFORE);
|
|
|
|
int backwards = after_or_end(where);
|
2016-10-21 05:39:47 +08:00
|
|
|
struct trailer_item *start_tok;
|
2014-10-14 02:16:24 +08:00
|
|
|
|
2016-10-21 05:39:47 +08:00
|
|
|
if (list_empty(head))
|
|
|
|
return 0;
|
2014-10-14 02:16:24 +08:00
|
|
|
|
2016-10-21 05:39:47 +08:00
|
|
|
start_tok = list_entry(backwards ? head->prev : head->next,
|
|
|
|
struct trailer_item,
|
|
|
|
list);
|
|
|
|
|
|
|
|
list_for_each_dir(pos, head, backwards) {
|
|
|
|
in_tok = list_entry(pos, struct trailer_item, list);
|
2014-10-14 02:16:24 +08:00
|
|
|
if (!same_token(in_tok, arg_tok))
|
|
|
|
continue;
|
|
|
|
on_tok = middle ? in_tok : start_tok;
|
2016-10-21 05:39:47 +08:00
|
|
|
apply_arg_if_exists(in_tok, arg_tok, on_tok, head);
|
2014-10-14 02:16:24 +08:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2024-03-01 08:14:41 +08:00
|
|
|
void process_trailers_lists(struct list_head *head,
|
|
|
|
struct list_head *arg_head)
|
2014-10-14 02:16:24 +08:00
|
|
|
{
|
2016-10-21 05:39:47 +08:00
|
|
|
struct list_head *pos, *p;
|
2016-10-21 05:39:49 +08:00
|
|
|
struct arg_item *arg_tok;
|
2014-10-14 02:16:24 +08:00
|
|
|
|
2016-10-21 05:39:47 +08:00
|
|
|
list_for_each_safe(pos, p, arg_head) {
|
2014-10-14 02:16:24 +08:00
|
|
|
int applied = 0;
|
2016-10-21 05:39:49 +08:00
|
|
|
arg_tok = list_entry(pos, struct arg_item, list);
|
2014-10-14 02:16:24 +08:00
|
|
|
|
2016-10-21 05:39:47 +08:00
|
|
|
list_del(pos);
|
2014-10-14 02:16:24 +08:00
|
|
|
|
2016-10-21 05:39:47 +08:00
|
|
|
applied = find_same_and_apply_arg(head, arg_tok);
|
2014-10-14 02:16:24 +08:00
|
|
|
|
|
|
|
if (!applied)
|
2016-10-21 05:39:47 +08:00
|
|
|
apply_arg_if_missing(head, arg_tok);
|
2014-10-14 02:16:24 +08:00
|
|
|
}
|
|
|
|
}
|
2014-10-14 02:16:25 +08:00
|
|
|
|
2017-07-24 16:22:43 +08:00
|
|
|
int trailer_set_where(enum trailer_where *item, const char *value)
|
2014-10-14 02:16:25 +08:00
|
|
|
{
|
2017-08-01 17:03:32 +08:00
|
|
|
if (!value)
|
|
|
|
*item = WHERE_DEFAULT;
|
|
|
|
else if (!strcasecmp("after", value))
|
2017-07-24 16:22:43 +08:00
|
|
|
*item = WHERE_AFTER;
|
2014-10-14 02:16:25 +08:00
|
|
|
else if (!strcasecmp("before", value))
|
2017-07-24 16:22:43 +08:00
|
|
|
*item = WHERE_BEFORE;
|
2014-10-14 02:16:25 +08:00
|
|
|
else if (!strcasecmp("end", value))
|
2017-07-24 16:22:43 +08:00
|
|
|
*item = WHERE_END;
|
2014-10-14 02:16:25 +08:00
|
|
|
else if (!strcasecmp("start", value))
|
2017-07-24 16:22:43 +08:00
|
|
|
*item = WHERE_START;
|
2014-10-14 02:16:25 +08:00
|
|
|
else
|
|
|
|
return -1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-07-24 16:22:43 +08:00
|
|
|
int trailer_set_if_exists(enum trailer_if_exists *item, const char *value)
|
2014-10-14 02:16:25 +08:00
|
|
|
{
|
2017-08-01 17:03:32 +08:00
|
|
|
if (!value)
|
|
|
|
*item = EXISTS_DEFAULT;
|
|
|
|
else if (!strcasecmp("addIfDifferent", value))
|
2017-07-24 16:22:43 +08:00
|
|
|
*item = EXISTS_ADD_IF_DIFFERENT;
|
2014-10-14 02:16:25 +08:00
|
|
|
else if (!strcasecmp("addIfDifferentNeighbor", value))
|
2017-07-24 16:22:43 +08:00
|
|
|
*item = EXISTS_ADD_IF_DIFFERENT_NEIGHBOR;
|
2014-10-14 02:16:25 +08:00
|
|
|
else if (!strcasecmp("add", value))
|
2017-07-24 16:22:43 +08:00
|
|
|
*item = EXISTS_ADD;
|
2014-10-14 02:16:25 +08:00
|
|
|
else if (!strcasecmp("replace", value))
|
2017-07-24 16:22:43 +08:00
|
|
|
*item = EXISTS_REPLACE;
|
2014-10-14 02:16:25 +08:00
|
|
|
else if (!strcasecmp("doNothing", value))
|
2017-07-24 16:22:43 +08:00
|
|
|
*item = EXISTS_DO_NOTHING;
|
2014-10-14 02:16:25 +08:00
|
|
|
else
|
|
|
|
return -1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-07-24 16:22:43 +08:00
|
|
|
int trailer_set_if_missing(enum trailer_if_missing *item, const char *value)
|
2014-10-14 02:16:25 +08:00
|
|
|
{
|
2017-08-01 17:03:32 +08:00
|
|
|
if (!value)
|
|
|
|
*item = MISSING_DEFAULT;
|
|
|
|
else if (!strcasecmp("doNothing", value))
|
2017-07-24 16:22:43 +08:00
|
|
|
*item = MISSING_DO_NOTHING;
|
2014-10-14 02:16:25 +08:00
|
|
|
else if (!strcasecmp("add", value))
|
2017-07-24 16:22:43 +08:00
|
|
|
*item = MISSING_ADD;
|
2014-10-14 02:16:25 +08:00
|
|
|
else
|
|
|
|
return -1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-10-15 01:37:58 +08:00
|
|
|
static void duplicate_conf(struct conf_info *dst, const struct conf_info *src)
|
2014-10-14 02:16:25 +08:00
|
|
|
{
|
|
|
|
*dst = *src;
|
2016-10-13 02:20:23 +08:00
|
|
|
dst->name = xstrdup_or_null(src->name);
|
|
|
|
dst->key = xstrdup_or_null(src->key);
|
|
|
|
dst->command = xstrdup_or_null(src->command);
|
trailer: add new .cmd config option
The `trailer.<token>.command` configuration variable
specifies a command (run via the shell, so it does not have
to be a single name or path to the command, but can be a
shell script), and the first occurrence of substring $ARG is
replaced with the value given to the `interpret-trailer`
command for the token in a '--trailer <token>=<value>' argument.
This has three downsides:
* The use of $ARG in the mechanism misleads the users that
the value is passed in the shell variable, and tempt them
to use $ARG more than once, but that would not work, as
the second and subsequent $ARG are not replaced.
* Because $ARG is textually replaced without regard to the
shell language syntax, even '$ARG' (inside a single-quote
pair), which a user would expect to stay intact, would be
replaced, and worse, if the value had an unmatched single
quote (imagine a name like "O'Connor", substituted into
NAME='$ARG' to make it NAME='O'Connor'), it would result in
a broken command that is not syntactically correct (or
worse).
* The first occurrence of substring `$ARG` will be replaced
with the empty string, in the command when the command is
first called to add a trailer with the specified <token>.
This is a bad design, the nature of automatic execution
causes it to add a trailer that we don't expect.
Introduce a new `trailer.<token>.cmd` configuration that
takes higher precedence to deprecate and eventually remove
`trailer.<token>.command`, which passes the value as an
argument to the command. Instead of "$ARG", users can
refer to the value as positional argument, $1, in their
scripts. At the same time, in order to allow
`git interpret-trailers` to better simulate the behavior
of `git command -s`, 'trailer.<token>.cmd' will not
automatically execute.
Helped-by: Junio C Hamano <gitster@pobox.com>
Helped-by: Christian Couder <christian.couder@gmail.com>
Signed-off-by: ZheNing Hu <adlternative@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-05-03 23:41:05 +08:00
|
|
|
dst->cmd = xstrdup_or_null(src->cmd);
|
2014-10-14 02:16:25 +08:00
|
|
|
}
|
|
|
|
|
2016-10-21 05:39:49 +08:00
|
|
|
static struct arg_item *get_conf_item(const char *name)
|
2014-10-14 02:16:25 +08:00
|
|
|
{
|
2016-10-21 05:39:47 +08:00
|
|
|
struct list_head *pos;
|
2016-10-21 05:39:49 +08:00
|
|
|
struct arg_item *item;
|
2014-10-14 02:16:25 +08:00
|
|
|
|
|
|
|
/* Look up item with same name */
|
2016-10-21 05:39:47 +08:00
|
|
|
list_for_each(pos, &conf_head) {
|
2016-10-21 05:39:49 +08:00
|
|
|
item = list_entry(pos, struct arg_item, list);
|
2014-10-14 02:16:25 +08:00
|
|
|
if (!strcasecmp(item->conf.name, name))
|
|
|
|
return item;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Item does not already exists, create it */
|
2021-03-14 00:17:22 +08:00
|
|
|
CALLOC_ARRAY(item, 1);
|
2014-10-14 02:16:25 +08:00
|
|
|
duplicate_conf(&item->conf, &default_conf_info);
|
|
|
|
item->conf.name = xstrdup(name);
|
|
|
|
|
2016-10-21 05:39:47 +08:00
|
|
|
list_add_tail(&item->list, &conf_head);
|
2014-10-14 02:16:25 +08:00
|
|
|
|
|
|
|
return item;
|
|
|
|
}
|
|
|
|
|
trailer: add new .cmd config option
The `trailer.<token>.command` configuration variable
specifies a command (run via the shell, so it does not have
to be a single name or path to the command, but can be a
shell script), and the first occurrence of substring $ARG is
replaced with the value given to the `interpret-trailer`
command for the token in a '--trailer <token>=<value>' argument.
This has three downsides:
* The use of $ARG in the mechanism misleads the users that
the value is passed in the shell variable, and tempt them
to use $ARG more than once, but that would not work, as
the second and subsequent $ARG are not replaced.
* Because $ARG is textually replaced without regard to the
shell language syntax, even '$ARG' (inside a single-quote
pair), which a user would expect to stay intact, would be
replaced, and worse, if the value had an unmatched single
quote (imagine a name like "O'Connor", substituted into
NAME='$ARG' to make it NAME='O'Connor'), it would result in
a broken command that is not syntactically correct (or
worse).
* The first occurrence of substring `$ARG` will be replaced
with the empty string, in the command when the command is
first called to add a trailer with the specified <token>.
This is a bad design, the nature of automatic execution
causes it to add a trailer that we don't expect.
Introduce a new `trailer.<token>.cmd` configuration that
takes higher precedence to deprecate and eventually remove
`trailer.<token>.command`, which passes the value as an
argument to the command. Instead of "$ARG", users can
refer to the value as positional argument, $1, in their
scripts. At the same time, in order to allow
`git interpret-trailers` to better simulate the behavior
of `git command -s`, 'trailer.<token>.cmd' will not
automatically execute.
Helped-by: Junio C Hamano <gitster@pobox.com>
Helped-by: Christian Couder <christian.couder@gmail.com>
Signed-off-by: ZheNing Hu <adlternative@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-05-03 23:41:05 +08:00
|
|
|
enum trailer_info_type { TRAILER_KEY, TRAILER_COMMAND, TRAILER_CMD,
|
|
|
|
TRAILER_WHERE, TRAILER_IF_EXISTS, TRAILER_IF_MISSING };
|
2014-10-14 02:16:25 +08:00
|
|
|
|
|
|
|
static struct {
|
|
|
|
const char *name;
|
|
|
|
enum trailer_info_type type;
|
|
|
|
} trailer_config_items[] = {
|
|
|
|
{ "key", TRAILER_KEY },
|
|
|
|
{ "command", TRAILER_COMMAND },
|
trailer: add new .cmd config option
The `trailer.<token>.command` configuration variable
specifies a command (run via the shell, so it does not have
to be a single name or path to the command, but can be a
shell script), and the first occurrence of substring $ARG is
replaced with the value given to the `interpret-trailer`
command for the token in a '--trailer <token>=<value>' argument.
This has three downsides:
* The use of $ARG in the mechanism misleads the users that
the value is passed in the shell variable, and tempt them
to use $ARG more than once, but that would not work, as
the second and subsequent $ARG are not replaced.
* Because $ARG is textually replaced without regard to the
shell language syntax, even '$ARG' (inside a single-quote
pair), which a user would expect to stay intact, would be
replaced, and worse, if the value had an unmatched single
quote (imagine a name like "O'Connor", substituted into
NAME='$ARG' to make it NAME='O'Connor'), it would result in
a broken command that is not syntactically correct (or
worse).
* The first occurrence of substring `$ARG` will be replaced
with the empty string, in the command when the command is
first called to add a trailer with the specified <token>.
This is a bad design, the nature of automatic execution
causes it to add a trailer that we don't expect.
Introduce a new `trailer.<token>.cmd` configuration that
takes higher precedence to deprecate and eventually remove
`trailer.<token>.command`, which passes the value as an
argument to the command. Instead of "$ARG", users can
refer to the value as positional argument, $1, in their
scripts. At the same time, in order to allow
`git interpret-trailers` to better simulate the behavior
of `git command -s`, 'trailer.<token>.cmd' will not
automatically execute.
Helped-by: Junio C Hamano <gitster@pobox.com>
Helped-by: Christian Couder <christian.couder@gmail.com>
Signed-off-by: ZheNing Hu <adlternative@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-05-03 23:41:05 +08:00
|
|
|
{ "cmd", TRAILER_CMD },
|
2014-10-14 02:16:25 +08:00
|
|
|
{ "where", TRAILER_WHERE },
|
|
|
|
{ "ifexists", TRAILER_IF_EXISTS },
|
|
|
|
{ "ifmissing", TRAILER_IF_MISSING }
|
|
|
|
};
|
|
|
|
|
2022-08-19 18:08:44 +08:00
|
|
|
static int git_trailer_default_config(const char *conf_key, const char *value,
|
config: add ctx arg to config_fn_t
Add a new "const struct config_context *ctx" arg to config_fn_t to hold
additional information about the config iteration operation.
config_context has a "struct key_value_info kvi" member that holds
metadata about the config source being read (e.g. what kind of config
source it is, the filename, etc). In this series, we're only interested
in .kvi, so we could have just used "struct key_value_info" as an arg,
but config_context makes it possible to add/adjust members in the future
without changing the config_fn_t signature. We could also consider other
ways of organizing the args (e.g. moving the config name and value into
config_context or key_value_info), but in my experiments, the
incremental benefit doesn't justify the added complexity (e.g. a
config_fn_t will sometimes invoke another config_fn_t but with a
different config value).
In subsequent commits, the .kvi member will replace the global "struct
config_reader" in config.c, making config iteration a global-free
operation. It requires much more work for the machinery to provide
meaningful values of .kvi, so for now, merely change the signature and
call sites, pass NULL as a placeholder value, and don't rely on the arg
in any meaningful way.
Most of the changes are performed by
contrib/coccinelle/config_fn_ctx.pending.cocci, which, for every
config_fn_t:
- Modifies the signature to accept "const struct config_context *ctx"
- Passes "ctx" to any inner config_fn_t, if needed
- Adds UNUSED attributes to "ctx", if needed
Most config_fn_t instances are easily identified by seeing if they are
called by the various config functions. Most of the remaining ones are
manually named in the .cocci patch. Manual cleanups are still needed,
but the majority of it is trivial; it's either adjusting config_fn_t
that the .cocci patch didn't catch, or adding forward declarations of
"struct config_context ctx" to make the signatures make sense.
The non-trivial changes are in cases where we are invoking a config_fn_t
outside of config machinery, and we now need to decide what value of
"ctx" to pass. These cases are:
- trace2/tr2_cfg.c:tr2_cfg_set_fl()
This is indirectly called by git_config_set() so that the trace2
machinery can notice the new config values and update its settings
using the tr2 config parsing function, i.e. tr2_cfg_cb().
- builtin/checkout.c:checkout_main()
This calls git_xmerge_config() as a shorthand for parsing a CLI arg.
This might be worth refactoring away in the future, since
git_xmerge_config() can call git_default_config(), which can do much
more than just parsing.
Handle them by creating a KVI_INIT macro that initializes "struct
key_value_info" to a reasonable default, and use that to construct the
"ctx" arg.
Signed-off-by: Glen Choo <chooglen@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-06-29 03:26:22 +08:00
|
|
|
const struct config_context *ctx UNUSED,
|
2022-08-26 01:09:48 +08:00
|
|
|
void *cb UNUSED)
|
2014-10-14 02:16:25 +08:00
|
|
|
{
|
|
|
|
const char *trailer_item, *variable_name;
|
|
|
|
|
|
|
|
if (!skip_prefix(conf_key, "trailer.", &trailer_item))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
variable_name = strrchr(trailer_item, '.');
|
|
|
|
if (!variable_name) {
|
|
|
|
if (!strcmp(trailer_item, "where")) {
|
2017-07-24 16:22:43 +08:00
|
|
|
if (trailer_set_where(&default_conf_info.where,
|
|
|
|
value) < 0)
|
2014-10-14 02:16:25 +08:00
|
|
|
warning(_("unknown value '%s' for key '%s'"),
|
|
|
|
value, conf_key);
|
|
|
|
} else if (!strcmp(trailer_item, "ifexists")) {
|
2017-07-24 16:22:43 +08:00
|
|
|
if (trailer_set_if_exists(&default_conf_info.if_exists,
|
|
|
|
value) < 0)
|
2014-10-14 02:16:25 +08:00
|
|
|
warning(_("unknown value '%s' for key '%s'"),
|
|
|
|
value, conf_key);
|
|
|
|
} else if (!strcmp(trailer_item, "ifmissing")) {
|
2017-07-24 16:22:43 +08:00
|
|
|
if (trailer_set_if_missing(&default_conf_info.if_missing,
|
|
|
|
value) < 0)
|
2014-10-14 02:16:25 +08:00
|
|
|
warning(_("unknown value '%s' for key '%s'"),
|
|
|
|
value, conf_key);
|
|
|
|
} else if (!strcmp(trailer_item, "separators")) {
|
2023-12-07 15:11:14 +08:00
|
|
|
if (!value)
|
|
|
|
return config_error_nonbool(conf_key);
|
2014-10-14 02:16:25 +08:00
|
|
|
separators = xstrdup(value);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2022-08-19 18:08:44 +08:00
|
|
|
static int git_trailer_config(const char *conf_key, const char *value,
|
config: add ctx arg to config_fn_t
Add a new "const struct config_context *ctx" arg to config_fn_t to hold
additional information about the config iteration operation.
config_context has a "struct key_value_info kvi" member that holds
metadata about the config source being read (e.g. what kind of config
source it is, the filename, etc). In this series, we're only interested
in .kvi, so we could have just used "struct key_value_info" as an arg,
but config_context makes it possible to add/adjust members in the future
without changing the config_fn_t signature. We could also consider other
ways of organizing the args (e.g. moving the config name and value into
config_context or key_value_info), but in my experiments, the
incremental benefit doesn't justify the added complexity (e.g. a
config_fn_t will sometimes invoke another config_fn_t but with a
different config value).
In subsequent commits, the .kvi member will replace the global "struct
config_reader" in config.c, making config iteration a global-free
operation. It requires much more work for the machinery to provide
meaningful values of .kvi, so for now, merely change the signature and
call sites, pass NULL as a placeholder value, and don't rely on the arg
in any meaningful way.
Most of the changes are performed by
contrib/coccinelle/config_fn_ctx.pending.cocci, which, for every
config_fn_t:
- Modifies the signature to accept "const struct config_context *ctx"
- Passes "ctx" to any inner config_fn_t, if needed
- Adds UNUSED attributes to "ctx", if needed
Most config_fn_t instances are easily identified by seeing if they are
called by the various config functions. Most of the remaining ones are
manually named in the .cocci patch. Manual cleanups are still needed,
but the majority of it is trivial; it's either adjusting config_fn_t
that the .cocci patch didn't catch, or adding forward declarations of
"struct config_context ctx" to make the signatures make sense.
The non-trivial changes are in cases where we are invoking a config_fn_t
outside of config machinery, and we now need to decide what value of
"ctx" to pass. These cases are:
- trace2/tr2_cfg.c:tr2_cfg_set_fl()
This is indirectly called by git_config_set() so that the trace2
machinery can notice the new config values and update its settings
using the tr2 config parsing function, i.e. tr2_cfg_cb().
- builtin/checkout.c:checkout_main()
This calls git_xmerge_config() as a shorthand for parsing a CLI arg.
This might be worth refactoring away in the future, since
git_xmerge_config() can call git_default_config(), which can do much
more than just parsing.
Handle them by creating a KVI_INIT macro that initializes "struct
key_value_info" to a reasonable default, and use that to construct the
"ctx" arg.
Signed-off-by: Glen Choo <chooglen@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-06-29 03:26:22 +08:00
|
|
|
const struct config_context *ctx UNUSED,
|
2022-08-26 01:09:48 +08:00
|
|
|
void *cb UNUSED)
|
2014-10-14 02:16:25 +08:00
|
|
|
{
|
|
|
|
const char *trailer_item, *variable_name;
|
2016-10-21 05:39:49 +08:00
|
|
|
struct arg_item *item;
|
2014-10-14 02:16:25 +08:00
|
|
|
struct conf_info *conf;
|
|
|
|
char *name = NULL;
|
|
|
|
enum trailer_info_type type;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (!skip_prefix(conf_key, "trailer.", &trailer_item))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
variable_name = strrchr(trailer_item, '.');
|
|
|
|
if (!variable_name)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
variable_name++;
|
|
|
|
for (i = 0; i < ARRAY_SIZE(trailer_config_items); i++) {
|
|
|
|
if (strcmp(trailer_config_items[i].name, variable_name))
|
|
|
|
continue;
|
|
|
|
name = xstrndup(trailer_item, variable_name - trailer_item - 1);
|
|
|
|
type = trailer_config_items[i].type;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!name)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
item = get_conf_item(name);
|
|
|
|
conf = &item->conf;
|
|
|
|
free(name);
|
|
|
|
|
|
|
|
switch (type) {
|
|
|
|
case TRAILER_KEY:
|
|
|
|
if (conf->key)
|
|
|
|
warning(_("more than one %s"), conf_key);
|
2023-12-07 15:11:32 +08:00
|
|
|
if (!value)
|
|
|
|
return config_error_nonbool(conf_key);
|
2014-10-14 02:16:25 +08:00
|
|
|
conf->key = xstrdup(value);
|
|
|
|
break;
|
|
|
|
case TRAILER_COMMAND:
|
|
|
|
if (conf->command)
|
|
|
|
warning(_("more than one %s"), conf_key);
|
2023-12-07 15:11:32 +08:00
|
|
|
if (!value)
|
|
|
|
return config_error_nonbool(conf_key);
|
2014-10-14 02:16:25 +08:00
|
|
|
conf->command = xstrdup(value);
|
|
|
|
break;
|
trailer: add new .cmd config option
The `trailer.<token>.command` configuration variable
specifies a command (run via the shell, so it does not have
to be a single name or path to the command, but can be a
shell script), and the first occurrence of substring $ARG is
replaced with the value given to the `interpret-trailer`
command for the token in a '--trailer <token>=<value>' argument.
This has three downsides:
* The use of $ARG in the mechanism misleads the users that
the value is passed in the shell variable, and tempt them
to use $ARG more than once, but that would not work, as
the second and subsequent $ARG are not replaced.
* Because $ARG is textually replaced without regard to the
shell language syntax, even '$ARG' (inside a single-quote
pair), which a user would expect to stay intact, would be
replaced, and worse, if the value had an unmatched single
quote (imagine a name like "O'Connor", substituted into
NAME='$ARG' to make it NAME='O'Connor'), it would result in
a broken command that is not syntactically correct (or
worse).
* The first occurrence of substring `$ARG` will be replaced
with the empty string, in the command when the command is
first called to add a trailer with the specified <token>.
This is a bad design, the nature of automatic execution
causes it to add a trailer that we don't expect.
Introduce a new `trailer.<token>.cmd` configuration that
takes higher precedence to deprecate and eventually remove
`trailer.<token>.command`, which passes the value as an
argument to the command. Instead of "$ARG", users can
refer to the value as positional argument, $1, in their
scripts. At the same time, in order to allow
`git interpret-trailers` to better simulate the behavior
of `git command -s`, 'trailer.<token>.cmd' will not
automatically execute.
Helped-by: Junio C Hamano <gitster@pobox.com>
Helped-by: Christian Couder <christian.couder@gmail.com>
Signed-off-by: ZheNing Hu <adlternative@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-05-03 23:41:05 +08:00
|
|
|
case TRAILER_CMD:
|
|
|
|
if (conf->cmd)
|
|
|
|
warning(_("more than one %s"), conf_key);
|
2023-12-07 15:11:32 +08:00
|
|
|
if (!value)
|
|
|
|
return config_error_nonbool(conf_key);
|
trailer: add new .cmd config option
The `trailer.<token>.command` configuration variable
specifies a command (run via the shell, so it does not have
to be a single name or path to the command, but can be a
shell script), and the first occurrence of substring $ARG is
replaced with the value given to the `interpret-trailer`
command for the token in a '--trailer <token>=<value>' argument.
This has three downsides:
* The use of $ARG in the mechanism misleads the users that
the value is passed in the shell variable, and tempt them
to use $ARG more than once, but that would not work, as
the second and subsequent $ARG are not replaced.
* Because $ARG is textually replaced without regard to the
shell language syntax, even '$ARG' (inside a single-quote
pair), which a user would expect to stay intact, would be
replaced, and worse, if the value had an unmatched single
quote (imagine a name like "O'Connor", substituted into
NAME='$ARG' to make it NAME='O'Connor'), it would result in
a broken command that is not syntactically correct (or
worse).
* The first occurrence of substring `$ARG` will be replaced
with the empty string, in the command when the command is
first called to add a trailer with the specified <token>.
This is a bad design, the nature of automatic execution
causes it to add a trailer that we don't expect.
Introduce a new `trailer.<token>.cmd` configuration that
takes higher precedence to deprecate and eventually remove
`trailer.<token>.command`, which passes the value as an
argument to the command. Instead of "$ARG", users can
refer to the value as positional argument, $1, in their
scripts. At the same time, in order to allow
`git interpret-trailers` to better simulate the behavior
of `git command -s`, 'trailer.<token>.cmd' will not
automatically execute.
Helped-by: Junio C Hamano <gitster@pobox.com>
Helped-by: Christian Couder <christian.couder@gmail.com>
Signed-off-by: ZheNing Hu <adlternative@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-05-03 23:41:05 +08:00
|
|
|
conf->cmd = xstrdup(value);
|
|
|
|
break;
|
2014-10-14 02:16:25 +08:00
|
|
|
case TRAILER_WHERE:
|
2017-07-24 16:22:43 +08:00
|
|
|
if (trailer_set_where(&conf->where, value))
|
2014-10-14 02:16:25 +08:00
|
|
|
warning(_("unknown value '%s' for key '%s'"), value, conf_key);
|
|
|
|
break;
|
|
|
|
case TRAILER_IF_EXISTS:
|
2017-07-24 16:22:43 +08:00
|
|
|
if (trailer_set_if_exists(&conf->if_exists, value))
|
2014-10-14 02:16:25 +08:00
|
|
|
warning(_("unknown value '%s' for key '%s'"), value, conf_key);
|
|
|
|
break;
|
|
|
|
case TRAILER_IF_MISSING:
|
2017-07-24 16:22:43 +08:00
|
|
|
if (trailer_set_if_missing(&conf->if_missing, value))
|
2014-10-14 02:16:25 +08:00
|
|
|
warning(_("unknown value '%s' for key '%s'"), value, conf_key);
|
|
|
|
break;
|
|
|
|
default:
|
2018-05-02 17:38:39 +08:00
|
|
|
BUG("trailer.c: unhandled type %d", type);
|
2014-10-14 02:16:25 +08:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
2014-10-14 02:16:26 +08:00
|
|
|
|
2024-03-01 08:14:41 +08:00
|
|
|
void trailer_config_init(void)
|
2016-11-03 01:29:19 +08:00
|
|
|
{
|
|
|
|
if (configured)
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* Default config must be setup first */
|
2017-07-24 16:22:43 +08:00
|
|
|
default_conf_info.where = WHERE_END;
|
|
|
|
default_conf_info.if_exists = EXISTS_ADD_IF_DIFFERENT_NEIGHBOR;
|
|
|
|
default_conf_info.if_missing = MISSING_ADD;
|
2016-11-03 01:29:19 +08:00
|
|
|
git_config(git_trailer_default_config, NULL);
|
|
|
|
git_config(git_trailer_config, NULL);
|
|
|
|
configured = 1;
|
|
|
|
}
|
|
|
|
|
2016-10-21 05:39:49 +08:00
|
|
|
static const char *token_from_item(struct arg_item *item, char *tok)
|
2014-10-14 02:16:26 +08:00
|
|
|
{
|
|
|
|
if (item->conf.key)
|
|
|
|
return item->conf.key;
|
|
|
|
if (tok)
|
|
|
|
return tok;
|
|
|
|
return item->conf.name;
|
|
|
|
}
|
|
|
|
|
2018-08-23 08:44:38 +08:00
|
|
|
static int token_matches_item(const char *tok, struct arg_item *item, size_t tok_len)
|
2014-10-14 02:16:26 +08:00
|
|
|
{
|
|
|
|
if (!strncasecmp(tok, item->conf.name, tok_len))
|
|
|
|
return 1;
|
|
|
|
return item->conf.key ? !strncasecmp(tok, item->conf.key, tok_len) : 0;
|
|
|
|
}
|
|
|
|
|
2016-10-22 01:55:00 +08:00
|
|
|
/*
|
2016-11-03 01:29:16 +08:00
|
|
|
* If the given line is of the form
|
|
|
|
* "<token><optional whitespace><separator>..." or "<separator>...", return the
|
|
|
|
* location of the separator. Otherwise, return -1. The optional whitespace
|
|
|
|
* is allowed there primarily to allow things like "Bug #43" where <token> is
|
|
|
|
* "Bug" and <separator> is "#".
|
|
|
|
*
|
|
|
|
* The separator-starts-line case (in which this function returns 0) is
|
|
|
|
* distinguished from the non-well-formed-line case (in which this function
|
|
|
|
* returns -1) because some callers of this function need such a distinction.
|
2016-10-22 01:55:00 +08:00
|
|
|
*/
|
2018-08-23 08:44:38 +08:00
|
|
|
static ssize_t find_separator(const char *line, const char *separators)
|
2014-10-14 02:16:26 +08:00
|
|
|
{
|
2016-11-03 01:29:16 +08:00
|
|
|
int whitespace_found = 0;
|
|
|
|
const char *c;
|
|
|
|
for (c = line; *c; c++) {
|
|
|
|
if (strchr(separators, *c))
|
|
|
|
return c - line;
|
|
|
|
if (!whitespace_found && (isalnum(*c) || *c == '-'))
|
|
|
|
continue;
|
|
|
|
if (c != line && (*c == ' ' || *c == '\t')) {
|
|
|
|
whitespace_found = 1;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return -1;
|
2016-10-22 01:55:00 +08:00
|
|
|
}
|
2014-10-14 02:16:26 +08:00
|
|
|
|
2016-10-22 01:55:00 +08:00
|
|
|
/*
|
|
|
|
* Obtain the token, value, and conf from the given trailer.
|
|
|
|
*
|
|
|
|
* separator_pos must not be 0, since the token cannot be an empty string.
|
|
|
|
*
|
|
|
|
* If separator_pos is -1, interpret the whole trailer as a token.
|
|
|
|
*/
|
|
|
|
static void parse_trailer(struct strbuf *tok, struct strbuf *val,
|
|
|
|
const struct conf_info **conf, const char *trailer,
|
2018-08-23 08:44:38 +08:00
|
|
|
ssize_t separator_pos)
|
2014-10-14 02:16:26 +08:00
|
|
|
{
|
2016-10-21 05:39:49 +08:00
|
|
|
struct arg_item *item;
|
2018-08-23 08:44:38 +08:00
|
|
|
size_t tok_len;
|
2016-10-21 05:39:48 +08:00
|
|
|
struct list_head *pos;
|
2014-10-14 02:16:26 +08:00
|
|
|
|
2016-10-22 01:55:00 +08:00
|
|
|
if (separator_pos != -1) {
|
|
|
|
strbuf_add(tok, trailer, separator_pos);
|
2014-10-14 02:16:26 +08:00
|
|
|
strbuf_trim(tok);
|
2016-10-22 01:55:00 +08:00
|
|
|
strbuf_addstr(val, trailer + separator_pos + 1);
|
2014-10-14 02:16:26 +08:00
|
|
|
strbuf_trim(val);
|
|
|
|
} else {
|
|
|
|
strbuf_addstr(tok, trailer);
|
|
|
|
strbuf_trim(tok);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Lookup if the token matches something in the config */
|
2016-10-21 05:39:48 +08:00
|
|
|
tok_len = token_len_without_separator(tok->buf, tok->len);
|
2016-10-21 05:39:49 +08:00
|
|
|
if (conf)
|
|
|
|
*conf = &default_conf_info;
|
2016-10-21 05:39:47 +08:00
|
|
|
list_for_each(pos, &conf_head) {
|
2016-10-21 05:39:49 +08:00
|
|
|
item = list_entry(pos, struct arg_item, list);
|
2016-10-21 05:39:48 +08:00
|
|
|
if (token_matches_item(tok->buf, item, tok_len)) {
|
|
|
|
char *tok_buf = strbuf_detach(tok, NULL);
|
2016-10-21 05:39:49 +08:00
|
|
|
if (conf)
|
|
|
|
*conf = &item->conf;
|
2016-10-21 05:39:48 +08:00
|
|
|
strbuf_addstr(tok, token_from_item(item, tok_buf));
|
|
|
|
free(tok_buf);
|
|
|
|
break;
|
|
|
|
}
|
2014-10-14 02:16:26 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-10-22 01:55:03 +08:00
|
|
|
static struct trailer_item *add_trailer_item(struct list_head *head, char *tok,
|
|
|
|
char *val)
|
2014-10-14 02:16:26 +08:00
|
|
|
{
|
2021-03-06 19:26:19 +08:00
|
|
|
struct trailer_item *new_item = xcalloc(1, sizeof(*new_item));
|
2018-02-15 02:59:50 +08:00
|
|
|
new_item->token = tok;
|
|
|
|
new_item->value = val;
|
|
|
|
list_add_tail(&new_item->list, head);
|
|
|
|
return new_item;
|
2014-10-14 02:16:26 +08:00
|
|
|
}
|
|
|
|
|
2016-10-21 05:39:49 +08:00
|
|
|
static void add_arg_item(struct list_head *arg_head, char *tok, char *val,
|
2017-08-01 17:03:32 +08:00
|
|
|
const struct conf_info *conf,
|
|
|
|
const struct new_trailer_item *new_trailer_item)
|
2014-10-14 02:16:26 +08:00
|
|
|
{
|
2021-03-06 19:26:19 +08:00
|
|
|
struct arg_item *new_item = xcalloc(1, sizeof(*new_item));
|
2018-02-15 02:59:50 +08:00
|
|
|
new_item->token = tok;
|
|
|
|
new_item->value = val;
|
|
|
|
duplicate_conf(&new_item->conf, conf);
|
2017-08-01 17:03:32 +08:00
|
|
|
if (new_trailer_item) {
|
|
|
|
if (new_trailer_item->where != WHERE_DEFAULT)
|
2018-02-15 02:59:50 +08:00
|
|
|
new_item->conf.where = new_trailer_item->where;
|
2017-08-01 17:03:32 +08:00
|
|
|
if (new_trailer_item->if_exists != EXISTS_DEFAULT)
|
2018-02-15 02:59:50 +08:00
|
|
|
new_item->conf.if_exists = new_trailer_item->if_exists;
|
2017-08-01 17:03:32 +08:00
|
|
|
if (new_trailer_item->if_missing != MISSING_DEFAULT)
|
2018-02-15 02:59:50 +08:00
|
|
|
new_item->conf.if_missing = new_trailer_item->if_missing;
|
2017-08-01 17:03:32 +08:00
|
|
|
}
|
2018-02-15 02:59:50 +08:00
|
|
|
list_add_tail(&new_item->list, arg_head);
|
2014-10-14 02:16:26 +08:00
|
|
|
}
|
|
|
|
|
2024-03-01 08:14:41 +08:00
|
|
|
void parse_trailers_from_config(struct list_head *config_head)
|
2014-10-14 02:16:26 +08:00
|
|
|
{
|
2016-10-21 05:39:49 +08:00
|
|
|
struct arg_item *item;
|
2016-10-21 05:39:47 +08:00
|
|
|
struct list_head *pos;
|
2014-10-14 02:16:31 +08:00
|
|
|
|
2016-10-21 05:39:49 +08:00
|
|
|
/* Add an arg item for each configured trailer with a command */
|
2016-10-21 05:39:47 +08:00
|
|
|
list_for_each(pos, &conf_head) {
|
2016-10-21 05:39:49 +08:00
|
|
|
item = list_entry(pos, struct arg_item, list);
|
2016-10-21 05:39:48 +08:00
|
|
|
if (item->conf.command)
|
2023-09-09 14:16:14 +08:00
|
|
|
add_arg_item(config_head,
|
2016-10-21 05:39:49 +08:00
|
|
|
xstrdup(token_from_item(item, NULL)),
|
|
|
|
xstrdup(""),
|
2017-08-01 17:03:32 +08:00
|
|
|
&item->conf, NULL);
|
2014-10-14 02:16:31 +08:00
|
|
|
}
|
2023-09-09 14:16:14 +08:00
|
|
|
}
|
|
|
|
|
2024-03-01 08:14:41 +08:00
|
|
|
void parse_trailers_from_command_line_args(struct list_head *arg_head,
|
|
|
|
struct list_head *new_trailer_head)
|
2023-09-09 14:16:14 +08:00
|
|
|
{
|
|
|
|
struct strbuf tok = STRBUF_INIT;
|
|
|
|
struct strbuf val = STRBUF_INIT;
|
|
|
|
const struct conf_info *conf;
|
|
|
|
struct list_head *pos;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* In command-line arguments, '=' is accepted (in addition to the
|
|
|
|
* separators that are defined).
|
|
|
|
*/
|
|
|
|
char *cl_separators = xstrfmt("=%s", separators);
|
2014-10-14 02:16:26 +08:00
|
|
|
|
2016-10-21 05:39:49 +08:00
|
|
|
/* Add an arg item for each trailer on the command line */
|
2017-08-01 17:03:31 +08:00
|
|
|
list_for_each(pos, new_trailer_head) {
|
|
|
|
struct new_trailer_item *tr =
|
|
|
|
list_entry(pos, struct new_trailer_item, list);
|
2018-08-23 08:44:38 +08:00
|
|
|
ssize_t separator_pos = find_separator(tr->text, cl_separators);
|
2017-08-01 17:03:31 +08:00
|
|
|
|
2016-10-22 01:55:00 +08:00
|
|
|
if (separator_pos == 0) {
|
|
|
|
struct strbuf sb = STRBUF_INIT;
|
2017-08-01 17:03:31 +08:00
|
|
|
strbuf_addstr(&sb, tr->text);
|
2016-10-22 01:55:00 +08:00
|
|
|
strbuf_trim(&sb);
|
|
|
|
error(_("empty trailer token in trailer '%.*s'"),
|
|
|
|
(int) sb.len, sb.buf);
|
|
|
|
strbuf_release(&sb);
|
|
|
|
} else {
|
2017-08-01 17:03:31 +08:00
|
|
|
parse_trailer(&tok, &val, &conf, tr->text,
|
2016-10-22 01:55:00 +08:00
|
|
|
separator_pos);
|
2016-10-21 05:39:49 +08:00
|
|
|
add_arg_item(arg_head,
|
|
|
|
strbuf_detach(&tok, NULL),
|
|
|
|
strbuf_detach(&val, NULL),
|
2017-08-01 17:03:32 +08:00
|
|
|
conf, tr);
|
2016-10-22 01:55:00 +08:00
|
|
|
}
|
2014-10-14 02:16:26 +08:00
|
|
|
}
|
|
|
|
|
2016-10-22 01:55:00 +08:00
|
|
|
free(cl_separators);
|
2014-10-14 02:16:26 +08:00
|
|
|
}
|
2014-10-14 02:16:27 +08:00
|
|
|
|
2016-11-03 01:29:18 +08:00
|
|
|
static const char *next_line(const char *str)
|
|
|
|
{
|
|
|
|
const char *nl = strchrnul(str, '\n');
|
|
|
|
return nl + !!*nl;
|
|
|
|
}
|
2014-10-14 02:16:27 +08:00
|
|
|
|
2016-11-03 01:29:18 +08:00
|
|
|
/*
|
|
|
|
* Return the position of the start of the last line. If len is 0, return -1.
|
|
|
|
*/
|
2018-08-23 08:44:38 +08:00
|
|
|
static ssize_t last_line(const char *buf, size_t len)
|
2016-11-03 01:29:18 +08:00
|
|
|
{
|
2018-08-23 08:44:38 +08:00
|
|
|
ssize_t i;
|
2016-11-03 01:29:18 +08:00
|
|
|
if (len == 0)
|
|
|
|
return -1;
|
|
|
|
if (len == 1)
|
|
|
|
return 0;
|
|
|
|
/*
|
|
|
|
* Skip the last character (in addition to the null terminator),
|
|
|
|
* because if the last character is a newline, it is considered as part
|
|
|
|
* of the last line anyway.
|
|
|
|
*/
|
|
|
|
i = len - 2;
|
2014-10-14 02:16:27 +08:00
|
|
|
|
2016-11-03 01:29:18 +08:00
|
|
|
for (; i >= 0; i--) {
|
|
|
|
if (buf[i] == '\n')
|
|
|
|
return i + 1;
|
|
|
|
}
|
|
|
|
return 0;
|
2014-10-14 02:16:27 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2023-10-21 03:01:34 +08:00
|
|
|
* Find the end of the log message as an offset from the start of the input
|
|
|
|
* (where callers of this function are interested in looking for a trailers
|
|
|
|
* block in the same input). We have to consider two categories of content that
|
|
|
|
* can come at the end of the input which we want to ignore (because they don't
|
|
|
|
* belong in the log message):
|
|
|
|
*
|
|
|
|
* (1) the "patch part" which begins with a "---" divider and has patch
|
|
|
|
* information (like the output of git-format-patch), and
|
|
|
|
*
|
|
|
|
* (2) any trailing comment lines, blank lines like in the output of "git
|
|
|
|
* commit -v", or stuff below the "cut" (scissor) line.
|
|
|
|
*
|
|
|
|
* As a formula, the situation looks like this:
|
|
|
|
*
|
|
|
|
* INPUT = LOG MESSAGE + IGNORED
|
|
|
|
*
|
|
|
|
* where IGNORED can be either of the two categories described above. It may be
|
|
|
|
* that there is nothing to ignore. Now it may be the case that the LOG MESSAGE
|
|
|
|
* contains a trailer block, but that's not the concern of this function.
|
2014-10-14 02:16:27 +08:00
|
|
|
*/
|
2023-10-21 03:01:34 +08:00
|
|
|
static size_t find_end_of_log_message(const char *input, int no_divider)
|
2014-10-14 02:16:27 +08:00
|
|
|
{
|
2023-10-21 03:01:34 +08:00
|
|
|
size_t end;
|
2016-11-03 01:29:18 +08:00
|
|
|
const char *s;
|
2014-10-14 02:16:27 +08:00
|
|
|
|
2023-10-21 03:01:34 +08:00
|
|
|
/* Assume the naive end of the input is already what we want. */
|
|
|
|
end = strlen(input);
|
|
|
|
|
|
|
|
/* Optionally skip over any patch part ("---" line and below). */
|
trailer: fix comment/cut-line regression with opts->no_divider
Commit 97e9d0b78a (trailer: find the end of the log message, 2023-10-20)
combined two code paths for finding the end of the log message. For the
"no_divider" case, we used to use find_trailer_end(), and that has now
been rolled into find_end_of_log_message(). But there's a regression;
that function returns early when no_divider is set, returning the whole
string.
That's not how find_trailer_end() behaved. Although it did skip the
"---" processing (which is what "no_divider" is meant to do), we should
still respect ignored_log_message_bytes(), which covers things like
comments, "commit -v" cut lines, and so on.
The bug is actually in the interpret-trailers command, but the obvious
way to experience it is by running "commit -v" with a "--trailer"
option. The new trailer will be added at the end of the verbose diff,
rather than before it (and consequently will be ignored entirely, since
everything after the diff's intro scissors line is thrown away).
I've added two tests here: one for interpret-trailers directly, which
shows the bug via the parsing routines, and one for "commit -v".
The fix itself is pretty simple: instead of returning early, no_divider
just skips the "---" handling but still calls ignored_log_message_bytes().
Reported-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2024-02-20 09:09:36 +08:00
|
|
|
if (!no_divider) {
|
|
|
|
for (s = input; *s; s = next_line(s)) {
|
|
|
|
const char *v;
|
|
|
|
|
|
|
|
if (skip_prefix(s, "---", &v) && isspace(*v)) {
|
|
|
|
end = s - input;
|
|
|
|
break;
|
|
|
|
}
|
2023-10-21 03:01:34 +08:00
|
|
|
}
|
2014-10-14 02:16:27 +08:00
|
|
|
}
|
|
|
|
|
2023-10-21 03:01:34 +08:00
|
|
|
/* Skip over other ignorable bits. */
|
|
|
|
return end - ignored_log_message_bytes(input, end);
|
2014-10-14 02:16:27 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2016-11-03 01:29:18 +08:00
|
|
|
* Return the position of the first trailer line or len if there are no
|
|
|
|
* trailers.
|
2014-10-14 02:16:27 +08:00
|
|
|
*/
|
2023-10-21 03:01:35 +08:00
|
|
|
static size_t find_trailer_block_start(const char *buf, size_t len)
|
2014-10-14 02:16:27 +08:00
|
|
|
{
|
2016-11-03 01:29:18 +08:00
|
|
|
const char *s;
|
2018-08-23 08:44:38 +08:00
|
|
|
ssize_t end_of_title, l;
|
|
|
|
int only_spaces = 1;
|
2016-10-22 01:55:01 +08:00
|
|
|
int recognized_prefix = 0, trailer_lines = 0, non_trailer_lines = 0;
|
2016-10-22 01:55:03 +08:00
|
|
|
/*
|
|
|
|
* Number of possible continuation lines encountered. This will be
|
|
|
|
* reset to 0 if we encounter a trailer (since those lines are to be
|
|
|
|
* considered continuations of that trailer), and added to
|
|
|
|
* non_trailer_lines if we encounter a non-trailer (since those lines
|
|
|
|
* are to be considered non-trailers).
|
|
|
|
*/
|
|
|
|
int possible_continuation_lines = 0;
|
2015-08-31 03:14:40 +08:00
|
|
|
|
|
|
|
/* The first paragraph is the title and cannot be trailers */
|
2016-11-03 01:29:18 +08:00
|
|
|
for (s = buf; s < buf + len; s = next_line(s)) {
|
find multi-byte comment chars in unterminated buffers
As with the previous patch, we need to swap out single-byte matching for
something like starts_with() to match all bytes of a multi-byte comment
character. But for cases where the buffer is not NUL-terminated (and we
instead have an explicit size or end pointer), it's not safe to use
starts_with(), as it might walk off the end of the buffer.
Let's introduce a new starts_with_mem() that does the same thing but
also accepts the length of the "haystack" str and makes sure not to walk
past it.
Note that in most cases the existing code did not need a length check at
all, since it was written in a way that knew we had at least one byte
available (and that was all we checked). So I had to read each one to
find the appropriate bounds. The one exception is sequencer.c's
add_commented_lines(), where we can actually get rid of the length
check. Just like starts_with(), our starts_with_mem() handles an empty
haystack variable by not matching (assuming a non-empty prefix).
A few notes on the implementation of starts_with_mem():
- it would be equally correct to take an "end" pointer (and indeed,
many of the callers have this and have to subtract to come up with
the length). I think taking a ptr/size combo is a more usual
interface for our codebase, though, and has the added benefit that
the function signature makes it harder to mix up the three
parameters.
- we could obviously build starts_with() on top of this by passing
strlen(str) as the length. But it's possible that starts_with() is a
relatively hot code path, and it should not pay that penalty (it can
generally return an answer proportional to the size of the prefix,
not the whole string).
- it naively feels like xstrncmpz() should be able to do the same
thing, but that's not quite true. If you pass the length of the
haystack buffer, then strncmp() finds that a shorter prefix string
is "less than" than the haystack, even if the haystack starts with
the prefix. If you pass the length of the prefix, then you risk
reading past the end of the haystack if it is shorter than the
prefix. So I think we really do need a new function.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2024-03-12 17:17:39 +08:00
|
|
|
if (starts_with_mem(s, buf + len - s, comment_line_str))
|
2015-08-31 03:14:40 +08:00
|
|
|
continue;
|
2016-11-03 01:29:18 +08:00
|
|
|
if (is_blank_line(s))
|
2015-08-31 03:14:40 +08:00
|
|
|
break;
|
|
|
|
}
|
2016-11-03 01:29:18 +08:00
|
|
|
end_of_title = s - buf;
|
2014-10-14 02:16:27 +08:00
|
|
|
|
|
|
|
/*
|
2016-10-22 01:55:01 +08:00
|
|
|
* Get the start of the trailers by looking starting from the end for a
|
|
|
|
* blank line before a set of non-blank lines that (i) are all
|
|
|
|
* trailers, or (ii) contains at least one Git-generated trailer and
|
|
|
|
* consists of at least 25% trailers.
|
2014-10-14 02:16:27 +08:00
|
|
|
*/
|
2016-11-03 01:29:18 +08:00
|
|
|
for (l = last_line(buf, len);
|
|
|
|
l >= end_of_title;
|
|
|
|
l = last_line(buf, l)) {
|
|
|
|
const char *bol = buf + l;
|
2016-10-22 01:55:01 +08:00
|
|
|
const char **p;
|
2018-08-23 08:44:38 +08:00
|
|
|
ssize_t separator_pos;
|
2016-10-22 01:55:01 +08:00
|
|
|
|
find multi-byte comment chars in unterminated buffers
As with the previous patch, we need to swap out single-byte matching for
something like starts_with() to match all bytes of a multi-byte comment
character. But for cases where the buffer is not NUL-terminated (and we
instead have an explicit size or end pointer), it's not safe to use
starts_with(), as it might walk off the end of the buffer.
Let's introduce a new starts_with_mem() that does the same thing but
also accepts the length of the "haystack" str and makes sure not to walk
past it.
Note that in most cases the existing code did not need a length check at
all, since it was written in a way that knew we had at least one byte
available (and that was all we checked). So I had to read each one to
find the appropriate bounds. The one exception is sequencer.c's
add_commented_lines(), where we can actually get rid of the length
check. Just like starts_with(), our starts_with_mem() handles an empty
haystack variable by not matching (assuming a non-empty prefix).
A few notes on the implementation of starts_with_mem():
- it would be equally correct to take an "end" pointer (and indeed,
many of the callers have this and have to subtract to come up with
the length). I think taking a ptr/size combo is a more usual
interface for our codebase, though, and has the added benefit that
the function signature makes it harder to mix up the three
parameters.
- we could obviously build starts_with() on top of this by passing
strlen(str) as the length. But it's possible that starts_with() is a
relatively hot code path, and it should not pay that penalty (it can
generally return an answer proportional to the size of the prefix,
not the whole string).
- it naively feels like xstrncmpz() should be able to do the same
thing, but that's not quite true. If you pass the length of the
haystack buffer, then strncmp() finds that a shorter prefix string
is "less than" than the haystack, even if the haystack starts with
the prefix. If you pass the length of the prefix, then you risk
reading past the end of the haystack if it is shorter than the
prefix. So I think we really do need a new function.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2024-03-12 17:17:39 +08:00
|
|
|
if (starts_with_mem(bol, buf + len - bol, comment_line_str)) {
|
2016-10-22 01:55:03 +08:00
|
|
|
non_trailer_lines += possible_continuation_lines;
|
|
|
|
possible_continuation_lines = 0;
|
2014-10-14 02:16:27 +08:00
|
|
|
continue;
|
2016-10-22 01:55:03 +08:00
|
|
|
}
|
2016-11-03 01:29:18 +08:00
|
|
|
if (is_blank_line(bol)) {
|
2014-10-14 02:16:27 +08:00
|
|
|
if (only_spaces)
|
|
|
|
continue;
|
2016-10-22 01:55:03 +08:00
|
|
|
non_trailer_lines += possible_continuation_lines;
|
2016-10-22 01:55:01 +08:00
|
|
|
if (recognized_prefix &&
|
|
|
|
trailer_lines * 3 >= non_trailer_lines)
|
2016-11-03 01:29:18 +08:00
|
|
|
return next_line(bol) - buf;
|
|
|
|
else if (trailer_lines && !non_trailer_lines)
|
|
|
|
return next_line(bol) - buf;
|
|
|
|
return len;
|
2014-10-14 02:16:27 +08:00
|
|
|
}
|
2016-10-22 01:55:01 +08:00
|
|
|
only_spaces = 0;
|
|
|
|
|
|
|
|
for (p = git_generated_prefixes; *p; p++) {
|
2016-11-03 01:29:18 +08:00
|
|
|
if (starts_with(bol, *p)) {
|
2016-10-22 01:55:01 +08:00
|
|
|
trailer_lines++;
|
2016-10-22 01:55:03 +08:00
|
|
|
possible_continuation_lines = 0;
|
2016-10-22 01:55:01 +08:00
|
|
|
recognized_prefix = 1;
|
|
|
|
goto continue_outer_loop;
|
|
|
|
}
|
2014-10-14 02:16:27 +08:00
|
|
|
}
|
2016-10-22 01:55:01 +08:00
|
|
|
|
2016-11-03 01:29:18 +08:00
|
|
|
separator_pos = find_separator(bol, separators);
|
|
|
|
if (separator_pos >= 1 && !isspace(bol[0])) {
|
2016-10-22 01:55:01 +08:00
|
|
|
struct list_head *pos;
|
|
|
|
|
|
|
|
trailer_lines++;
|
2016-10-22 01:55:03 +08:00
|
|
|
possible_continuation_lines = 0;
|
2016-10-22 01:55:01 +08:00
|
|
|
if (recognized_prefix)
|
|
|
|
continue;
|
|
|
|
list_for_each(pos, &conf_head) {
|
|
|
|
struct arg_item *item;
|
|
|
|
item = list_entry(pos, struct arg_item, list);
|
2016-11-03 01:29:18 +08:00
|
|
|
if (token_matches_item(bol, item,
|
2016-10-22 01:55:01 +08:00
|
|
|
separator_pos)) {
|
|
|
|
recognized_prefix = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2016-11-03 01:29:18 +08:00
|
|
|
} else if (isspace(bol[0]))
|
2016-10-22 01:55:03 +08:00
|
|
|
possible_continuation_lines++;
|
|
|
|
else {
|
2016-10-22 01:55:01 +08:00
|
|
|
non_trailer_lines++;
|
2016-10-22 01:55:03 +08:00
|
|
|
non_trailer_lines += possible_continuation_lines;
|
|
|
|
possible_continuation_lines = 0;
|
2014-10-14 02:16:27 +08:00
|
|
|
}
|
2016-10-22 01:55:01 +08:00
|
|
|
continue_outer_loop:
|
|
|
|
;
|
2014-10-14 02:16:27 +08:00
|
|
|
}
|
|
|
|
|
2016-11-03 01:29:18 +08:00
|
|
|
return len;
|
2014-11-09 17:23:42 +08:00
|
|
|
}
|
|
|
|
|
2016-11-03 01:29:18 +08:00
|
|
|
static int ends_with_blank_line(const char *buf, size_t len)
|
2014-10-14 02:16:27 +08:00
|
|
|
{
|
2018-08-23 08:44:38 +08:00
|
|
|
ssize_t ll = last_line(buf, len);
|
2016-11-03 01:29:18 +08:00
|
|
|
if (ll < 0)
|
|
|
|
return 0;
|
|
|
|
return is_blank_line(buf + ll);
|
2014-10-14 02:16:27 +08:00
|
|
|
}
|
|
|
|
|
2017-08-15 18:23:29 +08:00
|
|
|
static void unfold_value(struct strbuf *val)
|
|
|
|
{
|
|
|
|
struct strbuf out = STRBUF_INIT;
|
|
|
|
size_t i;
|
|
|
|
|
|
|
|
strbuf_grow(&out, val->len);
|
|
|
|
i = 0;
|
|
|
|
while (i < val->len) {
|
|
|
|
char c = val->buf[i++];
|
|
|
|
if (c == '\n') {
|
|
|
|
/* Collapse continuation down to a single space. */
|
|
|
|
while (i < val->len && isspace(val->buf[i]))
|
|
|
|
i++;
|
|
|
|
strbuf_addch(&out, ' ');
|
|
|
|
} else {
|
|
|
|
strbuf_addch(&out, c);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Empty lines may have left us with whitespace cruft at the edges */
|
|
|
|
strbuf_trim(&out);
|
|
|
|
|
|
|
|
/* output goes back to val as if we modified it in-place */
|
|
|
|
strbuf_swap(&out, val);
|
|
|
|
strbuf_release(&out);
|
|
|
|
}
|
|
|
|
|
2024-10-13 19:58:42 +08:00
|
|
|
static struct trailer_block *trailer_block_new(void)
|
2024-05-02 12:54:22 +08:00
|
|
|
{
|
2024-10-13 19:58:42 +08:00
|
|
|
struct trailer_block *trailer_block = xcalloc(1, sizeof(*trailer_block));
|
|
|
|
return trailer_block;
|
2024-05-02 12:54:22 +08:00
|
|
|
}
|
|
|
|
|
2024-10-13 19:58:42 +08:00
|
|
|
static struct trailer_block *trailer_block_get(const struct process_trailer_options *opts,
|
|
|
|
const char *str)
|
2024-05-02 12:54:25 +08:00
|
|
|
{
|
2024-10-13 19:58:42 +08:00
|
|
|
struct trailer_block *trailer_block = trailer_block_new();
|
2024-05-02 12:54:25 +08:00
|
|
|
size_t end_of_log_message = 0, trailer_block_start = 0;
|
|
|
|
struct strbuf **trailer_lines, **ptr;
|
|
|
|
char **trailer_strings = NULL;
|
|
|
|
size_t nr = 0, alloc = 0;
|
|
|
|
char **last = NULL;
|
|
|
|
|
|
|
|
trailer_config_init();
|
|
|
|
|
|
|
|
end_of_log_message = find_end_of_log_message(str, opts->no_divider);
|
|
|
|
trailer_block_start = find_trailer_block_start(str, end_of_log_message);
|
|
|
|
|
|
|
|
trailer_lines = strbuf_split_buf(str + trailer_block_start,
|
|
|
|
end_of_log_message - trailer_block_start,
|
|
|
|
'\n',
|
|
|
|
0);
|
|
|
|
for (ptr = trailer_lines; *ptr; ptr++) {
|
|
|
|
if (last && isspace((*ptr)->buf[0])) {
|
|
|
|
struct strbuf sb = STRBUF_INIT;
|
|
|
|
strbuf_attach(&sb, *last, strlen(*last), strlen(*last));
|
|
|
|
strbuf_addbuf(&sb, *ptr);
|
|
|
|
*last = strbuf_detach(&sb, NULL);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
ALLOC_GROW(trailer_strings, nr + 1, alloc);
|
|
|
|
trailer_strings[nr] = strbuf_detach(*ptr, NULL);
|
|
|
|
last = find_separator(trailer_strings[nr], separators) >= 1
|
|
|
|
? &trailer_strings[nr]
|
|
|
|
: NULL;
|
|
|
|
nr++;
|
|
|
|
}
|
|
|
|
strbuf_list_free(trailer_lines);
|
|
|
|
|
2024-10-13 19:58:42 +08:00
|
|
|
trailer_block->blank_line_before_trailer = ends_with_blank_line(str,
|
|
|
|
trailer_block_start);
|
|
|
|
trailer_block->start = trailer_block_start;
|
|
|
|
trailer_block->end = end_of_log_message;
|
|
|
|
trailer_block->trailers = trailer_strings;
|
|
|
|
trailer_block->trailer_nr = nr;
|
2024-05-02 12:54:25 +08:00
|
|
|
|
2024-10-13 19:58:42 +08:00
|
|
|
return trailer_block;
|
2024-05-02 12:54:25 +08:00
|
|
|
}
|
|
|
|
|
2023-09-09 14:16:13 +08:00
|
|
|
/*
|
2024-10-13 19:58:42 +08:00
|
|
|
* Parse trailers in "str", populating the trailer_block and "trailer_objects"
|
2023-09-09 14:16:13 +08:00
|
|
|
* linked list structure.
|
|
|
|
*/
|
2024-10-13 19:58:42 +08:00
|
|
|
struct trailer_block *parse_trailers(const struct process_trailer_options *opts,
|
|
|
|
const char *str,
|
|
|
|
struct list_head *trailer_objects)
|
2014-10-14 02:16:27 +08:00
|
|
|
{
|
2024-10-13 19:58:42 +08:00
|
|
|
struct trailer_block *trailer_block;
|
2016-10-21 05:39:48 +08:00
|
|
|
struct strbuf tok = STRBUF_INIT;
|
|
|
|
struct strbuf val = STRBUF_INIT;
|
2018-08-23 08:45:44 +08:00
|
|
|
size_t i;
|
2014-10-14 02:16:27 +08:00
|
|
|
|
2024-10-13 19:58:42 +08:00
|
|
|
trailer_block = trailer_block_get(opts, str);
|
2014-10-14 02:16:27 +08:00
|
|
|
|
2024-10-13 19:58:42 +08:00
|
|
|
for (i = 0; i < trailer_block->trailer_nr; i++) {
|
2016-10-22 01:55:00 +08:00
|
|
|
int separator_pos;
|
2024-10-13 19:58:42 +08:00
|
|
|
char *trailer = trailer_block->trailers[i];
|
2024-03-12 17:17:37 +08:00
|
|
|
if (starts_with(trailer, comment_line_str))
|
2016-10-22 01:55:03 +08:00
|
|
|
continue;
|
2016-11-03 01:29:19 +08:00
|
|
|
separator_pos = find_separator(trailer, separators);
|
2016-10-22 01:55:00 +08:00
|
|
|
if (separator_pos >= 1) {
|
2016-11-03 01:29:19 +08:00
|
|
|
parse_trailer(&tok, &val, NULL, trailer,
|
2016-10-22 01:55:00 +08:00
|
|
|
separator_pos);
|
2017-08-15 18:23:29 +08:00
|
|
|
if (opts->unfold)
|
|
|
|
unfold_value(&val);
|
2024-05-02 12:54:26 +08:00
|
|
|
add_trailer_item(trailer_objects,
|
2016-11-03 01:29:19 +08:00
|
|
|
strbuf_detach(&tok, NULL),
|
|
|
|
strbuf_detach(&val, NULL));
|
2017-08-15 18:23:21 +08:00
|
|
|
} else if (!opts->only_trailers) {
|
2016-11-03 01:29:19 +08:00
|
|
|
strbuf_addstr(&val, trailer);
|
2016-10-22 01:55:01 +08:00
|
|
|
strbuf_strip_suffix(&val, "\n");
|
2024-05-02 12:54:26 +08:00
|
|
|
add_trailer_item(trailer_objects,
|
2016-10-22 01:55:01 +08:00
|
|
|
NULL,
|
|
|
|
strbuf_detach(&val, NULL));
|
2014-11-09 17:23:39 +08:00
|
|
|
}
|
2014-10-14 02:16:27 +08:00
|
|
|
}
|
2024-05-02 12:54:23 +08:00
|
|
|
|
2024-10-13 19:58:42 +08:00
|
|
|
return trailer_block;
|
2014-10-14 02:16:27 +08:00
|
|
|
}
|
2014-10-14 02:16:28 +08:00
|
|
|
|
2024-03-01 08:14:41 +08:00
|
|
|
void free_trailers(struct list_head *trailers)
|
2014-10-14 02:16:28 +08:00
|
|
|
{
|
2016-10-21 05:39:47 +08:00
|
|
|
struct list_head *pos, *p;
|
2024-03-01 08:14:40 +08:00
|
|
|
list_for_each_safe(pos, p, trailers) {
|
2016-10-21 05:39:47 +08:00
|
|
|
list_del(pos);
|
|
|
|
free_trailer_item(list_entry(pos, struct trailer_item, list));
|
2014-10-14 02:16:28 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2024-10-13 19:58:42 +08:00
|
|
|
size_t trailer_block_start(struct trailer_block *trailer_block)
|
2016-11-03 01:29:19 +08:00
|
|
|
{
|
2024-10-13 19:58:42 +08:00
|
|
|
return trailer_block->start;
|
2024-05-02 12:54:22 +08:00
|
|
|
}
|
2016-11-03 01:29:19 +08:00
|
|
|
|
2024-10-13 19:58:42 +08:00
|
|
|
size_t trailer_block_end(struct trailer_block *trailer_block)
|
2024-05-02 12:54:22 +08:00
|
|
|
{
|
2024-10-13 19:58:42 +08:00
|
|
|
return trailer_block->end;
|
2024-05-02 12:54:22 +08:00
|
|
|
}
|
2016-11-03 01:29:19 +08:00
|
|
|
|
2024-10-13 19:58:42 +08:00
|
|
|
int blank_line_before_trailer_block(struct trailer_block *trailer_block)
|
2024-05-02 12:54:22 +08:00
|
|
|
{
|
2024-10-13 19:58:42 +08:00
|
|
|
return trailer_block->blank_line_before_trailer;
|
2016-11-03 01:29:19 +08:00
|
|
|
}
|
|
|
|
|
2024-10-13 19:58:42 +08:00
|
|
|
void trailer_block_release(struct trailer_block *trailer_block)
|
2016-11-03 01:29:19 +08:00
|
|
|
{
|
2018-08-23 08:45:44 +08:00
|
|
|
size_t i;
|
2024-10-13 19:58:42 +08:00
|
|
|
for (i = 0; i < trailer_block->trailer_nr; i++)
|
|
|
|
free(trailer_block->trailers[i]);
|
|
|
|
free(trailer_block->trailers);
|
|
|
|
free(trailer_block);
|
2016-11-03 01:29:19 +08:00
|
|
|
}
|
2017-08-15 18:23:56 +08:00
|
|
|
|
2024-03-15 14:55:05 +08:00
|
|
|
void format_trailers(const struct process_trailer_options *opts,
|
|
|
|
struct list_head *trailers,
|
|
|
|
struct strbuf *out)
|
2017-08-15 18:23:56 +08:00
|
|
|
{
|
2024-11-05 14:17:17 +08:00
|
|
|
struct strbuf tok = STRBUF_INIT;
|
|
|
|
struct strbuf val = STRBUF_INIT;
|
2019-01-29 05:33:37 +08:00
|
|
|
size_t origlen = out->len;
|
2024-03-15 14:55:01 +08:00
|
|
|
struct list_head *pos;
|
|
|
|
struct trailer_item *item;
|
2017-08-15 18:25:27 +08:00
|
|
|
|
2024-03-15 14:55:01 +08:00
|
|
|
list_for_each(pos, trailers) {
|
|
|
|
item = list_entry(pos, struct trailer_item, list);
|
|
|
|
if (item->token) {
|
2024-11-05 14:17:17 +08:00
|
|
|
strbuf_reset(&tok);
|
2024-03-15 14:55:01 +08:00
|
|
|
strbuf_addstr(&tok, item->token);
|
2024-11-05 14:17:17 +08:00
|
|
|
strbuf_reset(&val);
|
2024-03-15 14:55:01 +08:00
|
|
|
strbuf_addstr(&val, item->value);
|
2017-08-15 18:25:27 +08:00
|
|
|
|
2024-03-15 14:55:04 +08:00
|
|
|
/*
|
|
|
|
* Skip key/value pairs where the value was empty. This
|
|
|
|
* can happen from trailers specified without a
|
|
|
|
* separator, like `--trailer "Reviewed-by"` (no
|
|
|
|
* corresponding value).
|
|
|
|
*/
|
|
|
|
if (opts->trim_empty && !strlen(item->value))
|
|
|
|
continue;
|
2017-08-15 18:25:27 +08:00
|
|
|
|
2019-01-29 05:33:34 +08:00
|
|
|
if (!opts->filter || opts->filter(&tok, opts->filter_data)) {
|
2019-01-29 05:33:37 +08:00
|
|
|
if (opts->separator && out->len != origlen)
|
|
|
|
strbuf_addbuf(out, opts->separator);
|
2019-01-29 05:33:35 +08:00
|
|
|
if (!opts->value_only)
|
2020-12-09 23:52:07 +08:00
|
|
|
strbuf_addbuf(out, &tok);
|
2020-12-09 23:52:08 +08:00
|
|
|
if (!opts->key_only && !opts->value_only) {
|
|
|
|
if (opts->key_value_separator)
|
|
|
|
strbuf_addbuf(out, opts->key_value_separator);
|
2024-03-15 14:55:04 +08:00
|
|
|
else {
|
|
|
|
char c = last_non_space_char(tok.buf);
|
|
|
|
if (c && !strchr(separators, c))
|
|
|
|
strbuf_addf(out, "%c ", separators[0]);
|
|
|
|
}
|
2020-12-09 23:52:08 +08:00
|
|
|
}
|
2020-12-09 23:52:07 +08:00
|
|
|
if (!opts->key_only)
|
|
|
|
strbuf_addbuf(out, &val);
|
2019-01-29 05:33:37 +08:00
|
|
|
if (!opts->separator)
|
|
|
|
strbuf_addch(out, '\n');
|
2019-01-29 05:33:34 +08:00
|
|
|
}
|
2017-08-15 18:25:27 +08:00
|
|
|
} else if (!opts->only_trailers) {
|
2019-01-29 05:33:37 +08:00
|
|
|
if (opts->separator && out->len != origlen) {
|
|
|
|
strbuf_addbuf(out, opts->separator);
|
|
|
|
}
|
2024-03-15 14:55:01 +08:00
|
|
|
strbuf_addstr(out, item->value);
|
format_trailer_info(): append newline for non-trailer lines
This wraps up the preparatory refactors to unify the trailer formatters.
Two patches ago we made format_trailer_info() use trailer_item objects
instead of the "trailers" string array. The strings in the array
include trailing newlines, because the string array is split up with
trailer_lines = strbuf_split_buf(str + trailer_block_start,
end_of_log_message - trailer_block_start,
'\n',
0);
in trailer_info_get() and strbuf_split_buf() includes the terminator (in
this case the newline character '\n') for each split-up substring.
And before we made the transition to use trailer_item objects for it,
format_trailer_info() called parse_trailer() (which trims newlines) for
trailer lines but did _not_ call parse_trailer() for non-trailer lines.
So for trailer lines it had to add back the trimmed newline like this
if (!opts->separator)
strbuf_addch(out, '\n');
But for non-trailer lines it didn't have to add back the newline because
it could just reuse same string in the "trailers" string array (which
again, already included the trailing newline).
Now that format_trailer_info() uses trailer_item objects for all cases,
it can't rely on "trailers" string array anymore. And so it must be
taught to add a newline back when printing non-trailer lines, just like
it already does for trailer lines. Do so now.
The test suite can pass again without the need to hide failures
with *_failure, so flip the affected test cases back to *_success. Now,
format_trailer_info() is in better shape to supersede format_trailers(),
which we'll do in the next commit.
Signed-off-by: Linus Arver <linusa@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2024-03-15 14:55:03 +08:00
|
|
|
if (opts->separator)
|
2019-01-29 05:33:37 +08:00
|
|
|
strbuf_rtrim(out);
|
format_trailer_info(): append newline for non-trailer lines
This wraps up the preparatory refactors to unify the trailer formatters.
Two patches ago we made format_trailer_info() use trailer_item objects
instead of the "trailers" string array. The strings in the array
include trailing newlines, because the string array is split up with
trailer_lines = strbuf_split_buf(str + trailer_block_start,
end_of_log_message - trailer_block_start,
'\n',
0);
in trailer_info_get() and strbuf_split_buf() includes the terminator (in
this case the newline character '\n') for each split-up substring.
And before we made the transition to use trailer_item objects for it,
format_trailer_info() called parse_trailer() (which trims newlines) for
trailer lines but did _not_ call parse_trailer() for non-trailer lines.
So for trailer lines it had to add back the trimmed newline like this
if (!opts->separator)
strbuf_addch(out, '\n');
But for non-trailer lines it didn't have to add back the newline because
it could just reuse same string in the "trailers" string array (which
again, already included the trailing newline).
Now that format_trailer_info() uses trailer_item objects for all cases,
it can't rely on "trailers" string array anymore. And so it must be
taught to add a newline back when printing non-trailer lines, just like
it already does for trailer lines. Do so now.
The test suite can pass again without the need to hide failures
with *_failure, so flip the affected test cases back to *_success. Now,
format_trailer_info() is in better shape to supersede format_trailers(),
which we'll do in the next commit.
Signed-off-by: Linus Arver <linusa@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2024-03-15 14:55:03 +08:00
|
|
|
else
|
|
|
|
strbuf_addch(out, '\n');
|
2017-08-15 18:25:27 +08:00
|
|
|
}
|
|
|
|
}
|
2024-11-05 14:17:17 +08:00
|
|
|
|
|
|
|
strbuf_release(&tok);
|
|
|
|
strbuf_release(&val);
|
2017-08-15 18:23:56 +08:00
|
|
|
}
|
|
|
|
|
trailer: reorder format_trailers_from_commit() parameters
Currently there are two functions for formatting trailers in
<trailer.h>:
void format_trailers(const struct process_trailer_options *,
struct list_head *trailers, FILE *outfile);
void format_trailers_from_commit(struct strbuf *out, const char *msg,
const struct process_trailer_options *opts);
and although they are similar enough (even taking the same
process_trailer_options struct pointer) they are used quite differently.
One might intuitively think that format_trailers_from_commit() builds on
top of format_trailers(), but this is not the case. Instead
format_trailers_from_commit() calls format_trailer_info() and
format_trailers() is never called in that codepath.
This is a preparatory refactor to help us deprecate format_trailers() in
favor of format_trailer_info() (at which point we can rename the latter
to the former). When the deprecation is complete, both
format_trailers_from_commit(), and the interpret-trailers builtin will
be able to call into the same helper function (instead of
format_trailers() and format_trailer_info(), respectively). Unifying the
formatters is desirable because it simplifies the API.
Reorder parameters for format_trailers_from_commit() to prefer
const struct process_trailer_options *opts
as the first parameter, because these options are intimately tied to
formatting trailers. And take
struct strbuf *out
last, because it's an "out parameter" (something that the caller wants
to use as the output of this function).
Similarly, reorder parameters for format_trailer_info(), because later
on we will unify the two together.
Signed-off-by: Linus Arver <linusa@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2024-03-01 08:14:42 +08:00
|
|
|
void format_trailers_from_commit(const struct process_trailer_options *opts,
|
|
|
|
const char *msg,
|
|
|
|
struct strbuf *out)
|
2017-08-15 18:23:56 +08:00
|
|
|
{
|
2024-03-01 08:14:46 +08:00
|
|
|
LIST_HEAD(trailer_objects);
|
2024-10-13 19:58:42 +08:00
|
|
|
struct trailer_block *trailer_block = parse_trailers(opts, msg, &trailer_objects);
|
2024-03-01 08:14:46 +08:00
|
|
|
|
2024-03-01 08:14:45 +08:00
|
|
|
/* If we want the whole block untouched, we can take the fast path. */
|
|
|
|
if (!opts->only_trailers && !opts->unfold && !opts->filter &&
|
|
|
|
!opts->separator && !opts->key_only && !opts->value_only &&
|
|
|
|
!opts->key_value_separator) {
|
2024-10-13 19:58:42 +08:00
|
|
|
strbuf_add(out, msg + trailer_block->start,
|
|
|
|
trailer_block->end - trailer_block->start);
|
2024-03-01 08:14:45 +08:00
|
|
|
} else
|
2024-03-15 14:55:05 +08:00
|
|
|
format_trailers(opts, &trailer_objects, out);
|
2024-03-01 08:14:45 +08:00
|
|
|
|
2024-03-01 08:14:46 +08:00
|
|
|
free_trailers(&trailer_objects);
|
2024-10-13 19:58:42 +08:00
|
|
|
trailer_block_release(trailer_block);
|
2017-08-15 18:23:56 +08:00
|
|
|
}
|
2020-09-27 16:40:01 +08:00
|
|
|
|
|
|
|
void trailer_iterator_init(struct trailer_iterator *iter, const char *msg)
|
|
|
|
{
|
|
|
|
struct process_trailer_options opts = PROCESS_TRAILER_OPTIONS_INIT;
|
|
|
|
strbuf_init(&iter->key, 0);
|
|
|
|
strbuf_init(&iter->val, 0);
|
|
|
|
opts.no_divider = 1;
|
2024-10-13 19:58:42 +08:00
|
|
|
iter->internal.trailer_block = trailer_block_get(&opts, msg);
|
2023-09-09 14:16:12 +08:00
|
|
|
iter->internal.cur = 0;
|
2020-09-27 16:40:01 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
int trailer_iterator_advance(struct trailer_iterator *iter)
|
|
|
|
{
|
2024-10-13 19:58:42 +08:00
|
|
|
if (iter->internal.cur < iter->internal.trailer_block->trailer_nr) {
|
|
|
|
char *line = iter->internal.trailer_block->trailers[iter->internal.cur++];
|
2024-05-02 12:54:20 +08:00
|
|
|
int separator_pos = find_separator(line, separators);
|
2020-09-27 16:40:01 +08:00
|
|
|
|
2024-05-02 12:54:20 +08:00
|
|
|
iter->raw = line;
|
2020-09-27 16:40:01 +08:00
|
|
|
strbuf_reset(&iter->key);
|
|
|
|
strbuf_reset(&iter->val);
|
|
|
|
parse_trailer(&iter->key, &iter->val, NULL,
|
2024-05-02 12:54:20 +08:00
|
|
|
line, separator_pos);
|
2024-03-01 08:14:39 +08:00
|
|
|
/* Always unfold values during iteration. */
|
2020-09-27 16:40:01 +08:00
|
|
|
unfold_value(&iter->val);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
void trailer_iterator_release(struct trailer_iterator *iter)
|
|
|
|
{
|
2024-10-13 19:58:42 +08:00
|
|
|
trailer_block_release(iter->internal.trailer_block);
|
2020-09-27 16:40:01 +08:00
|
|
|
strbuf_release(&iter->val);
|
|
|
|
strbuf_release(&iter->key);
|
|
|
|
}
|
2024-05-06 02:49:09 +08:00
|
|
|
|
|
|
|
int amend_file_with_trailers(const char *path, const struct strvec *trailer_args)
|
|
|
|
{
|
|
|
|
struct child_process run_trailer = CHILD_PROCESS_INIT;
|
|
|
|
|
|
|
|
run_trailer.git_cmd = 1;
|
|
|
|
strvec_pushl(&run_trailer.args, "interpret-trailers",
|
|
|
|
"--in-place", "--no-divider",
|
|
|
|
path, NULL);
|
|
|
|
strvec_pushv(&run_trailer.args, trailer_args->v);
|
|
|
|
return run_command(&run_trailer);
|
|
|
|
}
|