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.3 required=3.0 tests=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 4AAE31F597 for ; Tue, 31 Jul 2018 18:00:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730167AbeGaTlx (ORCPT ); Tue, 31 Jul 2018 15:41:53 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:42966 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730038AbeGaTlx (ORCPT ); Tue, 31 Jul 2018 15:41:53 -0400 Received: by mail-wr1-f66.google.com with SMTP id e7-v6so17566275wrs.9 for ; Tue, 31 Jul 2018 11:00:25 -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=/4TY7yzOusjlewmPtI/l3Ix2uOnfVTwlTXtjlSACMns=; b=ladVNf/8Oy7uIoz4pEyHY+UOVMvBmcd8BwbTvWeMrC7l5L8ZMqELQiGk/mLSeV/bzU mzN4UfQxf1Jz+bPB1zenQSBjsgKQ/gV6TQnmwmjTgPQ4UkF9GR/PVLwQq/MGRATbZE0w HUf48Y0IqMtE0GpRDb6vD3+93vBj4MvDQ0YvE3strHsZpbHeb1WPpJssZGqTomtScp3M w/g8uZBpkvybBFR5xZlAH7WBaJTYHRNKtQjFu1z0jQq/RpAq/YWIVHdbYpWrmbNO3Lr5 QAzgzkMg79OLUVGTUs5zLP9HOAcEkXb9qVf8HNBGpu/wn0MJeJyWxApHfn+ZjBY6vti0 TzoA== 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=/4TY7yzOusjlewmPtI/l3Ix2uOnfVTwlTXtjlSACMns=; b=a1OKpvdXfyNTZcw7pFQSTqlwNtS3oCv86Iw2ojdXJ4FKQ//5UYNXwY+r0GLRfDrY5N +J3nZsQkJTRscIQXSLljHgoOE1fbYtTHgiuXRZ2ffAn9k99yLc5u8QlB9MgTPZlcSTNI 1TbTW4bA/MkoNKj/ERT4ho+j9n31YLBiI88GLO7FSI3xMAmy7c1Rm8t5NPZjm574b8Kv x1HbmhAylz3k6OOfko7WogFzneTDzGseTK/109F+ZiEFGEJ2dXB3C792I2n1IJ8BLUzt KX5WFm71qU1a7HAKjzyfEkV7cIwuW/xqH2vWvExZEL83uHG+CJnA8y2CuuWIGQAKVaNS K3uA== X-Gm-Message-State: AOUpUlEB4EqA12EBK4Q0BqWnjzDUcgfXTYv1Wgww5buHgX1yWhCTYXKk e+aHRHl6n6sTqCSKfi7NFM7VrLYC X-Google-Smtp-Source: AAOMgpdR0xxYJuesFdeZjv8bCXnkqblPcZoAEgiTfCuLXiPGQrMAYR89TAap71YiSGwQyvgiCs0bzQ== X-Received: by 2002:adf:e405:: with SMTP id g5-v6mr22136305wrm.96.1533060024562; Tue, 31 Jul 2018 11:00:24 -0700 (PDT) Received: from localhost.localdomain (AToulouse-658-1-67-118.w92-136.abo.wanadoo.fr. [92.136.29.118]) by smtp.googlemail.com with ESMTPSA id l10-v6sm20756602wrv.23.2018.07.31.11.00.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Jul 2018 11:00:23 -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 v5 04/20] rebase -i: rewrite the edit-todo functionality in C Date: Tue, 31 Jul 2018 19:59:47 +0200 Message-Id: <20180731180003.5421-5-alban.gruin@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180731180003.5421-1-alban.gruin@gmail.com> References: <20180724163221.15201-1-alban.gruin@gmail.com> <20180731180003.5421-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 --- No changes since v4. 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 05e73e71d4..731a64971d 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 94c23a7af2..2defe607f4 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 d7996bc8d9..403ecbf3c9 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 47372624e0..155219e742 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