From: Alban Gruin <alban.gruin@gmail.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Phillip Wood <phillip.wood@dunelm.org.uk>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v1 5/5] sequencer: directly call pick_commits() from complete_action()
Date: Wed, 2 Oct 2019 20:03:29 +0200 [thread overview]
Message-ID: <e37012e1-09dd-41b9-aa51-b6dd2b28a9c4@gmail.com> (raw)
In-Reply-To: <nycvar.QRO.7.76.6.1910021018360.46@tvgsbejvaqbjf.bet>
Hi Johannes,
Le 02/10/2019 à 10:20, Johannes Schindelin a écrit :
> Hi,
>
> On Fri, 27 Sep 2019, Phillip Wood wrote:
>
>> Hi Alban
>>
>> Thanks for removing some more unnecessary work reloading the the todo list.
>>
>> On 25/09/2019 21:13, Alban Gruin wrote:
>>> Currently, complete_action() calls sequencer_continue() to do the
>>> rebase. Even though the former already has the todo list, the latter
>>> loads it from the disk and parses it. Calling directly pick_commits()
>>> from complete_action() avoids this unnecessary round trip.
>>> Signed-off-by: Alban Gruin <alban.gruin@gmail.com>
>>> ---
>>> sequencer.c | 8 +++++---
>>> 1 file changed, 5 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/sequencer.c b/sequencer.c
>>> index ec7ea8d9e5..b395dd6e11 100644
>>> --- a/sequencer.c
>>> +++ b/sequencer.c
>>> @@ -5140,15 +5140,17 @@ int complete_action(struct repository *r, struct
>>> replay_opts *opts, unsigned fla
>>> return error_errno(_("could not write '%s'"), todo_file);
>>> }
>>> - todo_list_release(&new_todo);
>>> -
>>> if (checkout_onto(r, opts, onto_name, &oid, orig_head))
>>> return -1;
>>>
>>> if (require_clean_work_tree(r, "rebase", "", 1, 1))
>>> return -1;
>>> - return sequencer_continue(r, opts);
>>
>> sequencer_continue does a number of things before calling pick_commits(). It
>> - calls read_and_refresh_cache() - this is unnecessary here as we've just
>> called require_clean_work_tree()
>> - calls read_populate_opts() - this is unnecessary as we're staring a new
>> rebase so opts is fully populated
>> - loads the todo list - this is unnecessary as we've just populated the todo
>> list
>> - commits any staged changes - this is unnecessary as we're staring a new
>> rebase so there are no staged changes
>> - calls record_in_rewritten() - this is unnecessary as we're starting a new
>> rebase
>>
>> So I agree that this patch is correct.
>
> All true. Could this careful analysis maybe be included in the commit
> message (with `s/staring/starting/`)?
>
I will do so (same for your comment on 4/5) and resend this series as
soon as possible.
Cheers,
Alban
> Thanks,
> Dscho
>
>>
>> Thanks
>>
>> Phillip
>>
>>> + todo_list_write_total_nr(&new_todo);
>>> + res = pick_commits(r, &new_todo, opts);
>>> + todo_list_release(&new_todo);
>>> +
>>> + return res;
>>> }
>>>
>>> struct subject2item_entry {
>>>
>>
next prev parent reply other threads:[~2019-10-02 18:03 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20190925201315.19722-1-alban.gruin@gmail.com>
2019-09-25 20:13 ` [PATCH v1 1/5] sequencer: update `total_nr' when adding an item to a todo list Alban Gruin
2019-10-02 2:10 ` Junio C Hamano
2019-10-02 8:06 ` Johannes Schindelin
2019-10-02 8:59 ` Junio C Hamano
2019-10-02 9:48 ` Johannes Schindelin
2019-10-02 18:03 ` Alban Gruin
2019-09-25 20:13 ` [PATCH v1 2/5] sequencer: update `done_nr' when skipping commands in " Alban Gruin
2019-09-25 20:13 ` [PATCH v1 3/5] sequencer: move the code writing total_nr on the disk to a new function Alban Gruin
2019-09-25 20:13 ` [PATCH v1 4/5] rebase: fill `squash_onto' in get_replay_opts() Alban Gruin
2019-09-27 13:30 ` Phillip Wood
2019-10-02 8:16 ` Johannes Schindelin
2019-10-02 9:32 ` Phillip Wood
2019-10-02 12:06 ` Johannes Schindelin
2019-09-25 20:13 ` [PATCH v1 5/5] sequencer: directly call pick_commits() from complete_action() Alban Gruin
2019-09-27 13:26 ` Phillip Wood
2019-10-02 8:20 ` Johannes Schindelin
2019-10-02 18:03 ` Alban Gruin [this message]
2019-10-02 2:38 ` Junio C Hamano
2019-10-02 18:37 ` Alban Gruin
2019-10-26 7:47 ` René Scharfe
2019-10-26 11:27 ` Alban Gruin
2019-10-28 1:39 ` Junio C Hamano
2019-10-28 3:20 ` Junio C Hamano
2019-09-25 20:20 ` [PATCH v1 0/5] Use complete_action's todo list to do the rebase Alban Gruin
2019-09-27 13:32 ` [PATCH v1 0/5] Use complete_action’s " Phillip Wood
2019-10-07 9:26 ` [PATCH v2 0/5] Use complete_action's " Alban Gruin
2019-10-07 9:26 ` [PATCH v2 1/5] sequencer: update `total_nr' when adding an item to a todo list Alban Gruin
2019-10-07 9:26 ` [PATCH v2 2/5] sequencer: update `done_nr' when skipping commands in " Alban Gruin
2019-10-07 9:26 ` [PATCH v2 3/5] sequencer: move the code writing total_nr on the disk to a new function Alban Gruin
2019-10-07 9:26 ` [PATCH v2 4/5] rebase: fill `squash_onto' in get_replay_opts() Alban Gruin
2019-10-07 9:26 ` [PATCH v2 5/5] sequencer: directly call pick_commits() from complete_action() Alban Gruin
2019-10-08 2:45 ` [PATCH v2 0/5] Use complete_action's todo list to do the rebase Junio C Hamano
2019-10-08 16:18 ` Alban Gruin
2019-10-14 12:49 ` Johannes Schindelin
2019-11-23 14:37 ` [PATCH v3 " Alban Gruin
2019-11-23 14:37 ` [PATCH v3 1/5] sequencer: update `total_nr' when adding an item to a todo list Alban Gruin
2019-11-23 14:37 ` [PATCH v3 2/5] sequencer: update `done_nr' when skipping commands in " Alban Gruin
2019-11-23 14:37 ` [PATCH v3 3/5] sequencer: move the code writing total_nr on the disk to a new function Alban Gruin
2019-11-23 14:37 ` [PATCH v3 4/5] rebase: fill `squash_onto' in get_replay_opts() Alban Gruin
2019-11-23 14:37 ` [PATCH v3 5/5] sequencer: directly call pick_commits() from complete_action() Alban Gruin
2019-11-24 17:43 ` [PATCH v4 0/5] Use complete_action's todo list to do the rebase Alban Gruin
2019-11-24 17:43 ` [PATCH v4 1/5] sequencer: update `total_nr' when adding an item to a todo list Alban Gruin
2019-11-24 17:43 ` [PATCH v4 2/5] sequencer: update `done_nr' when skipping commands in " Alban Gruin
2019-11-24 17:43 ` [PATCH v4 3/5] sequencer: move the code writing total_nr on the disk to a new function Alban Gruin
2019-11-24 17:43 ` [PATCH v4 4/5] rebase: fill `squash_onto' in get_replay_opts() Alban Gruin
2019-11-26 18:27 ` Jonathan Tan
2019-11-24 17:43 ` [PATCH v4 5/5] sequencer: directly call pick_commits() from complete_action() Alban Gruin
2019-11-26 18:41 ` Jonathan Tan
2019-11-27 19:56 ` Alban Gruin
2019-11-27 20:09 ` Alban Gruin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e37012e1-09dd-41b9-aa51-b6dd2b28a9c4@gmail.com \
--to=alban.gruin@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=phillip.wood@dunelm.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).