From: Jeff King <peff@peff.net>
To: "SZEDER Gábor" <szeder.dev@gmail.com>
Cc: Derrick Stolee <derrickstolee@github.com>,
rsbecker@nexbridge.com, 'Junio C Hamano' <gitster@pobox.com>,
git@vger.kernel.org, avarab@gmail.com
Subject: Re: [PATCH v2] t5510: replace 'origin' with URL more carefully (was Re: Test Failure t5510,t5562 - was RE: [ANNOUNCE] Git v2.37.0-rc1)
Date: Tue, 21 Jun 2022 06:07:34 -0400 [thread overview]
Message-ID: <YrGYZieKgm4z3mZh@coredump.intra.peff.net> (raw)
In-Reply-To: <20220621092915.GD1689@szeder.dev>
On Tue, Jun 21, 2022 at 11:29:15AM +0200, SZEDER Gábor wrote:
> > So perhaps something like:
> >
> > perl -e '
> > my ($cmdline, $url) = @ARGV;
> > $cmdline =~ s[origin(?!/)][quotemeta($url)]ge;
>
> I don't like this "(?!/)" magic, because I haven't got the slightest
> idea of what it might do by merely looking at it, and these characters
> are not exactly easy to search for.
Yeah, I hadn't really dug into the rest of the thread and didn't
understand what that part was trying to do. So I left it untouched in my
examples as an exercise for the reader. :)
> The good old "add a space prefix and suffix" trick can help to easily
> match the "origin" word even when it stands alone, but, alas, the
> result is still not as simple as I'd like with the \s and the string
> concatenation:
>
> perl -e '
> new_cmdline=$(perl -e '
> my ($cmdline, $url) = @ARGV;
> $cmdline =~ s[\sorigin\s][" " . quotemeta($url) . " "]ge;
> print $cmdline;
> ' -- " $cmdline " "$remote_url")
If you do:
$url = quotemeta($url);
then you can drop the "e" from the regex, which gets rid of the gross
concatenation:
$cmdline =~ s[\sorigin\s][ $url ];
I think "\b" for a word boundary would avoid the whitespace
prefix/suffix hackery, but it also matches non-alphabetics (like "/").
You could use alternation, though, like:
$ cmdline='origin notorigin origin originnot origin/foo origin'
$ remote_url=real_url
$ perl -e '
my ($cmdline, $url) = @ARGV;
$url = quotemeta($url);
$cmdline =~ s/(\s|^)origin(\s|$)/$1$url$2/g;
print $cmdline;
' "$cmdline" "$remote_url"
real_url notorigin real_url originnot origin/foo real_url
Negative lookbehind and lookahead get rid of the "$1" and "$2", but they
are magical-looking, as you noted above. Possibly "/x" and some
whitespace would make the whole thing more readable.
-Peff
next prev parent reply other threads:[~2022-06-21 10:10 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-20 18:04 Test Failure t5510,t5562 - was RE: [ANNOUNCE] Git v2.37.0-rc1 rsbecker
2022-06-20 18:46 ` Derrick Stolee
2022-06-20 18:59 ` rsbecker
2022-06-20 20:00 ` Derrick Stolee
2022-06-20 20:30 ` Ævar Arnfjörð Bjarmason
2022-06-20 20:43 ` Junio C Hamano
2022-06-20 21:24 ` rsbecker
2022-06-20 21:33 ` Ævar Arnfjörð Bjarmason
2022-06-20 20:34 ` SZEDER Gábor
2022-06-20 22:17 ` rsbecker
2022-06-20 22:20 ` [PATCH v2] t5510: replace 'origin' with URL more carefully (was Re: Test Failure t5510,t5562 - was RE: [ANNOUNCE] Git v2.37.0-rc1) Derrick Stolee
2022-06-21 5:28 ` Johannes Sixt
2022-06-21 7:17 ` Jeff King
2022-06-21 9:29 ` SZEDER Gábor
2022-06-21 10:07 ` Jeff King [this message]
2022-06-21 16:35 ` Junio C Hamano
2022-06-21 20:27 ` Junio C Hamano
2022-06-21 21:13 ` Derrick Stolee
2022-06-21 21:36 ` Junio C Hamano
2022-06-21 22:34 ` [PATCH 00/10] t5510: fix the quoting mess Ævar Arnfjörð Bjarmason
2022-06-21 22:34 ` [PATCH 01/10] fetch tests: remove redundant test_unconfig() Ævar Arnfjörð Bjarmason
2022-06-22 5:52 ` Junio C Hamano
2022-06-21 22:34 ` [PATCH 02/10] fetch tests: use named, not positional parameters Ævar Arnfjörð Bjarmason
2022-06-21 22:34 ` [PATCH 03/10] fetch tests: use "local", &&-chaining, style etc Ævar Arnfjörð Bjarmason
2022-06-21 22:34 ` [PATCH 04/10] fetch tests: add a helper to avoid boilerplate Ævar Arnfjörð Bjarmason
2022-06-21 22:34 ` [PATCH 05/10] fetch tests: pass "mode" parameter first, pave way for "$@" Ævar Arnfjörð Bjarmason
2022-06-22 6:01 ` Junio C Hamano
2022-06-21 22:34 ` [PATCH 06/10] fetch tests: pass a list, not a string of arguments Ævar Arnfjörð Bjarmason
2022-06-21 22:34 ` [PATCH 07/10] fetch tests: remove lazy variable setup Ævar Arnfjörð Bjarmason
2022-06-21 22:34 ` [PATCH 08/10] fetch tests: remove shelling out for previously "lazy" variables Ævar Arnfjörð Bjarmason
2022-06-21 22:34 ` [PATCH 09/10] fetch tests: stop implicitly adding refspecs Ævar Arnfjörð Bjarmason
2022-06-21 22:34 ` [PATCH 10/10] fetch tests: fix needless and buggy re-quoting Ævar Arnfjörð Bjarmason
2022-06-22 6:12 ` Junio C Hamano
2022-06-22 11:25 ` Derrick Stolee
2022-06-22 15:21 ` Ævar Arnfjörð Bjarmason
2022-06-22 15:44 ` Junio C Hamano
2022-06-21 13:51 ` Test Failure t5510,t5562 - was RE: [ANNOUNCE] Git v2.37.0-rc1 rsbecker
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=YrGYZieKgm4z3mZh@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=avarab@gmail.com \
--cc=derrickstolee@github.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=rsbecker@nexbridge.com \
--cc=szeder.dev@gmail.com \
/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).