b4 prep --cleanup failure with cover-strategy: branch-description

b4 prep --cleanup failure with cover-strategy: branch-description

[Jeff Johnson]

Here is an edited capture of one failed cleanup attempt

% git checkout b4/md-drivers-devfreq
Switched to branch 'b4/md-drivers-devfreq'
% b4 prep --show-info
branch: b4/md-drivers-devfreq
cover-subject: md-drivers-devfreq
base-branch: linux-master
base-commit: a693b9c95abd4947c2d06e05733de5d470ab6586
start-commit: a693b9c95abd4947c2d06e05733de5d470ab6586
end-commit: ec30a61ebb797c2b9763c495f7ddf1beac1ab0d6
series-range:
a693b9c95abd4947c2d06e05733de5d470ab6586..ec30a61ebb797c2b9763c495f7ddf1beac1ab0d6
change-id: 20240605-md-drivers-devfreq-42b19b2594a1
revision: 2
cover-strategy: branch-description
needs-editing: True
needs-recipients: False
has-prerequisites: False
needs-auto-to-cc: True
needs-checking: True
needs-checking-deps: False
preflight-checks-failing: True
commit-ec30a61ebb79: PM/devfreq: governor: add missing MODULE_DESCRIPTION() macros
series-v1: a693b9c95abd..c24a39e01a87
20240605-md-drivers-devfreq-v1-1-d01ae91b907e@quicinc.com
% git checkout linux-master
Switched to branch 'linux-master'
% b4 prep --cleanup b4/md-drivers-devfreq
Traceback (most recent call last):
  File "/usr2/jjohnson/.local/bin/b4", line 8, in <module>
    sys.exit(cmd())
  File "/usr2/jjohnson/.local/lib/python3.8/site-packages/b4/command.py", line
417, in cmd
    cmdargs.func(cmdargs)
  File "/usr2/jjohnson/.local/lib/python3.8/site-packages/b4/command.py", line
83, in cmd_prep
    b4.ez.cmd_prep(cmdargs)
  File "/usr2/jjohnson/.local/lib/python3.8/site-packages/b4/ez.py", line
2766, in cmd_prep
    return cleanup(cmdargs.cleanup)
  File "/usr2/jjohnson/.local/lib/python3.8/site-packages/b4/ez.py", line
2332, in cleanup
    ts = tracking['series']
KeyError: 'series'
% b4 --version
0.14.0

Re: b4 prep --cleanup failure with cover-strategy: branch-description

[Konstantin Ryabitsev]

On Wed, Jun 26, 2024 at 07:23:01PM GMT, Jeff Johnson wrote:
> % b4 prep --cleanup b4/md-drivers-devfreq
> Traceback (most recent call last):
>   File "/usr2/jjohnson/.local/bin/b4", line 8, in <module>
>     sys.exit(cmd())
>   File "/usr2/jjohnson/.local/lib/python3.8/site-packages/b4/command.py", line
> 417, in cmd
>     cmdargs.func(cmdargs)
>   File "/usr2/jjohnson/.local/lib/python3.8/site-packages/b4/command.py", line
> 83, in cmd_prep
>     b4.ez.cmd_prep(cmdargs)
>   File "/usr2/jjohnson/.local/lib/python3.8/site-packages/b4/ez.py", line
> 2766, in cmd_prep
>     return cleanup(cmdargs.cleanup)
>   File "/usr2/jjohnson/.local/lib/python3.8/site-packages/b4/ez.py", line
> 2332, in cleanup
>     ts = tracking['series']
> KeyError: 'series'
> % b4 --version
> 0.14.0

bugbot assign to me

Re: b4 prep --cleanup failure with cover-strategy: branch-description

[Kernel.org Bugbot]

Hello:

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

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

Re: b4 prep --cleanup failure with cover-strategy: branch-description

[Kernel.org Bugbot]

quic_jjohnson writes via Kernel.org Bugzilla:

Some additional information about my workflow that may have impacted this issue.
I have one workspace called 'development' where I do most of my work, and it was in this workspace where I was performing tree-wide additions of missing MODULE_DESCRIPTION() macros using my standard x86_64 build configuration.

At one point I realized that I would not find issues with other ARCH settings with this configuration, so I then created a second workspace called 'arm64' which used the 'development' workspace as the remote. And as the name suggests, I originally updated the config in this workspace to build arm64 instead of x86_64, but that is probably not important. But what may be important is that when I encountered arm64 issues, I created b4 branches in the 'arm64' workspace.

Only later did I realize that having tree-wide WIP in two separate workspace was going to complicate my record keeping, so I pushed my WIP from 'arm64' to 'development'.

Today I tried to clean up one of the branches since the commit has landed in linux-next.

In my development workspace I see:
[jjohnson:development 9385] git checkout b4/md-arm64-drivers-edac
Updating files: 100% (10338/10338), done.
Switched to branch 'b4/md-arm64-drivers-edac'
[jjohnson:development 9386] b4 prep --show-info
CRITICAL: This is not a prep-managed branch.

In my arm64 workspace I see:
[jjohnson:arm64 1] git checkout b4/md-arm64-drivers-edac
Switched to branch 'b4/md-arm64-drivers-edac'
Your branch is up to date with 'development/b4/md-arm64-drivers-edac'.
[jjohnson:arm64 2] b4 prep --show-info
branch: b4/md-arm64-drivers-edac
cover-subject: md-arm64-drivers-edac
base-branch: linux-master
base-commit: 83a7eefedc9b56fe7bfeff13b6c7356688ffa670
start-commit: 83a7eefedc9b56fe7bfeff13b6c7356688ffa670
end-commit: c4515adee140419f499b576d3db7f0a1ef797ec3
series-range: 83a7eefedc9b56fe7bfeff13b6c7356688ffa670..c4515adee140419f499b576d3db7f0a1ef797ec3
change-id: 20240613-md-arm64-drivers-edac-2fa423340d75
revision: 3
cover-strategy: branch-description
needs-editing: True
needs-recipients: False
has-prerequisites: False
needs-auto-to-cc: False
needs-checking: False
needs-checking-deps: False
preflight-checks-failing: True
commit-c4515adee140: EDAC: add missing MODULE_DESCRIPTION() macros
series-v2: 83a7eefedc9b..8c38b6b182e5 20240617-md-arm64-drivers-edac-v2-1-6d6c5dd1e5da@quicinc.com
series-v1: 83a7eefedc9b..5127f12ffcdd 20240613-md-arm64-drivers-edac-v1-1-149a4f0f61bb@quicinc.com
[jjohnson:arm64 3] git checkout linux-master
Switched to branch 'linux-master'
Your branch is up to date with 'linus/master'.
[jjohnson:arm64 4] b4 prep --cleanup b4/md-arm64-drivers-edac
Traceback (most recent call last):
  File "/usr2/jjohnson/.local/bin/b4", line 8, in <module>
    sys.exit(cmd())
  File "/usr2/jjohnson/.local/lib/python3.8/site-packages/b4/command.py", line 417, in cmd
    cmdargs.func(cmdargs)
  File "/usr2/jjohnson/.local/lib/python3.8/site-packages/b4/command.py", line 83, in cmd_prep
    b4.ez.cmd_prep(cmdargs)
  File "/usr2/jjohnson/.local/lib/python3.8/site-packages/b4/ez.py", line 2766, in cmd_prep
    return cleanup(cmdargs.cleanup)
  File "/usr2/jjohnson/.local/lib/python3.8/site-packages/b4/ez.py", line 2332, in cleanup
    ts = tracking['series']
KeyError: 'series'

View: https://bugzilla.kernel.org/show_bug.cgi?id=218994#c2
You can reply to this message to join the discussion.
-- 
Deet-doot-dot, I am a bot.
Kernel.org Bugzilla (peebz 0.1)

Re: b4 prep --cleanup failure with cover-strategy: branch-description

[Kernel.org Bugbot]

quic_jjohnson writes via Kernel.org Bugzilla:

There is another behavior which I'm also encountering where the b4 prep --cleanup command returns without any backtrace and without apparently doing anything:

[jjohnson:development 1] git checkout b4/md-kvm
Switched to branch 'b4/md-kvm'
[jjohnson:development 2] b4 prep --show-info
branch: b4/md-kvm
cover-subject: md-kvm
base-branch: linux-master
base-commit: 2bfcfd584ff5ccc8bb7acde19b42570414bf880b
start-commit: 2bfcfd584ff5ccc8bb7acde19b42570414bf880b
end-commit: ef5bf7522b9c61da7f935d74246d19bd7e81c71d
series-range: 2bfcfd584ff5ccc8bb7acde19b42570414bf880b..ef5bf7522b9c61da7f935d74246d19bd7e81c71d
change-id: 20240528-md-kvm-36f20bc4a5b0
revision: 3
cover-strategy: branch-description
needs-editing: True
needs-recipients: False
has-prerequisites: False
needs-auto-to-cc: False
needs-checking: False
needs-checking-deps: False
preflight-checks-failing: True
commit-ef5bf7522b9c: KVM: x86: add missing MODULE_DESCRIPTION() macros
series-v2: 2bfcfd584ff5..8e4a790087e7 20240622-md-kvm-v2-1-29a60f7c48b1@quicinc.com
series-v1: 2bfcfd584ff5..5a3a35097cdd 20240528-md-kvm-v1-1-c1b86f0f5112@quicinc.com
[jjohnson:development 3] git checkout md-linux-next-master
Switched to branch 'md-linux-next-master'
[jjohnson:development 4] b4 prep --cleanup b4/md-kvm
[jjohnson:development 5] git branch|fgrep b4/md-kvm
  b4/md-kvm
[jjohnson:development 6] git checkout b4/md-kvm
Switched to branch 'b4/md-kvm'
[jjohnson:development 7] b4 prep --show-info
branch: b4/md-kvm
cover-subject: md-kvm
base-branch: linux-master
base-commit: 2bfcfd584ff5ccc8bb7acde19b42570414bf880b
start-commit: 2bfcfd584ff5ccc8bb7acde19b42570414bf880b
end-commit: ef5bf7522b9c61da7f935d74246d19bd7e81c71d
series-range: 2bfcfd584ff5ccc8bb7acde19b42570414bf880b..ef5bf7522b9c61da7f935d74246d19bd7e81c71d
change-id: 20240528-md-kvm-36f20bc4a5b0
revision: 3
cover-strategy: branch-description
needs-editing: True
needs-recipients: False
has-prerequisites: False
needs-auto-to-cc: False
needs-checking: False
needs-checking-deps: False
preflight-checks-failing: True
commit-ef5bf7522b9c: KVM: x86: add missing MODULE_DESCRIPTION() macros
series-v2: 2bfcfd584ff5..8e4a790087e7 20240622-md-kvm-v2-1-29a60f7c48b1@quicinc.com
series-v1: 2bfcfd584ff5..5a3a35097cdd 20240528-md-kvm-v1-1-c1b86f0f5112@quicinc.com

View: https://bugzilla.kernel.org/show_bug.cgi?id=218994#c3
You can reply to this message to join the discussion.
-- 
Deet-doot-dot, I am a bot.
Kernel.org Bugzilla (peebz 0.1)