# [PATCH 2/4] Export some email and pretty-printing functions 6 messages from 2008-02-17 to 2008-02-18. Participants: Daniel Barkalow, Junio C Hamano, Johannes Schindelin. Thread: https://gitlist.dev/t/12151 ## Daniel Barkalow, 2008-02-17 18:35 Subject: [PATCH 2/4] Export some email and pretty-printing functions Message-ID: URL: https://gitlist.dev/e/alpine.LNX.1.00.0802171335460.5816%40iabervon.org ``` These will be used for generating the cover letter in addition to the patch emails. Signed-off-by: Daniel Barkalow --- commit.h | 15 +++++++ log-tree.c | 126 ++++++++++++++++++++++++++++++++--------------------------- log-tree.h | 2 + pretty.c | 28 +++++++------- 4 files changed, 99 insertions(+), 72 deletions(-) diff --git a/commit.h b/commit.h index 10e2b5d..42b4825 100644 --- a/commit.h +++ b/commit.h @@ -71,6 +71,21 @@ extern void pretty_print_commit(enum cmit_fmt fmt, const struct commit*, int abbrev, const char *subject, const char *after_subject, enum date_mode, int non_ascii_present); +void add_user_info(const char *what, enum cmit_fmt fmt, struct strbuf *sb, + const char *line, enum date_mode dmode, + const char *encoding); +void pp_title_line(enum cmit_fmt fmt, + const char **msg_p, + struct strbuf *sb, + const char *subject, + const char *after_subject, + const char *encoding, + int plain_non_ascii); +void pp_remainder(enum cmit_fmt fmt, + const char **msg_p, + struct strbuf *sb, + int indent); + /** Removes the first commit from a list sorted by date, and adds all * of its parents. diff --git a/log-tree.c b/log-tree.c index 1f3fcf1..56c8b27 100644 --- a/log-tree.c +++ b/log-tree.c @@ -137,6 +137,72 @@ static int has_non_ascii(const char *s) return 0; } +void write_email_headers(struct rev_info *opt, const char *name, + const char **subject_p, const char **extra_headers_p) +{ + const char *subject = NULL; + const char *extra_headers = opt->extra_headers; + if (opt->total > 0) { + static char buffer[64]; + snprintf(buffer, sizeof(buffer), + "Subject: [%s %0*d/%d] ", + opt->subject_prefix, + digits_in_number(opt->total), + opt->nr, opt->total); + subject = buffer; + } else if (opt->total == 0 && opt->subject_prefix && *opt->subject_prefix) { + static char buffer[256]; + snprintf(buffer, sizeof(buffer), + "Subject: [%s] ", + opt->subject_prefix); + subject = buffer; + } else { + subject = "Subject: "; + } + + printf("From %s Mon Sep 17 00:00:00 2001\n", name); + if (opt->message_id) + printf("Message-Id: <%s>\n", opt->message_id); + if (opt->ref_message_id) + printf("In-Reply-To: <%s>\nReferences: <%s>\n", + opt->ref_message_id, opt->ref_message_id); + if (opt->mime_boundary) { + static char subject_buffer[1024]; + static char buffer[1024]; + snprintf(subject_buffer, sizeof(subject_buffer) - 1, + "%s" + "MIME-Version: 1.0\n" + "Content-Type: multipart/mixed;" + " boundary=\"%s%s\"\n" + "\n" + "This is a multi-part message in MIME " + "format.\n" + "--%s%s\n" + "Content-Type: text/plain; " + "charset=UTF-8; format=fixed\n" + "Content-Transfer-Encoding: 8bit\n\n", + extra_headers ? extra_headers : "", + mime_boundary_leader, opt->mime_boundary, + mime_boundary_leader, opt->mime_boundary); + extra_headers = subject_buffer; + + snprintf(buffer, sizeof(buffer) - 1, + "--%s%s\n" + "Content-Type: text/x-patch;" + " name=\"%s.diff\"\n" + "Content-Transfer-Encoding: 8bit\n" + "Content-Disposition: %s;" + " filename=\"%s.diff\"\n\n", + mime_boundary_leader, opt->mime_boundary, + name, + opt->no_inline ? "attachment" : "inline", + name); + opt->diffopt.stat_sep = buffer; + } + *subject_p = subject; + *extra_headers_p = extra_headers; +} + void show_log(struct rev_info *opt, const char *sep) { struct strbuf msgbuf; @@ -186,64 +252,8 @@ void show_log(struct rev_info *opt, const char *sep) */ if (opt->commit_format == CMIT_FMT_EMAIL) { - char *sha1 = sha1_to_hex(commit->object.sha1); - if (opt->total > 0) { - static char buffer[64]; - snprintf(buffer, sizeof(buffer), - "Subject: [%s %0*d/%d] ", - opt->subject_prefix, - digits_in_number(opt->total), - opt->nr, opt->total); - subject = buffer; - } else if (opt->total == 0 && opt->subject_prefix && *opt->subject_prefix) { - static char buffer[256]; - snprintf(buffer, sizeof(buffer), - "Subject: [%s] ", - opt->subject_prefix); - subject = buffer; - } else { - subject = "Subject: "; - } - - printf("From %s Mon Sep 17 00:00:00 2001\n", sha1); - if (opt->message_id) - printf("Message-Id: <%s>\n", opt->message_id); - if (opt->ref_message_id) - printf("In-Reply-To: <%s>\nReferences: <%s>\n", - opt->ref_message_id, opt->ref_message_id); - if (opt->mime_boundary) { - static char subject_buffer[1024]; - static char buffer[1024]; - snprintf(subject_buffer, sizeof(subject_buffer) - 1, - "%s" - "MIME-Version: 1.0\n" - "Content-Type: multipart/mixed;" - " boundary=\"%s%s\"\n" - "\n" - "This is a multi-part message in MIME " - "format.\n" - "--%s%s\n" - "Content-Type: text/plain; " - "charset=UTF-8; format=fixed\n" - "Content-Transfer-Encoding: 8bit\n\n", - extra_headers ? extra_headers : "", - mime_boundary_leader, opt->mime_boundary, - mime_boundary_leader, opt->mime_boundary); - extra_headers = subject_buffer; - - snprintf(buffer, sizeof(buffer) - 1, - "--%s%s\n" - "Content-Type: text/x-patch;" - " name=\"%s.diff\"\n" - "Content-Transfer-Encoding: 8bit\n" - "Content-Disposition: %s;" - " filename=\"%s.diff\"\n\n", - mime_boundary_leader, opt->mime_boundary, - sha1, - opt->no_inline ? "attachment" : "inline", - sha1); - opt->diffopt.stat_sep = buffer; - } + write_email_headers(opt, sha1_to_hex(commit->object.sha1), + &subject, &extra_headers); } else if (opt->commit_format != CMIT_FMT_USERFORMAT) { fputs(diff_get_color_opt(&opt->diffopt, DIFF_COMMIT), stdout); if (opt->commit_format != CMIT_FMT_ONELINE) diff --git a/log-tree.h b/log-tree.h index b33f7cd..7cab9ef 100644 --- a/log-tree.h +++ b/log-tree.h @@ -13,5 +13,7 @@ int log_tree_commit(struct rev_info *, struct commit *); int log_tree_opt_parse(struct rev_info *, const char **, int); void show_log(struct rev_info *opt, const char *sep); void show_decorations(struct commit *commit); +void write_email_headers(struct rev_info *opt, const char *name, + const char **subject_p, const char **extra_headers_p); #endif diff --git a/pretty.c b/pretty.c index b987ff2..f82380b 100644 --- a/pretty.c +++ b/pretty.c @@ -110,9 +110,9 @@ needquote: strbuf_addstr(sb, "?="); } -static void add_user_info(const char *what, enum cmit_fmt fmt, struct strbuf *sb, - const char *line, enum date_mode dmode, - const char *encoding) +void add_user_info(const char *what, enum cmit_fmt fmt, struct strbuf *sb, + const char *line, enum date_mode dmode, + const char *encoding) { char *date; int namelen; @@ -653,13 +653,13 @@ static void pp_header(enum cmit_fmt fmt, } } -static void pp_title_line(enum cmit_fmt fmt, - const char **msg_p, - struct strbuf *sb, - const char *subject, - const char *after_subject, - const char *encoding, - int plain_non_ascii) +void pp_title_line(enum cmit_fmt fmt, + const char **msg_p, + struct strbuf *sb, + const char *subject, + const char *after_subject, + const char *encoding, + int plain_non_ascii) { struct strbuf title; @@ -708,10 +708,10 @@ static void pp_title_line(enum cmit_fmt fmt, strbuf_release(&title); } -static void pp_remainder(enum cmit_fmt fmt, - const char **msg_p, - struct strbuf *sb, - int indent) +void pp_remainder(enum cmit_fmt fmt, + const char **msg_p, + struct strbuf *sb, + int indent) { int first = 1; for (;;) { -- 1.5.4.1.1350.g2b9ee ``` ## Junio C Hamano, 2008-02-18 03:45 Subject: Re: [PATCH 2/4] Export some email and pretty-printing functions Message-ID: <7vablzudvg.fsf@gitster.siamese.dyndns.org> URL: https://gitlist.dev/e/7vablzudvg.fsf%40gitster.siamese.dyndns.org In-Reply-To: ``` Daniel Barkalow writes: > +void add_user_info(const char *what, enum cmit_fmt fmt, struct strbuf *sb, > + const char *line, enum date_mode dmode, > + const char *encoding); Exactly the same comment about "the function name being too generic" from the last round still applies. ``` ## Johannes Schindelin, 2008-02-18 12:44 Subject: Re: [PATCH 2/4] Export some email and pretty-printing functions Message-ID: URL: https://gitlist.dev/e/alpine.LSU.1.00.0802181241440.30505%40racer.site In-Reply-To: ``` Hi, On Sun, 17 Feb 2008, Daniel Barkalow wrote: > diff --git a/commit.h b/commit.h > index 10e2b5d..42b4825 100644 > --- a/commit.h > +++ b/commit.h > @@ -71,6 +71,21 @@ extern void pretty_print_commit(enum cmit_fmt fmt, const struct commit*, > int abbrev, const char *subject, > const char *after_subject, enum date_mode, > int non_ascii_present); > +void add_user_info(const char *what, enum cmit_fmt fmt, struct strbuf *sb, > + const char *line, enum date_mode dmode, > + const char *encoding); > +void pp_title_line(enum cmit_fmt fmt, > + const char **msg_p, > + struct strbuf *sb, > + const char *subject, > + const char *after_subject, > + const char *encoding, > + int plain_non_ascii); > +void pp_remainder(enum cmit_fmt fmt, > + const char **msg_p, > + struct strbuf *sb, > + int indent); > + In addition to Junio's concern that add_user_info() really wants to be called pp_add_user_info(), I cannot help myself but suspect that pp_write_email_headers() -- which called for a new name, too -- also wants to live in pretty.c. Ciao, Dscho ``` ## Daniel Barkalow, 2008-02-18 17:00 Subject: Re: [PATCH 2/4] Export some email and pretty-printing functions Message-ID: URL: https://gitlist.dev/e/alpine.LNX.1.00.0802181156540.5816%40iabervon.org In-Reply-To: <7vablzudvg.fsf@gitster.siamese.dyndns.org> ``` On Sun, 17 Feb 2008, Junio C Hamano wrote: > Daniel Barkalow writes: > > > +void add_user_info(const char *what, enum cmit_fmt fmt, struct strbuf *sb, > > + const char *line, enum date_mode dmode, > > + const char *encoding); > > Exactly the same comment about "the function name being too > generic" from the last round still applies. pp_user_info() maybe? That also matches the other similar functions. -Daniel *This .sig left intentionally blank* ``` ## Daniel Barkalow, 2008-02-18 19:07 Subject: Re: [PATCH 2/4] Export some email and pretty-printing functions Message-ID: URL: https://gitlist.dev/e/alpine.LNX.1.00.0802181245580.5816%40iabervon.org In-Reply-To: ``` On Mon, 18 Feb 2008, Johannes Schindelin wrote: > Hi, > > On Sun, 17 Feb 2008, Daniel Barkalow wrote: > > > diff --git a/commit.h b/commit.h > > index 10e2b5d..42b4825 100644 > > --- a/commit.h > > +++ b/commit.h > > @@ -71,6 +71,21 @@ extern void pretty_print_commit(enum cmit_fmt fmt, const struct commit*, > > int abbrev, const char *subject, > > const char *after_subject, enum date_mode, > > int non_ascii_present); > > +void add_user_info(const char *what, enum cmit_fmt fmt, struct strbuf *sb, > > + const char *line, enum date_mode dmode, > > + const char *encoding); > > +void pp_title_line(enum cmit_fmt fmt, > > + const char **msg_p, > > + struct strbuf *sb, > > + const char *subject, > > + const char *after_subject, > > + const char *encoding, > > + int plain_non_ascii); > > +void pp_remainder(enum cmit_fmt fmt, > > + const char **msg_p, > > + struct strbuf *sb, > > + int indent); > > + > > In addition to Junio's concern that add_user_info() really wants to be > called pp_add_user_info(), I cannot help myself but suspect that > pp_write_email_headers() -- which called for a new name, too -- also wants > to live in pretty.c. Good idea, although I think "pp" is a verb about putting the result in the provided strbuf, so "pp_user_info()" and "pp_email_headers()". It's different, currently, in that it actually outputs the headers, rather than putting them in a buffer and uses struct rev_info. I'll need to work on this some more. -Daniel *This .sig left intentionally blank* ``` ## Daniel Barkalow, 2008-02-18 22:24 Subject: Re: [PATCH 2/4] Export some email and pretty-printing functions Message-ID: URL: https://gitlist.dev/e/alpine.LNX.1.00.0802181704240.5816%40iabervon.org In-Reply-To: ``` On Mon, 18 Feb 2008, Daniel Barkalow wrote: > On Mon, 18 Feb 2008, Johannes Schindelin wrote: > > > In addition to Junio's concern that add_user_info() really wants to be > > called pp_add_user_info(), I cannot help myself but suspect that > > pp_write_email_headers() -- which called for a new name, too -- also wants > > to live in pretty.c. > > Good idea, although I think "pp" is a verb about putting the result in the > provided strbuf, so "pp_user_info()" and "pp_email_headers()". > > It's different, currently, in that it actually outputs the headers, rather > than putting them in a buffer and uses struct rev_info. I'll need to work > on this some more. It's pretty firmly tied to a different style from the pp_* functions, so I think I'll make it log_write_email_headers() for this series. -Daniel *This .sig left intentionally blank* ```