From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.6 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.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 703B91F51C for ; Thu, 31 May 2018 11:03:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754568AbeEaLDY (ORCPT ); Thu, 31 May 2018 07:03:24 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:52291 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754469AbeEaLDT (ORCPT ); Thu, 31 May 2018 07:03:19 -0400 Received: by mail-wm0-f65.google.com with SMTP id 18-v6so47711523wml.2 for ; Thu, 31 May 2018 04:03:19 -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=M0metM26xelsTMOisSPtqLIWAwAyxEy/cM/CP3heBFU=; b=vPLNbgAl/IsiFKreKRdwInvFgMUtx8FzihlP3AMAZMm//GYg2XGLQdSV83T1dFKJNc sbGLQ3G6OYaw6uncHpVYVoaDagv4tRubuBm3d6QdU2bvh1Y3n2Pvz69uCumqxuMDLWDF +4EEf5UjBZm7LajCW2CULapAxbRv6AkW3+eXPebLVpayOZYiGLd9bKTQ0UAleeesiQoO zDJdLk/D+a16Hrf0KEl0qlOpSTU1QCSttQi/wxK6g+YHlSjRq6Tiq6A8T7s8gpK1skUQ ewImb/l0e1EitjYAsZ+VatFhkm0vrm7gltyN5zPcDqgZTCrIEl3m1Cn1G9oTNmSOCCVs hJSQ== 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=M0metM26xelsTMOisSPtqLIWAwAyxEy/cM/CP3heBFU=; b=P+PZRb0wIfxgOaCQ1DKE+kRSkrwYwDKzeljJyUtz2XUcq7yW4+pK8StIfDM9WZBaEA rm+TKhF7jBDq7TAzlgrN9rsrMrHTBjJQ/DRVMTMpy/8yX4hc9AG/GPo+oCzgaZjY8iW1 AjvN3Ml60pRa8gfWNhp0sNfpUmhr3c7/5eIErD/5dx8VVdpNJmc6rDWo9Im5pQVwlO7E yfOlWqPXXXMEz5brpEJKmktA+ziXhEpRbVC3rw589EKPYDYPzxGthfXc3VD1rNgfqcmf tiq9lQ4W2OB4ZlNJzVAC/eBgWr42JtJV4+NIhbtGjT4xK4V8XJ96jdc7+xyRQhnIuSHW fl6A== X-Gm-Message-State: ALKqPweG04Y8Xf5xB5xJ3lJK6dtixznWVWbzGcbDg7c+7zJMimNpXxoF RPkt+UORtIYuPRu8UuTc6d6d78FI X-Google-Smtp-Source: ADUXVKI28bkfYWeG+Q8C6yOLYial166VUkJZXTNEg5Fodf3b9dC5EmnfkDj6tfXVjiN38bw+R8cDgQ== X-Received: by 2002:aa7:c486:: with SMTP id m6-v6mr6880097edq.266.1527764598390; Thu, 31 May 2018 04:03:18 -0700 (PDT) Received: from localhost.localdomain (AToulouse-658-1-184-117.w86-199.abo.wanadoo.fr. [86.199.39.117]) by smtp.googlemail.com with ESMTPSA id f2-v6sm5887419edq.28.2018.05.31.04.03.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 May 2018 04:03:17 -0700 (PDT) From: Alban Gruin To: git@vger.kernel.org Cc: Stefan Beller , Christian Couder , Johannes Schindelin , phillip.wood@dunelm.org.uk, Alban Gruin Subject: [GSoC][PATCH 1/2] rebase--interactive: rewrite append_todo_help() in C Date: Thu, 31 May 2018 13:01:29 +0200 Message-Id: <20180531110130.18839-2-alban.gruin@gmail.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20180531110130.18839-1-alban.gruin@gmail.com> References: <20180531110130.18839-1-alban.gruin@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org This rewrites append_todo_help() from shell to C. It also incorporates some parts of initiate_action() and complete_action() that also write help texts to the todo file. Two flags are added to rebase--helper.c: one to call append_todo_help() (`--append-todo-help`), and another one to tell append_todo_help() to write the help text suited for the edit-todo mode (`--edit-todo`). Finally, append_todo_help() is removed from git-rebase--interactive.sh to use `rebase--helper --append-todo-help` instead. Signed-off-by: Alban Gruin --- builtin/rebase--helper.c | 10 ++++++-- git-rebase--interactive.sh | 52 ++-------------------------------------- sequencer.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++ sequencer.h | 1 + 4 files changed, 71 insertions(+), 52 deletions(-) diff --git a/builtin/rebase--helper.c b/builtin/rebase--helper.c index f7c2a5fdc..ad3a3a7eb 100644 --- a/builtin/rebase--helper.c +++ b/builtin/rebase--helper.c @@ -12,12 +12,12 @@ static const char * const builtin_rebase_helper_usage[] = { int cmd_rebase__helper(int argc, const char **argv, const char *prefix) { struct replay_opts opts = REPLAY_OPTS_INIT; - unsigned flags = 0, keep_empty = 0, rebase_merges = 0; + unsigned flags = 0, keep_empty = 0, rebase_merges = 0, edit_todo = 0; int abbreviate_commands = 0, rebase_cousins = -1; enum { CONTINUE = 1, ABORT, MAKE_SCRIPT, SHORTEN_OIDS, EXPAND_OIDS, CHECK_TODO_LIST, SKIP_UNNECESSARY_PICKS, REARRANGE_SQUASH, - ADD_EXEC + ADD_EXEC, APPEND_TODO_HELP } command = 0; struct option options[] = { OPT_BOOL(0, "ff", &opts.allow_ff, N_("allow fast-forward")), @@ -27,6 +27,8 @@ int cmd_rebase__helper(int argc, const char **argv, const char *prefix) OPT_BOOL(0, "rebase-merges", &rebase_merges, N_("rebase merge commits")), OPT_BOOL(0, "rebase-cousins", &rebase_cousins, N_("keep original branch points of cousins")), + OPT_BOOL(0, "edit-todo", &edit_todo, + N_("edit the todo list during an interactive rebase")), OPT_CMDMODE(0, "continue", &command, N_("continue rebase"), CONTINUE), OPT_CMDMODE(0, "abort", &command, N_("abort rebase"), @@ -45,6 +47,8 @@ int cmd_rebase__helper(int argc, const char **argv, const char *prefix) N_("rearrange fixup/squash lines"), REARRANGE_SQUASH), OPT_CMDMODE(0, "add-exec-commands", &command, N_("insert exec commands in todo list"), ADD_EXEC), + OPT_CMDMODE(0, "append-todo-help", &command, + N_("insert the help in the todo list"), APPEND_TODO_HELP), OPT_END() }; @@ -84,5 +88,7 @@ int cmd_rebase__helper(int argc, const char **argv, const char *prefix) return !!rearrange_squash(); if (command == ADD_EXEC && argc == 2) return !!sequencer_add_exec_commands(argv[1]); + if (command == APPEND_TODO_HELP && argc == 1) + return !!append_todo_help(edit_todo, keep_empty); usage_with_options(builtin_rebase_helper_usage, options); } diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 9884ecd71..419c54068 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -39,38 +39,6 @@ comment_for_reflog () { esac } -append_todo_help () { - gettext " -Commands: -p, pick = use commit -r, reword = use commit, but edit the commit message -e, edit = use commit, but stop for amending -s, squash = use commit, but meld into previous commit -f, fixup = like \"squash\", but discard this commit's log message -x, exec = run command (the rest of the line) using shell -d, drop = remove commit -l, label