From: Alban Gruin <alban.gruin@gmail.com>
To: phillip.wood@dunelm.org.uk, Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: [PATCH v3 2/2] rebase-interactive: warn if commit is dropped with `rebase --edit-todo'
Date: Fri, 10 Jan 2020 22:31:03 +0100 [thread overview]
Message-ID: <85e3d40a-9829-0f50-8d91-7e8e8fa319f1@gmail.com> (raw)
In-Reply-To: <79ad2e01-2fc3-cd52-7879-5a81370628ef@gmail.com>
Hi Phillip,
Le 10/01/2020 à 18:13, Phillip Wood a écrit :
> Hi Alban
>
> On 09/01/2020 21:13, Alban Gruin wrote:
>> Hi Phillip,
>>
>> Le 09/12/2019 à 17:00, Phillip Wood a écrit :
>>>>> diff --git a/rebase-interactive.c b/rebase-interactive.c
>>>>> index ad5dd49c31..80b6a2e7a6 100644
>>>>> --- a/rebase-interactive.c
>>>>> +++ b/rebase-interactive.c
>>>>> @@ -97,7 +97,8 @@ int edit_todo_list(struct repository *r, struct
>>>>> todo_list *todo_list,
>>>>> struct todo_list *new_todo, const char *shortrevisions,
>>>>> const char *shortonto, unsigned flags)
>>>>> {
>>>>> - const char *todo_file = rebase_path_todo();
>>>>> + const char *todo_file = rebase_path_todo(),
>>>>> + *todo_backup = rebase_path_todo_backup();
>>>>> /* If the user is editing the todo list, we first try to parse
>>>>> @@ -110,9 +111,9 @@ int edit_todo_list(struct repository *r, struct
>>>>> todo_list *todo_list,
>>>>> -1, flags | TODO_LIST_SHORTEN_IDS |
>>>>> TODO_LIST_APPEND_TODO_HELP))
>>>>> return error_errno(_("could not write '%s'"), todo_file);
>>>>> - if (initial && copy_file(rebase_path_todo_backup(), todo_file,
>>>>> 0666))
>>>>> - return error(_("could not copy '%s' to '%s'."), todo_file,
>>>>> - rebase_path_todo_backup());
>>>>> + unlink(todo_backup);
>>>>> + if (copy_file(todo_backup, todo_file, 0666))
>>>>> + return error(_("could not copy '%s' to '%s'."), todo_file,
>>>>> todo_backup);
>>>>
>>>> We used to copy ONLY when initial is set and we left old todo_backup
>>>> intact when !initial. That is no longer true after this change, but
>>>> it is intended---we create an exact copy of what we would hand out
>>>> to the end-user, so that we can compare it with the edited result
>>>> to figure out what got changed.
>>>
>>> I think it would be better to only create a new copy if the last edit
>>> was successful. As it stands if I edit the todo list and accidentally
>>> delete some lines and then edit the todo list again to try and fix it
>>> the second edit will succeed whether or not I reinserted the deleted
>>> lines.
>>>
>>> We could add this to the tests to check that a subsequent edit that does
>>> not fix the problem fails
>>>
>>> diff --git a/t/t3404-rebase-interactive.sh
>>> b/t/t3404-rebase-interactive.sh
>>> index 969e12d281..8544d8ab2c 100755
>>> --- a/t/t3404-rebase-interactive.sh
>>> +++ b/t/t3404-rebase-interactive.sh
>>>
>>> @@ -1416,6 +1416,7 @@ test_expect_success 'rebase --edit-todo respects
>>> rebase.missingCommitsCheck = er
>>> test_i18ncmp expect actual &&
>>> test_must_fail git rebase --continue 2>actual &&
>>> test_i18ncmp expect actual &&
>>> + test_must_fail git rebase --edit-todo &&
>>> cp orig .git/rebase-merge/git-rebase-todo &&
>>> test_must_fail env FAKE_LINES="1 2 3 4" \
>>> git rebase --edit-todo 2>actual &&
>>>
>>>
>>
>> In which case, if the check did not pass at the previous edit, the new
>> todo list should be compared to the backup. As sequencer_continue()
>> already does this, extract this to its own function in
>> rebase-interactive.c. To keep track of this, a file is created on the
>> disk (as you suggested in your other email.) At the next edit, if this
>> file exists and no errors were found, it is deleted. The backup is only
>> created if there is no errors in `todo_list' and in `new_todo'.
>>
>> This would guarantee that there is no errors in the backup, and that the
>> edited list is always compared to a list exempt of errors.
>>
>> This approach also has the benefit to detect if a commit part of a
>> badcmd was dropped.
>>
>> After some tweaks (ie. `expect' now lists 2 commits instead of one),
>> this passes the test with the change you suggested, and the one you sent
>> in your other email.
>
> That sounds good. I'm not sure how it passes the test in my other email
> though, if sequencer_continue() compares the todo list to the backup
> wont it still fail when continuing after conflicts as the backup is out
> of date?
>
I changed sequencer_continue() to check the todo list only if the file
indicating an error exists.
I still have to rewrite the commit message, then I’ll re-send this series.
Cheers,
Alban
> Best Wishes
>
> Phillip
>
next prev parent reply other threads:[~2020-01-10 21:31 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-17 14:39 [RFC PATCH 0/9] rebase -i: extend rebase.missingCommitsCheck to `--edit-todo' and co Alban Gruin
2019-07-17 14:39 ` [RFC PATCH 1/9] t3404: demonstrate that --edit-todo does not check for dropped commits Alban Gruin
2019-07-18 18:31 ` Junio C Hamano
2019-07-19 18:12 ` Alban Gruin
2019-07-19 19:51 ` Junio C Hamano
2019-07-17 14:39 ` [RFC PATCH 2/9] t3429: demonstrate that rebase exec " Alban Gruin
2019-07-17 14:39 ` [RFC PATCH 3/9] sequencer: update `total_nr' when adding an item to a todo list Alban Gruin
2019-07-18 19:52 ` Junio C Hamano
2019-07-19 18:12 ` Alban Gruin
2019-07-17 14:39 ` [RFC PATCH 4/9] sequencer: update `done_nr' when skipping commands in " Alban Gruin
2019-07-18 19:55 ` Junio C Hamano
2019-07-19 18:13 ` Alban Gruin
2019-07-17 14:39 ` [RFC PATCH 5/9] sequencer: move the code writing total_nr on the disk to a new function Alban Gruin
2019-07-18 20:04 ` Junio C Hamano
2019-07-19 18:14 ` Alban Gruin
2019-07-17 14:39 ` [RFC PATCH 6/9] sequencer: add a parameter to sequencer_continue() to accept a todo list Alban Gruin
2019-07-17 14:39 ` [RFC PATCH 7/9] rebase-interactive: todo_list_check() also uses the done list Alban Gruin
2019-07-17 14:39 ` [RFC PATCH 8/9] rebase-interactive: warn if commit is dropped with --edit-todo Alban Gruin
2019-07-17 14:39 ` [RFC PATCH 9/9] sequencer: have read_populate_todo() check for dropped commits Alban Gruin
2019-07-24 13:29 ` [RFC PATCH 0/9] rebase -i: extend rebase.missingCommitsCheck to `--edit-todo' and co Phillip Wood
2019-07-25 9:01 ` Johannes Schindelin
2019-07-25 20:26 ` Alban Gruin
2019-07-29 9:38 ` Phillip Wood
2019-09-24 20:15 ` Alban Gruin
2019-11-04 9:54 ` [RFC PATCH v2 0/2] rebase -i: extend rebase.missingCommitsCheck to `--edit-todo' Alban Gruin
2019-11-04 9:54 ` [RFC PATCH v2 1/2] t3404: demonstrate that --edit-todo does not check for dropped commits Alban Gruin
2019-11-04 9:54 ` [RFC PATCH v2 2/2] rebase-interactive: warn if commit is dropped with --edit-todo Alban Gruin
2019-11-05 14:20 ` Phillip Wood
2019-12-02 23:47 ` [PATCH v3 0/2] rebase -i: extend rebase.missingCommitsCheck Alban Gruin
2019-12-02 23:47 ` [PATCH v3 1/2] sequencer: move check_todo_list_from_file() to rebase-interactive.c Alban Gruin
2019-12-06 14:38 ` Johannes Schindelin
2019-12-02 23:47 ` [PATCH v3 2/2] rebase-interactive: warn if commit is dropped with `rebase --edit-todo' Alban Gruin
2019-12-04 19:19 ` Junio C Hamano
2019-12-09 16:00 ` Phillip Wood
2020-01-09 21:13 ` Alban Gruin
2020-01-10 17:13 ` Phillip Wood
2020-01-10 21:31 ` Alban Gruin [this message]
2020-01-11 14:44 ` Phillip Wood
2019-12-09 16:08 ` Phillip Wood
2019-12-04 21:51 ` [PATCH v3 0/2] rebase -i: extend rebase.missingCommitsCheck Junio C Hamano
2019-12-05 23:15 ` Alban Gruin
2019-12-06 10:41 ` Phillip Wood
2019-12-06 14:30 ` Johannes Schindelin
2020-01-11 17:39 ` [PATCH v4 " Alban Gruin
2020-01-11 17:39 ` [PATCH v4 1/2] sequencer: move check_todo_list_from_file() to rebase-interactive.c Alban Gruin
2020-01-11 17:39 ` [PATCH v4 2/2] rebase-interactive: warn if commit is dropped with `rebase --edit-todo' Alban Gruin
2020-01-19 16:28 ` Phillip Wood
2020-01-25 15:17 ` Alban Gruin
2020-01-25 17:54 ` [PATCH v5 0/2] rebase -i: extend rebase.missingCommitsCheck Alban Gruin
2020-01-25 17:54 ` [PATCH v5 1/2] sequencer: move check_todo_list_from_file() to rebase-interactive.c Alban Gruin
2020-01-25 17:54 ` [PATCH v5 2/2] rebase-interactive: warn if commit is dropped with `rebase --edit-todo' Alban Gruin
2020-01-26 10:04 ` [PATCH v5 0/2] rebase -i: extend rebase.missingCommitsCheck Johannes Schindelin
2020-01-27 21:39 ` Alban Gruin
2020-01-28 22:46 ` Johannes Schindelin
2020-01-28 21:12 ` [PATCH v6 " Alban Gruin
2020-01-28 21:12 ` [PATCH v6 1/2] sequencer: move check_todo_list_from_file() to rebase-interactive.c Alban Gruin
2020-01-28 21:12 ` [PATCH v6 2/2] rebase-interactive: warn if commit is dropped with `rebase --edit-todo' 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=85e3d40a-9829-0f50-8d91-7e8e8fa319f1@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).