Re: [PATCH ALTERNATIVE v6.v3 4/6] config: parse http.<url>.<variable> using urlmatch
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Aug 5, 2013, 22:56 UTC
- Message-ID
- <7vsiyniw63.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <5acf57129e37a87611ed03648f7b368@f74d39fa044aa309eaea14b9f57fe79>
"Kyle J. McKay" <mackyle@gmail.com> writes:
Show 9 quoted lines
> Use the urlmatch_config_entry() to wrap the underlying > http_options() two-level variable parser in order to set > http.<variable> to the value with the most specific URL in the > configuration. > > Signed-off-by: Jeff King <peff@peff.net> > Signed-off-by: Kyle J. McKay <mackyle@gmail.com> > Signed-off-by: Junio C Hamano <gitster@pobox.com> > ---
Oops, what did we sign-off?
Show 9 quoted lines
> This version of 4/6 moves the tests to t0110 since urlmatch is now global. > The config tests are removed since part 6/6 already has those and they no > longer belong with the urlmatch normalization tests. > > The Makefile rule has been removed since it's no longer needed to build > correctly as the test program no longer includes http.c. > > Other than those changes (and a minor rename to reflect the new location), > this patch is identical to the previous v6.v2 4/6.
Ahh, figures. Thanks.
Peff, any comments?
Show 15 quoted lines
> diff --git a/t/t0110-urlmatch-normalization.sh b/t/t0110-urlmatch-normalization.sh > new file mode 100755 > index 00000000..8d6096d4 > --- /dev/null > +++ b/t/t0110-urlmatch-normalization.sh > @@ -0,0 +1,177 @@ > +#!/bin/sh > + > +test_description='urlmatch URL normalization' > +. ./test-lib.sh > + > +# The base name of the test url files > +tu="$TEST_DIRECTORY/t0110/url" > + > +# Note that only file: URLs should be allowed without a host
It is somewhat unfortunate that the form most commonly used for pushing is not supported at all, i.e.
host:path
Current configuration set may not have anything interesting to affect the git-over-ssh push codepath, so in practice it may not matter, though.
> +test_expect_success 'url authority' '
"authority" refers to the host part? (not a complaint, but is a question)
> +test_expect_success 'url port checks' ' > + test-urlmatch-normalization "xyz://q@some.host:" &&
This is presumably replaced by a default port for xyz:// scheme, whatever the default port is, in other words, it is as if no colon is given at the end?
> + test-urlmatch-normalization "xyz://q@some.host:456/" && > + ! test-urlmatch-normalization "xyz://q@some.host:0" && > + ! test-urlmatch-normalization "xyz://q@some.host:0000000" &&
Port #0 is disallowed?
> + test-urlmatch-normalization "xyz://q@some.host:0000001?" &&
Is it the same as specifying "xyz://q@some.host:1?" and does it match "xyz://q@some.host:1"?
> + test-urlmatch-normalization "xyz://q@some.host:065535#" &&
Ditto, for 65535 and without #-fragment at the end?
Show 13 quoted lines
> +test_expect_success 'url port normalization' ' > + test "$(test-urlmatch-normalization -p "http://x:800")" = "http://x:800/" && > + test "$(test-urlmatch-normalization -p "http://x:0800")" = "http://x:800/" && > + test "$(test-urlmatch-normalization -p "http://x:00000800")" = "http://x:800/" && > + test "$(test-urlmatch-normalization -p "http://x:065535")" = "http://x:65535/" && > + test "$(test-urlmatch-normalization -p "http://x:1")" = "http://x:1/" && > + test "$(test-urlmatch-normalization -p "http://x:80")" = "http://x/" && > + test "$(test-urlmatch-normalization -p "http://x:080")" = "http://x/" && > + test "$(test-urlmatch-normalization -p "http://x:000000080")" = "http://x/" && > + test "$(test-urlmatch-normalization -p "https://x:443")" = "https://x/" && > + test "$(test-urlmatch-normalization -p "https://x:0443")" = "https://x/" && > + test "$(test-urlmatch-normalization -p "https://x:000000443")" = "https://x/" > +'
OK, these answer most of the previous questions.
Show 7 quoted lines
> +# http://@foo specifies an empty user name but does not specify a password > +# http://foo specifies neither a user name nor a password > +# So they should not be equivalent > +test_expect_success 'url equivalents' ' > + test-urlmatch-normalization "httP://x" "Http://X/" && > + test-urlmatch-normalization "Http://%4d%65:%4d^%70@The.Host" "hTTP://Me:%4D^p@the.HOST:80/" && > + ! test-urlmatch-normalization "https://@x.y/^" "httpS://x.y:443/^" &&
The comment is about this test, which seems to make sense. What is "^"? Just a random valid character that can appear in the path? (not a complaint, but is a question).