Re: When exactly should REBASE_HEAD exist?

From: Phillip Wood <phillip.wood123@gmail.com>
Date: Mar 10, 2023, 09:56 UTC
Message-ID: <722659e9-02ac-a9d2-b0fd-b9a2a3d85753@dunelm.org.uk>
In-Reply-To: <4d13d02a-ddaf-7b8f-7a27-c7a030816523@haller-berlin.de>

Hi Stefan

On 08/03/2023 19:02, Stefan Haller wrote:

Show 42 quoted lines

> 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.

Show 10 quoted lines

>      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"

Show 6 quoted lines

>      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?