From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Git List <git@vger.kernel.org>
Cc: Christian Couder <chriscool@tuxfamily.org>,
Daniel Barkalow <barkalow@iabervon.org>,
Jonathan Nieder <jrnieder@gmail.com>
Subject: [PATCH 06/11] revert: Implement parsing --continue, --abort and --skip
Date: Sun, 10 Apr 2011 20:41:52 +0530 [thread overview]
Message-ID: <1302448317-32387-7-git-send-email-artagnon@gmail.com> (raw)
In-Reply-To: <1302448317-32387-1-git-send-email-artagnon@gmail.com>
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
builtin/revert.c | 46 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 45 insertions(+), 1 deletions(-)
diff --git a/builtin/revert.c b/builtin/revert.c
index facae24..b90f3d0 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -39,6 +39,11 @@ static const char * const cherry_pick_usage[] = {
static struct {
enum { REVERT, CHERRY_PICK } action;
+ /* --abort, --skip, and --continue */
+ int abort_oper;
+ int skip_oper;
+ int continue_oper;
+
/* Boolean options */
int edit;
int no_replay;
@@ -98,8 +103,12 @@ static void die_opt_incompatible(const char *me, const char *base_opt,
static void parse_args(int argc, const char **argv)
{
const char * const * usage_str = revert_or_cherry_pick_usage();
+ const char *me;
int noop;
struct option options[] = {
+ OPT_BOOLEAN(0, "abort", &cmd_opts.abort_oper, "abort the current operation"),
+ OPT_BOOLEAN(0, "skip", &cmd_opts.skip_oper, "skip the current commit"),
+ OPT_BOOLEAN(0, "continue", &cmd_opts.continue_oper, "continue the current operation"),
OPT_BOOLEAN('n', "no-commit", &cmd_opts.no_commit, "don't automatically commit"),
OPT_BOOLEAN('e', "edit", &cmd_opts.edit, "edit the commit message"),
OPT_BOOLEAN('r', NULL, &noop, "no-op (backward compatibility)"),
@@ -127,7 +136,42 @@ static void parse_args(int argc, const char **argv)
cmd_opts.commit_argc = parse_options(argc, argv, NULL, options, usage_str,
PARSE_OPT_KEEP_ARGV0 |
PARSE_OPT_KEEP_UNKNOWN);
- if (cmd_opts.commit_argc < 2)
+
+ me = (cmd_opts.action == REVERT ? "revert" : "cherry-pick");
+
+ /* Check for incompatible command line arguments */
+ if (cmd_opts.abort_oper || cmd_opts.skip_oper || cmd_opts.continue_oper) {
+ char *this_oper;
+ int opt_bitarray[] = {cmd_opts.no_commit, cmd_opts.edit, noop,
+ cmd_opts.signoff, cmd_opts.mainline,
+ (cmd_opts.strategy ? 1 : 0),
+ (cmd_opts.xopts ? 1 : 0),
+ cmd_opts.no_replay, cmd_opts.allow_ff};
+ if (cmd_opts.abort_oper) {
+ this_oper = "--abort";
+ die_opt_incompatible(me, this_oper, 1,
+ &cmd_opts.skip_oper, "--skip");
+ die_opt_incompatible(me, this_oper, 1,
+ &cmd_opts.continue_oper, "--continue");
+ } else if (cmd_opts.skip_oper) {
+ this_oper = "--skip";
+ die_opt_incompatible(me, this_oper, 1,
+ &cmd_opts.abort_oper, "--abort");
+ die_opt_incompatible(me, this_oper, 1,
+ &cmd_opts.continue_oper, "--continue");
+ } else {
+ this_oper = "--continue";
+ die_opt_incompatible(me, this_oper, 1,
+ &cmd_opts.abort_oper, "--abort");
+ die_opt_incompatible(me, this_oper, 1,
+ &cmd_opts.skip_oper, "--skip");
+ }
+ die_opt_incompatible(me, this_oper, 9, opt_bitarray, "--no-commit",
+ "--edit", "-r", "--signoff", "--mainline",
+ "--strategy", "--strategy-option", "-x", "--ff");
+ }
+
+ else if (cmd_opts.commit_argc < 2)
usage_with_options(usage_str, options);
if (cmd_opts.allow_ff) {
--
1.7.4.rc1.7.g2cf08.dirty
next prev parent reply other threads:[~2011-04-10 15:13 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-10 15:11 [RFC PATCH 00/11] Sequencer Foundations Ramkumar Ramachandra
2011-04-10 15:11 ` [PATCH 01/11] revert: Avoid calling die; return error instead Ramkumar Ramachandra
2011-04-10 19:14 ` Jonathan Nieder
2011-05-08 12:04 ` Ramkumar Ramachandra
2011-04-11 20:26 ` Junio C Hamano
2011-04-10 15:11 ` [PATCH 02/11] revert: Lose global variables "commit" and "me" Ramkumar Ramachandra
2011-04-11 3:24 ` Christian Couder
2011-04-11 8:57 ` Ramkumar Ramachandra
2011-04-10 15:11 ` [PATCH 03/11] revert: Introduce a struct to parse command-line options into Ramkumar Ramachandra
2011-04-10 19:21 ` Jonathan Nieder
2011-05-08 12:18 ` Ramkumar Ramachandra
2011-04-11 21:41 ` Junio C Hamano
2011-05-08 12:09 ` Ramkumar Ramachandra
2011-04-10 15:11 ` [PATCH 04/11] revert: Separate cmdline argument handling from the functional code Ramkumar Ramachandra
2011-04-10 15:11 ` [PATCH 05/11] revert: Catch incompatible command-line options early Ramkumar Ramachandra
2011-04-11 21:44 ` Junio C Hamano
2011-05-08 11:47 ` Ramkumar Ramachandra
2011-04-10 15:11 ` Ramkumar Ramachandra [this message]
2011-04-10 15:11 ` [PATCH 07/11] revert: Handle conflict resolutions more elegantly Ramkumar Ramachandra
2011-04-10 15:11 ` [PATCH 08/11] usage: Introduce error_errno correspoding to die_errno Ramkumar Ramachandra
2011-04-10 15:11 ` [PATCH 09/11] revert: Write head, todo, done files Ramkumar Ramachandra
2011-04-10 15:11 ` [PATCH 10/11] revert: Give noop a default value while argument parsing Ramkumar Ramachandra
2011-04-10 15:11 ` [PATCH 11/11] revert: Implement --abort processing Ramkumar Ramachandra
2011-04-10 19:33 ` [RFC PATCH 00/11] Sequencer Foundations Daniel Barkalow
2011-04-11 8:55 ` Ramkumar Ramachandra
2011-04-10 19:47 ` Jonathan Nieder
2011-04-11 1:16 ` Daniel Barkalow
2011-04-11 6:42 ` Jonathan Nieder
2011-04-11 9:07 ` Ramkumar Ramachandra
2011-04-11 3:18 ` Christian Couder
2011-04-11 4:49 ` Ramkumar Ramachandra
2011-04-11 6:20 ` Christian Couder
2011-04-11 10:48 ` Ramkumar Ramachandra
2011-04-11 5:30 ` Daniel Barkalow
2011-04-11 5:38 ` Jonathan Nieder
2011-04-11 6:34 ` Daniel Barkalow
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1302448317-32387-7-git-send-email-artagnon@gmail.com \
--to=artagnon@gmail.com \
--cc=barkalow@iabervon.org \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).