2017-11-21 20:58:51 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='git rev-list using object filtering'
|
|
|
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
# Test the blob:none filter.
|
|
|
|
|
|
|
|
test_expect_success 'setup r1' '
|
|
|
|
echo "{print \$1}" >print_1.awk &&
|
|
|
|
echo "{print \$2}" >print_2.awk &&
|
|
|
|
|
|
|
|
git init r1 &&
|
|
|
|
for n in 1 2 3 4 5
|
|
|
|
do
|
|
|
|
echo "This is file: $n" > r1/file.$n
|
|
|
|
git -C r1 add file.$n
|
|
|
|
git -C r1 commit -m "$n"
|
|
|
|
done
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'verify blob:none omits all 5 blobs' '
|
2018-10-05 21:54:05 +00:00
|
|
|
git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 \
|
|
|
|
>ls_files_result &&
|
|
|
|
awk -f print_2.awk ls_files_result |
|
2018-10-05 21:54:03 +00:00
|
|
|
sort >expected &&
|
|
|
|
|
2018-10-05 21:54:07 +00:00
|
|
|
git -C r1 rev-list --quiet --objects --filter-print-omitted \
|
|
|
|
--filter=blob:none HEAD >revs &&
|
2018-10-05 21:54:05 +00:00
|
|
|
awk -f print_1.awk revs |
|
2018-10-05 21:54:03 +00:00
|
|
|
sed "s/~//" |
|
|
|
|
sort >observed &&
|
|
|
|
|
2018-10-05 21:54:04 +00:00
|
|
|
test_cmp expected observed
|
2017-11-21 20:58:51 +00:00
|
|
|
'
|
|
|
|
|
2018-10-05 21:31:24 +00:00
|
|
|
test_expect_success 'specify blob explicitly prevents filtering' '
|
|
|
|
file_3=$(git -C r1 ls-files -s file.3 |
|
|
|
|
awk -f print_2.awk) &&
|
|
|
|
|
|
|
|
file_4=$(git -C r1 ls-files -s file.4 |
|
|
|
|
awk -f print_2.awk) &&
|
|
|
|
|
|
|
|
git -C r1 rev-list --objects --filter=blob:none HEAD $file_3 >observed &&
|
2018-10-12 20:01:41 +00:00
|
|
|
grep "$file_3" observed &&
|
|
|
|
! grep "$file_4" observed
|
2018-10-05 21:31:24 +00:00
|
|
|
'
|
|
|
|
|
2017-11-21 20:58:51 +00:00
|
|
|
test_expect_success 'verify emitted+omitted == all' '
|
2018-10-05 21:54:07 +00:00
|
|
|
git -C r1 rev-list --objects HEAD >revs &&
|
2018-10-05 21:54:05 +00:00
|
|
|
awk -f print_1.awk revs |
|
2018-10-05 21:54:03 +00:00
|
|
|
sort >expected &&
|
|
|
|
|
2018-10-05 21:54:07 +00:00
|
|
|
git -C r1 rev-list --objects --filter-print-omitted --filter=blob:none \
|
|
|
|
HEAD >revs &&
|
2018-10-05 21:54:05 +00:00
|
|
|
awk -f print_1.awk revs |
|
2018-10-05 21:54:03 +00:00
|
|
|
sed "s/~//" |
|
|
|
|
sort >observed &&
|
|
|
|
|
2018-10-05 21:54:04 +00:00
|
|
|
test_cmp expected observed
|
2017-11-21 20:58:51 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
|
|
# Test blob:limit=<n>[kmg] filter.
|
|
|
|
# We boundary test around the size parameter. The filter is strictly less than
|
|
|
|
# the value, so size 500 and 1000 should have the same results, but 1001 should
|
|
|
|
# filter more.
|
|
|
|
|
|
|
|
test_expect_success 'setup r2' '
|
|
|
|
git init r2 &&
|
|
|
|
for n in 1000 10000
|
|
|
|
do
|
|
|
|
printf "%"$n"s" X > r2/large.$n
|
|
|
|
git -C r2 add large.$n
|
|
|
|
git -C r2 commit -m "$n"
|
|
|
|
done
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'verify blob:limit=500 omits all blobs' '
|
2018-10-05 21:54:05 +00:00
|
|
|
git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
|
|
|
|
awk -f print_2.awk ls_files_result |
|
2018-10-05 21:54:03 +00:00
|
|
|
sort >expected &&
|
|
|
|
|
2018-10-05 21:54:07 +00:00
|
|
|
git -C r2 rev-list --quiet --objects --filter-print-omitted \
|
|
|
|
--filter=blob:limit=500 HEAD >revs &&
|
2018-10-05 21:54:05 +00:00
|
|
|
awk -f print_1.awk revs |
|
2018-10-05 21:54:03 +00:00
|
|
|
sed "s/~//" |
|
|
|
|
sort >observed &&
|
|
|
|
|
2018-10-05 21:54:04 +00:00
|
|
|
test_cmp expected observed
|
2017-11-21 20:58:51 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'verify emitted+omitted == all' '
|
2018-10-05 21:54:07 +00:00
|
|
|
git -C r2 rev-list --objects HEAD >revs &&
|
2018-10-05 21:54:05 +00:00
|
|
|
awk -f print_1.awk revs |
|
2018-10-05 21:54:03 +00:00
|
|
|
sort >expected &&
|
|
|
|
|
2018-10-05 21:54:07 +00:00
|
|
|
git -C r2 rev-list --objects --filter-print-omitted \
|
|
|
|
--filter=blob:limit=500 HEAD >revs &&
|
2018-10-05 21:54:05 +00:00
|
|
|
awk -f print_1.awk revs |
|
2018-10-05 21:54:03 +00:00
|
|
|
sed "s/~//" |
|
|
|
|
sort >observed &&
|
|
|
|
|
2018-10-05 21:54:04 +00:00
|
|
|
test_cmp expected observed
|
2017-11-21 20:58:51 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'verify blob:limit=1000' '
|
2018-10-05 21:54:05 +00:00
|
|
|
git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
|
|
|
|
awk -f print_2.awk ls_files_result |
|
2018-10-05 21:54:03 +00:00
|
|
|
sort >expected &&
|
|
|
|
|
2018-10-05 21:54:07 +00:00
|
|
|
git -C r2 rev-list --quiet --objects --filter-print-omitted \
|
|
|
|
--filter=blob:limit=1000 HEAD >revs &&
|
2018-10-05 21:54:05 +00:00
|
|
|
awk -f print_1.awk revs |
|
2018-10-05 21:54:03 +00:00
|
|
|
sed "s/~//" |
|
|
|
|
sort >observed &&
|
|
|
|
|
2018-10-05 21:54:04 +00:00
|
|
|
test_cmp expected observed
|
2017-11-21 20:58:51 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'verify blob:limit=1001' '
|
2018-10-05 21:54:05 +00:00
|
|
|
git -C r2 ls-files -s large.10000 >ls_files_result &&
|
|
|
|
awk -f print_2.awk ls_files_result |
|
2018-10-05 21:54:03 +00:00
|
|
|
sort >expected &&
|
|
|
|
|
2018-10-05 21:54:07 +00:00
|
|
|
git -C r2 rev-list --quiet --objects --filter-print-omitted \
|
|
|
|
--filter=blob:limit=1001 HEAD >revs &&
|
2018-10-05 21:54:05 +00:00
|
|
|
awk -f print_1.awk revs |
|
2018-10-05 21:54:03 +00:00
|
|
|
sed "s/~//" |
|
|
|
|
sort >observed &&
|
|
|
|
|
2018-10-05 21:54:04 +00:00
|
|
|
test_cmp expected observed
|
2017-11-21 20:58:51 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'verify blob:limit=1k' '
|
2018-10-05 21:54:05 +00:00
|
|
|
git -C r2 ls-files -s large.10000 >ls_files_result &&
|
|
|
|
awk -f print_2.awk ls_files_result |
|
2018-10-05 21:54:03 +00:00
|
|
|
sort >expected &&
|
|
|
|
|
2018-10-05 21:54:07 +00:00
|
|
|
git -C r2 rev-list --quiet --objects --filter-print-omitted \
|
|
|
|
--filter=blob:limit=1k HEAD >revs &&
|
2018-10-05 21:54:05 +00:00
|
|
|
awk -f print_1.awk revs |
|
2018-10-05 21:54:03 +00:00
|
|
|
sed "s/~//" |
|
|
|
|
sort >observed &&
|
|
|
|
|
2018-10-05 21:54:04 +00:00
|
|
|
test_cmp expected observed
|
2017-11-21 20:58:51 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'verify blob:limit=1m' '
|
2018-10-05 21:54:07 +00:00
|
|
|
git -C r2 rev-list --quiet --objects --filter-print-omitted \
|
|
|
|
--filter=blob:limit=1m HEAD >revs &&
|
2018-10-05 21:54:05 +00:00
|
|
|
awk -f print_1.awk revs |
|
2018-10-05 21:54:03 +00:00
|
|
|
sed "s/~//" |
|
|
|
|
sort >observed &&
|
|
|
|
|
tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'
Using 'test_must_be_empty' is shorter and more idiomatic than
>empty &&
test_cmp empty out
as it saves the creation of an empty file. Furthermore, sometimes the
expected empty file doesn't have such a descriptive name like 'empty',
and its creation is far away from the place where it's finally used
for comparison (e.g. in 't7600-merge.sh', where two expected empty
files are created in the 'setup' test, but are used only about 500
lines later).
These cases were found by instrumenting 'test_cmp' to error out the
test script when it's used to compare empty files, and then converted
manually.
Note that even after this patch there still remain a lot of cases
where we use 'test_cmp' to check empty files:
- Sometimes the expected output is not hard-coded in the test, but
'test_cmp' is used to ensure that two similar git commands produce
the same output, and that output happens to be empty, e.g. the
test 'submodule update --merge - ignores --merge for new
submodules' in 't7406-submodule-update.sh'.
- Repetitive common tasks, including preparing the expected results
and running 'test_cmp', are often extracted into a helper
function, and some of this helper's callsites expect no output.
- For the same reason as above, the whole 'test_expect_success'
block is within a helper function, e.g. in 't3070-wildmatch.sh'.
- Or 'test_cmp' is invoked in a loop, e.g. the test 'cvs update
(-p)' in 't9400-git-cvsserver-server.sh'.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-19 21:57:25 +00:00
|
|
|
test_must_be_empty observed
|
2017-11-21 20:58:51 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
# Test sparse:path=<path> filter.
|
|
|
|
# Use a local file containing a sparse-checkout specification to filter
|
|
|
|
# out blobs not required for the corresponding sparse-checkout. We do not
|
|
|
|
# require sparse-checkout to actually be enabled.
|
|
|
|
|
|
|
|
test_expect_success 'setup r3' '
|
|
|
|
git init r3 &&
|
|
|
|
mkdir r3/dir1 &&
|
|
|
|
for n in sparse1 sparse2
|
|
|
|
do
|
|
|
|
echo "This is file: $n" > r3/$n
|
|
|
|
git -C r3 add $n
|
|
|
|
echo "This is file: dir1/$n" > r3/dir1/$n
|
|
|
|
git -C r3 add dir1/$n
|
|
|
|
done &&
|
|
|
|
git -C r3 commit -m "sparse" &&
|
|
|
|
echo dir1/ >pattern1 &&
|
|
|
|
echo sparse1 >pattern2
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'verify sparse:path=pattern1 omits top-level files' '
|
2018-10-05 21:54:05 +00:00
|
|
|
git -C r3 ls-files -s sparse1 sparse2 >ls_files_result &&
|
|
|
|
awk -f print_2.awk ls_files_result |
|
2018-10-05 21:54:03 +00:00
|
|
|
sort >expected &&
|
|
|
|
|
2018-10-05 21:54:07 +00:00
|
|
|
git -C r3 rev-list --quiet --objects --filter-print-omitted \
|
|
|
|
--filter=sparse:path=../pattern1 HEAD >revs &&
|
2018-10-05 21:54:05 +00:00
|
|
|
awk -f print_1.awk revs |
|
2018-10-05 21:54:03 +00:00
|
|
|
sed "s/~//" |
|
|
|
|
sort >observed &&
|
|
|
|
|
2018-10-05 21:54:04 +00:00
|
|
|
test_cmp expected observed
|
2017-11-21 20:58:51 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'verify sparse:path=pattern2 omits both sparse2 files' '
|
2018-10-05 21:54:05 +00:00
|
|
|
git -C r3 ls-files -s sparse2 dir1/sparse2 >ls_files_result &&
|
|
|
|
awk -f print_2.awk ls_files_result |
|
2018-10-05 21:54:03 +00:00
|
|
|
sort >expected &&
|
|
|
|
|
2018-10-05 21:54:07 +00:00
|
|
|
git -C r3 rev-list --quiet --objects --filter-print-omitted \
|
|
|
|
--filter=sparse:path=../pattern2 HEAD >revs &&
|
2018-10-05 21:54:05 +00:00
|
|
|
awk -f print_1.awk revs |
|
2018-10-05 21:54:03 +00:00
|
|
|
sed "s/~//" |
|
|
|
|
sort >observed &&
|
|
|
|
|
2018-10-05 21:54:04 +00:00
|
|
|
test_cmp expected observed
|
2017-11-21 20:58:51 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
# Test sparse:oid=<oid-ish> filter.
|
|
|
|
# Like sparse:path, but we get the sparse-checkout specification from
|
|
|
|
# a blob rather than a file on disk.
|
|
|
|
|
|
|
|
test_expect_success 'setup r3 part 2' '
|
|
|
|
echo dir1/ >r3/pattern &&
|
|
|
|
git -C r3 add pattern &&
|
|
|
|
git -C r3 commit -m "pattern"
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'verify sparse:oid=OID omits top-level files' '
|
2018-10-05 21:54:05 +00:00
|
|
|
git -C r3 ls-files -s pattern sparse1 sparse2 >ls_files_result &&
|
|
|
|
awk -f print_2.awk ls_files_result |
|
2018-10-05 21:54:03 +00:00
|
|
|
sort >expected &&
|
|
|
|
|
2017-11-21 20:58:51 +00:00
|
|
|
oid=$(git -C r3 ls-files -s pattern | awk -f print_2.awk) &&
|
2018-10-05 21:54:03 +00:00
|
|
|
|
2018-10-05 21:54:07 +00:00
|
|
|
git -C r3 rev-list --quiet --objects --filter-print-omitted \
|
|
|
|
--filter=sparse:oid=$oid HEAD >revs &&
|
2018-10-05 21:54:05 +00:00
|
|
|
awk -f print_1.awk revs |
|
2018-10-05 21:54:03 +00:00
|
|
|
sed "s/~//" |
|
|
|
|
sort >observed &&
|
|
|
|
|
2018-10-05 21:54:04 +00:00
|
|
|
test_cmp expected observed
|
2017-11-21 20:58:51 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'verify sparse:oid=oid-ish omits top-level files' '
|
2018-10-05 21:54:05 +00:00
|
|
|
git -C r3 ls-files -s pattern sparse1 sparse2 >ls_files_result &&
|
|
|
|
awk -f print_2.awk ls_files_result |
|
2018-10-05 21:54:03 +00:00
|
|
|
sort >expected &&
|
|
|
|
|
2018-10-05 21:54:07 +00:00
|
|
|
git -C r3 rev-list --quiet --objects --filter-print-omitted \
|
|
|
|
--filter=sparse:oid=master:pattern HEAD >revs &&
|
2018-10-05 21:54:05 +00:00
|
|
|
awk -f print_1.awk revs |
|
2018-10-05 21:54:03 +00:00
|
|
|
sed "s/~//" |
|
|
|
|
sort >observed &&
|
|
|
|
|
2018-10-05 21:54:04 +00:00
|
|
|
test_cmp expected observed
|
2017-11-21 20:58:51 +00:00
|
|
|
'
|
|
|
|
|
2018-10-05 21:31:23 +00:00
|
|
|
test_expect_success 'rev-list W/ --missing=print and --missing=allow-any for trees' '
|
|
|
|
TREE=$(git -C r3 rev-parse HEAD:dir1) &&
|
|
|
|
|
|
|
|
# Create a spare repo because we will be deleting objects from this one.
|
|
|
|
git clone r3 r3.b &&
|
|
|
|
|
|
|
|
rm r3.b/.git/objects/$(echo $TREE | sed "s|^..|&/|") &&
|
|
|
|
|
|
|
|
git -C r3.b rev-list --quiet --missing=print --objects HEAD \
|
|
|
|
>missing_objs 2>rev_list_err &&
|
|
|
|
echo "?$TREE" >expected &&
|
|
|
|
test_cmp expected missing_objs &&
|
|
|
|
|
|
|
|
# do not complain when a missing tree cannot be parsed
|
|
|
|
test_must_be_empty rev_list_err &&
|
|
|
|
|
|
|
|
git -C r3.b rev-list --missing=allow-any --objects HEAD \
|
|
|
|
>objs 2>rev_list_err &&
|
|
|
|
! grep $TREE objs &&
|
|
|
|
test_must_be_empty rev_list_err
|
|
|
|
'
|
|
|
|
|
2018-10-05 21:31:27 +00:00
|
|
|
# Test tree:0 filter.
|
|
|
|
|
|
|
|
test_expect_success 'verify tree:0 includes trees in "filtered" output' '
|
|
|
|
git -C r3 rev-list --quiet --objects --filter-print-omitted \
|
|
|
|
--filter=tree:0 HEAD >revs &&
|
|
|
|
|
|
|
|
awk -f print_1.awk revs |
|
|
|
|
sed s/~// |
|
|
|
|
xargs -n1 git -C r3 cat-file -t >unsorted_filtered_types &&
|
|
|
|
|
|
|
|
sort -u unsorted_filtered_types >filtered_types &&
|
2018-10-12 20:01:41 +00:00
|
|
|
test_write_lines blob tree >expected &&
|
2018-10-05 21:31:27 +00:00
|
|
|
test_cmp expected filtered_types
|
|
|
|
'
|
|
|
|
|
2018-10-18 00:39:15 +00:00
|
|
|
# Make sure tree:0 does not iterate through any trees.
|
|
|
|
|
|
|
|
test_expect_success 'filter a GIANT tree through tree:0' '
|
|
|
|
GIT_TRACE=1 git -C r3 rev-list \
|
|
|
|
--objects --filter=tree:0 HEAD 2>filter_trace &&
|
|
|
|
grep "Skipping contents of tree [.][.][.]" filter_trace >actual &&
|
|
|
|
# One line for each commit traversed.
|
|
|
|
test_line_count = 2 actual &&
|
|
|
|
|
|
|
|
# Make sure no other trees were considered besides the root.
|
|
|
|
! grep "Skipping contents of tree [^.]" filter_trace
|
|
|
|
'
|
|
|
|
|
2017-11-21 20:58:51 +00:00
|
|
|
# Delete some loose objects and use rev-list, but WITHOUT any filtering.
|
|
|
|
# This models previously omitted objects that we did not receive.
|
|
|
|
|
|
|
|
test_expect_success 'rev-list W/ --missing=print' '
|
2018-10-05 21:54:05 +00:00
|
|
|
git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 \
|
|
|
|
>ls_files_result &&
|
|
|
|
awk -f print_2.awk ls_files_result |
|
2018-10-05 21:54:03 +00:00
|
|
|
sort >expected &&
|
|
|
|
|
2017-11-21 20:58:51 +00:00
|
|
|
for id in `cat expected | sed "s|..|&/|"`
|
|
|
|
do
|
|
|
|
rm r1/.git/objects/$id
|
|
|
|
done &&
|
2018-10-05 21:54:03 +00:00
|
|
|
|
2018-10-05 21:54:07 +00:00
|
|
|
git -C r1 rev-list --quiet --missing=print --objects HEAD >revs &&
|
2018-10-05 21:54:05 +00:00
|
|
|
awk -f print_1.awk revs |
|
2018-10-05 21:54:03 +00:00
|
|
|
sed "s/?//" |
|
|
|
|
sort >observed &&
|
|
|
|
|
2018-10-05 21:54:04 +00:00
|
|
|
test_cmp expected observed
|
2017-11-21 20:58:51 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'rev-list W/O --missing fails' '
|
|
|
|
test_must_fail git -C r1 rev-list --quiet --objects HEAD
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'rev-list W/ missing=allow-any' '
|
|
|
|
git -C r1 rev-list --quiet --missing=allow-any --objects HEAD
|
|
|
|
'
|
|
|
|
|
|
|
|
test_done
|