git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v5 0/8] rev-list: implement object type filter

From
Patrick Steinhardt <ps@pks.im>
Date
Apr 19, 2021, 11:46 UTC
Message-ID
<cover.1618832437.git.ps@pks.im>
In-Reply-To
<cover.1618234575.git.ps@pks.im>
Hi,

this is the fifth version of my patch series which implements a new `object:type` filter for git-rev-list(1) and git-upload-pack(1) and extends support for bitmap indices to work with combined filters.

Changes compared to v4:
    - I'm now explicitly passing `strlen(v0)` to
      `type_from_string_gently()` to be prepared for the future
      semantics change here.
    - The error message printed in case the user passes in invalid
      object type to `--filter=object:type=` now prints the wrong
      value passed by the user.
    - Fixed missing header in list-objects-filter-options.h.
    - Tests now use test_create_repo and test_commit.
    - Removed a needless subshell in the tests.

I hope that this catches all feedback and that I didn't misunderstand or miss something. If I did, please give me a shout!

Patrick
Patrick Steinhardt (8):
  uploadpack.txt: document implication of `uploadpackfilter.allow`
  revision: mark commit parents as NOT_USER_GIVEN
  list-objects: move tag processing into its own function
  list-objects: support filtering by tag and commit
  list-objects: implement object type filter
  pack-bitmap: implement object type filter
  pack-bitmap: implement combined filter
  rev-list: allow filtering of provided items
 Documentation/config/uploadpack.txt |   9 ++-
 Documentation/rev-list-options.txt  |   8 ++
 builtin/pack-objects.c              |   2 +-
 builtin/rev-list.c                  |  36 ++++++---
 list-objects-filter-options.c       |  15 ++++
 list-objects-filter-options.h       |   3 +
 list-objects-filter.c               | 116 ++++++++++++++++++++++++++++
 list-objects-filter.h               |   2 +
 list-objects.c                      |  30 ++++++-
 pack-bitmap.c                       |  45 +++++++++--
 pack-bitmap.h                       |   3 +-
 reachable.c                         |   2 +-
 revision.c                          |   4 +-
 revision.h                          |   3 -
 t/t6112-rev-list-filters-objects.sh |  72 +++++++++++++++++
 t/t6113-rev-list-bitmap-filters.sh  |  68 +++++++++++++++-
 16 files changed, 388 insertions(+), 30 deletions(-)
Range-diff against v4:
1:  f80b9570d4 = 1:  bcc81336b1 uploadpack.txt: document implication of `uploadpackfilter.allow`
2:  46c1952405 = 2:  ffe8e2bf73 revision: mark commit parents as NOT_USER_GIVEN
3:  3d792f6339 = 3:  21d7f06d0a list-objects: move tag processing into its own function
4:  674da0f9ac = 4:  b5d6ab6b4a list-objects: support filtering by tag and commit
5:  d22a5fd37d ! 5:  f462745290 list-objects: implement object type filter
    @@ list-objects-filter-options.c: static int gently_parse_list_objects_filter(
      		return 1;
      
     +	} else if (skip_prefix(arg, "object:type=", &v0)) {
    -+		int type = type_from_string_gently(v0, -1, 1);
    ++		int type = type_from_string_gently(v0, strlen(v0), 1);
     +		if (type < 0) {
    -+			strbuf_addstr(errbuf, _("expected 'object:type=<type>'"));
    ++			strbuf_addf(errbuf, _("'%s' for 'object:type=<type>' is"
    ++					      "not a valid object type"), v0);
     +			return 1;
     +		}
     +
    @@ list-objects-filter-options.c: static int gently_parse_list_objects_filter(
      
     
      ## list-objects-filter-options.h ##
    +@@
    + #ifndef LIST_OBJECTS_FILTER_OPTIONS_H
    + #define LIST_OBJECTS_FILTER_OPTIONS_H
    + 
    ++#include "cache.h"
    + #include "parse-options.h"
    + #include "string-list.h"
    + 
     @@ list-objects-filter-options.h: enum list_objects_filter_choice {
      	LOFC_BLOB_LIMIT,
      	LOFC_TREE_DEPTH,
    @@ t/t6112-rev-list-filters-objects.sh: test_expect_success 'verify blob:limit=1m'
     +# Test object:type=<type> filter.
     +
     +test_expect_success 'setup object-type' '
    -+	git init object-type &&
    -+	echo contents >object-type/blob &&
    -+	git -C object-type add blob &&
    -+	git -C object-type commit -m commit-message &&
    ++	test_create_repo object-type &&
    ++	test_commit --no-tag -C object-type message blob &&
     +	git -C object-type tag tag -m tag-message
     +'
     +
    @@ t/t6112-rev-list-filters-objects.sh: test_expect_success 'verify blob:limit=1m'
     +'
     +
     +test_expect_success 'verify object:type=blob prints blob and commit' '
    -+	(
    -+		git -C object-type rev-parse HEAD &&
    -+		printf "%s blob\n" $(git -C object-type rev-parse HEAD:blob)
    -+	) >expected &&
    ++	git -C object-type rev-parse HEAD >expected &&
    ++	printf "%s blob\n" $(git -C object-type rev-parse HEAD:blob) >>expected &&
     +	git -C object-type rev-list --objects --filter=object:type=blob HEAD >actual &&
     +	test_cmp expected actual
     +'
6:  17c9f66bbc = 6:  90c80c1efa pack-bitmap: implement object type filter
7:  759ac54bb2 = 7:  9726e69861 pack-bitmap: implement combined filter
8:  c779d222cf ! 8:  fce3551e48 rev-list: allow filtering of provided items
    @@ pack-bitmap.c: struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs,
     
      ## pack-bitmap.h ##
     @@ pack-bitmap.h: void traverse_bitmap_commit_list(struct bitmap_index *,
    - 				 show_reachable_fn show_reachable);
      void test_bitmap_walk(struct rev_info *revs);
    + int test_bitmap_commits(struct repository *r);
      struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs,
     -					 struct list_objects_filter_options *filter);
     +					 struct list_objects_filter_options *filter,
-- 
2.31.1
Previous: Jeff KingNext: Patrick Steinhardt
Message 86 of 97 in “rev-parse: implement object type filter”
  1. 0/7 rev-parse: implement object type filterPatrick Steinhardt, Mar 1, 2021
  2. 3/7 list-objects: support filtering by tag and commitPatrick Steinhardt, Mar 1, 2021
  3. 4/7 list-objects: implement object type filterPatrick Steinhardt, Mar 1, 2021
  4. 1/7 revision: mark commit parents as NOT_USER_GIVENPatrick Steinhardt, Mar 1, 2021
  5. 2/7 list-objects: move tag processing into its own functionPatrick Steinhardt, Mar 1, 2021
  6. 6/7 pack-bitmap: implement combined filterPatrick Steinhardt, Mar 1, 2021
  7. 5/7 pack-bitmap: implement object type filterPatrick Steinhardt, Mar 1, 2021
  8. 7/7 rev-list: allow filtering of provided itemsPatrick Steinhardt, Mar 1, 2021
  9. Jeff KingMar 10, 2021
  10. Patrick SteinhardtMar 11, 2021
  11. Jeff KingMar 11, 2021
  12. Patrick SteinhardtMar 15, 2021
  13. Taylor BlauMar 10, 2021
  14. Jeff KingMar 10, 2021
  15. Patrick SteinhardtMar 11, 2021
  16. Jeff KingMar 11, 2021
  17. 0/8 rev-parse: implement object type filterPatrick Steinhardt, Mar 15, 2021
  18. 1/8 uploadpack.txt: document implication of `uploadpackfilter.allow`Patrick Steinhardt, Mar 15, 2021
  19. Jeff KingApr 6, 2021
  20. 2/8 revision: mark commit parents as NOT_USER_GIVENPatrick Steinhardt, Mar 15, 2021
  21. Jeff KingApr 6, 2021
  22. Patrick SteinhardtApr 9, 2021
  23. 4/8 list-objects: support filtering by tag and commitPatrick Steinhardt, Mar 15, 2021
  24. 3/8 list-objects: move tag processing into its own functionPatrick Steinhardt, Mar 15, 2021
  25. Jeff KingApr 6, 2021
  26. 5/8 list-objects: implement object type filterPatrick Steinhardt, Mar 15, 2021
  27. Jeff KingApr 6, 2021
  28. 7/8 pack-bitmap: implement combined filterPatrick Steinhardt, Mar 15, 2021
  29. Jeff KingApr 6, 2021
  30. Patrick SteinhardtApr 9, 2021
  31. Jeff KingApr 9, 2021
  32. Patrick SteinhardtApr 9, 2021
  33. Jeff KingApr 9, 2021
  34. 8/8 rev-list: allow filtering of provided itemsPatrick Steinhardt, Mar 15, 2021
  35. Jeff KingApr 6, 2021
  36. Patrick SteinhardtApr 9, 2021
  37. Jeff KingApr 9, 2021
  38. 6/8 pack-bitmap: implement object type filterPatrick Steinhardt, Mar 15, 2021
  39. Jeff KingApr 6, 2021
  40. Junio C HamanoMar 20, 2021
  41. Jeff KingApr 6, 2021
  42. Patrick SteinhardtApr 9, 2021
  43. Jeff KingApr 9, 2021
  44. 0/8 rev-parse: implement object type filterPatrick Steinhardt, Apr 9, 2021
  45. 1/8 uploadpack.txt: document implication of `uploadpackfilter.allow`Patrick Steinhardt, Apr 9, 2021
  46. 2/8 revision: mark commit parents as NOT_USER_GIVENPatrick Steinhardt, Apr 9, 2021
  47. 3/8 list-objects: move tag processing into its own functionPatrick Steinhardt, Apr 9, 2021
  48. 4/8 list-objects: support filtering by tag and commitPatrick Steinhardt, Apr 9, 2021
  49. Junio C HamanoApr 11, 2021
  50. 5/8 list-objects: implement object type filterPatrick Steinhardt, Apr 9, 2021
  51. 6/8 pack-bitmap: implement object type filterPatrick Steinhardt, Apr 9, 2021
  52. 7/8 pack-bitmap: implement combined filterPatrick Steinhardt, Apr 9, 2021
  53. 8/8 rev-list: allow filtering of provided itemsPatrick Steinhardt, Apr 9, 2021
  54. 8/8 rev-list: allow filtering of provided itemsPatrick Steinhardt, Apr 9, 2021
  55. Philip OakleyApr 9, 2021
  56. Patrick SteinhardtApr 12, 2021
  57. Junio C HamanoApr 11, 2021
  58. Patrick SteinhardtApr 12, 2021
  59. 0/8 rev-list: implement object type filterPatrick Steinhardt, Apr 12, 2021
  60. 1/8 uploadpack.txt: document implication of `uploadpackfilter.allow`Patrick Steinhardt, Apr 12, 2021
  61. 2/8 revision: mark commit parents as NOT_USER_GIVENPatrick Steinhardt, Apr 12, 2021
  62. 3/8 list-objects: move tag processing into its own functionPatrick Steinhardt, Apr 12, 2021
  63. 4/8 list-objects: support filtering by tag and commitPatrick Steinhardt, Apr 12, 2021
  64. 5/8 list-objects: implement object type filterPatrick Steinhardt, Apr 12, 2021
  65. Ævar Arnfjörð BjarmasonApr 13, 2021
  66. Andreas SchwabApr 13, 2021
  67. Patrick SteinhardtApr 14, 2021
  68. 6/8 pack-bitmap: implement object type filterPatrick Steinhardt, Apr 12, 2021
  69. 7/8 pack-bitmap: implement combined filterPatrick Steinhardt, Apr 12, 2021
  70. 8/8 rev-list: allow filtering of provided itemsPatrick Steinhardt, Apr 12, 2021
  71. Jeff KingApr 13, 2021
  72. Patrick SteinhardtApr 13, 2021
  73. Jeff KingApr 15, 2021
  74. Junio C HamanoApr 16, 2021
  75. Junio C HamanoApr 16, 2021
  76. Ramsay JonesApr 17, 2021
  77. Jeff KingApr 17, 2021
  78. Junio C HamanoApr 17, 2021
  79. Junio C HamanoApr 13, 2021
  80. Patrick SteinhardtApr 14, 2021
  81. Junio C HamanoApr 14, 2021
  82. Jeff KingApr 15, 2021
  83. Junio C HamanoApr 15, 2021
  84. Junio C HamanoApr 15, 2021
  85. Jeff KingApr 17, 2021
  86. 0/8 rev-list: implement object type filterPatrick Steinhardt, Apr 19, 2021
  87. 1/8 uploadpack.txt: document implication of `uploadpackfilter.allow`Patrick Steinhardt, Apr 19, 2021
  88. 2/8 revision: mark commit parents as NOT_USER_GIVENPatrick Steinhardt, Apr 19, 2021
  89. 3/8 list-objects: move tag processing into its own functionPatrick Steinhardt, Apr 19, 2021
  90. 4/8 list-objects: support filtering by tag and commitPatrick Steinhardt, Apr 19, 2021
  91. 5/8 list-objects: implement object type filterPatrick Steinhardt, Apr 19, 2021
  92. 7/8 pack-bitmap: implement combined filterPatrick Steinhardt, Apr 19, 2021
  93. 6/8 pack-bitmap: implement object type filterPatrick Steinhardt, Apr 19, 2021
  94. 8/8 rev-list: allow filtering of provided itemsPatrick Steinhardt, Apr 19, 2021
  95. Junio C HamanoApr 19, 2021
  96. Jeff KingApr 23, 2021
  97. Junio C HamanoApr 28, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.