From patchwork Sat Oct 27 21:29:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alban Gruin X-Patchwork-Id: 10658449 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 04A33679F for ; Sat, 27 Oct 2018 21:30:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E8CB72A87A for ; Sat, 27 Oct 2018 21:30:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DC9032A892; Sat, 27 Oct 2018 21:30:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8692C2A87E for ; Sat, 27 Oct 2018 21:30:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728924AbeJ1GMb (ORCPT ); Sun, 28 Oct 2018 02:12:31 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:36881 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728869AbeJ1GMa (ORCPT ); Sun, 28 Oct 2018 02:12:30 -0400 Received: by mail-wr1-f68.google.com with SMTP id g9-v6so4667650wrq.4 for ; Sat, 27 Oct 2018 14:30: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 :mime-version:content-transfer-encoding; bh=hkLQIlxbYOmzOXiqw2TYR990BYzjLe+X1gdiMoGGy0g=; b=BozxwVFsYugijPldUEyIP3aWIHqHUnNOqhWO/dIhdC09QLfiTzV6mrMfEQXVyCUrL2 1aJ/p7GP5AQ/A4BIEz8BBC5TQZovs2+yYRPq7mP3Lyo6QFVppXUn9S/oajkZXJW6ykFu geujmE2/Z1UiW59BYA+6QR3YEre1tfkYn6hSuvO99qXZcOxefpFFMhwy7upPfVgqZAMZ KE4tmHi0QReiD0NAcH0vJMVKWTupOKJG05Mhjv8O8bWO3wt7QWMtcocgmCEsmDB1vhti QFhVEDwSiUM6RDEp836T0FH4hIfhtv2NG9TmIG3ZhV8l6tbCCc7BoFMqfP9Q7L4cZldZ VaFQ== 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:mime-version:content-transfer-encoding; bh=hkLQIlxbYOmzOXiqw2TYR990BYzjLe+X1gdiMoGGy0g=; b=UD85BBdRlkC4BRmfq876be/vFJWgUVrK1P67T8yX+hIBu848x10HGLd2Zv8B8DFCWH Wn49+5ChlfimdLzsZS/lkZiv6IyDF+gV8rm2gI40y0E0+zFGJe1g8Vxk0shOQZABISfn 1WiTVPFg9p1FAeUQcDg/mB/eglgPAk1OMwR1xTz13qkhTFZKElFCM5oQg2s3gpCKlPKa gb2ODuvgHcQg9UDLC1PF6zxHNNi9p3WSvtnAVG4oDk5ODGYyLtmFc3z19wJAC4ZHFruO sSlPWW3W5uLWQX68kGQbD0Vzdgw1tf40teyGfNmqkMt6/pNly2IH8CWOv6GzTWn5RYOf ZBrQ== X-Gm-Message-State: AGRZ1gJR8Zekwii549eQ8hzDXqCBW2TQs8wiH50HL9NhCK1kenG5SCa9 HMpwrrK1BVI5wPJlCLsPOAb9Xs6R X-Google-Smtp-Source: AJdET5e3cePGK/mURbqrr/3N+CvC2NvMzIaceC7OOVYwp9sgkR7r1DybtqxLU7wqNbPMZ3QbXDhrPQ== X-Received: by 2002:adf:db0f:: with SMTP id s15-v6mr9402591wri.129.1540675810062; Sat, 27 Oct 2018 14:30:10 -0700 (PDT) Received: from localhost.localdomain (atoulouse-658-1-19-179.w86-222.abo.wanadoo.fr. [86.222.18.179]) by smtp.googlemail.com with ESMTPSA id t198-v6sm9842514wmd.9.2018.10.27.14.30.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 27 Oct 2018 14:30:09 -0700 (PDT) From: Alban Gruin To: git@vger.kernel.org Cc: Johannes Schindelin , Phillip Wood , Junio C Hamano , Alban Gruin Subject: [PATCH v2 14/16] sequencer: use edit_todo_list() in complete_action() Date: Sat, 27 Oct 2018 23:29:28 +0200 Message-Id: <20181027212930.9303-15-alban.gruin@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181027212930.9303-1-alban.gruin@gmail.com> References: <20181007195418.25752-1-alban.gruin@gmail.com> <20181027212930.9303-1-alban.gruin@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This changes complete_action() to use edit_todo_list(), now that it can handle the initial edit of the todo list. Signed-off-by: Alban Gruin --- sequencer.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/sequencer.c b/sequencer.c index a03505f582..0763eeae25 100644 --- a/sequencer.c +++ b/sequencer.c @@ -4457,7 +4457,7 @@ int complete_action(struct replay_opts *opts, unsigned flags, struct todo_list new_todo = TODO_LIST_INIT; struct strbuf *buf = &todo_list->buf; struct object_id oid; - int command_count; + int command_count, res; get_oid(onto, &oid); shortonto = find_unique_abbrev(&oid, DEFAULT_ABBREV); @@ -4484,24 +4484,16 @@ int complete_action(struct replay_opts *opts, unsigned flags, return error(_("nothing to do")); } - if (todo_list_write_to_file(todo_list, todo_file, - shortrevisions, shortonto, command_count, - 1, -1, flags | TODO_LIST_SHORTEN_IDS)) - return error_errno(_("could not write '%s'"), todo_file); - - if (copy_file(rebase_path_todo_backup(), todo_file, 0666)) - return error(_("could not copy '%s' to '%s'."), todo_file, - rebase_path_todo_backup()); - - if (launch_sequence_editor(todo_file, &new_todo.buf, NULL)) { + res = edit_todo_list(todo_list, &new_todo, flags, + command_count, shortrevisions, shortonto); + if (res == -1) + return -1; + else if (res == -2) { apply_autostash(opts); sequencer_remove_state(opts); return -1; - } - - strbuf_stripspace(&new_todo.buf, 1); - if (new_todo.buf.len == 0) { + } else if (res == -3) { apply_autostash(opts); sequencer_remove_state(opts); todo_list_release(&new_todo);