Teach git-commit-graph to inspect the objects only in a certain list
of pack-indexes within the given pack directory. This allows updating
the commit graph iteratively, since we add all commits stored in a
previous commit graph.
Signed-off-by: Derrick Stolee <dstolee@xxxxxxxxxxxxx>
---
Documentation/git-commit-graph.txt | 11 +++++++++++
builtin/commit-graph.c | 32 +++++++++++++++++++++++++++++---
commit-graph.c | 25 +++++++++++++++++++++++--
commit-graph.h | 4 +++-
packfile.c | 4 ++--
packfile.h | 2 ++
t/t5318-commit-graph.sh | 13 +++++++++++++
7 files changed, 83 insertions(+), 8 deletions(-)
diff --git a/Documentation/git-commit-graph.txt b/Documentation/git-commit-graph.txt
index 7ae8f7484d..727d5d70bb 100644
--- a/Documentation/git-commit-graph.txt
+++ b/Documentation/git-commit-graph.txt
@@ -42,6 +42,10 @@ With the `--delete-expired` option, delete the graph files in the pack
directory that are not referred to by the graph-head file. To avoid race
conditions, do not delete the file previously referred to by the
graph-head file if it is updated by the `--update-head` option.
++
+With the `--stdin-packs` option, generate the new commit graph by
+walking objects only in the specified packfiles and any commits in
+the existing graph-head.
'read'::
@@ -72,6 +76,13 @@ $ git commit-graph write
$ git commit-graph write --update-head --delete-expired
------------------------------------------------
+* Write a graph file, extending the current graph file using commits
+* in <pack-index>, update graph-head, and delete stale graph files.
++
+------------------------------------------------
+$ echo <pack-index> | git commit-graph write --update-head --delete-expired --stdin-packs
+------------------------------------------------
+
* Read basic information from a graph file.
+
------------------------------------------------
diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c
index 15f647fd81..fe5f00551c 100644
--- a/builtin/commit-graph.c
+++ b/builtin/commit-graph.c
@@ -9,7 +9,7 @@ static char const * const builtin_commit_graph_usage[] = {
N_("git commit-graph [--pack-dir <packdir>]"),
N_("git commit-graph clear [--pack-dir <packdir>]"),
N_("git commit-graph read [--graph-hash=<hash>]"),
- N_("git commit-graph write [--pack-dir <packdir>] [--update-head] [--delete-expired]"),
+ N_("git commit-graph write [--pack-dir <packdir>] [--update-head] [--delete-expired] [--stdin-packs]"),
NULL
};
@@ -24,7 +24,7 @@ static const char * const builtin_commit_graph_read_usage[] = {
};
static const char * const builtin_commit_graph_write_usage[] = {
- N_("git commit-graph write [--pack-dir <packdir>] [--update-head] [--delete-expired]"),
+ N_("git commit-graph write [--pack-dir <packdir>] [--update-head] [--delete-expired] [--stdin-packs]"),
NULL
};
@@ -33,6 +33,7 @@ static struct opts_commit_graph {
const char *graph_hash;
int update_head;
int delete_expired;
+ int stdin_packs;
} opts;
static int graph_clear(int argc, const char **argv)
@@ -216,6 +217,11 @@ static int graph_write(int argc, const char **argv)
struct object_id *graph_hash;
struct object_id old_graph_hash;
int has_existing;
+ const char **pack_indexes = NULL;
+ int nr_packs = 0;
+ const char **lines = NULL;
+ int nr_lines = 0;
+ int alloc_lines = 0;
static struct option builtin_commit_graph_write_options[] = {
{ OPTION_STRING, 'p', "pack-dir", &opts.pack_dir,
@@ -225,6 +231,8 @@ static int graph_write(int argc, const char **argv)
N_("update graph-head to written graph file")),
OPT_BOOL('d', "delete-expired", &opts.delete_expired,
N_("delete expired head graph file")),
+ OPT_BOOL('s', "stdin-packs", &opts.stdin_packs,
+ N_("only scan packfiles listed by stdin")),
OPT_END(),
};
@@ -241,7 +249,25 @@ static int graph_write(int argc, const char **argv)
has_existing = !!get_graph_head_hash(opts.pack_dir, &old_graph_hash);
- graph_hash = write_commit_graph(opts.pack_dir);
+ if (opts.stdin_packs) {
+ struct strbuf buf = STRBUF_INIT;
+ nr_lines = 0;
+ alloc_lines = 128;
+ ALLOC_ARRAY(lines, alloc_lines);
+
+ while (strbuf_getline(&buf, stdin) != EOF) {
+ ALLOC_GROW(lines, nr_lines + 1, alloc_lines);
+ lines[nr_lines++] = buf.buf;
+ strbuf_detach(&buf, NULL);
+ }
+
+ pack_indexes = lines;
+ nr_packs = nr_lines;
+ }
+
+ graph_hash = write_commit_graph(opts.pack_dir,
+ pack_indexes,
+ nr_packs);
if (opts.update_head)
update_head_file(opts.pack_dir, graph_hash);
diff --git a/commit-graph.c b/commit-graph.c
index d711a2cd81..27a34f5eda 100644
--- a/commit-graph.c
+++ b/commit-graph.c
@@ -655,7 +655,9 @@ static void close_reachable(struct packed_oid_list *oids)
}
}
-struct object_id *write_commit_graph(const char *pack_dir)
+struct object_id *write_commit_graph(const char *pack_dir,
+ const char **pack_indexes,
+ int nr_packs)
{
struct packed_oid_list oids;
struct packed_commit_list commits;
@@ -690,7 +692,26 @@ struct object_id *write_commit_graph(const char *pack_dir)
oids.nr = commit_graph->num_commits;
}
- for_each_packed_object(if_packed_commit_add_to_list, &oids, 0);
+ if (pack_indexes) {
+ int pack_dir_len = strlen(pack_dir) + 1;
+ struct strbuf packname = STRBUF_INIT;
+ strbuf_add(&packname, pack_dir, pack_dir_len - 1);
+ strbuf_addch(&packname, '/');
+ for (i = 0; i < nr_packs; i++) {
+ struct packed_git *p;
+ strbuf_setlen(&packname, pack_dir_len);
+ strbuf_addstr(&packname, pack_indexes[i]);
+ p = add_packed_git(packname.buf, packname.len, 1);
+ if (!p)
+ die("error adding pack %s", packname.buf);
+ if (open_pack_index(p))
+ die("error opening index for %s", packname.buf);
+ for_each_object_in_pack(p, if_packed_commit_add_to_list, &oids);
+ close_pack(p);
+ }
+ }
+ else
+ for_each_packed_object(if_packed_commit_add_to_list, &oids, 0);
close_reachable(&oids);
QSORT(oids.list, oids.nr, commit_compare);
diff --git a/commit-graph.h b/commit-graph.h
index 7c4c9c38ab..918b34dd2b 100644
--- a/commit-graph.h
+++ b/commit-graph.h
@@ -50,7 +50,9 @@ extern struct object_id *get_nth_commit_oid(struct commit_graph *g,
uint32_t n,
struct object_id *oid);
-extern struct object_id *write_commit_graph(const char *pack_dir);
+extern struct object_id *write_commit_graph(const char *pack_dir,
+ const char **pack_indexes,
+ int nr_packs);
#endif
diff --git a/packfile.c b/packfile.c
index 29f5dc2398..e4b1dc02bc 100644
--- a/packfile.c
+++ b/packfile.c
@@ -299,7 +299,7 @@ void close_pack_index(struct packed_git *p)
}
}
-static void close_pack(struct packed_git *p)
+void close_pack(struct packed_git *p)
{
close_pack_windows(p);
close_pack_fd(p);
@@ -1840,7 +1840,7 @@ int has_pack_index(const unsigned char *sha1)
return 1;
}
-static int for_each_object_in_pack(struct packed_git *p, each_packed_object_fn cb, void *data)
+int for_each_object_in_pack(struct packed_git *p, each_packed_object_fn cb, void *data)
{
uint32_t i;
int r = 0;
diff --git a/packfile.h b/packfile.h
index 0cdeb54dcd..9281e909d5 100644
--- a/packfile.h
+++ b/packfile.h
@@ -61,6 +61,7 @@ extern void close_pack_index(struct packed_git *);
extern unsigned char *use_pack(struct packed_git *, struct pack_window **, off_t, unsigned long *);
extern void close_pack_windows(struct packed_git *);
+extern void close_pack(struct packed_git *);
extern void close_all_packs(void);
extern void unuse_pack(struct pack_window **);
extern void clear_delta_base_cache(void);
@@ -133,6 +134,7 @@ typedef int each_packed_object_fn(const struct object_id *oid,
struct packed_git *pack,
uint32_t pos,
void *data);
+extern int for_each_object_in_pack(struct packed_git *p, each_packed_object_fn, void *data);
extern int for_each_packed_object(each_packed_object_fn, void *, unsigned flags);
#endif
diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh
index 1e3fe59d70..e3546e6844 100755
--- a/t/t5318-commit-graph.sh
+++ b/t/t5318-commit-graph.sh
@@ -169,6 +169,19 @@ test_expect_success 'clear graph' '
graph_git_behavior 'cleared graph, commit 8 vs merge 1' commits/8 merge/1
graph_git_behavior 'cleared graph, commit 8 vs merge 2' commits/8 merge/2
+test_expect_success 'build graph from latest pack with closure' '
+ graph5=$(cat new-idx | git commit-graph write --update-head --delete-expired --stdin-packs) &&
+ test_path_is_file $packdir/graph-$graph5.graph &&
+ test_path_is_file $packdir/graph-head &&
+ printf $graph5 >expect &&
+ test_cmp expect $packdir/graph-head &&
+ git commit-graph read --graph-hash=$graph5 >output &&
+ graph_read_expect "9" "$packdir" &&
+ test_cmp expect output'
+
+graph_git_behavior 'graph from pack, commit 8 vs merge 1' commits/8 merge/1
+graph_git_behavior 'graph from pack, commit 8 vs merge 2' commits/8 merge/2
+
test_expect_success 'setup bare repo' '
cd .. &&
git clone --bare --no-local full bare &&
--
2.15.1.45.g9b7079f
