From: Lessley Dennington <lessleydennington@gmail.com>
To: Elijah Newren <newren@gmail.com>,
Lessley Dennington via GitGitGadget <gitgitgadget@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Derrick Stolee <stolee@gmail.com>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH 2/2] blame: enable and test the sparse index
Date: Tue, 23 Nov 2021 06:57:59 -0800 [thread overview]
Message-ID: <2ac61ff8-816d-99b4-333b-381d9a1dbdeb@gmail.com> (raw)
In-Reply-To: <CABPp-BGM-57Xxxb-MRvkkgGFbVn4z6PEZFKryuBCwj7Ymr_oSA@mail.gmail.com>
On 11/22/21 11:57 PM, Elijah Newren wrote:
> On Thu, Oct 14, 2021 at 10:25 AM Lessley Dennington via GitGitGadget
> <gitgitgadget@gmail.com> wrote:
>>
>> From: Lessley Dennington <lessleydennington@gmail.com>
>>
>> Enable the sparse index for the 'git blame' command. The index was already
>> not expanded with this command, so the most interesting thing to do is to
>> add tests that verify that 'git blame' behaves correctly when the sparse
>> index is enabled and that its performance improves. More specifically, these
>> cases are:
>>
>> 1. The index is not expanded for 'blame' when given paths in the sparse
>> checkout cone at multiple levels.
>>
>> 2. Performance measurably improves for 'blame' with sparse index when given
>> paths in the sparse checkout cone at multiple levels.
>>
>> The `p2000` tests demonstrate a ~60% execution time reduction when running
>> 'blame' for a file two levels deep and and a ~30% execution time reduction
>> for a file three levels deep.
>>
>> Test before after
>> ----------------------------------------------------------------
>> 2000.62: git blame f2/f4/a (full-v3) 0.31 0.32 +3.2%
>> 2000.63: git blame f2/f4/a (full-v4) 0.29 0.31 +6.9%
>> 2000.64: git blame f2/f4/a (sparse-v3) 0.55 0.23 -58.2%
>> 2000.65: git blame f2/f4/a (sparse-v4) 0.57 0.23 -59.6%
>> 2000.66: git blame f2/f4/f3/a (full-v3) 0.77 0.85 +10.4%
>> 2000.67: git blame f2/f4/f3/a (full-v4) 0.78 0.81 +3.8%
>> 2000.68: git blame f2/f4/f3/a (sparse-v3) 1.07 0.72 -32.7%
>> 2000.99: git blame f2/f4/f3/a (sparse-v4) 1.05 0.73 -30.5%
>
> Looks good.
>
>> We do not include paths outside the sparse checkout cone because blame
>> currently does not support blaming files outside of the sparse definition.
>> Attempting to do so fails with the following error:
>>
>> fatal: no such path '<path outside sparse definition>' in HEAD
>
> While technically accurate, this wording is misleading; it implies
> that there is something unique to sparse checkouts, and perhaps even
> to cone mode, affecting how blame handles files not in the working
> directory. That's not true, though; git blame without a revision has
> always reported an error when given a file that does not exist in the
> working tree. Try this in git.git:
>
> $ rm t/README
> $ git blame t/README
> fatal: Cannot lstat 't/README': No such file or directory
>
> The reason is that with no revisions, calling git blame with a
> filename means asking the question "Which commit did each line in that
> file come from?" If there's no file, the question just doesn't make
> sense. You could make sense of it by thinking in terms of some
> revision of the file, but then you're passing a revision along --
> which works just fine in a sparse checkout too.
>
Thank you for clarifying that this is actually the expected behavior and
isn't something we need to "fix" for sparse-checkout. I will update
accordingly for v5.
>>
>> Signed-off-by: Lessley Dennington <lessleydennington@gmail.com>
>> ---
>> builtin/blame.c | 3 +++
>> t/perf/p2000-sparse-operations.sh | 2 ++
>> t/t1092-sparse-checkout-compatibility.sh | 24 +++++++++++++++++-------
>> 3 files changed, 22 insertions(+), 7 deletions(-)
>>
>> diff --git a/builtin/blame.c b/builtin/blame.c
>> index 641523ff9af..af3d81e2bd4 100644
>> --- a/builtin/blame.c
>> +++ b/builtin/blame.c
>> @@ -902,6 +902,9 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
>> long anchor;
>> const int hexsz = the_hash_algo->hexsz;
>>
>> + prepare_repo_settings(the_repository);
>> + the_repository->settings.command_requires_full_index = 0;
>> +
>> setup_default_color_by_age();
>> git_config(git_blame_config, &output_option);
>> repo_init_revisions(the_repository, &revs, NULL);
>> diff --git a/t/perf/p2000-sparse-operations.sh b/t/perf/p2000-sparse-operations.sh
>> index bff93f16e93..9ac76a049b8 100755
>> --- a/t/perf/p2000-sparse-operations.sh
>> +++ b/t/perf/p2000-sparse-operations.sh
>> @@ -115,5 +115,7 @@ test_perf_on_all git reset --hard
>> test_perf_on_all git reset -- does-not-exist
>> test_perf_on_all git diff
>> test_perf_on_all git diff --staged
>> +test_perf_on_all git blame $SPARSE_CONE/a
>> +test_perf_on_all git blame $SPARSE_CONE/f3/a
>>
>> test_done
>> diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh
>> index 1070bff1a83..54826e858a9 100755
>> --- a/t/t1092-sparse-checkout-compatibility.sh
>> +++ b/t/t1092-sparse-checkout-compatibility.sh
>> @@ -485,15 +485,16 @@ test_expect_success 'blame with pathspec inside sparse definition' '
>> test_all_match git blame deep/deeper1/deepest/a
>> '
>>
>> -# TODO: blame currently does not support blaming files outside of the
>> -# sparse definition. It complains that the file doesn't exist locally.
>> -test_expect_failure 'blame with pathspec outside sparse definition' '
>> +# Blame does not support blaming files outside of the sparse
>> +# definition, so we verify this scenario.
>
> As above, this is misleading. It'd be better to word it something like:
>
> # Without a revision specified, blame will error if passed any file that
> # is not present in the working directory (even if the file is tracked).
> # Here we just verify that this is also true with sparse checkouts.
>
Thank you. Will update for v5.
>> +test_expect_success 'blame with pathspec outside sparse definition' '
>> init_repos &&
>>
>> - test_all_match git blame folder1/a &&
>> - test_all_match git blame folder2/a &&
>> - test_all_match git blame deep/deeper2/a &&
>> - test_all_match git blame deep/deeper2/deepest/a
>> + test_sparse_match git sparse-checkout set &&
>> + test_sparse_match test_must_fail git blame folder1/a &&
>> + test_sparse_match test_must_fail git blame folder2/a &&
>> + test_sparse_match test_must_fail git blame deep/deeper2/a &&
>> + test_sparse_match test_must_fail git blame deep/deeper2/deepest/a
>> '
>>
>> test_expect_success 'checkout and reset (mixed)' '
>> @@ -871,6 +872,15 @@ test_expect_success 'sparse-index is not expanded: merge conflict in cone' '
>> )
>> '
>>
>> +test_expect_success 'sparse index is not expanded: blame' '
>> + init_repos &&
>> +
>> + ensure_not_expanded blame a &&
>> + ensure_not_expanded blame deep/a &&
>> + ensure_not_expanded blame deep/deeper1/a &&
>> + ensure_not_expanded blame deep/deeper1/deepest/a
>> +'
>> +
>> # NEEDSWORK: a sparse-checkout behaves differently from a full checkout
>> # in this scenario, but it shouldn't.
>> test_expect_success 'reset mixed and checkout orphan' '
>> --
>> gitgitgadget
next prev parent reply other threads:[~2021-11-23 14:58 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-14 17:25 [PATCH 0/2] Sparse Index: diff and blame builtins Lessley Dennington via GitGitGadget
2021-10-14 17:25 ` [PATCH 1/2] diff: enable and test the sparse index Lessley Dennington via GitGitGadget
2021-10-15 16:46 ` Derrick Stolee
2021-10-14 17:25 ` [PATCH 2/2] blame: " Lessley Dennington via GitGitGadget
2021-11-23 7:57 ` Elijah Newren
2021-11-23 14:57 ` Lessley Dennington [this message]
2021-10-15 21:20 ` [PATCH v2 0/2] Sparse Index: diff and blame builtins Lessley Dennington via GitGitGadget
2021-10-15 21:20 ` [PATCH v2 1/2] diff: enable and test the sparse index Lessley Dennington via GitGitGadget
2021-10-25 20:47 ` Taylor Blau
2021-10-26 16:10 ` Lessley Dennington
2021-10-26 16:15 ` Taylor Blau
2021-10-15 21:20 ` [PATCH v2 2/2] blame: " Lessley Dennington via GitGitGadget
2021-10-25 20:53 ` Taylor Blau
2021-10-26 16:17 ` Lessley Dennington
2021-11-21 1:32 ` Elijah Newren
2021-11-01 21:27 ` [PATCH v3 0/2] Sparse Index: diff and blame builtins Lessley Dennington via GitGitGadget
2021-11-01 21:27 ` [PATCH v3 1/2] diff: enable and test the sparse index Lessley Dennington via GitGitGadget
2021-11-03 17:05 ` Junio C Hamano
2021-11-04 23:55 ` Lessley Dennington
2021-11-01 21:27 ` [PATCH v3 2/2] blame: " Lessley Dennington via GitGitGadget
2021-11-03 16:47 ` Junio C Hamano
2021-11-05 0:04 ` Lessley Dennington
2021-11-21 1:46 ` Elijah Newren
2021-11-22 22:42 ` [PATCH v4 0/4] Sparse Index: diff and blame builtins Lessley Dennington via GitGitGadget
2021-11-22 22:42 ` [PATCH v4 1/4] sparse index: enable only for git repos Lessley Dennington via GitGitGadget
2021-11-23 7:41 ` Elijah Newren
2021-11-23 14:52 ` Lessley Dennington
2021-11-23 23:39 ` Junio C Hamano
2021-11-24 14:41 ` Lessley Dennington
2021-11-24 18:23 ` Junio C Hamano
2021-11-29 23:38 ` Lessley Dennington
2021-11-30 6:32 ` Junio C Hamano
2021-11-30 23:25 ` Lessley Dennington
2021-11-22 22:42 ` [PATCH v4 2/4] test-read-cache: set up repo after git directory Lessley Dennington via GitGitGadget
2021-11-23 23:42 ` Junio C Hamano
2021-11-24 15:10 ` Lessley Dennington
2021-11-24 18:36 ` Junio C Hamano
2021-11-29 23:01 ` Lessley Dennington
2021-11-22 22:42 ` [PATCH v4 3/4] diff: enable and test the sparse index Lessley Dennington via GitGitGadget
2021-11-23 7:47 ` Elijah Newren
2021-11-23 14:53 ` Lessley Dennington
2021-11-23 23:48 ` Junio C Hamano
2021-11-22 22:42 ` [PATCH v4 4/4] blame: " Lessley Dennington via GitGitGadget
2021-11-23 23:53 ` Junio C Hamano
2021-11-24 14:52 ` Lessley Dennington
2021-12-03 21:15 ` [PATCH v5 0/7] Sparse Index: diff and blame builtins Lessley Dennington via GitGitGadget
2021-12-03 21:15 ` [PATCH v5 1/7] git: esnure correct git directory setup with -h Lessley Dennington via GitGitGadget
2021-12-04 18:41 ` Elijah Newren
2021-12-04 19:58 ` Junio C Hamano
2021-12-03 21:16 ` [PATCH v5 2/7] commit-graph: return if there is no git directory Lessley Dennington via GitGitGadget
2021-12-03 21:16 ` [PATCH v5 3/7] test-read-cache: set up repo after " Lessley Dennington via GitGitGadget
2021-12-03 21:16 ` [PATCH v5 4/7] repo-settings: prepare_repo_settings only in git repos Lessley Dennington via GitGitGadget
2021-12-07 4:43 ` Ævar Arnfjörð Bjarmason
2021-12-08 15:46 ` Lessley Dennington
2021-12-03 21:16 ` [PATCH v5 5/7] diff: replace --staged with --cached in t1092 tests Lessley Dennington via GitGitGadget
2021-12-03 21:16 ` [PATCH v5 6/7] diff: enable and test the sparse index Lessley Dennington via GitGitGadget
2021-12-03 21:16 ` [PATCH v5 7/7] blame: " Lessley Dennington via GitGitGadget
2021-12-04 19:43 ` [PATCH v5 0/7] Sparse Index: diff and blame builtins Elijah Newren
2021-12-06 15:55 ` [PATCH v6 " Lessley Dennington via GitGitGadget
2021-12-06 15:55 ` [PATCH v6 1/7] git: ensure correct git directory setup with -h Lessley Dennington via GitGitGadget
2021-12-06 15:55 ` [PATCH v6 2/7] commit-graph: return if there is no git directory Lessley Dennington via GitGitGadget
2021-12-06 15:55 ` [PATCH v6 3/7] test-read-cache: set up repo after " Lessley Dennington via GitGitGadget
2021-12-06 15:55 ` [PATCH v6 4/7] repo-settings: prepare_repo_settings only in git repos Lessley Dennington via GitGitGadget
2021-12-06 15:55 ` [PATCH v6 5/7] diff: replace --staged with --cached in t1092 tests Lessley Dennington via GitGitGadget
2021-12-06 15:56 ` [PATCH v6 6/7] diff: enable and test the sparse index Lessley Dennington via GitGitGadget
2021-12-06 15:56 ` [PATCH v6 7/7] blame: " Lessley Dennington via GitGitGadget
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=2ac61ff8-816d-99b4-333b-381d9a1dbdeb@gmail.com \
--to=lessleydennington@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
--cc=stolee@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).