From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ramkumar Ramachandra Subject: [PATCH 08/18] revert: Separate cmdline parsing from functional code Date: Mon, 1 Aug 2011 23:36:55 +0530 Message-ID: <1312222025-28453-9-git-send-email-artagnon@gmail.com> References: <1312222025-28453-1-git-send-email-artagnon@gmail.com> Cc: Git List , Jonathan Nieder , Christian Couder , Daniel Barkalow , Jeff King To: Junio C Hamano X-From: git-owner@vger.kernel.org Mon Aug 01 20:11:53 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 1Qnwy0-00041f-Oh for gcvg-git-2@lo.gmane.org; Mon, 01 Aug 2011 20:11:53 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751993Ab1HASLs (ORCPT ); Mon, 1 Aug 2011 14:11:48 -0400 Received: from mail-pz0-f42.google.com ([209.85.210.42]:62360 "EHLO mail-pz0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750699Ab1HASLr (ORCPT ); Mon, 1 Aug 2011 14:11:47 -0400 Received: by mail-pz0-f42.google.com with SMTP id 37so11912645pzk.1 for ; Mon, 01 Aug 2011 11:11:47 -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=SxiwAHgHfzF7vmuz76t1qw3DL2i4GFlhPQmHU59VZaU=; b=Qkxz3qJDVluHnHodhMONSd7f++Ca8zu2RgIy5J6eGhwd0/LTSrK0wDofoQ4vKCbu4E C2hYAqbvM6O1Th8CI7nlQQp0gsYn3Tcwj/z9/lp5jRQEZ5x+d5f+8SxZVQWgDmVLfc0W KLvRSKP2eGZi95lgmsl/U1nFuCKP6a2QJYegc= Received: by 10.68.20.40 with SMTP id k8mr7592808pbe.457.1312222307123; Mon, 01 Aug 2011 11:11:47 -0700 (PDT) Received: from localhost.localdomain ([203.110.240.41]) by mx.google.com with ESMTPS id d3sm5789958pbh.37.2011.08.01.11.11.39 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 01 Aug 2011 11:11:45 -0700 (PDT) X-Mailer: git-send-email 1.7.4.rc1.7.g2cf08.dirty In-Reply-To: <1312222025-28453-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: Currently, revert_or_cherry_pick sets up a default git config, parses command-line arguments, before preparing to pick commits. This makes for a bad API as the central worry of callers is to assert whether or not a conflict occured while cherry picking. The current API is like: if (revert_or_cherry_pick(argc, argv, opts) < 0) print "Something failed, we're not sure what" Simplify and rename revert_or_cherry_pick to pick_commits so that it only has the responsibility of setting up the revision walker and picking commits in a loop. Transfer the remaining work to its callers. Now, the API is simplified as: if (parse_args(argc, argv, opts) < 0) print "Can't parse arguments" if (pick_commits(opts) < 0) print "Error encountered in picking machinery" Later in the series, pick_commits will also serve as the starting point for continuing a cherry-pick or revert. Inspired-by: Christian Couder Helped-by: Jonathan Nieder Signed-off-by: Ramkumar Ramachandra Signed-off-by: Jonathan Nieder --- builtin/revert.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/builtin/revert.c b/builtin/revert.c index 50f72de..90fe2ef 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -563,16 +563,12 @@ static void read_and_refresh_cache(struct replay_opts *opts) rollback_lock_file(&index_lock); } -static int revert_or_cherry_pick(int argc, const char **argv, - struct replay_opts *opts) +static int pick_commits(struct replay_opts *opts) { struct rev_info revs; struct commit *commit; - git_config(git_default_config, NULL); setenv(GIT_REFLOG_ACTION, action_name(opts), 0); - parse_args(argc, argv, opts); - if (opts->allow_ff) { if (opts->signoff) die(_("cherry-pick --ff cannot be used with --signoff")); @@ -605,7 +601,9 @@ int cmd_revert(int argc, const char **argv, const char *prefix) if (isatty(0)) opts.edit = 1; opts.action = REVERT; - return revert_or_cherry_pick(argc, argv, &opts); + git_config(git_default_config, NULL); + parse_args(argc, argv, &opts); + return pick_commits(&opts); } int cmd_cherry_pick(int argc, const char **argv, const char *prefix) @@ -614,5 +612,7 @@ int cmd_cherry_pick(int argc, const char **argv, const char *prefix) memset(&opts, 0, sizeof(opts)); opts.action = CHERRY_PICK; - return revert_or_cherry_pick(argc, argv, &opts); + git_config(git_default_config, NULL); + parse_args(argc, argv, &opts); + return pick_commits(&opts); } -- 1.7.4.rc1.7.g2cf08.dirty