From: Teng Long <dyroneteng@gmail.com>
To: git@vger.kernel.org
Cc: jonathantanmy@google.com, avarab@gmail.com,
Teng Long <dyroneteng@gmail.com>
Subject: [PATCH v2 3/3] t5702: excluding commits with packfile-uris
Date: Tue, 18 May 2021 16:49:53 +0800 [thread overview]
Message-ID: <e824cc26a7a85673800429fd320279f3b6198576.1621327467.git.dyroneteng@gmail.com> (raw)
In-Reply-To: <cover.1621327467.git.dyroneteng@gmail.com>
Modify the logic of configure_exclusion to support the processing of
commits objects and add test cases for excluding commit objects
(recursive and non-recursive).
Replace "rm..." in the original test with "test_when_finished...".
Replace "git commit..." in the original test with "test_commit...".
Signed-off-by: Teng Long <dyroneteng@gmail.com>
---
t/t5702-protocol-v2.sh | 145 +++++++++++++++++++++++++++++++----------
1 file changed, 111 insertions(+), 34 deletions(-)
diff --git a/t/t5702-protocol-v2.sh b/t/t5702-protocol-v2.sh
index 2e1243ca40..2148bfcda1 100755
--- a/t/t5702-protocol-v2.sh
+++ b/t/t5702-protocol-v2.sh
@@ -753,7 +753,7 @@ test_expect_success 'ls-remote with v2 http sends only one POST' '
'
test_expect_success 'push with http:// and a config of v2 does not request v2' '
- test_when_finished "rm -f log" &&
+ test_when_finished "rm -rf \"$HTTPD_DOCUMENT_ROOT_PATH/http_parent\" http_child log" &&
# Till v2 for push is designed, make sure that if a client has
# protocol.version configured to use v2, that the client instead falls
# back and uses v0.
@@ -776,7 +776,7 @@ test_expect_success 'push with http:// and a config of v2 does not request v2' '
'
test_expect_success 'when server sends "ready", expect DELIM' '
- rm -rf "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" http_child &&
+ test_when_finished "rm -rf \"$HTTPD_DOCUMENT_ROOT_PATH/http_parent\" http_child" &&
git init "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
test_commit -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" one &&
@@ -796,7 +796,7 @@ test_expect_success 'when server sends "ready", expect DELIM' '
'
test_expect_success 'when server does not send "ready", expect FLUSH' '
- rm -rf "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" http_child log &&
+ test_when_finished "rm -rf \"$HTTPD_DOCUMENT_ROOT_PATH/http_parent\" http_child log" &&
git init "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
test_commit -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" one &&
@@ -824,17 +824,39 @@ test_expect_success 'when server does not send "ready", expect FLUSH' '
'
configure_exclusion () {
- git -C "$1" hash-object "$2" >objh &&
- git -C "$1" pack-objects "$HTTPD_DOCUMENT_ROOT_PATH/mypack" <objh >packh &&
- git -C "$1" config --add \
- "uploadpack.blobpackfileuri" \
- "$(cat objh) $(cat packh) $HTTPD_URL/dumb/mypack-$(cat packh).pack" &&
- cat objh
+ objt="$1"
+ P="$2"
+ recursive="$4"
+
+ if test "$objt" = "blob"
+ then
+ git -C "$P" hash-object "$3" >objh &&
+ git -C "$P" pack-objects "$HTTPD_DOCUMENT_ROOT_PATH/mypack" <objh >packh &&
+ git -C "$P" config --add \
+ "uploadpack.excludeobject" \
+ "$(cat objh) $recursive $(cat packh) $HTTPD_URL/dumb/mypack-$(cat packh).pack" &&
+ cat objh
+ elif test "$objt" = "commit"
+ then
+ echo "$3" >objh
+ if test "$recursive" = 0
+ then
+ git -C "$P" pack-objects "$HTTPD_DOCUMENT_ROOT_PATH/mypack" <objh >packh
+ else
+ git -C "$2" pack-objects --revs "$HTTPD_DOCUMENT_ROOT_PATH/mypack" <objh >packh
+ fi
+ git -C "$P" config --add \
+ "uploadpack.excludeobject" \
+ "$(cat objh) $recursive $(cat packh) $HTTPD_URL/dumb/mypack-$(cat packh).pack" &&
+ cat objh
+ else
+ echo "unsupported object type in configure_exclusion (got $objt)"
+ fi
}
test_expect_success 'part of packfile response provided as URI' '
P="$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
- rm -rf "$P" http_child log &&
+ test_when_finished "rm -rf \"$P\" http_child log" &&
git init "$P" &&
git -C "$P" config "uploadpack.allowsidebandall" "true" &&
@@ -843,10 +865,10 @@ test_expect_success 'part of packfile response provided as URI' '
git -C "$P" add my-blob &&
echo other-blob >"$P/other-blob" &&
git -C "$P" add other-blob &&
- git -C "$P" commit -m x &&
+ test_commit -C "$P" A &&
- configure_exclusion "$P" my-blob >h &&
- configure_exclusion "$P" other-blob >h2 &&
+ configure_exclusion blob "$P" my-blob 0 >h &&
+ configure_exclusion blob "$P" other-blob 0 >h2 &&
GIT_TRACE=1 GIT_TRACE_PACKET="$(pwd)/log" GIT_TEST_SIDEBAND_ALL=1 \
git -c protocol.version=2 \
@@ -881,18 +903,18 @@ test_expect_success 'part of packfile response provided as URI' '
test_line_count = 6 filelist
'
-test_expect_success 'packfile URIs with fetch instead of clone' '
+test_expect_success 'blobs packfile URIs with fetch instead of clone' '
P="$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
- rm -rf "$P" http_child log &&
+ test_when_finished "rm -rf \"$P\" http_child log" &&
git init "$P" &&
git -C "$P" config "uploadpack.allowsidebandall" "true" &&
echo my-blob >"$P/my-blob" &&
git -C "$P" add my-blob &&
- git -C "$P" commit -m x &&
+ test_commit -C "$P" A &&
- configure_exclusion "$P" my-blob >h &&
+ configure_exclusion blob "$P" my-blob 0 >h &&
git init http_child &&
@@ -902,9 +924,65 @@ test_expect_success 'packfile URIs with fetch instead of clone' '
fetch "$HTTPD_URL/smart/http_parent"
'
+test_expect_success 'commits(not recursively) packfile URIs with fetch instead of clone' '
+ P="$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
+ test_when_finished "rm -rf \"$P\" http_child log" &&
+
+ git init "$P" &&
+ git -C "$P" config "uploadpack.allowsidebandall" "true" &&
+
+ echo my-blob >"$P/my-blob" &&
+ git -C "$P" add my-blob &&
+ test_commit -C "$P" A &&
+
+ mycommit=$(git -C "$P" rev-parse A) &&
+ echo other-blob >"$P/other-blob" &&
+ git -C "$P" add other-blob &&
+ test_commit -C "$P" B &&
+ othercommit=$(git -C "$P" rev-parse B) &&
+
+ configure_exclusion commit "$P" "$mycommit" 0 >h &&
+ configure_exclusion commit "$P" "$othercommit" 0 >h2 &&
+
+ git init http_child &&
+
+ GIT_TRACE=1 GIT_TEST_SIDEBAND_ALL=1 \
+ git -C http_child -c protocol.version=2 \
+ -c fetch.uriprotocols=http,https \
+ fetch "$HTTPD_URL/smart/http_parent"
+'
+
+test_expect_success 'commits(recursively) packfile URIs with fetch instead of clone' '
+ P="$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
+ test_when_finished "rm -rf \"$P\" http_child log" &&
+
+ git init "$P" &&
+ git -C "$P" config "uploadpack.allowsidebandall" "true" &&
+
+ echo my-blob >"$P/my-blob" &&
+ git -C "$P" add my-blob &&
+ test_commit -C "$P" A &&
+
+ mycommit=$(git -C "$P" rev-parse A) &&
+ echo other-blob >"$P/other-blob" &&
+ git -C "$P" add other-blob &&
+ test_commit -C "$P" B &&
+ othercommit=$(git -C "$P" rev-parse B) &&
+
+ configure_exclusion commit "$P" "$mycommit" 1 >h2 &&
+ configure_exclusion commit "$P" "$othercommit" 1 >h2 &&
+
+ git init http_child &&
+
+ GIT_TRACE=1 GIT_TEST_SIDEBAND_ALL=1 \
+ git -C http_child -c protocol.version=2 \
+ -c fetch.uriprotocols=http,https \
+ fetch "$HTTPD_URL/smart/http_parent"
+'
+
test_expect_success 'fetching with valid packfile URI but invalid hash fails' '
P="$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
- rm -rf "$P" http_child log &&
+ test_when_finished "rm -rf \"$P\" http_child log" &&
git init "$P" &&
git -C "$P" config "uploadpack.allowsidebandall" "true" &&
@@ -913,9 +991,9 @@ test_expect_success 'fetching with valid packfile URI but invalid hash fails' '
git -C "$P" add my-blob &&
echo other-blob >"$P/other-blob" &&
git -C "$P" add other-blob &&
- git -C "$P" commit -m x &&
+ test_commit -C "$P" A &&
- configure_exclusion "$P" my-blob >h &&
+ configure_exclusion blob "$P" my-blob 0 >h &&
# Configure a URL for other-blob. Just reuse the hash of the object as
# the hash of the packfile, since the hash does not matter for this
# test as long as it is not the hash of the pack, and it is of the
@@ -923,8 +1001,8 @@ test_expect_success 'fetching with valid packfile URI but invalid hash fails' '
git -C "$P" hash-object other-blob >objh &&
git -C "$P" pack-objects "$HTTPD_DOCUMENT_ROOT_PATH/mypack" <objh >packh &&
git -C "$P" config --add \
- "uploadpack.blobpackfileuri" \
- "$(cat objh) $(cat objh) $HTTPD_URL/dumb/mypack-$(cat packh).pack" &&
+ "uploadpack.excludeobject" \
+ "$(cat objh) 0 $(cat objh) $HTTPD_URL/dumb/mypack-$(cat packh).pack" &&
test_must_fail env GIT_TEST_SIDEBAND_ALL=1 \
git -c protocol.version=2 \
@@ -935,16 +1013,15 @@ test_expect_success 'fetching with valid packfile URI but invalid hash fails' '
test_expect_success 'packfile-uri with transfer.fsckobjects' '
P="$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
- rm -rf "$P" http_child log &&
+ test_when_finished "rm -rf \"$P\" http_child log" &&
git init "$P" &&
git -C "$P" config "uploadpack.allowsidebandall" "true" &&
echo my-blob >"$P/my-blob" &&
git -C "$P" add my-blob &&
- git -C "$P" commit -m x &&
-
- configure_exclusion "$P" my-blob >h &&
+ test_commit -C "$P" A &&
+ configure_exclusion blob "$P" my-blob 0 >h &&
sane_unset GIT_TEST_SIDEBAND_ALL &&
git -c protocol.version=2 -c transfer.fsckobjects=1 \
@@ -959,7 +1036,7 @@ test_expect_success 'packfile-uri with transfer.fsckobjects' '
test_expect_success 'packfile-uri with transfer.fsckobjects fails on bad object' '
P="$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
- rm -rf "$P" http_child log &&
+ test_when_finished "rm -rf \"$P\" http_child log" &&
git init "$P" &&
git -C "$P" config "uploadpack.allowsidebandall" "true" &&
@@ -976,9 +1053,9 @@ test_expect_success 'packfile-uri with transfer.fsckobjects fails on bad object'
echo my-blob >"$P/my-blob" &&
git -C "$P" add my-blob &&
- git -C "$P" commit -m x &&
+ test_commit -C "$P" A &&
- configure_exclusion "$P" my-blob >h &&
+ configure_exclusion blob "$P" my-blob 0 >h &&
sane_unset GIT_TEST_SIDEBAND_ALL &&
test_must_fail git -c protocol.version=2 -c transfer.fsckobjects=1 \
@@ -989,7 +1066,7 @@ test_expect_success 'packfile-uri with transfer.fsckobjects fails on bad object'
test_expect_success 'packfile-uri with transfer.fsckobjects succeeds when .gitmodules is separate from tree' '
P="$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
- rm -rf "$P" http_child &&
+ test_when_finished "rm -rf \"$P\" http_child" &&
git init "$P" &&
git -C "$P" config "uploadpack.allowsidebandall" "true" &&
@@ -1000,7 +1077,7 @@ test_expect_success 'packfile-uri with transfer.fsckobjects succeeds when .gitmo
git -C "$P" add .gitmodules &&
git -C "$P" commit -m x &&
- configure_exclusion "$P" .gitmodules >h &&
+ configure_exclusion blob "$P" .gitmodules 0 >h &&
sane_unset GIT_TEST_SIDEBAND_ALL &&
git -c protocol.version=2 -c transfer.fsckobjects=1 \
@@ -1015,7 +1092,7 @@ test_expect_success 'packfile-uri with transfer.fsckobjects succeeds when .gitmo
test_expect_success 'packfile-uri with transfer.fsckobjects fails when .gitmodules separate from tree is invalid' '
P="$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
- rm -rf "$P" http_child err &&
+ test_when_finished "rm -rf \"$P\" http_child err" &&
git init "$P" &&
git -C "$P" config "uploadpack.allowsidebandall" "true" &&
@@ -1024,9 +1101,9 @@ test_expect_success 'packfile-uri with transfer.fsckobjects fails when .gitmodul
echo "path = include/foo" >>"$P/.gitmodules" &&
echo "url = git://example.com/git/lib.git" >>"$P/.gitmodules" &&
git -C "$P" add .gitmodules &&
- git -C "$P" commit -m x &&
+ test_commit -C "$P" A &&
- configure_exclusion "$P" .gitmodules >h &&
+ configure_exclusion blob "$P" .gitmodules 0 >h &&
sane_unset GIT_TEST_SIDEBAND_ALL &&
test_must_fail git -c protocol.version=2 -c transfer.fsckobjects=1 \
--
2.31.1.442.g7e39198978.dirty
next prev parent reply other threads:[~2021-05-18 8:50 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-07 2:11 [PATCH] Packfile-uris support excluding commit objects Teng Long
2021-05-10 11:14 ` Ævar Arnfjörð Bjarmason
2021-05-18 8:49 ` [PATCH v2 0/3] packfile-uris: commit objects exclusion Teng Long
2021-05-18 8:49 ` [PATCH v2 1/3] packfile-uris: support for excluding commit object Teng Long
2021-05-19 4:28 ` Junio C Hamano
2021-05-20 4:46 ` Junio C Hamano
2021-05-18 8:49 ` [PATCH v2 2/3] packfile-uris.txt: " Teng Long
2021-05-18 8:49 ` Teng Long [this message]
2021-07-26 9:46 ` [PATCH v3 0/3] packfile-uris: commit objects exclusio Teng Long
2021-07-26 9:46 ` [PATCH v3 1/3] packfile-uris: support for excluding commit objects Teng Long
2021-07-26 18:15 ` Junio C Hamano
2021-07-26 19:45 ` Felipe Contreras
2021-08-11 1:44 ` Teng Long
2021-07-26 9:46 ` [PATCH v3 2/3] t5702: " Teng Long
2021-07-26 15:03 ` Ævar Arnfjörð Bjarmason
2021-08-11 1:46 ` [PATCH v3 1/3] packfile-uris: " Teng Long
2021-07-26 9:46 ` [PATCH v3 3/3] packfile-uri.txt: " Teng Long
2021-07-26 20:52 ` Junio C Hamano
2021-08-11 1:47 ` Teng Long
2021-07-26 12:34 ` [PATCH v3 0/3] packfile-uris: commit objects exclusio Ævar Arnfjörð Bjarmason
2021-08-11 1:48 ` Teng Long
2021-08-11 7:45 ` [PATCH v4 0/7] packfile-uris: commits and trees exclusion Teng Long
2021-08-11 7:45 ` [PATCH v4 1/7] pack-objects.c: introduce new method `match_packfile_uri_exclusions` Teng Long
2021-08-11 7:45 ` [PATCH v4 2/7] Add new parameter "carry_data" for "show_object" function Teng Long
2021-08-11 7:45 ` [PATCH v4 3/7] packfile-uri: support for excluding commit objects Teng Long
2021-08-11 7:45 ` [PATCH v4 4/7] packfile-uri: support for excluding tree objects Teng Long
2021-08-11 7:45 ` [PATCH v4 5/7] packfile-uri.txt: support for excluding commits and trees Teng Long
2021-08-11 9:59 ` Bagas Sanjaya
2021-08-11 7:45 ` [PATCH v4 6/7] t5702: replace with "test_when_finished" for cleanup Teng Long
2021-08-11 7:45 ` [PATCH v4 7/7] t5702: support for excluding commit objects Teng Long
2021-08-25 2:21 ` [PATCH v5 00/14] packfile-uris: commits, trees and tags exclusion Teng Long
2021-08-25 2:21 ` [PATCH v5 01/14] pack-objects.c: introduce new method `match_packfile_uri_exclusions` Teng Long
2021-08-25 2:21 ` [PATCH v5 02/14] Add new parameter "carry_data" for "show_object" function Teng Long
2021-08-26 20:45 ` Junio C Hamano
2021-09-02 11:08 ` Teng Long
2021-08-25 2:21 ` [PATCH v5 03/14] packfile-uri: support for excluding commit objects Teng Long
2021-08-25 23:49 ` Ævar Arnfjörð Bjarmason
2021-09-02 12:26 ` Teng Long
2021-08-26 20:56 ` Junio C Hamano
2021-09-02 12:51 ` Teng Long
2021-08-25 2:21 ` [PATCH v5 04/14] packfile-uri: support for excluding tree objects Teng Long
2021-08-25 2:21 ` [PATCH v5 05/14] packfile-uri.txt: support for excluding commits and trees Teng Long
2021-08-25 23:52 ` Ævar Arnfjörð Bjarmason
2021-09-02 11:23 ` Teng Long
2021-08-25 2:21 ` [PATCH v5 06/14] t5702: replace with "test_when_finished" for cleanup Teng Long
2021-08-25 23:55 ` Ævar Arnfjörð Bjarmason
2021-09-02 11:37 ` Teng Long
2021-08-25 2:21 ` [PATCH v5 07/14] t5702: support for excluding commit objects Teng Long
2021-08-25 2:21 ` [PATCH v5 08/14] Add new parameter "carry_data" for "show_commit function Teng Long
2021-08-25 2:21 ` [PATCH v5 09/14] commit.h: add wrapped tags in commit struct Teng Long
2021-08-25 23:58 ` Ævar Arnfjörð Bjarmason
2021-09-02 12:17 ` Teng Long
2021-09-02 12:39 ` ZheNing Hu
2021-09-02 13:01 ` Teng Long
2021-08-25 2:21 ` [PATCH v5 10/14] object.h: add referred tags in `referred_objects` struct Teng Long
2021-08-25 2:21 ` [PATCH v5 11/14] packfile-uri: support for excluding tag objects Teng Long
2021-08-25 2:21 ` [PATCH v5 12/14] packfile-uri.txt: " Teng Long
2021-08-25 2:21 ` [PATCH v5 13/14] t5702: add tag exclusion test case Teng Long
2021-08-25 2:21 ` [PATCH v5 14/14] pack-objects.c: introduce `want_exclude_object` function Teng Long
2021-10-19 11:38 ` [PATCH v6 00/12] packfile-uri: support excluding multiple object types Teng Long
2021-10-19 11:38 ` [PATCH v6 01/12] objects.c: introduce `exclude_level` enum Teng Long
2021-10-19 11:38 ` [PATCH v6 02/12] Introduce function `match_packfile_uri_exclusions` Teng Long
2021-10-19 11:38 ` [PATCH v6 03/12] Replace `show_data` with structure `show_info` Teng Long
2021-10-19 11:38 ` [PATCH v6 04/12] Introduce `uploadpack.excludeobject` configuration Teng Long
2021-10-19 11:38 ` [PATCH v6 05/12] t5702: test cases for `uploadpack.excludeobject` Teng Long
2021-10-19 11:38 ` [PATCH v6 06/12] packfile-uri: support for excluding commits Teng Long
2021-10-19 11:38 ` [PATCH v6 07/12] t5702: test cases " Teng Long
2021-10-19 11:38 ` [PATCH v6 08/12] packfile-uri: support for excluding trees Teng Long
2021-10-19 11:38 ` [PATCH v6 09/12] t5702: test cases " Teng Long
2021-10-19 11:38 ` [PATCH v6 10/12] packfile-uri: support for excluding tags Teng Long
2021-10-19 11:38 ` [PATCH v6 11/12] t5702: test cases " Teng Long
2021-10-19 11:38 ` [PATCH v6 12/12] packfile-uri.txt: support multiple object types Teng Long
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=e824cc26a7a85673800429fd320279f3b6198576.1621327467.git.dyroneteng@gmail.com \
--to=dyroneteng@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=jonathantanmy@google.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).