From: Derrick Stolee <stolee@gmail.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Derrick Stolee via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, gitster@pobox.com, newren@gmail.com,
vdye@github.com, Derrick Stolee <derrickstolee@github.com>,
Derrick Stolee <dstolee@microsoft.com>
Subject: Re: [PATCH 2/2] ls-files: add --sparse option
Date: Wed, 8 Dec 2021 10:14:02 -0500 [thread overview]
Message-ID: <03a642fc-6310-1ea4-083e-9fe4530cf761@gmail.com> (raw)
In-Reply-To: <211123.86h7c3wrg2.gmgdl@evledraar.gmail.com>
On 11/22/2021 9:07 PM, Ævar Arnfjörð Bjarmason wrote:
>
> On Tue, Nov 16 2021, Derrick Stolee via GitGitGadget wrote:
Things in the dependent topics are starting to simmer down, so I'm
back revisiting this topic.
>> From: Derrick Stolee <dstolee@microsoft.com>
>> [...]
>> +test_expect_success 'ls-files' '
>> + init_repos &&
>> +
>> + # Behavior agrees by default. Sparse index is expanded.
>> + test_all_match git ls-files &&
>> +
>> + # With --sparse, the sparse index data changes behavior.
>> + git -C sparse-index ls-files --sparse >sparse-index-out &&
>> + grep "^folder1/\$" sparse-index-out &&
>> + grep "^folder2/\$" sparse-index-out &&
>> +
>> + # With --sparse and no sparse index, nothing changes.
>> + git -C sparse-checkout ls-files --sparse >sparse-checkout-out &&
>> + grep "^folder1/0/0/0\$" sparse-checkout-out &&
>> + ! grep "/\$" sparse-checkout-out &&
>
> I think all of this would be much clearer both in terms of explaining
> this change, and also for future test relability if it did away with the
> selective grepping, and simply ran tls-files with and without --sparse,
> and then test_cmp'd the full output (after munging away the OIDs).
>
> I.e. the sort of output that's in my just-sent reply to the CL:
> https://lore.kernel.org/git/211123.86lf1fwrq5.gmgdl@evledraar.gmail.com/
>
> We really don't need to optimize for lines of tests added, and having
> ~30 lines of plainly understood diff output is IMO preferrable to even 5
> lines of tricky positive & negative grep invocations that take some time
> to reason about and understand.
>
> I.e. something like:
>
> cat >expected <<-\EOF &&
> 100644 blob OID e
> 100644 blob OID folder1-
> 100644 blob OID folder1.x
> -040000 tree OID folder1/
> +100644 blob OID folder1/0/0/0
> +100644 blob OID folder1/0/1
> +100644 blob OID folder1/a
> 100644 blob OID folder10
> -040000 tree OID folder2/
> +100644 blob OID folder2/0/0/0
> +100644 blob OID folder2/0/1
> +100644 blob OID folder2/a
> 100644 blob OID g
> -040000 tree OID x/
> +100644 blob OID x/a
> 100644 blob OID z
> EOF
> git [...] ls-files --sparse >actual.raw &&
> [munge away OIDs] <actual.raw >actual &&
> test_cmp expected actual
>
> Would test everything you're trying to test here and more (would need 2x
> of those..), and would be easier to read & understand.
I don't think it is that hard to understand "I expect to see these
lines and not these lines" but I am open to more fully verifying
the full output and demonstrating the change that happens when the
flag is added.
Taking your idea and applying it to 'ls-files' (without --stage to
avoid OIDs which would change depending on the hash algorithm), the
start of the test looks like this:
test_expect_success 'ls-files' '
init_repos &&
# Behavior agrees by default. Sparse index is expanded.
test_all_match git ls-files &&
# With --sparse, the sparse index data changes behavior.
git -C sparse-index ls-files --stage >out &&
git -C sparse-index ls-files --stage --sparse >sparse &&
cat >expect <<-\EOF &&
e
folder1-
folder1.x
-folder1/0/0/0
-folder1/0/1
-folder1/a
+folder1/
folder10
-folder2/0/0/0
-folder2/0/1
-folder2/a
+folder2/
g
-x/a
+x/
z
EOF
diff -u out sparse | tail -n 16 >actual &&
test_cmp expect actual
'
I can make similar adjustments throughout the test to match
this style.
Thanks,
-Stolee
next prev parent reply other threads:[~2021-12-08 15:14 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-16 15:38 [PATCH 0/2] Sparse index: fetch, pull, ls-files Derrick Stolee via GitGitGadget
2021-11-16 15:38 ` [PATCH 1/2] fetch/pull: use the sparse index Derrick Stolee via GitGitGadget
2021-11-16 15:38 ` [PATCH 2/2] ls-files: add --sparse option Derrick Stolee via GitGitGadget
2021-11-22 18:36 ` Elijah Newren
2021-11-22 19:44 ` Derrick Stolee
2021-11-23 2:07 ` Ævar Arnfjörð Bjarmason
2021-12-08 15:14 ` Derrick Stolee [this message]
2021-12-08 15:20 ` Derrick Stolee
2021-12-08 17:04 ` Elijah Newren
2021-12-08 18:23 ` Derrick Stolee
2021-12-08 18:36 ` Elijah Newren
2021-12-08 19:06 ` Derrick Stolee
2021-12-09 12:50 ` Ævar Arnfjörð Bjarmason
2021-12-10 13:57 ` Derrick Stolee
2021-12-10 15:13 ` Ævar Arnfjörð Bjarmason
2021-12-13 19:16 ` Junio C Hamano
2021-12-16 14:11 ` Derrick Stolee
2021-11-17 9:29 ` [PATCH 0/2] Sparse index: fetch, pull, ls-files Junio C Hamano
2021-11-17 15:28 ` Derrick Stolee
2021-11-18 22:13 ` Junio C Hamano
2021-11-23 1:57 ` Ævar Arnfjörð Bjarmason
2021-12-08 19:39 ` [PATCH v2 0/5] " Derrick Stolee via GitGitGadget
2021-12-08 19:39 ` [PATCH v2 1/5] fetch/pull: use the sparse index Derrick Stolee via GitGitGadget
2021-12-08 19:39 ` [PATCH v2 2/5] ls-files: add --sparse option Derrick Stolee via GitGitGadget
2021-12-09 5:08 ` Elijah Newren
2021-12-10 13:51 ` Derrick Stolee
2021-12-08 19:39 ` [PATCH v2 3/5] t1092: replace 'read-cache --table' with 'ls-files --sparse' Derrick Stolee via GitGitGadget
2021-12-09 5:19 ` Elijah Newren
2021-12-08 19:39 ` [PATCH v2 4/5] t1091/t3705: remove 'test-tool read-cache --table' Derrick Stolee via GitGitGadget
2021-12-09 5:20 ` Elijah Newren
2021-12-08 19:39 ` [PATCH v2 5/5] test-read-cache: remove --table, --expand options Derrick Stolee via GitGitGadget
2021-12-09 5:23 ` [PATCH v2 0/5] Sparse index: fetch, pull, ls-files Elijah Newren
2021-12-10 15:13 ` [PATCH v3 " Derrick Stolee via GitGitGadget
2021-12-10 15:13 ` [PATCH v3 1/5] fetch/pull: use the sparse index Derrick Stolee via GitGitGadget
2021-12-10 15:13 ` [PATCH v3 2/5] ls-files: add --sparse option Derrick Stolee via GitGitGadget
2021-12-10 15:13 ` [PATCH v3 3/5] t1092: replace 'read-cache --table' with 'ls-files --sparse' Derrick Stolee via GitGitGadget
2021-12-10 15:13 ` [PATCH v3 4/5] t1091/t3705: remove 'test-tool read-cache --table' Derrick Stolee via GitGitGadget
2021-12-10 15:13 ` [PATCH v3 5/5] test-read-cache: remove --table, --expand options Derrick Stolee via GitGitGadget
2021-12-10 16:16 ` [PATCH v3 0/5] Sparse index: fetch, pull, ls-files Ævar Arnfjörð Bjarmason
2021-12-10 18:45 ` Elijah Newren
2021-12-11 2:24 ` Ævar Arnfjörð Bjarmason
2021-12-11 4:45 ` Elijah Newren
2021-12-10 18:53 ` Elijah Newren
2021-12-22 14:20 ` [PATCH v4 " Derrick Stolee via GitGitGadget
2021-12-22 14:20 ` [PATCH v4 1/5] fetch/pull: use the sparse index Derrick Stolee via GitGitGadget
2021-12-22 14:20 ` [PATCH v4 2/5] ls-files: add --sparse option Derrick Stolee via GitGitGadget
2021-12-22 14:20 ` [PATCH v4 3/5] t1092: replace 'read-cache --table' with 'ls-files --sparse' Derrick Stolee via GitGitGadget
2021-12-22 14:20 ` [PATCH v4 4/5] t1091/t3705: remove 'test-tool read-cache --table' Derrick Stolee via GitGitGadget
2021-12-22 14:20 ` [PATCH v4 5/5] test-read-cache: remove --table, --expand options Derrick Stolee via GitGitGadget
2021-12-22 19:17 ` [PATCH v4 0/5] Sparse index: fetch, pull, ls-files Elijah Newren
2021-12-22 23:56 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=03a642fc-6310-1ea4-083e-9fe4530cf761@gmail.com \
--to=stolee@gmail.com \
--cc=avarab@gmail.com \
--cc=derrickstolee@github.com \
--cc=dstolee@microsoft.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
--cc=vdye@github.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).