From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ramkumar Ramachandra Subject: [PATCH 6/6] revert: Simplify passing command-line arguments around Date: Sat, 8 Oct 2011 23:06:47 +0530 Message-ID: <1318095407-26429-7-git-send-email-artagnon@gmail.com> References: <1318095407-26429-1-git-send-email-artagnon@gmail.com> Cc: Jonathan Nieder , Junio C Hamano , Jeff King , Daniel Barkalow , Christian Couder To: Git List X-From: git-owner@vger.kernel.org Sat Oct 08 19:37:39 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 1RCaqA-0004tz-51 for gcvg-git-2@lo.gmane.org; Sat, 08 Oct 2011 19:37:38 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753374Ab1JHRhY (ORCPT ); Sat, 8 Oct 2011 13:37:24 -0400 Received: from mail-yx0-f174.google.com ([209.85.213.174]:63909 "EHLO mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753209Ab1JHRhW (ORCPT ); Sat, 8 Oct 2011 13:37:22 -0400 Received: by yxl31 with SMTP id 31so4442527yxl.19 for ; Sat, 08 Oct 2011 10:37:22 -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=ld9vC6UeUzqodfVTbpV5Fhon8w1HTeSm1KS/obBjL0A=; b=DfYWXqKkSAehKvUtFXYwwhTn2MdFqddELpRsf03w9F3gAB8Vq/egu9mJSj00i06UC8 CfveWLfkh25qq8uO+ZHVPXd+ei038NnOCPHbO3fFn6dKyN6B7WwVEq2qp1l+RI27KzRh dCHGtfVZa7WKgP9XRfrjssh3b7KZaJkRyrFfA= Received: by 10.68.17.193 with SMTP id q1mr23075458pbd.98.1318095441530; Sat, 08 Oct 2011 10:37:21 -0700 (PDT) Received: from localhost.localdomain ([122.174.152.157]) by mx.google.com with ESMTPS id h5sm45151528pbq.11.2011.10.08.10.37.17 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 08 Oct 2011 10:37:19 -0700 (PDT) X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1318095407-26429-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: From: Jonathan Nieder The chief command-line argument parser, parse_args, currently parses arguments into an (argc, argv) and lets prepare_revs, a later function, turn it into a structure. Change this so that callers of the cherry-pick machinery will have to fill in an options structure instead of crafting command-line arguments. [rr: minor improvements, commit message] Signed-off-by: Ramkumar Ramachandra Signed-off-by: Jonathan Nieder --- builtin/revert.c | 53 +++++++++++++++++++++++++++++------------------------ 1 files changed, 29 insertions(+), 24 deletions(-) diff --git a/builtin/revert.c b/builtin/revert.c index a9dd210..a72b20d 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -54,13 +54,14 @@ struct replay_opts { int allow_rerere_auto; int mainline; - int commit_argc; - const char **commit_argv; /* Merge strategy */ const char *strategy; const char **xopts; size_t xopts_nr, xopts_alloc; + + /* Only used by REPLAY_NONE */ + struct rev_info *revs; }; #define GIT_REFLOG_ACTION "GIT_REFLOG_ACTION" @@ -163,9 +164,9 @@ static void parse_args(int argc, const char **argv, struct replay_opts *opts) die(_("program error")); } - opts->commit_argc = parse_options(argc, argv, NULL, options, usage_str, - PARSE_OPT_KEEP_ARGV0 | - PARSE_OPT_KEEP_UNKNOWN); + argc = parse_options(argc, argv, NULL, options, usage_str, + PARSE_OPT_KEEP_ARGV0 | + PARSE_OPT_KEEP_UNKNOWN); /* Check for incompatible subcommands */ verify_opt_mutually_compatible(me, @@ -200,9 +201,6 @@ static void parse_args(int argc, const char **argv, struct replay_opts *opts) NULL); } - else if (opts->commit_argc < 2) - usage_with_options(usage_str, options); - if (opts->allow_ff) verify_opt_compatible(me, "--ff", "--signoff", opts->signoff, @@ -210,7 +208,20 @@ static void parse_args(int argc, const char **argv, struct replay_opts *opts) "-x", opts->record_origin, "--edit", opts->edit, NULL); - opts->commit_argv = argv; + + if (opts->subcommand == REPLAY_NONE) { + opts->revs = xmalloc(sizeof(*opts->revs)); + init_revisions(opts->revs, NULL); + opts->revs->no_walk = 1; + if (argc < 2) + usage_with_options(usage_str, options); + argc = setup_revisions(argc, argv, opts->revs, NULL); + } else + opts->revs = NULL; + + /* Forbid stray command-line arguments */ + if (argc > 1) + usage_with_options(usage_str, options); } struct commit_message { @@ -607,23 +618,15 @@ static int do_pick_commit(struct commit *commit, enum replay_action action, return res; } -static void prepare_revs(struct rev_info *revs, struct replay_opts *opts) +static void prepare_revs(struct replay_opts *opts) { - int argc; - - init_revisions(revs, NULL); - revs->no_walk = 1; if (opts->action != REPLAY_REVERT) - revs->reverse = 1; + opts->revs->reverse ^= 1; - argc = setup_revisions(opts->commit_argc, opts->commit_argv, revs, NULL); - if (argc > 1) - usage(*revert_or_cherry_pick_usage(opts)); - - if (prepare_revision_walk(revs)) + if (prepare_revision_walk(opts->revs)) die(_("revision walk setup failed")); - if (!revs->commits) + if (!opts->revs->commits) die(_("empty commit set passed")); } @@ -817,14 +820,13 @@ static void read_populate_opts(struct replay_opts **opts_ptr) static void walk_revs_populate_todo(struct replay_insn_list **todo_list, struct replay_opts *opts) { - struct rev_info revs; struct commit *commit; struct replay_insn_list **next; - prepare_revs(&revs, opts); + prepare_revs(opts); next = todo_list; - while ((commit = get_revision(&revs))) + while ((commit = get_revision(opts->revs))) next = replay_insn_list_append(opts->action, commit, next); } @@ -948,6 +950,9 @@ static int pick_revisions(struct replay_opts *opts) struct replay_insn_list *todo_list = NULL; unsigned char sha1[20]; + if (opts->subcommand == REPLAY_NONE) + assert(opts->revs); + read_and_refresh_cache(opts); /* -- 1.7.4.1