From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ramkumar Ramachandra Subject: [PATCH 1/5] fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_len Date: Wed, 8 Sep 2010 23:29:53 +0530 Message-ID: <1283968797-31793-2-git-send-email-artagnon@gmail.com> References: <1283968797-31793-1-git-send-email-artagnon@gmail.com> Cc: Git Mailing List , Jonathan Nieder To: Junio C Hamano X-From: git-owner@vger.kernel.org Wed Sep 08 20:02:17 2010 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1OtOyM-0000U4-Nv for gcvg-git-2@lo.gmane.org; Wed, 08 Sep 2010 20:02:15 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752061Ab0IHSCM (ORCPT ); Wed, 8 Sep 2010 14:02:12 -0400 Received: from mail-pv0-f174.google.com ([74.125.83.174]:35423 "EHLO mail-pv0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751287Ab0IHSCK (ORCPT ); Wed, 8 Sep 2010 14:02:10 -0400 Received: by pvg2 with SMTP id 2so150627pvg.19 for ; Wed, 08 Sep 2010 11:02:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=r+urYYfZvEP7AnVpu6ggJkREboPLFjq3/cuPq4N/SZs=; b=RBuq/zd4BbqAydPqvB7xnT3Zw+dRl9lil1Bo9KUEWI+9miGZviL0wbu0miyMpmhwTn oeJJFScU4AKRiOk/B+F/7+ugVKDninmDSprJ/5OeEKW9vS0It/2kKexhMuUnZx+2jkCe 3aeOSGO7SsGL4GiVbNbWmJOTiAFswEjhAt41c= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=ZEGRUk+fPu1R0vJPeSCRe67ssIcRri7iCHEHnZXy/AaAwHzCFJ52xFz9YiSu3lJzz7 Ednj5E4HbpvUuoFJKzAINojooweGsy02W1Zezb8y2jG+zlBNBOttIDXyH+EysUfry6Ej 2xJAbE57TsroImybBwmCX+URhNlDixqpQYt5o= Received: by 10.142.121.40 with SMTP id t40mr107749wfc.258.1283968928500; Wed, 08 Sep 2010 11:02:08 -0700 (PDT) Received: from localhost.localdomain ([203.110.240.41]) by mx.google.com with ESMTPS id z6sm199616ibc.12.2010.09.08.11.02.04 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 08 Sep 2010 11:02:07 -0700 (PDT) X-Mailer: git-send-email 1.7.2.2.409.gdbb11.dirty In-Reply-To: <1283968797-31793-1-git-send-email-artagnon@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Give "shortlog_len" parameter to the fmt_merge_msg(), remove its "merge_summary" parameter, and remove fmt_merge_msg_shortlog() function. In the updated API, shortlog_len == 0 means no shortlog is given. The parameter "merge_title" controls if the title of the merge commit is autogenerated (it reads something like "Merge branch ..."), and typically it is set to true when the caller does not give its own message. Signed-off-by: Ramkumar Ramachandra Mentored-by: Jonathan Nieder --- builtin.h | 7 ++++--- builtin/fmt-merge-msg.c | 30 ++++++++++++++---------------- builtin/merge.c | 14 ++++++-------- 3 files changed, 24 insertions(+), 27 deletions(-) diff --git a/builtin.h b/builtin.h index ed6ee26..09b94ea 100644 --- a/builtin.h +++ b/builtin.h @@ -7,6 +7,8 @@ #include "commit.h" #include "notes.h" +#define DEFAULT_MERGE_LOG_LEN 20 + extern const char git_version_string[]; extern const char git_usage_string[]; extern const char git_more_info_string[]; @@ -14,9 +16,8 @@ extern const char git_more_info_string[]; extern void list_common_cmds_help(void); extern const char *help_unknown_cmd(const char *cmd); extern void prune_packed_objects(int); -extern int fmt_merge_msg(int merge_summary, struct strbuf *in, - struct strbuf *out); -extern int fmt_merge_msg_shortlog(struct strbuf *in, struct strbuf *out); +extern int fmt_merge_msg(struct strbuf *in, struct strbuf *out, + int merge_title, int shortlog_len); extern int commit_notes(struct notes_tree *t, const char *msg); struct notes_rewrite_cfg { diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c index 937d5a7..42021d3 100644 --- a/builtin/fmt-merge-msg.c +++ b/builtin/fmt-merge-msg.c @@ -255,9 +255,9 @@ static void do_fmt_merge_msg_title(struct strbuf *out, strbuf_addf(out, " into %s\n", current_branch); } -static int do_fmt_merge_msg(int merge_title, int merge_summary, - struct strbuf *in, struct strbuf *out) { - int limit = 20, i = 0, pos = 0; +static int do_fmt_merge_msg(int merge_title, struct strbuf *in, + struct strbuf *out, int shortlog_len) { + int i = 0, pos = 0; unsigned char head_sha1[20]; const char *current_branch; @@ -288,7 +288,7 @@ static int do_fmt_merge_msg(int merge_title, int merge_summary, if (merge_title) do_fmt_merge_msg_title(out, current_branch); - if (merge_summary) { + if (shortlog_len) { struct commit *head; struct rev_info rev; @@ -303,17 +303,14 @@ static int do_fmt_merge_msg(int merge_title, int merge_summary, for (i = 0; i < origins.nr; i++) shortlog(origins.items[i].string, origins.items[i].util, - head, &rev, limit, out); + head, &rev, shortlog_len, out); } return 0; } -int fmt_merge_msg(int merge_summary, struct strbuf *in, struct strbuf *out) { - return do_fmt_merge_msg(1, merge_summary, in, out); -} - -int fmt_merge_msg_shortlog(struct strbuf *in, struct strbuf *out) { - return do_fmt_merge_msg(0, 1, in, out); +int fmt_merge_msg(struct strbuf *in, struct strbuf *out, + int merge_title, int shortlog_len) { + return do_fmt_merge_msg(merge_title, in, out, shortlog_len); } int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix) @@ -355,12 +352,13 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix) if (strbuf_read(&input, fileno(in), 0) < 0) die_errno("could not read input file"); - if (message) { + + if (message) strbuf_addstr(&output, message); - ret = fmt_merge_msg_shortlog(&input, &output); - } else { - ret = fmt_merge_msg(merge_summary, &input, &output); - } + ret = fmt_merge_msg(&input, &output, + message ? 0 : 1, + merge_summary ? DEFAULT_MERGE_LOG_LEN : 0); + if (ret) return ret; write_in_full(STDOUT_FILENO, output.buf, output.len); diff --git a/builtin/merge.c b/builtin/merge.c index 2207f79..b2c0984 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -998,14 +998,12 @@ int cmd_merge(int argc, const char **argv, const char *prefix) for (i = 0; i < argc; i++) merge_name(argv[i], &merge_names); - if (have_message && option_log) - fmt_merge_msg_shortlog(&merge_names, &merge_msg); - else if (!have_message) - fmt_merge_msg(option_log, &merge_names, &merge_msg); - - - if (!(have_message && !option_log) && merge_msg.len) - strbuf_setlen(&merge_msg, merge_msg.len-1); + if (!have_message || option_log) { + fmt_merge_msg(&merge_names, &merge_msg, !have_message, + option_log ? DEFAULT_MERGE_LOG_LEN : 0); + if (merge_msg.len) + strbuf_setlen(&merge_msg, merge_msg.len - 1); + } } if (head_invalid || !argc) -- 1.7.2.2.409.gdbb11.dirty