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 0E5301F597 for ; Tue, 26 Jun 2018 16:23:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752626AbeFZQXO (ORCPT ); Tue, 26 Jun 2018 12:23:14 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:33381 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752147AbeFZQXL (ORCPT ); Tue, 26 Jun 2018 12:23:11 -0400 Received: by mail-wr0-f193.google.com with SMTP id k16-v6so17890941wro.0 for ; Tue, 26 Jun 2018 09:23:11 -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=CdBdO40uV3dUFl7zjAwu66mIZ3I4WhQJ5tIpJ6dcw+I=; b=BU2jdFCg+fsVsYGCj0UrzZTIZT/+Duy0BS6G3ZJN2DEMVlqXZMOwfrG5VZw98i2jEE r1e9hdE68iqOuSBBYoQxiN4LfYA0Z3well+B4ihGB2ozMTKx83nI/x1+9whqDOSgD5Nr kWXOVHKMmbrDiskreodUtjWmNM4K2Re4fm/EJAbBC7wPNMTYmCalPLlH4DtxwD6114CK v0UTAVd9bKypMooYepkk7mrAybNZoQqoSCok2rrHKQek1tGyMBBJC7XcdZYf9w5o3tUh rEQegMfMxhEN5ypKrRDk6JCukRTFW/ORmrznVLhuVfiZfP9r50TsQIZE1NzuwOaFaeQ8 It0g== 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=CdBdO40uV3dUFl7zjAwu66mIZ3I4WhQJ5tIpJ6dcw+I=; b=d63RKtd0tFKZLY1DBzBOuIMo6VZ4bBDO4/JXMYTkDHkNBf/l1xfJu53Z2R8kFTc9Yz +vmJ+ZHeLuzjpVTvGQyQVrC/0RIelNRvsLeImJktkz2iW6G/eBnj68hBC5IOvaiJLbAI aF032GxDECShfP+C+4Wt80e9xe+741WMYoklbGsPXa54DvMU4+DA4Ix696NGonQQzCOr odH7kZto1iLrE3dcRf0idc8/tHWyFCDZAgrcj4NDQuB07uGkGcOTmJq3UAEPZc6COkt3 2kuCwemZAw5HXneOlS73VCABnIT+Udd/gHur9cg8EzTaO0x0YC0jq1iLnqeM33uqjm/e gRQg== X-Gm-Message-State: APt69E0wjlmcc+Q0OXy0GwHhg4xWN4RE9NxOB4+2cCqVRk686LFe3qsL EHBd5X5B599SI2mb13f4lR0bneuC X-Google-Smtp-Source: AAOMgpdYab+eivVXegRXP5wHn0sOkSuqTItJ5z8RqTc14/2DP+tfeuy02bEDvt38T4x4mfxrtB6WuQ== X-Received: by 2002:adf:fa07:: with SMTP id m7-v6mr2171565wrr.228.1530030190235; Tue, 26 Jun 2018 09:23:10 -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 n17-v6sm3545723wmd.14.2018.06.26.09.23.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Jun 2018 09:23:09 -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 v3 2/2] rebase-interactive: rewrite the edit-todo functionality in C Date: Tue, 26 Jun 2018 18:21:43 +0200 Message-Id: <20180626162143.31608-3-alban.gruin@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180626162143.31608-1-alban.gruin@gmail.com> References: <20180613152211.12580-1-alban.gruin@gmail.com> <20180626162143.31608-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 edit-todo functionality from shell to C. To achieve that, a new command mode, `edit-todo`, is added, and the `write-edit-todo` flag is removed, as the shell script does not need to write the edit todo help message to the todo list anymore. The shell version is then stripped in favour of a call to the helper. Signed-off-by: Alban Gruin --- builtin/rebase--helper.c | 13 ++++++++----- git-rebase--interactive.sh | 11 +---------- rebase-interactive.c | 31 +++++++++++++++++++++++++++++++ rebase-interactive.h | 1 + 4 files changed, 41 insertions(+), 15 deletions(-) diff --git a/builtin/rebase--helper.c b/builtin/rebase--helper.c index 05e73e71d..731a64971 100644 --- a/builtin/rebase--helper.c +++ b/builtin/rebase--helper.c @@ -13,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, write_edit_todo = 0; + unsigned flags = 0, keep_empty = 0, rebase_merges = 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, APPEND_TODO_HELP + ADD_EXEC, APPEND_TODO_HELP, EDIT_TODO } command = 0; struct option options[] = { OPT_BOOL(0, "ff", &opts.allow_ff, N_("allow fast-forward")), @@ -28,8 +28,6 @@ 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"), @@ -50,6 +48,9 @@ int cmd_rebase__helper(int argc, const char **argv, const char *prefix) 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_CMDMODE(0, "edit-todo", &command, + N_("edit the todo list during an interactive rebase"), + EDIT_TODO), OPT_END() }; @@ -90,6 +91,8 @@ int cmd_rebase__helper(int argc, const char **argv, const char *prefix) 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); + return !!append_todo_help(0, keep_empty); + if (command == EDIT_TODO && argc == 1) + return !!edit_todo_list(flags); usage_with_options(builtin_rebase_helper_usage, options); } diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 94c23a7af..2defe607f 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -108,16 +108,7 @@ initiate_action () { --continue ;; edit-todo) - git stripspace --strip-comments <"$todo" >"$todo".new - mv -f "$todo".new "$todo" - collapse_todo_ids - git rebase--helper --append-todo-help --write-edit-todo - - git_sequence_editor "$todo" || - die "$(gettext "Could not execute editor")" - expand_todo_ids - - exit + exec git rebase--helper --edit-todo ;; show-current-patch) exec git show REBASE_HEAD -- diff --git a/rebase-interactive.c b/rebase-interactive.c index c79c819b9..ace8e095b 100644 --- a/rebase-interactive.c +++ b/rebase-interactive.c @@ -66,3 +66,34 @@ int append_todo_help(unsigned edit_todo, unsigned keep_empty) return ret; } + +int edit_todo_list(unsigned flags) +{ + struct strbuf buf = STRBUF_INIT; + const char *todo_file = rebase_path_todo(); + FILE *todo; + + if (strbuf_read_file(&buf, todo_file, 0) < 0) + return error_errno(_("could not read '%s'."), todo_file); + + strbuf_stripspace(&buf, 1); + todo = fopen_or_warn(todo_file, "w"); + if (!todo) { + strbuf_release(&buf); + return 1; + } + + strbuf_write(&buf, todo); + fclose(todo); + strbuf_release(&buf); + + transform_todos(flags | TODO_LIST_SHORTEN_IDS); + append_todo_help(1, 0); + + if (launch_sequence_editor(todo_file, NULL, NULL)) + return 1; + + transform_todos(flags & ~(TODO_LIST_SHORTEN_IDS)); + + return 0; +} diff --git a/rebase-interactive.h b/rebase-interactive.h index 47372624e..155219e74 100644 --- a/rebase-interactive.h +++ b/rebase-interactive.h @@ -2,5 +2,6 @@ #define REBASE_INTERACTIVE_H int append_todo_help(unsigned edit_todo, unsigned keep_empty); +int edit_todo_list(unsigned flags); #endif -- 2.18.0