From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christian Couder Subject: [PATCH v3 6/9] pick: libify "pick_help_msg()" Date: Sat, 22 Aug 2009 06:16:12 +0200 Message-ID: <20090822041616.4261.59306.chriscool@tuxfamily.org> References: <20090822041157.4261.92491.chriscool@tuxfamily.org> Cc: git@vger.kernel.org, Johannes Schindelin , Stephan Beyer , Daniel Barkalow , Jakub Narebski To: Junio C Hamano X-From: git-owner@vger.kernel.org Sat Aug 22 06:51:32 2009 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1MeiZe-0005aq-C3 for gcvg-git-2@lo.gmane.org; Sat, 22 Aug 2009 06:51:30 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932531AbZHVEvD (ORCPT ); Sat, 22 Aug 2009 00:51:03 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932436AbZHVEuv (ORCPT ); Sat, 22 Aug 2009 00:50:51 -0400 Received: from smtp3-g21.free.fr ([212.27.42.3]:38332 "EHLO smtp3-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932276AbZHVEur (ORCPT ); Sat, 22 Aug 2009 00:50:47 -0400 Received: from smtp3-g21.free.fr (localhost [127.0.0.1]) by smtp3-g21.free.fr (Postfix) with ESMTP id 44E878180C2; Sat, 22 Aug 2009 06:50:38 +0200 (CEST) Received: from bureau.boubyland (gre92-7-82-243-130-161.fbx.proxad.net [82.243.130.161]) by smtp3-g21.free.fr (Postfix) with ESMTP id 0E9AB818094; Sat, 22 Aug 2009 06:50:36 +0200 (CEST) X-git-sha1: bf9bb9f10ed00e861e7b367403135e5cbebd020c X-Mailer: git-mail-commits v0.5.2 In-Reply-To: <20090822041157.4261.92491.chriscool@tuxfamily.org> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: This function gives an help message when pick or revert failed. Signed-off-by: Christian Couder --- builtin-revert.c | 23 +---------------------- pick.c | 22 ++++++++++++++++++++++ pick.h | 1 + 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/builtin-revert.c b/builtin-revert.c index 4797ac5..e5250bd 100644 --- a/builtin-revert.c +++ b/builtin-revert.c @@ -142,27 +142,6 @@ static void set_author_ident_env(const char *message) sha1_to_hex(commit->object.sha1)); } -static char *help_msg(const unsigned char *sha1) -{ - static char helpbuf[1024]; - char *msg = getenv("GIT_CHERRY_PICK_HELP"); - - if (msg) - return msg; - - strcpy(helpbuf, " After resolving the conflicts,\n" - "mark the corrected paths with 'git add ' " - "or 'git rm ' and commit the result."); - - if (!(flags & PICK_REVERSE)) { - sprintf(helpbuf + strlen(helpbuf), - "\nWhen commiting, use the option " - "'-c %s' to retain authorship and message.", - find_unique_abbrev(sha1, DEFAULT_ABBREV)); - } - return helpbuf; -} - static void write_message(struct strbuf *msgbuf, const char *filename) { struct lock_file msg_file; @@ -211,7 +190,7 @@ static int revert_or_cherry_pick(int argc, const char **argv) exit(1); } else if (failed > 0) { fprintf(stderr, "Automatic %s failed.%s\n", - me, help_msg(commit->object.sha1)); + me, pick_help_msg(commit->object.sha1, flags)); write_message(&msgbuf, git_path("MERGE_MSG")); rerere(); exit(1); diff --git a/pick.c b/pick.c index 058b877..4f882bb 100644 --- a/pick.c +++ b/pick.c @@ -208,3 +208,25 @@ int pick_commit(struct commit *pick_commit, int mainline, int flags, return ret; } + +char *pick_help_msg(const unsigned char *sha1, int flags) +{ + static char helpbuf[1024]; + char *msg = getenv("GIT_CHERRY_PICK_HELP"); + + if (msg) + return msg; + + strcpy(helpbuf, " After resolving the conflicts,\n" + "mark the corrected paths with 'git add ' " + "or 'git rm ' and commit the result."); + + if (!(flags & PICK_REVERSE)) { + sprintf(helpbuf + strlen(helpbuf), + "\nWhen commiting, use the option " + "'-c %s' to retain authorship and message.", + find_unique_abbrev(sha1, DEFAULT_ABBREV)); + } + return helpbuf; +} + diff --git a/pick.h b/pick.h index 7a74ad8..115541a 100644 --- a/pick.h +++ b/pick.h @@ -9,5 +9,6 @@ /* We don't need a PICK_QUIET. This is done by * setenv("GIT_MERGE_VERBOSITY", "0", 1); */ extern int pick_commit(struct commit *commit, int mainline, int flags, struct strbuf *msg); +extern char *pick_help_msg(const unsigned char *sha1, int flags); #endif -- 1.6.4.271.ge010d