GNU bug report logs - #79408
31.0.50; VC commands for cherry-picking

Previous Next

Full log

Message #8 received at 79408 <at> debbugs.gnu.org (full text, mbox):

From: Juri Linkov <juri <at> linkov.net>
To: Sean Whitton <spwhitton <at> spwhitton.name>
Cc: dmitry <at> gutov.dev, sbaugh <at> janestreet.com, eliz <at> gnu.org,
 79408 <at> debbugs.gnu.org
Subject: Re: bug#79408: 31.0.50; VC commands for cherry-picking
Date: Mon, 08 Sep 2025 21:34:19 +0300

> These are my proposed commands:
>
> vc-cherry-pick:
>  - Gets the log message for REV with get-change-comment API function.
>  - Gets the string to append with cherry-pick-comment API function.
>  - Puts these together, starts a Log Edit session for the user to amend
>    the message (e.g. for Git, doing C-c C-s to add a sign-off).

Will 'C-c C-d' be supported to show diff from the Log Edit buffer?

>  We'll be expecting the user to invoke this from Log View mode.

I guess the basic workflow would be to view a branch log
with e.g. 'C-x v b l', then after marking the required commits
invoke the new commands.

>  If multiple commits are marked, then I think we have to skip the Log Edit
>  session, for now, because we don't have a nice way to prompt for
>  multiple messages.

Maybe even for the single commit 'vc-cherry-pick' could ask
for confirmation (maybe with a multiple choice), and optionally
commit straight away without showing a Log Edit buffer.

> vc-cherry-apply:
>  The advantage of having a backend API function for this is that the
>  backend can use its full merging logic.
>  A generic vc-default-cherry-apply can be implementated similarly to
>  vc-apply-to-other-working-tree.
>
> vc-undo-apply:
>  Like vc-cherry-apply except passes REVERSE non-nil at the appropriate
>  point.  Similarly there can be a vc-default-reverse-cherry-apply.

Are the last two commands equivalent to showing diff and invoking
'C-c RET a' on it, with or without the prefix argument REVERSE?

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.