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

Re: [PATCH v4 4/6] rev-list: handle missing tree objects properly

From
Matthew DeVore <matvore@google.com>
Date
Aug 14, 2018, 22:43 UTC
Message-ID
<CAMfpvh+2SeOynnzH_keOPE9g2PrMgfzrjOMHWxQxkuOf+T3Y7A@mail.gmail.com>
In-Reply-To
<20180814180626.31788-1-jonathantanmy@google.com>
On Tue, Aug 14, 2018 at 11:06 AM Jonathan Tan <jonathantanmy@google.com> wrote:
Show 11 quoted lines
>
> > Previously, we assumed only blob objects could be missing. This patch
> > makes rev-list handle missing trees like missing blobs. A missing tree
> > will cause an error if --missing indicates an error should be caused,
> > and the hash is printed even if the tree is missing.
>
> The last sentence is difficult to understand - probably better to say
> that all --missing= arguments and --exclude-promisor-objects work for
> missing trees like they currently do for blobs (and do not fixate on
> just --missing=error). And also demonstrate this in tests, like in
> t6612.

Fixed the commit message. And for the tests, in t0410 I changed the --missing=allow-any to --missing-allow-promisor, and in t6112 I added --missing=allow-any and --missing=print test cases.

Show 16 quoted lines
>
> > In list-objects.c we no longer print a message to stderr if a tree
> > object is missing (quiet_on_missing is always true). I couldn't find
> > any place where this would matter, or where the caller of
> > traverse_commit_list would need to be fixed to show the error. However,
> > in the future it would be trivial to make the caller show the message if
> > we needed to.
> >
> > This is not tested very thoroughly, since we cannot create promisor
> > objects in tests without using an actual partial clone. t0410 has a
> > promise_and_delete utility function, but the is_promisor_object function
> > does not return 1 for objects deleted in this way. More tests will will
> > come in a patch that implements a filter that can be used with git
> > clone.
>
> These two paragraphs are no longer applicable, I think.
Sorry about that. Removed.
Show 9 quoted lines
>
> > @@ -373,6 +375,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
> >       init_revisions(&revs, prefix);
> >       revs.abbrev = DEFAULT_ABBREV;
> >       revs.commit_format = CMIT_FMT_UNSPECIFIED;
> > +     revs.do_not_die_on_missing_tree = 1;
>
> Is this correct? I would have expected this to be set only if --missing
> was set.

If --missing is not set, then we want to fetch missing objects automatically, and then die if we fail to do that, which is what happens for blobs. So we don't want to die in list-objects.c. If we fail to fetch, then we will die on line 213 in rev-list.c.

Show 18 quoted lines
>
> > -     process_tree_contents(ctx, tree, base);
> > +     /*
> > +      * NEEDSWORK: we should not have to process this tree's contents if the
> > +      * filter wants to exclude all its contents AND the filter doesn't need
> > +      * to collect the omitted OIDs. We should add a LOFR_SKIP_TREE bit which
> > +      * allows skipping all children.
> > +      */
> > +     if (parsed)
> > +             process_tree_contents(ctx, tree, base);
>
> I agree with Jeff Hostetler in [1] that a LOFR_SKIP_TREE bit is
> desirable, but I don't think that this patch is the right place to
> introduce this NEEDSWORK. For me, this patch is about skipping iterating
> over the contents of a tree because the tree does not exist; this
> NEEDSWORK is about skipping iterating over the contents of a tree
> because we don't want its contents, and it is quite confusing to
> conflate the two.
I've removed this.
Show 13 quoted lines
>
> [1] https://public-inbox.org/git/d751d56b-84bb-a03d-5f2a-7dbaf8d947cc@jeffhostetler.com/
>
> > @@ -124,6 +124,7 @@ struct rev_info {
> >                       first_parent_only:1,
> >                       line_level_traverse:1,
> >                       tree_blobs_in_commit_order:1,
> > +                     do_not_die_on_missing_tree:1,
>
> I know that the other flags don't have documentation, but I think it's
> worth documenting this one because it is rather complicated. I have
> provided a sample one in my earlier review - feel free to use that or
> come up with your own.
Added your wording to revision.h without major change.
Show 34 quoted lines
>
> > diff --git a/t/t0410-partial-clone.sh b/t/t0410-partial-clone.sh
> > index 4984ca583..74e3c5767 100755
> > --- a/t/t0410-partial-clone.sh
> > +++ b/t/t0410-partial-clone.sh
> > @@ -186,6 +186,72 @@ test_expect_success 'rev-list stops traversal at missing and promised commit' '
> >       ! grep $FOO out
> >  '
> >
> > +test_expect_success 'show missing tree objects with --missing=print' '
> > +     rm -rf repo &&
> > +     test_create_repo repo &&
> > +     test_commit -C repo foo &&
> > +     test_commit -C repo bar &&
> > +     test_commit -C repo baz &&
> > +
> > +     TREE=$(git -C repo rev-parse bar^{tree}) &&
> > +
> > +     promise_and_delete $TREE &&
> > +
> > +     git -C repo config core.repositoryformatversion 1 &&
> > +     git -C repo config extensions.partialclone "arbitrary string" &&
> > +     git -C repo 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
> > +     ! grep -q "Could not read " rev_list_err
> > +'
>
> I think that the --exclude-promisor-tests can go in t0410 as you have
> done, but the --missing tests (except for --missing=allow-promisor)
> should go in t6112. (And like the existing --missing tests, they should
> be done without setting extensions.partialclone.)
Done.
>
> As for --missing=allow-promisor, I don't see them being tested anywhere
> :-( so feel free to make a suggestion. I would put them in t6112 for
> easy comparison with the other --missing tests.

Kept my allow-promisor test in t0410 since it requires partial clone to be turned on in the config, and because it is pretty similar to --exclude-promisor-objects.

Previous: Jonathan TanNext: Jonathan Tan
Message 38 of 151 in “filter: support for excluding all trees and blobs”
  1. 0/5 filter: support for excluding all trees and blobsMatthew DeVore, Aug 9, 2018
  2. 1/5 revision: invert meaning of the USER_GIVEN flagMatthew DeVore, Aug 9, 2018
  3. Jonathan TanAug 10, 2018
  4. 2/5 list-objects-filter: implement filter only:commitsMatthew DeVore, Aug 9, 2018
  5. Jonathan TanAug 10, 2018
  6. 3/5 list-objects: store common func args in structMatthew DeVore, Aug 9, 2018
  7. 4/5 list-objects: refactor to process_tree_contentsMatthew DeVore, Aug 9, 2018
  8. 5/5 rev-list: handle missing tree objects properlyMatthew DeVore, Aug 9, 2018
  9. Jonathan TanAug 10, 2018
  10. Jonathan TanAug 10, 2018
  11. 0/5 filter: support for excluding all trees and blobsMatthew DeVore, Aug 10, 2018
  12. 1/5 list-objects: store common func args in structMatthew DeVore, Aug 10, 2018
  13. 2/5 list-objects: refactor to process_tree_contentsMatthew DeVore, Aug 10, 2018
  14. 3/5 rev-list: handle missing tree objects properlyMatthew DeVore, Aug 10, 2018
  15. Jonathan TanAug 13, 2018
  16. Matthew DeVoreAug 14, 2018
  17. Jonathan TanAug 14, 2018
  18. 4/5 revision: mark non-user-given objects insteadMatthew DeVore, Aug 10, 2018
  19. 5/5 list-objects-filter: implement filter tree:noneMatthew DeVore, Aug 10, 2018
  20. Jeff HostetlerAug 13, 2018
  21. Matthew DeVoreAug 14, 2018
  22. Jonathan TanAug 13, 2018
  23. Matthew DeVoreAug 14, 2018
  24. 0/5 filter: support for excluding all trees and blobsMatthew DeVore, Aug 13, 2018
  25. 1/5 list-objects: store common func args in structMatthew DeVore, Aug 13, 2018
  26. 2/5 list-objects: refactor to process_tree_contentsMatthew DeVore, Aug 13, 2018
  27. 3/5 rev-list: handle missing tree objects properlyMatthew DeVore, Aug 13, 2018
  28. 4/5 revision: mark non-user-given objects insteadMatthew DeVore, Aug 13, 2018
  29. 5/5 list-objects-filter: implement filter tree:0Matthew DeVore, Aug 13, 2018
  30. Jeff HostetlerAug 14, 2018
  31. Matthew DeVoreAug 14, 2018
  32. Matthew DeVoreOct 3, 2018
  33. 0/6 filter: support for excluding all trees and blobsMatthew DeVore, Aug 14, 2018
  34. 1/6 list-objects: store common func args in structMatthew DeVore, Aug 14, 2018
  35. 2/6 list-objects: refactor to process_tree_contentsMatthew DeVore, Aug 14, 2018
  36. 4/6 rev-list: handle missing tree objects properlyMatthew DeVore, Aug 14, 2018
  37. Jonathan TanAug 14, 2018
  38. Matthew DeVoreAug 14, 2018
  39. Jonathan TanAug 14, 2018
  40. Jonathan TanAug 14, 2018
  41. 3/6 list-objects: always parse trees gentlyMatthew DeVore, Aug 14, 2018
  42. 5/6 revision: mark non-user-given objects insteadMatthew DeVore, Aug 14, 2018
  43. 6/6 list-objects-filter: implement filter tree:0Matthew DeVore, Aug 14, 2018
  44. Jonathan TanAug 14, 2018
  45. Matthew DeVoreAug 14, 2018
  46. Jonathan TanAug 14, 2018
  47. Junio C HamanoAug 14, 2018
  48. Matthew DeVoreAug 14, 2018
  49. Junio C HamanoAug 15, 2018
  50. Matthew DeVoreAug 15, 2018
  51. Jeff KingAug 14, 2018
  52. Matthew DeVoreAug 14, 2018
  53. Jeff KingAug 15, 2018
  54. Junio C HamanoAug 15, 2018
  55. Matthew DeVoreAug 15, 2018
  56. 0/6 filter: support for excluding all trees and blobsMatthew DeVore, Aug 15, 2018
  57. 1/6 list-objects: store common func args in structMatthew DeVore, Aug 15, 2018
  58. 2/6 list-objects: refactor to process_tree_contentsMatthew DeVore, Aug 15, 2018
  59. 3/6 list-objects: always parse trees gentlyMatthew DeVore, Aug 15, 2018
  60. 4/6 rev-list: handle missing tree objects properlyMatthew DeVore, Aug 15, 2018
  61. 5/6 revision: mark non-user-given objects insteadMatthew DeVore, Aug 15, 2018
  62. 6/6 list-objects-filter: implement filter tree:0Matthew DeVore, Aug 15, 2018
  63. 0/6 filter: support for excluding all trees and blobsMatthew DeVore, Aug 15, 2018
  64. 1/6 list-objects: store common func args in structMatthew DeVore, Aug 15, 2018
  65. 3/6 list-objects: always parse trees gentlyMatthew DeVore, Aug 15, 2018
  66. 2/6 list-objects: refactor to process_tree_contentsMatthew DeVore, Aug 15, 2018
  67. 4/6 rev-list: handle missing tree objects properlyMatthew DeVore, Aug 15, 2018
  68. 5/6 revision: mark non-user-given objects insteadMatthew DeVore, Aug 15, 2018
  69. 6/6 list-objects-filter: implement filter tree:0Matthew DeVore, Aug 15, 2018
  70. Stefan BellerAug 17, 2018
  71. Matthew DeVoreAug 17, 2018
  72. Stefan BellerAug 17, 2018
  73. Matthew DeVoreAug 20, 2018
  74. Stefan BellerAug 21, 2018
  75. Junio C HamanoAug 21, 2018
  76. Stefan BellerAug 22, 2018
  77. Duy NguyenAug 18, 2018
  78. Matthew DeVoreAug 20, 2018
  79. Stefan BellerAug 20, 2018
  80. Matthew DeVoreAug 20, 2018
  81. Stefan BellerAug 21, 2018
  82. Duy NguyenAug 21, 2018
  83. 0/7 filter: support for excluding all trees and blobsMatthew DeVore, Sep 4, 2018
  84. 1/7 list-objects: store common func args in structMatthew DeVore, Sep 4, 2018
  85. 2/7 list-objects: refactor to process_tree_contentsMatthew DeVore, Sep 4, 2018
  86. 3/7 list-objects: always parse trees gentlyMatthew DeVore, Sep 4, 2018
  87. 4/7 rev-list: handle missing tree objects properlyMatthew DeVore, Sep 4, 2018
  88. 5/7 revision: mark non-user-given objects insteadMatthew DeVore, Sep 4, 2018
  89. Junio C HamanoSep 4, 2018
  90. Matthew DeVoreSep 5, 2018
  91. 7/7 list-objects-filter: implement filter tree:0Matthew DeVore, Sep 4, 2018
  92. Junio C HamanoSep 4, 2018
  93. Matthew DeVoreSep 6, 2018
  94. 6/7 list-objects-filter: use BUG rather than dieMatthew DeVore, Sep 4, 2018
  95. Junio C HamanoSep 4, 2018
  96. Stefan BellerSep 4, 2018
  97. 0/7 filter: support for excluding all trees and blobsMatthew DeVore, Sep 14, 2018
  98. 1/7 list-objects: store common func args in structMatthew DeVore, Sep 14, 2018
  99. 2/7 list-objects: refactor to process_tree_contentsMatthew DeVore, Sep 14, 2018
  100. 3/7 list-objects: always parse trees gentlyMatthew DeVore, Sep 14, 2018
  101. 4/7 rev-list: handle missing tree objects properlyMatthew DeVore, Sep 14, 2018
  102. 5/7 revision: mark non-user-given objects insteadMatthew DeVore, Sep 14, 2018
  103. Junio C HamanoSep 14, 2018
  104. Matthew DeVoreSep 14, 2018
  105. 6/7 list-objects-filter: use BUG rather than dieMatthew DeVore, Sep 14, 2018
  106. 7/7 list-objects-filter: implement filter tree:0Matthew DeVore, Sep 14, 2018
  107. Junio C HamanoSep 14, 2018
  108. Junio C HamanoSep 14, 2018
  109. Matthew DeVoreSep 15, 2018
  110. 0/8 filter: support for excluding all trees and blobsMatthew DeVore, Sep 21, 2018
  111. 1/8 list-objects: store common func args in structMatthew DeVore, Sep 21, 2018
  112. 2/8 list-objects: refactor to process_tree_contentsMatthew DeVore, Sep 21, 2018
  113. 3/8 list-objects: always parse trees gentlyMatthew DeVore, Sep 21, 2018
  114. 4/8 rev-list: handle missing tree objects properlyMatthew DeVore, Sep 21, 2018
  115. 5/8 revision: mark non-user-given objects insteadMatthew DeVore, Sep 21, 2018
  116. 6/8 list-objects-filter: use BUG rather than dieMatthew DeVore, Sep 21, 2018
  117. 7/8 list-objects-filter-options: do not over-strbuf_initMatthew DeVore, Sep 21, 2018
  118. 8/8 list-objects-filter: implement filter tree:0Matthew DeVore, Sep 21, 2018
  119. 0/8 filter: support for excluding all trees and blobsMatthew DeVore, Oct 3, 2018
  120. 1/8 list-objects: store common func args in structMatthew DeVore, Oct 3, 2018
  121. 2/8 list-objects: refactor to process_tree_contentsMatthew DeVore, Oct 3, 2018
  122. 3/8 list-objects: always parse trees gentlyMatthew DeVore, Oct 3, 2018
  123. 4/8 rev-list: handle missing tree objects properlyMatthew DeVore, Oct 3, 2018
  124. 5/8 revision: mark non-user-given objects insteadMatthew DeVore, Oct 3, 2018
  125. 6/8 list-objects-filter: use BUG rather than dieMatthew DeVore, Oct 3, 2018
  126. 7/8 list-objects-filter-options: do not over-strbuf_initMatthew DeVore, Oct 3, 2018
  127. 8/8 list-objects-filter: implement filter tree:0Matthew DeVore, Oct 3, 2018
  128. Matthew DeVoreOct 3, 2018
  129. 0/8 filter: support for excluding all trees and blobsMatthew DeVore, Oct 5, 2018
  130. 1/8 list-objects: store common func args in structMatthew DeVore, Oct 5, 2018
  131. 2/8 list-objects: refactor to process_tree_contentsMatthew DeVore, Oct 5, 2018
  132. 3/8 list-objects: always parse trees gentlyMatthew DeVore, Oct 5, 2018
  133. 4/8 rev-list: handle missing tree objects properlyMatthew DeVore, Oct 5, 2018
  134. 5/8 revision: mark non-user-given objects insteadMatthew DeVore, Oct 5, 2018
  135. 6/8 list-objects-filter: use BUG rather than dieMatthew DeVore, Oct 5, 2018
  136. 7/8 list-objects-filter-options: do not over-strbuf_initMatthew DeVore, Oct 5, 2018
  137. 8/8 list-objects-filter: implement filter tree:0Matthew DeVore, Oct 5, 2018
  138. Junio C HamanoOct 7, 2018
  139. Matthew DeVoreOct 8, 2018
  140. 0/8 filter: support for excluding all trees and blobsMatthew DeVore, Oct 12, 2018
  141. 1/8 list-objects: store common func args in structMatthew DeVore, Oct 12, 2018
  142. 2/8 list-objects: refactor to process_tree_contentsMatthew DeVore, Oct 12, 2018
  143. 3/8 list-objects: always parse trees gentlyMatthew DeVore, Oct 12, 2018
  144. 4/8 rev-list: handle missing tree objects properlyMatthew DeVore, Oct 12, 2018
  145. 5/8 revision: mark non-user-given objects insteadMatthew DeVore, Oct 12, 2018
  146. 6/8 list-objects-filter: use BUG rather than dieMatthew DeVore, Oct 12, 2018
  147. 7/8 list-objects-filter-options: do not over-strbuf_initMatthew DeVore, Oct 12, 2018
  148. 8/8 list-objects-filter: implement filter tree:0Matthew DeVore, Oct 12, 2018
  149. Junio C HamanoOct 15, 2018
  150. Junio C HamanoOct 15, 2018
  151. Matthew DeVoreOct 16, 2018

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.