From 021f2f4c1aed011c664844408325fe683a4046a8 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 21 Dec 2012 23:26:16 -0800 Subject: get_patch_filename(): simplify function signature Most functions that emit to a strbuf take the strbuf as their first parameter; make this function follow suit. The serial number of the patch being emitted (nr) and suffix used for patch filename (suffix) are both recorded in rev_info; drop these separate parameters and pass the rev_info directly. Signed-off-by: Junio C Hamano --- log-tree.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'log-tree.c') diff --git a/log-tree.c b/log-tree.c index c894930c18..ceed6b62e6 100644 --- a/log-tree.c +++ b/log-tree.c @@ -299,9 +299,12 @@ static unsigned int digits_in_number(unsigned int number) return result; } -void get_patch_filename(struct commit *commit, const char *subject, int nr, - const char *suffix, struct strbuf *buf) +void get_patch_filename(struct strbuf *buf, + struct commit *commit, const char *subject, + struct rev_info *info) { + const char *suffix = info->patch_suffix; + int nr = info->nr; int suffix_len = strlen(suffix) + 1; int start_len = buf->len; @@ -387,8 +390,9 @@ void log_write_email_headers(struct rev_info *opt, struct commit *commit, mime_boundary_leader, opt->mime_boundary); extra_headers = subject_buffer; - get_patch_filename(opt->numbered_files ? NULL : commit, NULL, - opt->nr, opt->patch_suffix, &filename); + get_patch_filename(&filename, + opt->numbered_files ? NULL : commit, NULL, + opt); snprintf(buffer, sizeof(buffer) - 1, "\n--%s%s\n" "Content-Type: text/x-patch;" -- cgit v1.2.1 From 38ec23ac893e96a9027c1cf8112b3d97a0384d39 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 21 Dec 2012 21:39:37 -0800 Subject: get_patch_filename(): drop "just-numbers" hack The function chooses from three operating modes (format using the subject, the commit, or just number) based on NULL-ness of two of its parameters, which is an ugly hack for sharing only a bit of code. Separate out the "just numbers" part out to the callers. Signed-off-by: Junio C Hamano --- log-tree.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) (limited to 'log-tree.c') diff --git a/log-tree.c b/log-tree.c index ceed6b62e6..d9f86ce624 100644 --- a/log-tree.c +++ b/log-tree.c @@ -307,21 +307,18 @@ void get_patch_filename(struct strbuf *buf, int nr = info->nr; int suffix_len = strlen(suffix) + 1; int start_len = buf->len; + int max_len = start_len + FORMAT_PATCH_NAME_MAX - suffix_len; - strbuf_addf(buf, commit || subject ? "%04d-" : "%d", nr); - if (commit || subject) { - int max_len = start_len + FORMAT_PATCH_NAME_MAX - suffix_len; + strbuf_addf(buf, "%04d-", nr); + if (subject) + strbuf_addstr(buf, subject); + else if (commit) { struct pretty_print_context ctx = {0}; - - if (subject) - strbuf_addstr(buf, subject); - else if (commit) - format_commit_message(commit, "%f", buf, &ctx); - - if (max_len < buf->len) - strbuf_setlen(buf, max_len); - strbuf_addstr(buf, suffix); + format_commit_message(commit, "%f", buf, &ctx); } + if (max_len < buf->len) + strbuf_setlen(buf, max_len); + strbuf_addstr(buf, suffix); } void log_write_email_headers(struct rev_info *opt, struct commit *commit, @@ -390,9 +387,11 @@ void log_write_email_headers(struct rev_info *opt, struct commit *commit, mime_boundary_leader, opt->mime_boundary); extra_headers = subject_buffer; - get_patch_filename(&filename, - opt->numbered_files ? NULL : commit, NULL, - opt); + if (opt->numbered_files) + strbuf_addf(&filename, "%d", opt->nr); + else + get_patch_filename(&filename, commit, NULL, + opt); snprintf(buffer, sizeof(buffer) - 1, "\n--%s%s\n" "Content-Type: text/x-patch;" -- cgit v1.2.1 From d28b5d47ab72a91d5090748f8f8baaf6ffa084fc Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 21 Dec 2012 22:06:01 -0800 Subject: get_patch_filename(): split into two functions The function switched between two operating modes depending on the NULL-ness of its two parameters, as a hacky way to share small part of implementation, sacrificing cleanliness of the API. Implement "fmt_output_subject()" function that takes a subject string and gives the name for the output file, and on top of it, implement "fmt_output_commit()" function that takes a commit and gives the name for the output file. Signed-off-by: Junio C Hamano --- log-tree.c | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) (limited to 'log-tree.c') diff --git a/log-tree.c b/log-tree.c index d9f86ce624..670beaebf9 100644 --- a/log-tree.c +++ b/log-tree.c @@ -299,26 +299,32 @@ static unsigned int digits_in_number(unsigned int number) return result; } -void get_patch_filename(struct strbuf *buf, - struct commit *commit, const char *subject, +void fmt_output_subject(struct strbuf *filename, + const char *subject, struct rev_info *info) { const char *suffix = info->patch_suffix; int nr = info->nr; - int suffix_len = strlen(suffix) + 1; - int start_len = buf->len; - int max_len = start_len + FORMAT_PATCH_NAME_MAX - suffix_len; - - strbuf_addf(buf, "%04d-", nr); - if (subject) - strbuf_addstr(buf, subject); - else if (commit) { - struct pretty_print_context ctx = {0}; - format_commit_message(commit, "%f", buf, &ctx); - } - if (max_len < buf->len) - strbuf_setlen(buf, max_len); - strbuf_addstr(buf, suffix); + int start_len = filename->len; + int max_len = start_len + FORMAT_PATCH_NAME_MAX - (strlen(suffix) + 1); + + strbuf_addf(filename, "%04d-%s", nr, subject); + + if (max_len < filename->len) + strbuf_setlen(filename, max_len); + strbuf_addstr(filename, suffix); +} + +void fmt_output_commit(struct strbuf *filename, + struct commit *commit, + struct rev_info *info) +{ + struct pretty_print_context ctx = {0}; + struct strbuf subject = STRBUF_INIT; + + format_commit_message(commit, "%f", &subject, &ctx); + fmt_output_subject(filename, subject.buf, info); + strbuf_release(&subject); } void log_write_email_headers(struct rev_info *opt, struct commit *commit, @@ -390,8 +396,7 @@ void log_write_email_headers(struct rev_info *opt, struct commit *commit, if (opt->numbered_files) strbuf_addf(&filename, "%d", opt->nr); else - get_patch_filename(&filename, commit, NULL, - opt); + fmt_output_commit(&filename, commit, opt); snprintf(buffer, sizeof(buffer) - 1, "\n--%s%s\n" "Content-Type: text/x-patch;" -- cgit v1.2.1 From 5fe10fe80a04a57affbaa35258f498bc1acb05e9 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 22 Dec 2012 00:21:23 -0800 Subject: format-patch: add --reroll-count=$N option The --reroll-count=$N option, when given a positive integer: - Adds " v$N" to the subject prefix specified. As the default subject prefix string is "PATCH", --reroll-count=2 makes it "PATCH v2". - Prefixes "v$N-" to the names used for output files. The cover letter, whose name is usually 0000-cover-letter.patch, becomes v2-0000-cover-letter.patch when given --reroll-count=2. This allows users to use the same --output-directory for multiple iterations of the same series, without letting the output for a newer round overwrite output files from the earlier rounds. The user can incorporate materials from earlier rounds to update the newly minted iteration, and use "send-email v2-*.patch" to send out the patches belonging to the second iteration easily. Signed-off-by: Junio C Hamano --- log-tree.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'log-tree.c') diff --git a/log-tree.c b/log-tree.c index 670beaebf9..5dc126b65c 100644 --- a/log-tree.c +++ b/log-tree.c @@ -308,6 +308,8 @@ void fmt_output_subject(struct strbuf *filename, int start_len = filename->len; int max_len = start_len + FORMAT_PATCH_NAME_MAX - (strlen(suffix) + 1); + if (0 < info->reroll_count) + strbuf_addf(filename, "v%d-", info->reroll_count); strbuf_addf(filename, "%04d-%s", nr, subject); if (max_len < filename->len) -- cgit v1.2.1