Re: b4: introducing b4 shazam (like b4 am -o- | git am)

From: Rob Herring <robh@kernel.org>
To: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
Cc: tools@linux.kernel.org, users@linux.kernel.org
Subject: Re: b4: introducing b4 shazam (like b4 am -o- | git am)
Date: Tue, 19 Oct 2021 09:49:57 -0500	[thread overview]
Message-ID: <CAL_JsqK0+f_QPiYr6hv1dVoNT7qJspmjDW6hg0HUcfctpTo22Q@mail.gmail.com> (raw)
In-Reply-To: <20210921202526.mk2meetobbtl3tvi@meerkat.local>

On Tue, Sep 21, 2021 at 3:25 PM Konstantin Ryabitsev
<konstantin@linuxfoundation.org> wrote:
>
> Hi, all:
>
> The current master branch landed a new feature that implements a new
> subcommand "shazam". It is the functional equivalent of piping "b4 am" to "git
> am", with some extra safety padding.
>
> See "b4 shazam --help" to see the available options. You will notice that many
> of them are exactly the same as for "b4 am".
>
> The default operation still tries to be the safest possible:
>
> - we'll create a temporary sparse worktree that will only contain the files
>   being modified
> - we'll use the base-commit sha, if we find it, or we'll try to guess the base
>   commit from git index info
> - we'll run "git am" against that temporary worktree
> - if successful, we'll fetch from the worktree into your current repo and
>   delete the temporary sparse checkout
> - you can then "git checkout -b foo FETCH_HEAD" or "git merge FETCH_HEAD"
>   or "git rebase" as necessary

I get a splat due to my multiple worktree setup:

Fetching into FETCH_HEAD
Traceback (most recent call last):
  File "/home/rob/.local/bin/b4", line 33, in <module>
    sys.exit(load_entry_point('b4', 'console_scripts', 'b4')())
  File "/home/rob/proj/git/b4/b4/command.py", line 264, in cmd
    cmdargs.func(cmdargs)
  File "/home/rob/proj/git/b4/b4/command.py", line 76, in cmd_shazam
    b4.mbox.main(cmdargs)
  File "/home/rob/proj/git/b4/b4/mbox.py", line 721, in main
    make_am(msgs, cmdargs, msgid)
  File "/home/rob/proj/git/b4/b4/mbox.py", line 312, in make_am
    with open(fhf, 'r') as fhh:
NotADirectoryError: [Errno 20] Not a directory:
'/home/rob/proj/git/linux-dt/.git/FETCH_HEAD'

I just sent a patch to fix it.

>
> Alternatively, if you run "git shazam -A", we'll just run "git am" on the
> current HEAD, which is the exact equivalent of "b4 am -o- | git am".

'-A' worked fine. Can we make this a configuration value with
enable/disable override instead? I kind of expect users will use this
mostly one way or the other rather than decide per patch series. Sure,
I could wrap that in a script, but so could I with "b4 am -o- | git
am".

Rob