2017-12-12 08:55:35 +00:00
|
|
|
#ifndef PRETTY_H
|
|
|
|
#define PRETTY_H
|
|
|
|
|
date API: create a date.h, split from cache.h
Move the declaration of the date.c functions from cache.h, and adjust
the relevant users to include the new date.h header.
The show_ident_date() function belonged in pretty.h (it's defined in
pretty.c), its two users outside of pretty.c didn't strictly need to
include pretty.h, as they get it indirectly, but let's add it to them
anyway.
Similarly, the change to "builtin/{fast-import,show-branch,tag}.c"
isn't needed as far as the compiler is concerned, but since they all
use the "DATE_MODE()" macro we now define in date.h, let's have them
include it.
We could simply include this new header in "cache.h", but as this
change shows these functions weren't common enough to warrant
including in it in the first place. By moving them out of cache.h
changes to this API will no longer cause a (mostly) full re-build of
the project when "make" is run.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-02-16 08:14:02 +00:00
|
|
|
#include "date.h"
|
2018-08-15 17:54:05 +00:00
|
|
|
#include "string-list.h"
|
|
|
|
|
2017-12-12 08:55:35 +00:00
|
|
|
struct commit;
|
2023-02-24 00:09:22 +00:00
|
|
|
struct repository;
|
2018-08-15 17:54:05 +00:00
|
|
|
struct strbuf;
|
2021-02-13 01:52:41 +00:00
|
|
|
struct process_trailer_options;
|
2017-12-12 08:55:35 +00:00
|
|
|
|
|
|
|
/* Commit formats */
|
|
|
|
enum cmit_fmt {
|
|
|
|
CMIT_FMT_RAW,
|
|
|
|
CMIT_FMT_MEDIUM,
|
|
|
|
CMIT_FMT_DEFAULT = CMIT_FMT_MEDIUM,
|
|
|
|
CMIT_FMT_SHORT,
|
|
|
|
CMIT_FMT_FULL,
|
|
|
|
CMIT_FMT_FULLER,
|
|
|
|
CMIT_FMT_ONELINE,
|
|
|
|
CMIT_FMT_EMAIL,
|
|
|
|
CMIT_FMT_MBOXRD,
|
|
|
|
CMIT_FMT_USERFORMAT,
|
|
|
|
|
|
|
|
CMIT_FMT_UNSPECIFIED
|
|
|
|
};
|
|
|
|
|
2021-02-28 11:22:47 +00:00
|
|
|
struct pretty_print_describe_status {
|
|
|
|
unsigned int max_invocations;
|
|
|
|
};
|
|
|
|
|
2017-12-12 08:55:35 +00:00
|
|
|
struct pretty_print_context {
|
|
|
|
/*
|
|
|
|
* Callers should tweak these to change the behavior of pp_* functions.
|
|
|
|
*/
|
|
|
|
enum cmit_fmt fmt;
|
|
|
|
int abbrev;
|
format-patch: return an allocated string from log_write_email_headers()
When pretty-printing a commit in the email format, we have to fill in
the "after subject" field of the pretty_print_context with any extra
headers the user provided (e.g., from "--to" or "--cc" options) plus any
special MIME headers.
We return an out-pointer that sometimes points to a newly heap-allocated
string and sometimes not. To avoid leaking, we store the allocated
version in a buffer with static lifetime, which is ugly. Worse, as we
extend the header feature, we'll end up having to repeat this ugly
pattern.
Instead, let's have our out-pointer pass ownership back to the caller,
and duplicate the string when necessary. This does mean one extra
allocation per commit when you use extra headers, but in the context of
format-patch which is showing diffs, I don't think that's even
measurable.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2024-03-20 00:35:33 +00:00
|
|
|
char *after_subject;
|
2017-12-12 08:55:35 +00:00
|
|
|
int preserve_subject;
|
|
|
|
struct date_mode date_mode;
|
|
|
|
unsigned date_mode_explicit:1;
|
|
|
|
int expand_tabs_in_log;
|
|
|
|
int need_8bit_cte;
|
|
|
|
char *notes_message;
|
|
|
|
struct reflog_walk_info *reflog_info;
|
|
|
|
struct rev_info *rev;
|
|
|
|
const char *output_encoding;
|
|
|
|
struct string_list *mailmap;
|
|
|
|
int color;
|
|
|
|
struct ident_split *from_ident;
|
2020-04-08 04:31:38 +00:00
|
|
|
unsigned encode_email_headers:1;
|
2021-02-28 11:22:47 +00:00
|
|
|
struct pretty_print_describe_status *describe_status;
|
2017-12-12 08:55:35 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Fields below here are manipulated internally by pp_* functions and
|
|
|
|
* should not be counted on by callers.
|
|
|
|
*/
|
|
|
|
struct string_list in_body_headers;
|
|
|
|
int graph_width;
|
|
|
|
};
|
|
|
|
|
2017-12-12 08:55:35 +00:00
|
|
|
/* Check whether commit format is mail. */
|
2017-12-12 08:55:35 +00:00
|
|
|
static inline int cmit_fmt_is_mail(enum cmit_fmt fmt)
|
|
|
|
{
|
|
|
|
return (fmt == CMIT_FMT_EMAIL || fmt == CMIT_FMT_MBOXRD);
|
|
|
|
}
|
|
|
|
|
2021-06-22 16:03:54 +00:00
|
|
|
/*
|
|
|
|
* Examine the user-specified format given by "fmt" (or if NULL, the global one
|
|
|
|
* previously saved by get_commit_format()), and set flags based on which items
|
|
|
|
* the format will need when it is expanded.
|
|
|
|
*/
|
2017-12-12 08:55:35 +00:00
|
|
|
struct userformat_want {
|
|
|
|
unsigned notes:1;
|
2019-01-11 06:30:46 +00:00
|
|
|
unsigned source:1;
|
2021-06-22 16:04:50 +00:00
|
|
|
unsigned decorate:1;
|
2017-12-12 08:55:35 +00:00
|
|
|
};
|
|
|
|
void userformat_find_requirements(const char *fmt, struct userformat_want *w);
|
2017-12-12 08:55:35 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Shortcut for invoking pretty_print_commit if we do not have any context.
|
|
|
|
* Context would be set empty except "fmt".
|
|
|
|
*/
|
2017-12-12 08:55:35 +00:00
|
|
|
void pp_commit_easy(enum cmit_fmt fmt, const struct commit *commit,
|
|
|
|
struct strbuf *sb);
|
2017-12-12 08:55:35 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Get information about user and date from "line", format it and
|
|
|
|
* put it into "sb".
|
|
|
|
* Format of "line" must be readable for split_ident_line function.
|
|
|
|
* The resulting format is "what: name <email> date".
|
|
|
|
*/
|
2017-12-12 08:55:35 +00:00
|
|
|
void pp_user_info(struct pretty_print_context *pp, const char *what,
|
|
|
|
struct strbuf *sb, const char *line,
|
|
|
|
const char *encoding);
|
2017-12-12 08:55:35 +00:00
|
|
|
|
|
|
|
/*
|
pretty: split oneline and email subject printing
The pp_title_line() function is used for two formats: the oneline format
and the subject line of the email format. But most of the logic in the
function does not make any sense for oneline; it is about special
formatting of email headers.
Lumping the two formats together made sense long ago in 4234a76167
(Extend --pretty=oneline to cover the first paragraph, 2007-06-11), when
there was a lot of manual logic to paste lines together. But later,
88c44735ab (pretty: factor out format_subject(), 2008-12-27) pulled that
logic into its own function.
We can implement the oneline format by just calling that one function.
This makes the intention of the code much more clear, as we know we only
need to worry about those extra email options when dealing with actual
email.
While the intent here is cleanup, it is possible to trigger these cases
in practice by running format-patch with an explicit --oneline option.
But if you did, the results are basically nonsense. For example, with
the preserve_subject flag:
$ printf "%s\n" one two three | git commit --allow-empty -F -
$ git format-patch -1 --stdout -k | grep ^Subject
Subject: =?UTF-8?q?one=0Atwo=0Athree?=
$ git format-patch -1 --stdout -k --oneline --no-signature
2af7fbe one
two
three
Or with extra headers:
$ git format-patch -1 --stdout --cc=me --oneline --no-signature
2af7fbe one two three
Cc: me
So I'd actually consider this to be an improvement, though you are
probably crazy to use other formats with format-patch in the first place
(arguably it should forbid non-email formats entirely, but that's a
bigger change).
As a bonus, it eliminates some pointless extra allocations for the
oneline output. The email code, since it has to deal with wrapping,
formats into an extra auxiliary buffer. The speedup is tiny, though like
"rev-list --no-abbrev --format=oneline" seems to improve by a consistent
1-2% for me.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2024-03-20 00:28:51 +00:00
|
|
|
* Format subject line of commit message taken from "msg_p" and
|
2017-12-12 08:55:35 +00:00
|
|
|
* put it into "sb".
|
|
|
|
* First line of "msg_p" is also affected.
|
|
|
|
*/
|
pretty: split oneline and email subject printing
The pp_title_line() function is used for two formats: the oneline format
and the subject line of the email format. But most of the logic in the
function does not make any sense for oneline; it is about special
formatting of email headers.
Lumping the two formats together made sense long ago in 4234a76167
(Extend --pretty=oneline to cover the first paragraph, 2007-06-11), when
there was a lot of manual logic to paste lines together. But later,
88c44735ab (pretty: factor out format_subject(), 2008-12-27) pulled that
logic into its own function.
We can implement the oneline format by just calling that one function.
This makes the intention of the code much more clear, as we know we only
need to worry about those extra email options when dealing with actual
email.
While the intent here is cleanup, it is possible to trigger these cases
in practice by running format-patch with an explicit --oneline option.
But if you did, the results are basically nonsense. For example, with
the preserve_subject flag:
$ printf "%s\n" one two three | git commit --allow-empty -F -
$ git format-patch -1 --stdout -k | grep ^Subject
Subject: =?UTF-8?q?one=0Atwo=0Athree?=
$ git format-patch -1 --stdout -k --oneline --no-signature
2af7fbe one
two
three
Or with extra headers:
$ git format-patch -1 --stdout --cc=me --oneline --no-signature
2af7fbe one two three
Cc: me
So I'd actually consider this to be an improvement, though you are
probably crazy to use other formats with format-patch in the first place
(arguably it should forbid non-email formats entirely, but that's a
bigger change).
As a bonus, it eliminates some pointless extra allocations for the
oneline output. The email code, since it has to deal with wrapping,
formats into an extra auxiliary buffer. The speedup is tiny, though like
"rev-list --no-abbrev --format=oneline" seems to improve by a consistent
1-2% for me.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2024-03-20 00:28:51 +00:00
|
|
|
void pp_email_subject(struct pretty_print_context *pp, const char **msg_p,
|
|
|
|
struct strbuf *sb, const char *encoding,
|
|
|
|
int need_8bit_cte);
|
2017-12-12 08:55:35 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Get current state of commit message from "msg_p" and continue formatting
|
|
|
|
* by adding indentation and '>' signs. Put result into "sb".
|
|
|
|
*/
|
2017-12-12 08:55:35 +00:00
|
|
|
void pp_remainder(struct pretty_print_context *pp, const char **msg_p,
|
|
|
|
struct strbuf *sb, int indent);
|
|
|
|
|
2017-12-12 08:55:35 +00:00
|
|
|
/*
|
|
|
|
* Create a text message about commit using given "format" and "context".
|
|
|
|
* Put the result to "sb".
|
|
|
|
* Please use this function for custom formats.
|
|
|
|
*/
|
2018-11-14 00:13:00 +00:00
|
|
|
void repo_format_commit_message(struct repository *r,
|
|
|
|
const struct commit *commit,
|
2017-12-12 08:55:35 +00:00
|
|
|
const char *format, struct strbuf *sb,
|
|
|
|
const struct pretty_print_context *context);
|
|
|
|
|
2017-12-12 08:55:35 +00:00
|
|
|
/*
|
|
|
|
* Parse given arguments from "arg", check it for correctness and
|
|
|
|
* fill struct rev_info.
|
|
|
|
*/
|
2017-12-12 08:55:35 +00:00
|
|
|
void get_commit_format(const char *arg, struct rev_info *);
|
|
|
|
|
2017-12-12 08:55:35 +00:00
|
|
|
/*
|
|
|
|
* Make a commit message with all rules from given "pp"
|
|
|
|
* and put it into "sb".
|
|
|
|
* Please use this function if you have a context (candidate for "pp").
|
|
|
|
*/
|
2017-12-12 08:55:35 +00:00
|
|
|
void pretty_print_commit(struct pretty_print_context *pp,
|
|
|
|
const struct commit *commit,
|
|
|
|
struct strbuf *sb);
|
|
|
|
|
2017-12-12 08:55:35 +00:00
|
|
|
/*
|
|
|
|
* Change line breaks in "msg" to "line_separator" and put it into "sb".
|
|
|
|
* Return "msg" itself.
|
|
|
|
*/
|
2017-12-12 08:55:35 +00:00
|
|
|
const char *format_subject(struct strbuf *sb, const char *msg,
|
|
|
|
const char *line_separator);
|
|
|
|
|
2017-12-12 08:55:35 +00:00
|
|
|
/* Check if "cmit_fmt" will produce an empty output. */
|
2017-12-12 08:55:35 +00:00
|
|
|
int commit_format_is_empty(enum cmit_fmt);
|
|
|
|
|
2020-08-21 21:41:49 +00:00
|
|
|
/* Make subject of commit message suitable for filename */
|
|
|
|
void format_sanitized_subject(struct strbuf *sb, const char *msg, size_t len);
|
|
|
|
|
2023-02-24 00:09:28 +00:00
|
|
|
int has_non_ascii(const char *text);
|
|
|
|
|
2021-02-13 01:52:41 +00:00
|
|
|
/*
|
|
|
|
* Set values of fields in "struct process_trailer_options"
|
|
|
|
* according to trailers arguments.
|
|
|
|
*/
|
|
|
|
int format_set_trailers_options(struct process_trailer_options *opts,
|
|
|
|
struct string_list *filter_list,
|
|
|
|
struct strbuf *sepbuf,
|
|
|
|
struct strbuf *kvsepbuf,
|
2021-02-13 01:52:42 +00:00
|
|
|
const char **arg,
|
|
|
|
char **invalid_arg);
|
2021-02-13 01:52:41 +00:00
|
|
|
|
date API: create a date.h, split from cache.h
Move the declaration of the date.c functions from cache.h, and adjust
the relevant users to include the new date.h header.
The show_ident_date() function belonged in pretty.h (it's defined in
pretty.c), its two users outside of pretty.c didn't strictly need to
include pretty.h, as they get it indirectly, but let's add it to them
anyway.
Similarly, the change to "builtin/{fast-import,show-branch,tag}.c"
isn't needed as far as the compiler is concerned, but since they all
use the "DATE_MODE()" macro we now define in date.h, let's have them
include it.
We could simply include this new header in "cache.h", but as this
change shows these functions weren't common enough to warrant
including in it in the first place. By moving them out of cache.h
changes to this API will no longer cause a (mostly) full re-build of
the project when "make" is run.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-02-16 08:14:02 +00:00
|
|
|
/*
|
|
|
|
* Like show_date, but pull the timestamp and tz parameters from
|
|
|
|
* the ident_split. It will also sanity-check the values and produce
|
|
|
|
* a well-known sentinel date if they appear bogus.
|
|
|
|
*/
|
|
|
|
const char *show_ident_date(const struct ident_split *id,
|
2024-04-05 17:44:59 +00:00
|
|
|
struct date_mode mode);
|
date API: create a date.h, split from cache.h
Move the declaration of the date.c functions from cache.h, and adjust
the relevant users to include the new date.h header.
The show_ident_date() function belonged in pretty.h (it's defined in
pretty.c), its two users outside of pretty.c didn't strictly need to
include pretty.h, as they get it indirectly, but let's add it to them
anyway.
Similarly, the change to "builtin/{fast-import,show-branch,tag}.c"
isn't needed as far as the compiler is concerned, but since they all
use the "DATE_MODE()" macro we now define in date.h, let's have them
include it.
We could simply include this new header in "cache.h", but as this
change shows these functions weren't common enough to warrant
including in it in the first place. By moving them out of cache.h
changes to this API will no longer cause a (mostly) full re-build of
the project when "make" is run.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-02-16 08:14:02 +00:00
|
|
|
|
|
|
|
|
2017-12-12 08:55:35 +00:00
|
|
|
#endif /* PRETTY_H */
|