path-walk: allow consumer to specify object types
We add the ability to filter the object types in the path-walk API so the callback function is called fewer times. This adds the ability to ask for the commits in a list, as well. We re-use the empty string for this set of objects because these are passed directly to the callback function instead of being part of the 'path_stack'. Future changes will add the ability to visit annotated tags. Signed-off-by: Derrick Stolee <stolee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Derrick Stolee
committed by
Junio C Hamano
Junio C Hamano
parent
d190124f27
commit
c8dba310d7
@@ -33,22 +33,27 @@ test_expect_success 'all' '
|
||||
test-tool path-walk -- --all >out &&
|
||||
|
||||
cat >expect <<-EOF &&
|
||||
0:tree::$(git rev-parse topic^{tree})
|
||||
0:tree::$(git rev-parse base^{tree})
|
||||
0:tree::$(git rev-parse base~1^{tree})
|
||||
0:tree::$(git rev-parse base~2^{tree})
|
||||
1:tree:right/:$(git rev-parse topic:right)
|
||||
1:tree:right/:$(git rev-parse base~1:right)
|
||||
1:tree:right/:$(git rev-parse base~2:right)
|
||||
2:blob:right/d:$(git rev-parse base~1:right/d)
|
||||
3:blob:right/c:$(git rev-parse base~2:right/c)
|
||||
3:blob:right/c:$(git rev-parse topic:right/c)
|
||||
4:tree:left/:$(git rev-parse base:left)
|
||||
4:tree:left/:$(git rev-parse base~2:left)
|
||||
5:blob:left/b:$(git rev-parse base~2:left/b)
|
||||
5:blob:left/b:$(git rev-parse base:left/b)
|
||||
6:blob:a:$(git rev-parse base~2:a)
|
||||
0:commit::$(git rev-parse topic)
|
||||
0:commit::$(git rev-parse base)
|
||||
0:commit::$(git rev-parse base~1)
|
||||
0:commit::$(git rev-parse base~2)
|
||||
1:tree::$(git rev-parse topic^{tree})
|
||||
1:tree::$(git rev-parse base^{tree})
|
||||
1:tree::$(git rev-parse base~1^{tree})
|
||||
1:tree::$(git rev-parse base~2^{tree})
|
||||
2:tree:right/:$(git rev-parse topic:right)
|
||||
2:tree:right/:$(git rev-parse base~1:right)
|
||||
2:tree:right/:$(git rev-parse base~2:right)
|
||||
3:blob:right/d:$(git rev-parse base~1:right/d)
|
||||
4:blob:right/c:$(git rev-parse base~2:right/c)
|
||||
4:blob:right/c:$(git rev-parse topic:right/c)
|
||||
5:tree:left/:$(git rev-parse base:left)
|
||||
5:tree:left/:$(git rev-parse base~2:left)
|
||||
6:blob:left/b:$(git rev-parse base~2:left/b)
|
||||
6:blob:left/b:$(git rev-parse base:left/b)
|
||||
7:blob:a:$(git rev-parse base~2:a)
|
||||
blobs:6
|
||||
commits:4
|
||||
trees:9
|
||||
EOF
|
||||
|
||||
@@ -59,19 +64,23 @@ test_expect_success 'topic only' '
|
||||
test-tool path-walk -- topic >out &&
|
||||
|
||||
cat >expect <<-EOF &&
|
||||
0:tree::$(git rev-parse topic^{tree})
|
||||
0:tree::$(git rev-parse base~1^{tree})
|
||||
0:tree::$(git rev-parse base~2^{tree})
|
||||
1:tree:right/:$(git rev-parse topic:right)
|
||||
1:tree:right/:$(git rev-parse base~1:right)
|
||||
1:tree:right/:$(git rev-parse base~2:right)
|
||||
2:blob:right/d:$(git rev-parse base~1:right/d)
|
||||
3:blob:right/c:$(git rev-parse base~2:right/c)
|
||||
3:blob:right/c:$(git rev-parse topic:right/c)
|
||||
4:tree:left/:$(git rev-parse base~2:left)
|
||||
5:blob:left/b:$(git rev-parse base~2:left/b)
|
||||
6:blob:a:$(git rev-parse base~2:a)
|
||||
0:commit::$(git rev-parse topic)
|
||||
0:commit::$(git rev-parse base~1)
|
||||
0:commit::$(git rev-parse base~2)
|
||||
1:tree::$(git rev-parse topic^{tree})
|
||||
1:tree::$(git rev-parse base~1^{tree})
|
||||
1:tree::$(git rev-parse base~2^{tree})
|
||||
2:tree:right/:$(git rev-parse topic:right)
|
||||
2:tree:right/:$(git rev-parse base~1:right)
|
||||
2:tree:right/:$(git rev-parse base~2:right)
|
||||
3:blob:right/d:$(git rev-parse base~1:right/d)
|
||||
4:blob:right/c:$(git rev-parse base~2:right/c)
|
||||
4:blob:right/c:$(git rev-parse topic:right/c)
|
||||
5:tree:left/:$(git rev-parse base~2:left)
|
||||
6:blob:left/b:$(git rev-parse base~2:left/b)
|
||||
7:blob:a:$(git rev-parse base~2:a)
|
||||
blobs:5
|
||||
commits:3
|
||||
trees:7
|
||||
EOF
|
||||
|
||||
@@ -82,15 +91,66 @@ test_expect_success 'topic, not base' '
|
||||
test-tool path-walk -- topic --not base >out &&
|
||||
|
||||
cat >expect <<-EOF &&
|
||||
0:commit::$(git rev-parse topic)
|
||||
1:tree::$(git rev-parse topic^{tree})
|
||||
2:tree:right/:$(git rev-parse topic:right)
|
||||
3:blob:right/d:$(git rev-parse topic:right/d)
|
||||
4:blob:right/c:$(git rev-parse topic:right/c)
|
||||
5:tree:left/:$(git rev-parse topic:left)
|
||||
6:blob:left/b:$(git rev-parse topic:left/b)
|
||||
7:blob:a:$(git rev-parse topic:a)
|
||||
blobs:4
|
||||
commits:1
|
||||
trees:3
|
||||
EOF
|
||||
|
||||
test_cmp_sorted expect out
|
||||
'
|
||||
|
||||
test_expect_success 'topic, not base, only blobs' '
|
||||
test-tool path-walk --no-trees --no-commits \
|
||||
-- topic --not base >out &&
|
||||
|
||||
cat >expect <<-EOF &&
|
||||
commits:0
|
||||
trees:0
|
||||
0:blob:right/d:$(git rev-parse topic:right/d)
|
||||
1:blob:right/c:$(git rev-parse topic:right/c)
|
||||
2:blob:left/b:$(git rev-parse topic:left/b)
|
||||
3:blob:a:$(git rev-parse topic:a)
|
||||
blobs:4
|
||||
EOF
|
||||
|
||||
test_cmp_sorted expect out
|
||||
'
|
||||
|
||||
# No, this doesn't make a lot of sense for the path-walk API,
|
||||
# but it is possible to do.
|
||||
test_expect_success 'topic, not base, only commits' '
|
||||
test-tool path-walk --no-blobs --no-trees \
|
||||
-- topic --not base >out &&
|
||||
|
||||
cat >expect <<-EOF &&
|
||||
0:commit::$(git rev-parse topic)
|
||||
commits:1
|
||||
trees:0
|
||||
blobs:0
|
||||
EOF
|
||||
|
||||
test_cmp_sorted expect out
|
||||
'
|
||||
|
||||
test_expect_success 'topic, not base, only trees' '
|
||||
test-tool path-walk --no-blobs --no-commits \
|
||||
-- topic --not base >out &&
|
||||
|
||||
cat >expect <<-EOF &&
|
||||
commits:0
|
||||
0:tree::$(git rev-parse topic^{tree})
|
||||
1:tree:right/:$(git rev-parse topic:right)
|
||||
2:blob:right/d:$(git rev-parse topic:right/d)
|
||||
3:blob:right/c:$(git rev-parse topic:right/c)
|
||||
4:tree:left/:$(git rev-parse topic:left)
|
||||
5:blob:left/b:$(git rev-parse topic:left/b)
|
||||
6:blob:a:$(git rev-parse topic:a)
|
||||
blobs:4
|
||||
2:tree:left/:$(git rev-parse topic:left)
|
||||
trees:3
|
||||
blobs:0
|
||||
EOF
|
||||
|
||||
test_cmp_sorted expect out
|
||||
@@ -100,17 +160,20 @@ test_expect_success 'topic, not base, boundary' '
|
||||
test-tool path-walk -- --boundary topic --not base >out &&
|
||||
|
||||
cat >expect <<-EOF &&
|
||||
0:tree::$(git rev-parse topic^{tree})
|
||||
0:tree::$(git rev-parse base~1^{tree})
|
||||
1:tree:right/:$(git rev-parse topic:right)
|
||||
1:tree:right/:$(git rev-parse base~1:right)
|
||||
2:blob:right/d:$(git rev-parse base~1:right/d)
|
||||
3:blob:right/c:$(git rev-parse base~1:right/c)
|
||||
3:blob:right/c:$(git rev-parse topic:right/c)
|
||||
4:tree:left/:$(git rev-parse base~1:left)
|
||||
5:blob:left/b:$(git rev-parse base~1:left/b)
|
||||
6:blob:a:$(git rev-parse base~1:a)
|
||||
0:commit::$(git rev-parse topic)
|
||||
0:commit::$(git rev-parse base~1)
|
||||
1:tree::$(git rev-parse topic^{tree})
|
||||
1:tree::$(git rev-parse base~1^{tree})
|
||||
2:tree:right/:$(git rev-parse topic:right)
|
||||
2:tree:right/:$(git rev-parse base~1:right)
|
||||
3:blob:right/d:$(git rev-parse base~1:right/d)
|
||||
4:blob:right/c:$(git rev-parse base~1:right/c)
|
||||
4:blob:right/c:$(git rev-parse topic:right/c)
|
||||
5:tree:left/:$(git rev-parse base~1:left)
|
||||
6:blob:left/b:$(git rev-parse base~1:left/b)
|
||||
7:blob:a:$(git rev-parse base~1:a)
|
||||
blobs:5
|
||||
commits:2
|
||||
trees:5
|
||||
EOF
|
||||
|
||||
|
||||
Reference in New Issue
Block a user