From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.0 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI shortcircuit=no autolearn=ham autolearn_force=no version=3.4.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 7CA151F45E for ; Tue, 28 Aug 2018 12:11:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727973AbeH1QC4 (ORCPT ); Tue, 28 Aug 2018 12:02:56 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:33026 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727822AbeH1QC4 (ORCPT ); Tue, 28 Aug 2018 12:02:56 -0400 Received: by mail-wm0-f66.google.com with SMTP id i134-v6so1743555wmf.0 for ; Tue, 28 Aug 2018 05:11:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=yRe4qBTYRFwCP+uNaPBvhF6Xz6ZTPBqo3hmJXLUe7J4=; b=AZXO2OR/cwERAl6QIYsWUi+r1QEbPUQJxIwgW44a2TBm8O1vvdR9dPUXe+bUeyaeiP 4WgHCXVDankGJg2g8CL2Gx9ZKpXSHPvPgJ+6H+62qeWIDhD1o/4J83JsTSadW1lV7Ovx Qh0Olc0exzBF+2Dia5xhI78QyAN20GWc/x4OLEhhQFNdosgS4pR2RHiXdAJ5Yum254T8 TD/YJxUAm4kyq31Tw6fPiX/AoYp/IPzF67XDiZAR3impPp2mIauyesd2X/L+4roFqdpe 8+DInBkRxJzmknumPoyL5cgWhvG1kxmpbbTcRjYfpSkQM6qpdAyuEy7xA8kD3VUgMNTs zm0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=yRe4qBTYRFwCP+uNaPBvhF6Xz6ZTPBqo3hmJXLUe7J4=; b=p3bM7dKbPAfijgaSiBsgZG2bP8eS1eyj22e5tIqSWUvY7/QteKsIE/1dhHDd0I4cVr YwG17Hv9YY292/Anljh/0diuaAT/7j+9i0GmxHAUO56T+UEJKIJ+qIRRq7/bqytC31ZO rfwkOwXwCl/5VUy2RNo2CRqhVEycx+YDgV9R+1uiMLj7/Q3OyPX2bzXgbmSd2AKHcloF coWswwDred+lWUwch3tl913nbuWN7kRPgJuUvZ1wSNqwMouEWLutqZxmTA9StJPbhQ0x gsWNNoIHP2t5aHrZj3wrfD3APJlAWDYKOCUMoOzi9SUmzwYMfKmYQtZwK1/KIkYkjxJz 60ug== X-Gm-Message-State: APzg51AvBrlsqjF+ZDsY4LJxoHzf7u7X688/uNnvaetswshxRRXfnMFE MDjAEkpBc0mTTXUoDScaPjZ4LJ9o X-Google-Smtp-Source: ANB0VdZcVMaY+OdsBYauBHQaZpsd8gh3oyQxBkjS0UospMWYf5u/ACQj6RlSCKpy8wD5H1iu6FVJFA== X-Received: by 2002:a1c:d785:: with SMTP id o127-v6mr1174734wmg.67.1535458292058; Tue, 28 Aug 2018 05:11:32 -0700 (PDT) Received: from localhost.localdomain (AToulouse-658-1-33-140.w86-221.abo.wanadoo.fr. [86.221.112.140]) by smtp.googlemail.com with ESMTPSA id y206-v6sm1702790wmg.14.2018.08.28.05.11.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Aug 2018 05:11:30 -0700 (PDT) From: Alban Gruin To: git@vger.kernel.org Cc: Stefan Beller , Christian Couder , Pratik Karki , Johannes Schindelin , phillip.wood@dunelm.org.uk, gitster@pobox.com, Alban Gruin Subject: [GSoC][PATCH v7 18/20] rebase--interactive2: rewrite the submodes of interactive rebase in C Date: Tue, 28 Aug 2018 14:10:43 +0200 Message-Id: <20180828121045.14933-19-alban.gruin@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180828121045.14933-1-alban.gruin@gmail.com> References: <20180810165147.4779-1-alban.gruin@gmail.com> <20180828121045.14933-1-alban.gruin@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org This rewrites the submodes of interactive rebase (`--continue`, `--skip`, `--edit-todo`, and `--show-current-patch`) in C. git-rebase.sh is then modified to call directly git-rebase--interactive2 instead of git-rebase--interactive.sh. Signed-off-by: Alban Gruin --- builtin/rebase--interactive2.c | 51 ++++++++++++++++++++++++++++++---- git-rebase.sh | 45 +++++++++++++++++++++++++++--- 2 files changed, 86 insertions(+), 10 deletions(-) diff --git a/builtin/rebase--interactive2.c b/builtin/rebase--interactive2.c index 038bbf359e..b32621b179 100644 --- a/builtin/rebase--interactive2.c +++ b/builtin/rebase--interactive2.c @@ -134,11 +134,14 @@ int cmd_rebase__interactive(int argc, const char **argv, const char *prefix) { struct replay_opts opts = REPLAY_OPTS_INIT; unsigned flags = 0, keep_empty = 0, rebase_merges = 0, autosquash = 0; - int abbreviate_commands = 0, rebase_cousins = -1; + int abbreviate_commands = 0, rebase_cousins = -1, ret = 0; const char *onto = NULL, *onto_name = NULL, *restrict_revision = NULL, *squash_onto = NULL, *upstream = NULL, *head_name = NULL, *switch_to = NULL, *cmd = NULL; char *raw_strategies = NULL; + enum { + NONE = 0, CONTINUE, SKIP, EDIT_TODO, SHOW_CURRENT_PATCH + } command = 0; struct option options[] = { OPT_BOOL(0, "ff", &opts.allow_ff, N_("allow fast-forward")), OPT_BOOL(0, "keep-empty", &keep_empty, N_("keep empty commits")), @@ -151,6 +154,13 @@ int cmd_rebase__interactive(int argc, const char **argv, const char *prefix) N_("move commits that begin with squash!/fixup!")), OPT_BOOL(0, "signoff", &opts.signoff, N_("sign commits")), OPT__VERBOSE(&opts.verbose, N_("be verbose")), + OPT_CMDMODE(0, "continue", &command, N_("continue rebase"), + CONTINUE), + OPT_CMDMODE(0, "skip", &command, N_("skip commit"), SKIP), + OPT_CMDMODE(0, "edit-todo", &command, N_("edit the todo list"), + EDIT_TODO), + OPT_CMDMODE(0, "show-current-patch", &command, N_("show the current patch"), + SHOW_CURRENT_PATCH), OPT_STRING(0, "onto", &onto, N_("onto"), N_("onto")), OPT_STRING(0, "restrict-revision", &restrict_revision, N_("restrict-revision"), N_("restrict revision")), @@ -197,10 +207,39 @@ int cmd_rebase__interactive(int argc, const char **argv, const char *prefix) warning(_("--[no-]rebase-cousins has no effect without " "--rebase-merges")); - if (!onto && !upstream) - die(_("a base commit must be provided with --upstream or --onto")); + switch (command) { + case NONE: + if (!onto && !upstream) + die(_("a base commit must be provided with --upstream or --onto")); + + ret = do_interactive_rebase(&opts, flags, switch_to, upstream, onto, + onto_name, squash_onto, head_name, restrict_revision, + raw_strategies, cmd, autosquash); + break; + case SKIP: { + struct string_list merge_rr = STRING_LIST_INIT_DUP; + + rerere_clear(&merge_rr); + /* fallthrough */ + case CONTINUE: + ret = sequencer_continue(&opts); + break; + } + case EDIT_TODO: + ret = edit_todo_list(flags); + break; + case SHOW_CURRENT_PATCH: { + struct child_process cmd = CHILD_PROCESS_INIT; + + cmd.git_cmd = 1; + argv_array_pushl(&cmd.args, "show", "REBASE_HEAD", "--", NULL); + ret = run_command(&cmd); + + break; + } + default: + BUG("invalid command '%d'", command); + } - return !!do_interactive_rebase(&opts, flags, switch_to, upstream, onto, - onto_name, squash_onto, head_name, restrict_revision, - raw_strategies, cmd, autosquash); + return !!ret; } diff --git a/git-rebase.sh b/git-rebase.sh index 51a6db7daa..6e1e413cf2 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -200,19 +200,56 @@ finish_rebase () { rm -rf "$state_dir" } +run_interactive () { + GIT_CHERRY_PICK_HELP="$resolvemsg" + export GIT_CHERRY_PICK_HELP + + test -n "$keep_empty" && keep_empty="--keep-empty" + test -n "$rebase_merges" && rebase_merges="--rebase-merges" + test -n "$rebase_cousins" && rebase_cousins="--rebase-cousins" + test -n "$autosquash" && autosquash="--autosquash" + test -n "$verbose" && verbose="--verbose" + test -n "$force_rebase" && force_rebase="--no-ff" + test -n "$restrict_revision" && \ + restrict_revision="--restrict-revision=^$restrict_revision" + test -n "$upstream" && upstream="--upstream=$upstream" + test -n "$onto" && onto="--onto=$onto" + test -n "$squash_onto" && squash_onto="--squash-onto=$squash_onto" + test -n "$onto_name" && onto_name="--onto-name=$onto_name" + test -n "$head_name" && head_name="--head-name=$head_name" + test -n "$strategy" && strategy="--strategy=$strategy" + test -n "$strategy_opts" && strategy_opts="--strategy-opts=$strategy_opts" + test -n "$switch_to" && switch_to="--switch-to=$switch_to" + test -n "$cmd" && cmd="--cmd=$cmd" + test -n "$action" && action="--$action" + + exec git rebase--interactive2 "$action" "$keep_empty" "$rebase_merges" "$rebase_cousins" \ + "$upstream" "$onto" "$squash_onto" "$restrict_revision" \ + "$allow_empty_message" "$autosquash" "$verbose" \ + "$force_rebase" "$onto_name" "$head_name" "$strategy" \ + "$strategy_opts" "$cmd" "$switch_to" \ + "$allow_rerere_autoupdate" "$gpg_sign_opt" "$signoff" +} + run_specific_rebase () { if [ "$interactive_rebase" = implied ]; then GIT_EDITOR=: export GIT_EDITOR autosquash= fi - . git-rebase--$type - if test -z "$preserve_merges" + if test -n "$interactive_rebase" -a -z "$preserve_merges" then - git_rebase__$type + run_interactive else - git_rebase__preserve_merges + . git-rebase--$type + + if test -z "$preserve_merges" + then + git_rebase__$type + else + git_rebase__preserve_merges + fi fi ret=$? -- 2.18.0