From: Josh Steadmon <steadmon@google.com>
To: Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, tom.saeger@oracle.com, gitster@pobox.com,
sunshine@sunshineco.com, Derrick Stolee <stolee@gmail.com>,
Derrick Stolee <derrickstolee@github.com>,
Derrick Stolee <dstolee@microsoft.com>
Subject: Re: [PATCH v2 4/5] test-tool: test refspec input/output
Date: Wed, 7 Apr 2021 16:08:18 -0700 [thread overview]
Message-ID: <YG47Yu8VPiRuUBsM@google.com> (raw)
In-Reply-To: <bf296282323aa74f7c5b1a49c74d5aaa4b6f37ae.1617734870.git.gitgitgadget@gmail.com>
On 2021.04.06 18:47, Derrick Stolee via GitGitGadget wrote:
> From: Derrick Stolee <dstolee@microsoft.com>
>
> Add a new test-helper, 'test-tool refspec', that currently reads stdin
> line-by-line and translates the refspecs using the parsing logic of
> refspec_item_init() and writes them to output.
>
> Create a test in t5511-refspec.sh that uses this helper to test several
> known special cases. This includes all of the special properties of the
> 'struct refspec_item', including:
>
> * force: The refspec starts with '+'.
> * pattern: Each side of the refspec has a glob character ('*')
> * matching: The refspec is simply the string ":".
> * exact_sha1: The 'src' string is a 40-character hex string.
> * negative: The refspec starts with '^' and 'dst' is NULL.
>
> While the exact_sha1 property doesn't require special logic in
> refspec_item_format, it is still tested here for completeness.
>
> There is also the special-case refspec "@" which translates to "HEAD".
>
> Note that if a refspec does not start with "refs/", then that is not
> incorporated as part of the 'struct refspec_item'. This behavior is
> confirmed by these tests. These refspecs still work in the wild because
> the refs layer interprets them appropriately as branches, prepending
> "refs/" or "refs/heads/" as necessary. I spent some time attempting to
> insert these prefixes explicitly in parse_refspec(), but these are
> several subtleties I was unable to overcome. If such a change were to be
> made, then this new test in t5511-refspec.sh will need to be updated
> with new output. For example, the input lines ending with "translated"
> are designed to demonstrate these subtleties.
>
> Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
> ---
> Makefile | 1 +
> t/helper/test-refspec.c | 44 +++++++++++++++++++++++++++++++++++++++++
> t/helper/test-tool.c | 1 +
> t/helper/test-tool.h | 1 +
> t/t5511-refspec.sh | 41 ++++++++++++++++++++++++++++++++++++++
> 5 files changed, 88 insertions(+)
> create mode 100644 t/helper/test-refspec.c
>
> diff --git a/Makefile b/Makefile
> index a6a73c574191..f858c9f25976 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -734,6 +734,7 @@ TEST_BUILTINS_OBJS += test-reach.o
> TEST_BUILTINS_OBJS += test-read-cache.o
> TEST_BUILTINS_OBJS += test-read-graph.o
> TEST_BUILTINS_OBJS += test-read-midx.o
> +TEST_BUILTINS_OBJS += test-refspec.o
> TEST_BUILTINS_OBJS += test-ref-store.o
> TEST_BUILTINS_OBJS += test-regex.o
> TEST_BUILTINS_OBJS += test-repository.o
> diff --git a/t/helper/test-refspec.c b/t/helper/test-refspec.c
> new file mode 100644
> index 000000000000..b06735ded208
> --- /dev/null
> +++ b/t/helper/test-refspec.c
> @@ -0,0 +1,44 @@
> +#include "cache.h"
> +#include "parse-options.h"
> +#include "refspec.h"
> +#include "strbuf.h"
> +#include "test-tool.h"
> +
> +static const char * const refspec_usage[] = {
> + N_("test-tool refspec [--fetch]"),
> + NULL
> +};
> +
> +int cmd__refspec(int argc, const char **argv)
> +{
> + struct strbuf line = STRBUF_INIT;
> + int fetch = 0;
> +
> + struct option refspec_options [] = {
> + OPT_BOOL(0, "fetch", &fetch,
> + N_("enable the 'fetch' option for parsing refpecs")),
Typo here: s/refpecs/refspecs/
> + OPT_END()
> + };
> +
> + argc = parse_options(argc, argv, NULL, refspec_options,
> + refspec_usage, 0);
> +
> + while (strbuf_getline(&line, stdin) != EOF) {
> + struct refspec_item rsi;
> + char *buf;
> +
> + if (!refspec_item_init(&rsi, line.buf, fetch)) {
> + printf("failed to parse %s\n", line.buf);
> + continue;
> + }
> +
> + buf = refspec_item_format(&rsi);
> + printf("%s\n", buf);
> + free(buf);
> +
> + refspec_item_clear(&rsi);
> + }
> +
> + strbuf_release(&line);
> + return 0;
> +}
> diff --git a/t/helper/test-tool.c b/t/helper/test-tool.c
> index 287aa6002307..f534ad1731a9 100644
> --- a/t/helper/test-tool.c
> +++ b/t/helper/test-tool.c
> @@ -55,6 +55,7 @@ static struct test_cmd cmds[] = {
> { "read-cache", cmd__read_cache },
> { "read-graph", cmd__read_graph },
> { "read-midx", cmd__read_midx },
> + { "refspec", cmd__refspec },
> { "ref-store", cmd__ref_store },
> { "regex", cmd__regex },
> { "repository", cmd__repository },
> diff --git a/t/helper/test-tool.h b/t/helper/test-tool.h
> index 9ea4b31011dd..46a0b8850f17 100644
> --- a/t/helper/test-tool.h
> +++ b/t/helper/test-tool.h
> @@ -44,6 +44,7 @@ int cmd__reach(int argc, const char **argv);
> int cmd__read_cache(int argc, const char **argv);
> int cmd__read_graph(int argc, const char **argv);
> int cmd__read_midx(int argc, const char **argv);
> +int cmd__refspec(int argc, const char **argv);
> int cmd__ref_store(int argc, const char **argv);
> int cmd__regex(int argc, const char **argv);
> int cmd__repository(int argc, const char **argv);
> diff --git a/t/t5511-refspec.sh b/t/t5511-refspec.sh
> index be025b90f989..489bec08d570 100755
> --- a/t/t5511-refspec.sh
> +++ b/t/t5511-refspec.sh
> @@ -93,4 +93,45 @@ test_refspec fetch "refs/heads/${good}"
> bad=$(printf '\011tab')
> test_refspec fetch "refs/heads/${bad}" invalid
>
> +test_expect_success 'test input/output round trip' '
> + cat >input <<-\EOF &&
> + +refs/heads/*:refs/remotes/origin/*
> + refs/heads/*:refs/remotes/origin/*
> + refs/heads/main:refs/remotes/frotz/xyzzy
> + :refs/remotes/frotz/deleteme
> + ^refs/heads/secrets
> + refs/heads/secret:refs/heads/translated
> + refs/heads/secret:heads/translated
> + refs/heads/secret:remotes/translated
> + secret:translated
> + refs/heads/*:remotes/xxy/*
> + refs/heads*/for-linus:refs/remotes/mine/*
> + 2e36527f23b7f6ae15e6f21ac3b08bf3fed6ee48:refs/heads/fixed
> + HEAD
> + @
> + :
> + EOF
> + cat >expect <<-\EOF &&
> + +refs/heads/*:refs/remotes/origin/*
> + refs/heads/*:refs/remotes/origin/*
> + refs/heads/main:refs/remotes/frotz/xyzzy
> + :refs/remotes/frotz/deleteme
> + ^refs/heads/secrets
> + refs/heads/secret:refs/heads/translated
> + refs/heads/secret:heads/translated
> + refs/heads/secret:remotes/translated
> + secret:translated
> + refs/heads/*:remotes/xxy/*
> + refs/heads*/for-linus:refs/remotes/mine/*
> + 2e36527f23b7f6ae15e6f21ac3b08bf3fed6ee48:refs/heads/fixed
> + HEAD
> + HEAD
> + :
> + EOF
> + test-tool refspec <input >output &&
> + test_cmp expect output &&
> + test-tool refspec --fetch <input >output &&
> + test_cmp expect output
> +'
> +
> test_done
> --
> gitgitgadget
>
next prev parent reply other threads:[~2021-04-07 23:08 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-05 13:04 [PATCH 0/5] Maintenance: adapt custom refspecs Derrick Stolee via GitGitGadget
2021-04-05 13:04 ` [PATCH 1/5] maintenance: simplify prefetch logic Derrick Stolee via GitGitGadget
2021-04-05 17:01 ` Tom Saeger
2021-04-05 13:04 ` [PATCH 2/5] test-lib: use exact match for test_subcommand Derrick Stolee via GitGitGadget
2021-04-05 17:31 ` Eric Sunshine
2021-04-05 17:43 ` Junio C Hamano
2021-04-05 13:04 ` [PATCH 3/5] refspec: output a refspec item Derrick Stolee via GitGitGadget
2021-04-05 16:57 ` Tom Saeger
2021-04-05 17:40 ` Eric Sunshine
2021-04-05 17:44 ` Junio C Hamano
2021-04-06 11:21 ` Derrick Stolee
2021-04-06 15:23 ` Eric Sunshine
2021-04-06 16:51 ` Derrick Stolee
2021-04-07 8:46 ` Ævar Arnfjörð Bjarmason
2021-04-07 20:53 ` Derrick Stolee
2021-04-07 22:05 ` Ævar Arnfjörð Bjarmason
2021-04-07 22:49 ` Junio C Hamano
2021-04-07 23:01 ` Ævar Arnfjörð Bjarmason
2021-04-08 7:33 ` Junio C Hamano
2021-04-05 13:04 ` [PATCH 4/5] test-tool: test refspec input/output Derrick Stolee via GitGitGadget
2021-04-05 17:52 ` Eric Sunshine
2021-04-06 11:13 ` Derrick Stolee
2021-04-07 8:54 ` Ævar Arnfjörð Bjarmason
2021-04-05 13:04 ` [PATCH 5/5] maintenance: allow custom refspecs during prefetch Derrick Stolee via GitGitGadget
2021-04-05 17:16 ` Tom Saeger
2021-04-06 11:15 ` Derrick Stolee
2021-04-07 8:53 ` Ævar Arnfjörð Bjarmason
2021-04-07 10:26 ` Ævar Arnfjörð Bjarmason
2021-04-09 11:48 ` Derrick Stolee
2021-04-09 19:28 ` Ævar Arnfjörð Bjarmason
2021-04-10 0:56 ` Derrick Stolee
2021-04-10 11:37 ` Ævar Arnfjörð Bjarmason
2021-04-07 13:47 ` Ævar Arnfjörð Bjarmason
2021-04-06 18:47 ` [PATCH v2 0/5] Maintenance: adapt custom refspecs Derrick Stolee via GitGitGadget
2021-04-06 18:47 ` [PATCH v2 1/5] maintenance: simplify prefetch logic Derrick Stolee via GitGitGadget
2021-04-07 23:23 ` Emily Shaffer
2021-04-09 19:00 ` Derrick Stolee
2021-04-06 18:47 ` [PATCH v2 2/5] test-lib: use exact match for test_subcommand Derrick Stolee via GitGitGadget
2021-04-06 18:47 ` [PATCH v2 3/5] refspec: output a refspec item Derrick Stolee via GitGitGadget
2021-04-06 18:47 ` [PATCH v2 4/5] test-tool: test refspec input/output Derrick Stolee via GitGitGadget
2021-04-07 23:08 ` Josh Steadmon [this message]
2021-04-07 23:26 ` Emily Shaffer
2021-04-06 18:47 ` [PATCH v2 5/5] maintenance: allow custom refspecs during prefetch Derrick Stolee via GitGitGadget
2021-04-06 19:36 ` Tom Saeger
2021-04-06 19:45 ` Derrick Stolee
2021-04-07 23:09 ` Josh Steadmon
2021-04-07 23:37 ` Emily Shaffer
2021-04-08 0:23 ` Jonathan Tan
2021-04-10 2:03 ` [PATCH v3 0/3] Maintenance: adapt custom refspecs Derrick Stolee via GitGitGadget
2021-04-10 2:03 ` [PATCH v3 1/3] maintenance: simplify prefetch logic Derrick Stolee via GitGitGadget
2021-04-12 20:13 ` Tom Saeger
2021-04-12 20:27 ` Derrick Stolee
2021-04-10 2:03 ` [PATCH v3 2/3] fetch: add --prefetch option Derrick Stolee via GitGitGadget
2021-04-11 21:09 ` Ramsay Jones
2021-04-12 20:23 ` Derrick Stolee
2021-04-10 2:03 ` [PATCH v3 3/3] maintenance: use 'git fetch --prefetch' Derrick Stolee via GitGitGadget
2021-04-11 1:35 ` [PATCH v3 0/3] Maintenance: adapt custom refspecs Junio C Hamano
2021-04-12 16:48 ` Tom Saeger
2021-04-12 17:24 ` Tom Saeger
2021-04-12 17:41 ` Tom Saeger
2021-04-12 20:25 ` Derrick Stolee
2021-04-16 12:49 ` [PATCH v4 0/4] " Derrick Stolee via GitGitGadget
2021-04-16 12:49 ` [PATCH v4 1/4] maintenance: simplify prefetch logic Derrick Stolee via GitGitGadget
2021-04-16 18:02 ` Tom Saeger
2021-04-16 12:49 ` [PATCH v4 2/4] fetch: add --prefetch option Derrick Stolee via GitGitGadget
2021-04-16 17:52 ` Tom Saeger
2021-04-16 18:26 ` Tom Saeger
2021-04-16 12:49 ` [PATCH v4 3/4] maintenance: use 'git fetch --prefetch' Derrick Stolee via GitGitGadget
2021-04-16 12:49 ` [PATCH v4 4/4] maintenance: respect remote.*.skipFetchAll Derrick Stolee via GitGitGadget
2021-04-16 13:54 ` Ævar Arnfjörð Bjarmason
2021-04-16 14:33 ` Tom Saeger
2021-04-16 18:31 ` Tom Saeger
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YG47Yu8VPiRuUBsM@google.com \
--to=steadmon@google.com \
--cc=derrickstolee@github.com \
--cc=dstolee@microsoft.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=stolee@gmail.com \
--cc=sunshine@sunshineco.com \
--cc=tom.saeger@oracle.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.
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 NNTP newsgroup(s).