From: Son Luong Ngoc <sluongng@gmail.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: git <git@vger.kernel.org>
Subject: Re: [PATCH] fsmonitor: query watchman with right valid json
Date: Tue, 7 Jun 2022 12:56:05 +0200 [thread overview]
Message-ID: <CAL3xRKev_KHvAFuviG7RxsxA_786K4QY5F08a8D23M9MLM81+g@mail.gmail.com> (raw)
In-Reply-To: <220607.86ilpcvp89.gmgdl@evledraar.gmail.com>
Hi Ævar,
On Tue, Jun 7, 2022 at 10:42 AM Ævar Arnfjörð Bjarmason
<avarab@gmail.com> wrote:
>
>
> On Tue, Jun 07 2022, Son Luong Ngoc wrote:
>
> > In rare circumstances where the current git index does not carry the
> > last_update_token, the fsmonitor v2 hook will be invoked with an
> > empty string which would caused the final rendered json to be invalid.
> >
> > ["query", "/path/to/my/git/repository/", {
> > "since": ,
> > "fields": ["name"],
> > "expression": ["not", ["dirname", ".git"]]
> > }]
> >
> > Which will left user with the following error message
> >
> > > git status
> > failed to parse command from stdin: line 2, column 13, position 67: unexpected token near ','
> > Watchman: command returned no output.
> > Falling back to scanning...
> >
> > Hide the "since" field in json query when "last_update_token" is empty.
> >
> > Signed-off-by: Son Luong Ngoc <sluongng@gmail.com>
> > ---
> > templates/hooks--fsmonitor-watchman.sample | 21 +++++++++++++--------
> > 1 file changed, 13 insertions(+), 8 deletions(-)
> >
> > diff --git a/templates/hooks--fsmonitor-watchman.sample b/templates/hooks--fsmonitor-watchman.sample
> > index 14ed0aa42d..b4ee86dfc4 100755
> > --- a/templates/hooks--fsmonitor-watchman.sample
> > +++ b/templates/hooks--fsmonitor-watchman.sample
> > @@ -79,6 +79,12 @@ sub watchman_query {
> > or die "open2() failed: $!\n" .
> > "Falling back to scanning...\n";
> >
> > + my $query = <<" END";
> > + ["query", "$git_work_tree", {
> > + "fields": ["name"],
> > + "expression": ["not", ["dirname", ".git"]]
> > + }]
> > + END
>
> Wouldn't a more minimal & obvious patch here be....
>
> > # In the query expression below we're asking for names of files that
> > # changed since $last_update_token but not from the .git folder.
> > #
> > @@ -87,15 +93,14 @@ sub watchman_query {
> > # output to file names only. Then we're using the "expression" term to
> > # further constrain the results.
> > if (substr($last_update_token, 0, 1) eq "c") {
> > - $last_update_token = "\"$last_update_token\"";
>
> To just change this to be:
>
> # same as now:
> $last_update_token = "\"$last_update_token\"";
> $last_update_line = qq["since": $last_update_token,];
>
> Of course having declared the new $last_update_line variable earlier, then:
>
Yup, I think this is a sensible suggestion.
I will fixup and send a V2 shortly.
> > + $query = <<" END";
> > + ["query", "$git_work_tree", {
> > + "since": "$last_update_token",
> > + "fields": ["name"],
> > + "expression": ["not", ["dirname", ".git"]]
> > + }]
> > + END
> > }
> > - my $query = <<" END";
> > - ["query", "$git_work_tree", {
> > - "since": $last_update_token,
>
> Just change this line to:
>
> $last_update_line
>
> I.e. you don't need to duplicate the whole query just to omit/include a
> single line in it, or am I missing something?
>
> (This suggestion *would* include a redundant line, but I'm assuming
> JSON/watchman deals with that just fine...).
I think we can remove that redundant line by adding '\n' before
$last_update_line.
I will be including this into the next version.
Thanks,
Son Luong.
next prev parent reply other threads:[~2022-06-07 11:02 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-07 7:54 [PATCH] fsmonitor: query watchman with right valid json Son Luong Ngoc
2022-06-07 8:40 ` Ævar Arnfjörð Bjarmason
2022-06-07 10:56 ` Son Luong Ngoc [this message]
2022-06-07 11:14 ` [PATCH v2] " Son Luong Ngoc
2022-06-07 14:39 ` Ævar Arnfjörð Bjarmason
2022-06-07 17:00 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAL3xRKev_KHvAFuviG7RxsxA_786K4QY5F08a8D23M9MLM81+g@mail.gmail.com \
--to=sluongng@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).