applying mailing list review tags (was: Re: [PATCH v3 00/16] python: add mypy support to python/qemu)

[John Snow]

On 6/9/20 4:58 AM, Markus Armbruster wrote:
> Philippe Mathieu-Daudé <philmd@redhat.com> writes:
> 
>> On 6/8/20 5:33 PM, Kevin Wolf wrote:
>>> Am 08.06.2020 um 17:19 hat John Snow geschrieben:
>>>>
>>>>
>>>> On 6/5/20 5:26 AM, Kevin Wolf wrote:
>>>>> Am 04.06.2020 um 22:22 hat John Snow geschrieben:
>>>>>> Based-on: 20200604195252.20739-1-jsnow@redhat.com
>>>>>>
>>>>>> This series is extracted from my larger series that attempted to bundle
>>>>>> our python module as an installable module. These fixes don't require 
>>>>>> that,
>>>>>> so they are being sent first as I think there's less up for debate in 
>>>>>> here.
>>>>>>
>>>>>> This requires my "refactor shutdown" patch as a pre-requisite.
>>>>>
>>>>> You didn't like my previous R-b? Here's a new one. :-)
>>>>>
>>>>> Reviewed-by: Kevin Wolf <kwolf@redhat.com>
>>>>>
>>>>
>>>> I felt like I should address the feedback, and though I could have
>>>> applied the R-B to patches I didn't change, it was ... faster to just
>>>> re-send it.
>>>>
>>>> Serious question: How do you apply people's R-Bs to your patches? At the
>>>> moment, it's pretty manually intensive for me. I use stgit and I pop all
>>>> of the patches off (stg pop -n 100), and then one-at-a-time I `stg push;
>>>> stg edit` and copy-paste the R-B into it.
>>
>> wget https://patchew.org/QEMU/${MSG_ID}/mbox
>> git am mbox
>>
>> Where ${MSG_ID} is the Message-Id of the series cover letter.
> 
> Patchew's awesomeness is still under-appreciated.
> 

Not for lack of appreciating patchew, but the problem with this workflow
is if I have already made modifications to my patches locally, I can't
use this to apply tags from upstream.

It looks like I will continue to do this manually for the time being;
but scripting the ability to "merge tags" from the list would be a cool
trick.

I'm not sure how to do it with git, though. Let's say I've got 16
patches and I've made modifications to some, but not all; so I have a
branch with 16 patches ahead of origin/master.

Does anyone have any cool tricks for being able to script:

1. Correlating a mailing list patch from e.g. patchew to a commit in my
history, even if it's changed a little bit?

(git-backport-diff uses patch names, that might be sufficient... Could
use that as a starting point, at least.)

2. Obtaining the commit message of that patch?
`git show -s --format=%B $SHA` ought to do it...

3. Editing that commit message? This I'm not sure about. I'd need to
understand the tags on the upstream and downstream versions, merge them,
and then re-write the message. Some magic with `git rebase -i` ?

--js