From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ramkumar Ramachandra Subject: [PATCH 07/18] revert: Eliminate global "commit" variable Date: Wed, 27 Jul 2011 08:49:04 +0530 Message-ID: <1311736755-24205-8-git-send-email-artagnon@gmail.com> References: <1311736755-24205-1-git-send-email-artagnon@gmail.com> Cc: Jonathan Nieder , Junio C Hamano , Christian Couder , Daniel Barkalow , Jeff King To: Git List X-From: git-owner@vger.kernel.org Wed Jul 27 05:23:28 2011 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 1QluiV-00068x-Fa for gcvg-git-2@lo.gmane.org; Wed, 27 Jul 2011 05:23:27 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753890Ab1G0DW4 (ORCPT ); Tue, 26 Jul 2011 23:22:56 -0400 Received: from mail-pz0-f42.google.com ([209.85.210.42]:35904 "EHLO mail-pz0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754069Ab1G0DWz (ORCPT ); Tue, 26 Jul 2011 23:22:55 -0400 Received: by mail-pz0-f42.google.com with SMTP id 37so1938359pzk.1 for ; Tue, 26 Jul 2011 20:22:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=kVeowf/tU2GNsDcz8/OJGF0IbhDsPRkIi7j8267Yrcg=; b=cplD9GBLPeuy3k4hw/Y+75lLoxmGo85gsJ2d+ImQgj0DpUKR+ixjmDUV2n2DKb3DmT ubiAegrUdDnFMHIm7wTUHpsUKrSvEvtHGAWbgjutru4Rj5Yww9ZmWJQsWHubIZs8tCsV 0UTK9OzTLcItUjmSGpONfrPUznqAGvoEyt34Q= Received: by 10.68.43.5 with SMTP id s5mr11745102pbl.486.1311736974804; Tue, 26 Jul 2011 20:22:54 -0700 (PDT) Received: from localhost.localdomain ([203.110.240.41]) by mx.google.com with ESMTPS id p7sm1210706pbn.65.2011.07.26.20.22.50 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 26 Jul 2011 20:22:53 -0700 (PDT) X-Mailer: git-send-email 1.7.4.rc1.7.g2cf08.dirty In-Reply-To: <1311736755-24205-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: Functions which act on commits currently rely on a file-scope static variable to be set before they're called. Consequently, the API and corresponding callsites are ugly and unclear. Remove this variable and change their API to accept the commit to act on as additional argument so that the callsites change from looking like commit = prepare_a_commit(); act_on_commit(); to looking like commit = prepare_a_commit(); act_on_commit(commit); This change is also in line with our long-term goal of exposing some of these functions through a public API. Inspired-by: Christian Couder Helped-by: Jonathan Nieder Helped-by: Junio C Hamano Signed-off-by: Ramkumar Ramachandra --- builtin/revert.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/builtin/revert.c b/builtin/revert.c index ee9b4cd..7c4a9c5 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -37,7 +37,6 @@ static const char * const cherry_pick_usage[] = { static int edit, record_origin, no_commit, mainline, signoff, allow_ff; static enum { REVERT, CHERRY_PICK } action; -static struct commit *commit; static int commit_argc; static const char **commit_argv; static int allow_rerere_auto; @@ -116,25 +115,25 @@ struct commit_message { const char *message; }; -static int get_message(const char *raw_message, struct commit_message *out) +static int get_message(struct commit *commit, struct commit_message *out) { const char *encoding; const char *abbrev, *subject; int abbrev_len, subject_len; char *q; - if (!raw_message) + if (!commit->buffer) return -1; - encoding = get_encoding(raw_message); + encoding = get_encoding(commit->buffer); if (!encoding) encoding = "UTF-8"; if (!git_commit_encoding) git_commit_encoding = "UTF-8"; out->reencoded_message = NULL; - out->message = raw_message; + out->message = commit->buffer; if (strcmp(encoding, git_commit_encoding)) - out->reencoded_message = reencode_string(raw_message, + out->reencoded_message = reencode_string(commit->buffer, git_commit_encoding, encoding); if (out->reencoded_message) out->message = out->reencoded_message; @@ -182,7 +181,7 @@ static char *get_encoding(const char *message) return NULL; } -static void write_cherry_pick_head(void) +static void write_cherry_pick_head(struct commit *commit) { int fd; struct strbuf buf = STRBUF_INIT; @@ -350,7 +349,7 @@ static int run_git_commit(const char *defmsg) return run_command_v_opt(args, RUN_GIT_CMD); } -static int do_pick_commit(void) +static int do_pick_commit(struct commit *commit) { unsigned char head[20]; struct commit *base, *next, *parent; @@ -412,7 +411,7 @@ static int do_pick_commit(void) return error(_("%s: cannot parse parent commit %s"), me, sha1_to_hex(parent->object.sha1)); - if (get_message(commit->buffer, &msg) != 0) + if (get_message(commit, &msg) != 0) return error(_("Cannot get commit message for %s"), sha1_to_hex(commit->object.sha1)); @@ -465,7 +464,7 @@ static int do_pick_commit(void) strbuf_addstr(&msgbuf, ")\n"); } if (!no_commit) - write_cherry_pick_head(); + write_cherry_pick_head(commit); } if (!strategy || !strcmp(strategy, "recursive") || action == REVERT) { @@ -543,6 +542,7 @@ static void read_and_refresh_cache(const char *me) static int revert_or_cherry_pick(int argc, const char **argv) { struct rev_info revs; + struct commit *commit; git_config(git_default_config, NULL); me = action == REVERT ? "revert" : "cherry-pick"; @@ -565,7 +565,7 @@ static int revert_or_cherry_pick(int argc, const char **argv) prepare_revs(&revs); while ((commit = get_revision(&revs))) { - int res = do_pick_commit(); + int res = do_pick_commit(commit); if (res) return res; } -- 1.7.4.rc1.7.g2cf08.dirty