From: Shuqi Liang <cheskaqiqi@gmail.com>
To: git@vger.kernel.org
Cc: Shuqi Liang <cheskaqiqi@gmail.com>,
vdye@github.com, gitster@pobox.com, derrickstolee@github.com
Subject: [PATCH v7 0/2] diff-files: integrate with sparse index
Date: Wed, 22 Mar 2023 12:18:18 -0400 [thread overview]
Message-ID: <20230322161820.3609-1-cheskaqiqi@gmail.com> (raw)
In-Reply-To: <20230320205241.105476-1-cheskaqiqi@gmail.com>
Changes since v6:
1. Fix word wrap in commit message.
2. Use 'mkdir -p folder1' since full-checkout already have folder1.
3. Use `--stat` to ignore file creation time differences in unrefreshed
index.
4. In 'diff-files with pathspec outside sparse definition' add
'git diff-files "folder*/a" to show that the result is the same with a
wildcard pathspec.
5. Create an 'ensure_expanded' to handle silent failures.
Shuqi Liang (2):
t1092: add tests for `git diff-files`
diff-files: integrate with sparse index
builtin/diff-files.c | 8 ++
t/perf/p2000-sparse-operations.sh | 2 +
t/t1092-sparse-checkout-compatibility.sh | 98 ++++++++++++++++++++++++
3 files changed, 108 insertions(+)
Range-diff against v6:
1: 2a994e60bc ! 1: e2dcf9921e t1092: add tests for `git diff-files`
@@ Metadata
## Commit message ##
t1092: add tests for `git diff-files`
- Before integrating the 'git diff-files' builtin
- with the sparse index feature, add tests to
- t1092-sparse-checkout-compatibility.sh to ensure it currently works
- with sparse-checkout and will still work with sparse index
- after that integration.
+ Before integrating the 'git diff-files' builtin with the sparse index
+ feature, add tests to t1092-sparse-checkout-compatibility.sh to ensure
+ it currently works with sparse-checkout and will still work with sparse
+ index after that integration.
- When adding tests against a sparse-checkout
- definition, we test two modes: all changes are
- within the sparse-checkout cone and some changes are outside
- the sparse-checkout cone.
+ When adding tests against a sparse-checkout definition, we test two
+ modes: all changes are within the sparse-checkout cone and some changes
+ are outside the sparse-checkout cone.
- In order to have staged changes outside of
- the sparse-checkout cone, make a directory called 'folder1' and
- copy `a` into 'folder1/a'. 'folder1/a' is identical to `a` in the base
- commit. These make 'folder1/a' in the index, while leaving it outside of
- the sparse-checkout definition. Test 'folder1/a'being present on-disk
+ In order to have staged changes outside of the sparse-checkout cone,
+ make a directory called 'folder1' and copy `a` into 'folder1/a'.
+ 'folder1/a' is identical to `a` in the base commit. These make
+ 'folder1/a' in the index, while leaving it outside of the
+ sparse-checkout definition. Test 'folder1/a'being present on-disk
without modifications, then change content inside 'folder1/a' in order
to test 'folder1/a' being present on-disk with modifications.
@@ t/t1092-sparse-checkout-compatibility.sh: test_expect_success 'grep sparse direc
+ test_all_match git diff-files deep/*
+'
+
-+test_expect_failure 'diff-files with pathspec outside sparse definition' '
++test_expect_success 'diff-files with pathspec outside sparse definition' '
+ init_repos &&
+
+ test_sparse_match test_must_fail git diff-files folder2/a &&
@@ t/t1092-sparse-checkout-compatibility.sh: test_expect_success 'grep sparse direc
+ # Add file to the index but outside of cone for sparse-checkout cases.
+ # Add file to the index without sparse-checkout cases to ensure all have
+ # same output.
-+ run_on_all mkdir folder1 &&
++ run_on_all mkdir -p folder1 &&
+ run_on_all cp a folder1/a &&
+
+ # file present on-disk without modifications
-+ test_all_match git diff-files &&
-+ test_all_match git diff-files folder1/a &&
++ # use `--stat` to ignore file creation time differences in
++ # unrefreshed index
++ test_all_match git diff-files --stat &&
++ test_all_match git diff-files --stat folder1/a &&
++ test_all_match git diff-files --stat "folder*/a" &&
+
+ # file present on-disk with modifications
+ run_on_all ../edit-contents folder1/a &&
+ test_all_match git diff-files &&
-+ test_all_match git diff-files folder1/a
++ test_all_match git diff-files folder1/a &&
++ test_all_match git diff-files "folder*/a"
+'
+
test_done
2: ac730e372d ! 2: fb8edaf583 diff-files: integrate with sparse index
@@ Commit message
<pathspec> contains wildcard that may need a full-index or the
<pathspec> is simply outside of sparse-checkout definition.
- Remove full index requirement for `git diff-files`
- and add test to ensure the index only expanded when necessary
- in `git diff-files`.
+ Remove full index requirement for `git diff-files`.Create an
+ 'ensure_expanded' to handle silent failures. Add test to
+ ensure the index only expanded when necessary in `git diff-files`.
The `p2000` tests demonstrate a ~96% execution time reduction for 'git
diff-files' and a ~97% execution time reduction for 'git diff-files'
@@ builtin/diff-files.c: int cmd_diff_files(int argc, const char **argv, const char
+
+ if (pathspec_needs_expanded_index(the_repository->index, &rev.diffopt.pathspec))
+ ensure_full_index(the_repository->index);
-+
++
result = run_diff_files(&rev, options);
result = diff_result_code(&rev.diffopt, result);
cleanup:
@@ t/perf/p2000-sparse-operations.sh: test_perf_on_all git checkout-index -f --all
test_done
## t/t1092-sparse-checkout-compatibility.sh ##
-@@ t/t1092-sparse-checkout-compatibility.sh: test_expect_failure 'diff-files with pathspec outside sparse definition' '
- test_all_match git diff-files folder1/a
+@@ t/t1092-sparse-checkout-compatibility.sh: ensure_not_expanded () {
+ test_region ! index ensure_full_index trace2.txt
+ }
+
++ensure_expanded () {
++ rm -f trace2.txt &&
++ if test -z "$WITHOUT_UNTRACKED_TXT"
++ then
++ echo >>sparse-index/untracked.txt
++ fi &&
++
++ if test "$1" = "!"
++ then
++ shift &&
++ test_must_fail env \
++ GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
++ git -C sparse-index "$@" \
++ >sparse-index-out \
++ 2>sparse-index-error || return 1
++ else
++ GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
++ git -C sparse-index "$@" \
++ >sparse-index-out \
++ 2>sparse-index-error || return 1
++ fi &&
++ test_region index ensure_full_index trace2.txt
++}
++
+ test_expect_success 'sparse-index is not expanded' '
+ init_repos &&
+
+@@ t/t1092-sparse-checkout-compatibility.sh: test_expect_success 'diff-files with pathspec outside sparse definition' '
+ test_all_match git diff-files "folder*/a"
'
+test_expect_success 'diff-files pathspec expands index when necessary' '
@@ t/t1092-sparse-checkout-compatibility.sh: test_expect_failure 'diff-files with p
+ run_on_all ../edit-contents deep/a &&
+
+ # pathspec that should expand index
-+ ! ensure_not_expanded diff-files "*/a" &&
-+ test_must_be_empty sparse-index-err &&
-+
-+ ! ensure_not_expanded diff-files "**a" &&
-+ test_must_be_empty sparse-index-err
++ ensure_expanded diff-files "*/a" &&
++ ensure_expanded diff-files "**a"
+'
+
+test_expect_success 'sparse index is not expanded: diff-files' '
--
2.39.0
next prev parent reply other threads:[~2023-03-22 16:18 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-04 2:57 [RFC][PATCH] t1092: add tests for `git diff-files` Shuqi Liang
2023-03-06 14:14 ` Derrick Stolee
2023-03-07 6:58 ` [PATCH v2 0/2] diff-files: integrate with sparse index Shuqi Liang
2023-03-07 6:58 ` [PATCH v2 1/2] t1092: add tests for `git diff-files` Shuqi Liang
2023-03-07 18:53 ` Junio C Hamano
2023-03-08 22:04 ` Shuqi Liang
2023-03-08 22:40 ` Junio C Hamano
2023-03-07 6:58 ` [PATCH v2 2/2] diff-files: integrate with sparse index Shuqi Liang
2023-03-09 1:33 ` [PATCH v3 0/2] " Shuqi Liang
2023-03-09 1:33 ` [PATCH v3 1/2] t1092: add tests for `git diff-files` Shuqi Liang
2023-03-09 3:00 ` Junio C Hamano
2023-03-09 1:33 ` [PATCH v3 2/2] diff-files: integrate with sparse index Shuqi Liang
2023-03-09 6:39 ` [PATCH v4 0/2] " Shuqi Liang
2023-03-09 6:39 ` [PATCH v4 1/2] t1092: add tests for `git diff-files` Shuqi Liang
2023-03-09 17:20 ` Junio C Hamano
2023-03-09 23:21 ` Shuqi Liang
2023-03-09 23:40 ` Junio C Hamano
2023-03-09 6:39 ` [PATCH v4 2/2] diff-files: integrate with sparse index Shuqi Liang
2023-03-10 5:00 ` [PATCH v5 0/2] " Shuqi Liang
2023-03-10 5:00 ` [PATCH v5 1/2] t1092: add tests for `git diff-files` Shuqi Liang
2023-03-10 18:23 ` Victoria Dye
2023-03-20 20:55 ` Shuqi Liang
2023-03-10 5:00 ` [PATCH v5 2/2] diff-files: integrate with sparse index Shuqi Liang
2023-03-10 18:23 ` Victoria Dye
2023-03-20 20:52 ` [RFC PATCH v6 0/2] " Shuqi Liang
2023-03-20 20:52 ` [PATCH v6 1/2] t1092: add tests for `git diff-files` Shuqi Liang
2023-03-21 21:21 ` Victoria Dye
2023-03-21 21:25 ` Junio C Hamano
2023-03-21 22:19 ` Victoria Dye
2023-03-20 20:52 ` [PATCH v6 2/2] diff-files: integrate with sparse index Shuqi Liang
2023-03-21 22:34 ` Victoria Dye
2023-03-21 18:38 ` [RFC PATCH v6 0/2] " Victoria Dye
2023-03-22 16:18 ` Shuqi Liang [this message]
2023-03-22 16:18 ` [PATCH v7 1/2] t1092: add tests for `git diff-files` Shuqi Liang
2023-04-13 21:56 ` Victoria Dye
2023-03-22 16:18 ` [PATCH v7 2/2] diff-files: integrate with sparse index Shuqi Liang
2023-04-13 21:54 ` Victoria Dye
2023-04-20 4:50 ` Shuqi Liang
2023-04-20 15:26 ` Victoria Dye
2023-04-21 1:10 ` Shuqi Liang
2023-04-21 21:26 ` Victoria Dye
2023-04-22 21:25 ` Shuqi Liang
2023-03-22 23:36 ` [PATCH v7 0/2] " Junio C Hamano
2023-03-23 7:42 ` Shuqi Liang
2023-03-23 16:03 ` Junio C Hamano
2023-03-23 23:59 ` Shuqi Liang
2023-03-23 17:25 ` Victoria Dye
2023-04-13 21:36 ` Junio C Hamano
2023-04-13 21:38 ` Victoria Dye
2023-04-23 1:07 ` [PATCH v8 " Shuqi Liang
2023-04-23 1:07 ` [PATCH v8 1/2] t1092: add tests for `git diff-files` Shuqi Liang
2023-04-23 1:07 ` [PATCH v8 2/2] diff-files: integrate with sparse index Shuqi Liang
2023-05-01 22:26 ` Victoria Dye
2023-04-25 16:57 ` [PATCH v8 0/2] " Junio C Hamano
2023-05-01 22:04 ` Junio C Hamano
2023-05-02 17:23 ` [PATCH v9 " Shuqi Liang
2023-05-02 17:23 ` [PATCH v9 1/2] t1092: add tests for `git diff-files` Shuqi Liang
2023-05-02 19:25 ` Junio C Hamano
2023-05-03 16:37 ` Victoria Dye
2023-05-02 17:23 ` [PATCH v9 2/2] diff-files: integrate with sparse index Shuqi Liang
2023-05-03 21:55 ` [PATCH v10 0/2] " Shuqi Liang
2023-05-03 21:55 ` [PATCH v10 1/2] t1092: add tests for `git diff-files` Shuqi Liang
2023-05-03 23:25 ` Junio C Hamano
2023-05-03 21:55 ` [PATCH v10 2/2] diff-files: integrate with sparse index Shuqi Liang
2023-05-08 18:46 ` [PATCH v11 0/2] " Shuqi Liang
2023-05-08 18:46 ` [PATCH v11 1/2] t1092: add tests for `git diff-files` Shuqi Liang
2023-05-08 22:25 ` Victoria Dye
2023-05-08 18:46 ` [PATCH v11 2/2] diff-files: integrate with sparse index Shuqi Liang
2023-05-09 19:42 ` [PATCH v12 0/2] " Shuqi Liang
2023-05-09 19:42 ` [PATCH v12 1/2] t1092: add tests for `git diff-files` Shuqi Liang
2023-05-09 19:42 ` [PATCH v12 2/2] diff-files: integrate with sparse index Shuqi Liang
2023-05-11 3:41 ` [PATCH v12 0/2] " Victoria Dye
2023-05-11 5:04 ` 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=20230322161820.3609-1-cheskaqiqi@gmail.com \
--to=cheskaqiqi@gmail.com \
--cc=derrickstolee@github.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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 read-only IMAP folder(s) and NNTP newsgroup(s).