Skip to content

Object store refactoring: commit graph

Jonathan Tan git 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest6 patches 2 repliesIn review
  2. v26 patches 13 repliesSuperseded
  3. v15 patches 11 repliesSuperseded

Changes in v3 from the cover letter

- now also based on sb/object-store-lookup in addition to ds/commit-graph-fsck (I rebased ds/commit-graph-fsck onto sb-object-store-lookup, then rebased this patch set onto the result)
- patches 1-5 are unchanged
- patch 6:
- used "PRItime" instead of "ul" when printing a timestamp (the SQUASH??? patch)
- updated invocations of lookup_commit() to take a repository object

[1] https://public-inbox.org/git/[email protected]/

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/6commit-graph: refactor preparing commit graphcommit-graph.c+17 -110 replies
2/6object-store: add missing includeobject-store.h+3 -00 replies
3/6commit-graph: add missing forward declarationcommit-graph.h+2 -00 replies
4/6commit-graph: add free_commit_graphbuiltin/commit-graph.c commit-graph.c commit-graph.h+18 -100 replies
5/6commit-graph: store graph in struct object_storecommit-graph.c object-store.h object.c+27 -210 replies
6/6commit-graph: add repo arg to graph readersMakefile builtin/fsck.c cache.h +10 more+162 -423 replies

Reviews trailers per patch

1 of 6 patches has a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchDerrick Stolee
SeriesR-b
1/6
2/6
3/6
4/6
5/6
6/6R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v3 thread

Cover letter [PATCH v3 0/6] Object store refactoring: commit graph

This is on _both_ ds/commit-graph-fsck and sb/object-store-lookup, following Stolee's suggestion.

(It also seems better to build it this way to me, since both these branches are going into "next" according to the latest What's Cooking.)

Junio wrote in [1]:

Quoted 8 lines

I've added SQUASH??? patch at the tip of each of the above, rebuilt 'pu' with them and pushed the result out. It seems that Travis is happier with the result.

Please do not forget to squash them in when/if rerolling. If there is no need to change anything else other than squashing them, you can tell me to which commit in your series the fix needs to be squashed in (that would save me time to figure it out, obviously).

I'm rerolling because I also need to update the last patch with the new lookup_commit() function signature that Stefan's sb/object-store-lookup introduces. I have squashed the SQUASH??? patch into the corresponding patch in this patch set.

Changes from v2:
- now also based on sb/object-store-lookup in addition to ds/commit-graph-fsck (I rebased ds/commit-graph-fsck onto sb-object-store-lookup, then rebased this patch set onto the result)
- patches 1-5 are unchanged
- patch 6:
- used "PRItime" instead of "ul" when printing a timestamp (the SQUASH??? patch)
- updated invocations of lookup_commit() to take a repository object

[1] https://public-inbox.org/git/[email protected]/

Jonathan Tan (6):
commit-graph: refactor preparing commit graph
object-store: add missing include
commit-graph: add missing forward declaration
commit-graph: add free_commit_graph
commit-graph: store graph in struct object_store
commit-graph: add repo arg to graph readers

 Makefile                   |   1 +
 builtin/commit-graph.c     |   2 +
 builtin/fsck.c             |   2 +-
 cache.h                    |   1 -
 commit-graph.c             | 108 +++++++++++++++++++++----------------
 commit-graph.h             |  11 ++--
 commit.c                   |   6 +--
 config.c                   |   5 --
 environment.c              |   1 -
 object-store.h             |   6 +++
 object.c                   |   5 ++
 ref-filter.c               |   2 +-
 t/helper/test-repository.c |  82 ++++++++++++++++++++++++++++
 t/helper/test-tool.c       |   1 +
 t/helper/test-tool.h       |   1 +
 t/t5318-commit-graph.sh    |  35 ++++++++++++
 16 files changed, 207 insertions(+), 62 deletions(-)
 create mode 100644 t/helper/test-repository.c
Signature · 1 line
2.18.0.203.gfac676dfb9-goog