b4 trailers doesn't work with imported series

b4 trailers doesn't work with imported series

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 912 bytes --]

Not a common use case but if I do for example:

| $ b4 prep -F 20221117104636.639889-1-broonie@kernel.org -n tap-spec-relax -f v6.1-rc1
...
| NOTE: any follow-up trailers were ignored; apply them with b4 trailers -u

I run the suggested command but get:

| $ b4 trailers -u
| Calculating patch-ids from commits, this may take a moment...
| Checking change-id "20221207-tap-spec-relax-9138e5760340"
| Grabbing search results from lore.kernel.org
| Nothing matching that query.
| No trailer updates found.

since the change wasn't sent with b4 initially.  I see that the
documentaton does say to use -F but using that produces the same
output, it looks like it's checking the change-id no matter what
and gives up if it can't find it.

BTW I also notice that no template inter-version chnagelog is
generated for the b4 prep command above, the same thing seems to
happen even if the sent series has a cover letter.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: b4 trailers doesn't work with imported series

[Konstantin Ryabitsev]

On Wed, Dec 07, 2022 at 12:41:05AM +0000, Mark Brown wrote:
> Not a common use case but if I do for example:
> 
> | $ b4 prep -F 20221117104636.639889-1-broonie@kernel.org -n tap-spec-relax -f v6.1-rc1
> ...
> | NOTE: any follow-up trailers were ignored; apply them with b4 trailers -u
> 
> I run the suggested command but get:

Great finds. Fixed now in master. Mostly, this was due to us not expecting to
find a series without a cover letter (which is normal for a single-patch
series).

> BTW I also notice that no template inter-version chnagelog is
> generated for the b4 prep command above, the same thing seems to
> happen even if the sent series has a cover letter.

Yes, this needs further work. The major difficulty here is that cover letters
are so free-form. We enforce some structure when we create the series from
scratch, but when we import it from another existing series, there's no way to
reliably tell if there's already a changelog section -- so I think I will just
bluntly insert a brand new changelog section and let the contributor fix any
obvious errors using --edit-cover.

Thank you for the report!

-K

Re: b4 trailers doesn't work with imported series

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 1376 bytes --]

Hi,

With current git I'm seeing an error trying to shazam one particular
"series" (a single patch with a cover letter, which does normally work):

$ b4 shazam 20250627164348.3982628-2-mathias.nyman@linux.intel.com
Grabbing thread from lore.kernel.org/all/20250627164348.3982628-2-mathias.nyman@linux.intel.com/t.mbox.gz
Checking for newer revisions
Grabbing search results from lore.kernel.org
Analyzing 9 messages in the thread
Analyzing 0 code-review messages
Traceback (most recent call last):
  File "/home/broonie/git/b4/src/b4/command.py", line 450, in <module>
    cmd()
  File "/home/broonie/git/b4/src/b4/command.py", line 433, in cmd
    cmdargs.func(cmdargs)
  File "/home/broonie/git/b4/src/b4/command.py", line 105, in cmd_shazam
    b4.mbox.main(cmdargs)
  File "/home/broonie/git/b4/src/b4/mbox.py", line 842, in main
    make_am(msgs, cmdargs, msgid)
  File "/home/broonie/git/b4/src/b4/mbox.py", line 113, in make_am
    lser = lmbx.get_series(revision=wantver, sloppytrailers=cmdargs.sloppytrailers, reroll=reroll,
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/broonie/git/b4/src/b4/__init__.py", line 362, in get_series
    pmsg = self.msgid_map[fmsg.in_reply_to]
           ~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^
KeyError: '20250627142044.3872229-2-mathias.nyman@linux.intel.com'

Thanks,
Mark

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: b4 trailers doesn't work with imported series

[Konstantin Ryabitsev]

On Fri, Jun 27, 2025 at 06:00:54PM +0100, Mark Brown wrote:
> Hi,
> 
> With current git I'm seeing an error trying to shazam one particular
> "series" (a single patch with a cover letter, which does normally work):
> 
> $ b4 shazam 20250627164348.3982628-2-mathias.nyman@linux.intel.com

Ack, can confirm.

bugspray tag me

Re: b4 trailers doesn't work with imported series

[Bugspray Bot]

Hello:

This conversation is now tracked by Kernel.org Bugzilla:
https://bugzilla.kernel.org/show_bug.cgi?id=220283

There is no need to do anything else, just keep talking.
-- 
Deet-doot-dot, I am a bot.
Kernel.org Bugzilla (bugspray 0.1-dev)

Re: b4 trailers doesn't work with imported series

[Bugspray Bot]

Konstantin Ryabitsev writes in commit 0c7bd8a7ec090ab34b3406a46742004bd94fc30b:

mbox: fix backtrace when we can't find the in-reply-to message

In certain situation we may not have a parent message when processing
follow-ups, because they were sent to a previous revision and the
patch-id no longer matches.

Reported-by: Mark Brown <broonie@kernel.org>
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=220283
Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>

(via https://git.kernel.org/pub/scm/utils/b4/b4.git/commit/?id=0c7bd8a7ec09)
-- 
Deet-doot-dot, I am a bot.
Kernel.org Bugzilla (bugspray 0.1-dev)