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=-3.8 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 67BA01F516 for ; Tue, 26 Jun 2018 16:17:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752545AbeFZQRq (ORCPT ); Tue, 26 Jun 2018 12:17:46 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:36098 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752509AbeFZQRj (ORCPT ); Tue, 26 Jun 2018 12:17:39 -0400 Received: by mail-wr0-f196.google.com with SMTP id f16-v6so17870917wrm.3 for ; Tue, 26 Jun 2018 09:17:39 -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=FiP1hlccSD0W6YgfEHfGf6avIc6vMw6uT4462VsJHE4=; b=j8K6JZIK03+14/gwn/ygbZUC05ZfRCBg1IhGeugvl40m7JaEjnsh6Hi+5QeEWUINH5 SGiLBTLrXt6VGQnBLlwF9AzQ7VpRcOVC5wDiDhafvzbzCD3CALI/DKBqlfaCU2YIoE33 IFGIVMVA+bNY5JPF0Yb0Wt6uU6CGpXWqb6Bp9JLVVewGM6XRFIm9oHi4C8iKqp6Iy5dt AupaeuAyAQ6GZWPv7ZDwP3+Bmquu0tKcobkP3SKDplTLGjULd/BR6HRPsm1AcCYYw+tF jHwWPk2VgglQmsmWZjsu691Gp/mmPkuHw7LcLGlSlkfpL7stTEXt30Pk5n3ZGuq6477E SPAA== 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=FiP1hlccSD0W6YgfEHfGf6avIc6vMw6uT4462VsJHE4=; b=Sc+QIaBK9SUmVc6ZwwLEKfIJ2pigPxbxC3kFMaf0r4e4dTPxCUdrrPV7kUJIBNlkfe 6i7jbYtcY+9FJzDUVheA255Emy9uiYz1SU6O8N5caaIBJ1XGhtTCRZFp+9s1qJyH4DO9 adpHMM9d8yYxBnKrgKLWV4WpKXtjNPLOkkuNpKW16NxOMcs/K6p/Pb9OHFshn8wWcyj0 y5144Xe3+x5PtJiNmnTte348IV4YzbKkC0xEZO0OTpP+Db7RWAkDjyoFyu5tth/+Bs6q fx62lmmHKGQLB+dofxb38nBsKJlqRCYFOvnzsm0GGYHJyBNlywI/3kBjuWu8zyqJAsVO wQzw== X-Gm-Message-State: APt69E0A+9zkdCHLq02S0VUqa2hATr9nIyuTnjS6qXxH/8a/+RbzOe65 TBZ/XwNndzPcimsvFzqqw03FnzGa X-Google-Smtp-Source: AAOMgpdaDec2UsaC50yEH02xwdK/Uzau89eqaCPgeIhwliMBjrt4sWXbfyAhPqnUfkTB2QoTvfro+Q== X-Received: by 2002:adf:cf0d:: with SMTP id o13-v6mr2023088wrj.112.1530029858245; Tue, 26 Jun 2018 09:17:38 -0700 (PDT) Received: from localhost.localdomain (AToulouse-658-1-38-233.w86-221.abo.wanadoo.fr. [86.221.117.233]) by smtp.googlemail.com with ESMTPSA id g88-v6sm3790319wmc.27.2018.06.26.09.17.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Jun 2018 09:17:37 -0700 (PDT) From: Alban Gruin To: git@vger.kernel.org Cc: Stefan Beller , Christian Couder , Pratik Karki , Johannes Schindelin , phillip.wood@dunelm.org.uk, Alban Gruin Subject: [GSoC][PATCH v4 2/2] rebase--interactive: rewrite append_todo_help() in C Date: Tue, 26 Jun 2018 18:16:43 +0200 Message-Id: <20180626161643.31152-3-alban.gruin@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180626161643.31152-1-alban.gruin@gmail.com> References: <20180607103012.22981-1-alban.gruin@gmail.com> <20180626161643.31152-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. This also introduces the source file rebase-interactive.c. This file will contain functions necessary for interactive rebase that are too specific for the sequencer, and is part of libgit.a. 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 (`--write-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 --- Makefile | 1 + builtin/rebase--helper.c | 11 ++++-- git-rebase--interactive.sh | 52 ++--------------------------- rebase-interactive.c | 68 ++++++++++++++++++++++++++++++++++++++ rebase-interactive.h | 6 ++++ 5 files changed, 86 insertions(+), 52 deletions(-) create mode 100644 rebase-interactive.c create mode 100644 rebase-interactive.h diff --git a/Makefile b/Makefile index 0cb6590f2..a281139ef 100644 --- a/Makefile +++ b/Makefile @@ -922,6 +922,7 @@ LIB_OBJS += protocol.o LIB_OBJS += quote.o LIB_OBJS += reachable.o LIB_OBJS += read-cache.o +LIB_OBJS += rebase-interactive.o LIB_OBJS += reflog-walk.o LIB_OBJS += refs.o LIB_OBJS += refs/files-backend.o diff --git a/builtin/rebase--helper.c b/builtin/rebase--helper.c index f7c2a5fdc..05e73e71d 100644 --- a/builtin/rebase--helper.c +++ b/builtin/rebase--helper.c @@ -3,6 +3,7 @@ #include "config.h" #include "parse-options.h" #include "sequencer.h" +#include "rebase-interactive.h" static const char * const builtin_rebase_helper_usage[] = { N_("git rebase--helper []"), @@ -12,12 +13,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, write_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 +28,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, "write-edit-todo", &write_edit_todo, + N_("append the edit-todo message to the todo-list")), OPT_CMDMODE(0, "continue", &command, N_("continue rebase"), CONTINUE), OPT_CMDMODE(0, "abort", &command, N_("abort rebase"), @@ -45,6 +48,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 +89,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(write_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 299ded213..94c23a7af 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