From: Phillip Wood <phillip.wood123@gmail.com>
To: Stefan Haller <lists@haller-berlin.de>, git@vger.kernel.org
Subject: Re: When exactly should REBASE_HEAD exist?
Date: Fri, 10 Mar 2023 09:56:28 +0000 [thread overview]
Message-ID: <722659e9-02ac-a9d2-b0fd-b9a2a3d85753@dunelm.org.uk> (raw)
In-Reply-To: <4d13d02a-ddaf-7b8f-7a27-c7a030816523@haller-berlin.de>
Hi Stefan
On 08/03/2023 19:02, Stefan Haller wrote:
> On 05.03.23 21:15, Phillip Wood wrote:
>> Hi Stefan
>>
>> On 05/03/2023 19:13, Stefan Haller wrote:
>>> On 05.03.23 17:59, Stefan Haller wrote:
>>>> On 05.03.23 15:31, Phillip Wood wrote:
>>>>> Hi Stefan
>>>>>
>>>>> On 02/03/2023 20:27, Stefan Haller wrote:
>>>>>> On 02.03.23 11:19, Phillip Wood wrote:
>>>>>>> On 28/02/2023 12:55, Stefan Haller wrote:
>>>>>>>> The reason why I am asking this is: I'm using lazygit, which, during
>>>>>>>> interactive rebases, shows a combined view of the real commits that
>>>>>>>> were
>>>>>>>> already applied, and the remaining commits that are yet to be
>>>>>>>> applied
>>>>>>>> (it gets these by parsing rebase-merge/git-rebase-todo);
>>>>>>>> something like
>>>>>>>> this, when I set the 2nd commit to "edit":
>>>>>>>>
>>>>>>>> pick 4th commit
>>>>>>>> pick 3rd commit
>>>>>>>> 2nd commit <-- YOU ARE HERE
>>>>>>>> 1st commit
>>>>>>>>
>>>>>>>> This is great, but assuming that the 2nd commit conflicted,
>>>>>>>> currently
>>>>>>>> the display looks like this:
>>>>>>>>
>>>>>>>> pick 4th commit
>>>>>>>> pick 3rd commit
>>>>>>>> 1st commit <-- YOU ARE HERE
>>>>>>>>
>>>>>>>> I would like to extend this to also show a "fake entry" for the
>>>>>>>> commit
>>>>>>>> that conflicted, if there is one. REBASE_HEAD is perfect for this,
>>>>>>>> except that I need a way to distinguish whether it was applied
>>>>>>>> already
>>>>>>>> or not.
> OK, I see. Sounds like a possible algorithm could be:
>
> func commitNameToShowAsTheCurrentlyConflictingCommit() {
Going back to your original email, if all you want to do is show "YOU
ARE HERE" against the correct commit then you can get that from the last
entry in the "done" file irrespective of whether there were conflicts or
not. If you also want to show whether it was picked cleanly or not then
it is more complicated.
> lastDone := last command of "done" file
> if lastDone.command is "break" or "exec" {
> return nil
> }
>
> next := first command of "git-rebase-todo" file
> if lastDone == next {
> // Command was rescheduled and shows in remaining todos already
> return nil
> }
I don't know what your current implementation looks like but if I was
starting from scratch I think it would be simpler to always use the last
command from "done" and then suppress the first command from
"git-rebase-todo" if it is the same. That way the "YOU ARE HERE" always
marks the last command from "done"
> if lastDone.command is "edit" {
> if "amend" file exists {
> // "edit" command was successful
> return nil
> }
> }
If you need to know if the pick was successful or not then that should
tell you, but if all you need to know is which commit the rebase stopped
on then you don't need this.
Best Wishes
Phillip
> return lastDone.commitName
> }
>
> Does this sound reasonable?
next prev parent reply other threads:[~2023-03-10 9:57 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-28 12:55 When exactly should REBASE_HEAD exist? Stefan Haller
2023-03-02 10:19 ` Phillip Wood
2023-03-02 20:27 ` Stefan Haller
2023-03-03 10:57 ` Stefan Haller
2023-03-03 21:25 ` Chris Torek
2023-03-04 8:36 ` Stefan Haller
2023-03-06 3:31 ` Chris Torek
2023-03-07 13:16 ` Stefan Haller
2023-03-05 14:33 ` Phillip Wood
2023-03-05 16:58 ` Stefan Haller
2023-03-05 14:31 ` Phillip Wood
2023-03-05 16:59 ` Stefan Haller
2023-03-05 19:13 ` Stefan Haller
2023-03-05 20:15 ` Phillip Wood
2023-03-08 19:02 ` Stefan Haller
2023-03-10 9:56 ` Phillip Wood [this message]
2023-03-10 17:42 ` Stefan Haller
2023-03-16 17:46 ` Phillip Wood
2023-03-19 14:50 ` Phillip Wood
2023-03-20 7:29 ` Stefan Haller
2023-03-20 8:42 ` Stefan Haller
2023-03-07 18:07 ` Junio C Hamano
2023-03-08 19:02 ` Stefan Haller
2023-03-08 19:40 ` Junio C Hamano
2023-03-09 14:45 ` Stefan Haller
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=722659e9-02ac-a9d2-b0fd-b9a2a3d85753@dunelm.org.uk \
--to=phillip.wood123@gmail.com \
--cc=git@vger.kernel.org \
--cc=lists@haller-berlin.de \
--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).