[PATCH 06/14] packed-graph: implement git-graph --write

From

Derrick Stolee <stolee@gmail.com>

Date

Jan 25, 2018, 14:02 UTC

Message-ID

<20180125140231.65604-7-dstolee@microsoft.com>

In-Reply-To

<20180125140231.65604-1-dstolee@microsoft.com>

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
---
 Documentation/git-graph.txt | 26 ++++++++++++++
 builtin/graph.c             | 37 ++++++++++++++++++--
 t/t5319-graph.sh            | 83 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 143 insertions(+), 3 deletions(-)
 create mode 100755 t/t5319-graph.sh

diff --git a/Documentation/git-graph.txt b/Documentation/git-graph.txt
index de5a3c07e6..be6bc38814 100644
--- a/Documentation/git-graph.txt
+++ b/Documentation/git-graph.txt
@@ -5,3 +5,29 @@ NAME
 ----
 git-graph - Write and verify Git commit graphs (.graph files)
 
+
+SYNOPSIS
+--------
+[verse]
+'git graph' --write <options> [--pack-dir <pack_dir>]
+
+EXAMPLES
+--------
+
+* Write a graph file for the packed commits in your local .git folder.
++
+------------------------------------------------
+$ git midx --write
+------------------------------------------------
+
+CONFIGURATION
+-------------
+
+core.graph::
+	The graph command will fail if core.graph is false.
+	Also, the written graph files will be ignored by other commands
+	unless core.graph is true.
+
+GIT
+---
+Part of the linkgit:git[1] suite
\ No newline at end of file
diff --git a/builtin/graph.c b/builtin/graph.c
index a902dc8646..09f5552338 100644
--- a/builtin/graph.c
+++ b/builtin/graph.c
@@ -6,31 +6,62 @@
 #include "lockfile.h"
 #include "packfile.h"
 #include "parse-options.h"
+#include "packed-graph.h"
 
 static char const * const builtin_graph_usage[] ={
 	N_("git graph [--pack-dir <packdir>]"),
+	N_("git graph --write [--pack-dir <packdir>]"),
 	NULL
 };
 
 static struct opts_graph {
 	const char *pack_dir;
+	int write;
 } opts;
 
+static int graph_write(void)
+{
+	struct object_id *graph_id = construct_graph(opts.pack_dir);
+
+	if (graph_id)
+		printf("%s\n", oid_to_hex(graph_id));
+
+	free(graph_id);
+	return 0;
+}
+
 int cmd_graph(int argc, const char **argv, const char *prefix)
 {
 	static struct option builtin_graph_options[] = {
 		{ OPTION_STRING, 'p', "pack-dir", &opts.pack_dir,
 			N_("dir"),
 			N_("The pack directory to store the graph") },
+		OPT_BOOL('w', "write", &opts.write,
+			N_("write graph file")),
 		OPT_END(),
 	};
 
-	if (!core_graph)
-		die("core.graph is false");
-
 	if (argc == 2 && !strcmp(argv[1], "-h"))
 		usage_with_options(builtin_graph_usage, builtin_graph_options);
 
+	git_config(git_default_config, NULL);
+	if (!core_graph)
+		die("git-graph requires core.graph=true.");
+
+	argc = parse_options(argc, argv, prefix,
+			     builtin_graph_options,
+			     builtin_graph_usage, 0);
+
+	if (!opts.pack_dir) {
+		struct strbuf path = STRBUF_INIT;
+		strbuf_addstr(&path, get_object_directory());
+		strbuf_addstr(&path, "/pack");
+		opts.pack_dir = strbuf_detach(&path, NULL);
+	}
+
+	if (opts.write)
+		return graph_write();
+
 	return 0;
 }
 
diff --git a/t/t5319-graph.sh b/t/t5319-graph.sh
new file mode 100755
index 0000000000..52e979dfd3
--- /dev/null
+++ b/t/t5319-graph.sh
@@ -0,0 +1,83 @@
+#!/bin/sh
+
+test_description='packed graph'
+. ./test-lib.sh
+
+test_expect_success \
+    'setup full repo' \
+    'rm -rf .git &&
+     mkdir full &&
+     cd full &&
+     git init &&
+     git config core.graph true &&
+     git config pack.threads 1 &&
+     packdir=".git/objects/pack"'
+
+test_expect_success \
+    'write graph with no packs' \
+    'git graph --write --pack-dir .'
+
+test_expect_success \
+    'create commits and repack' \
+    'for i in $(test_seq 5)
+     do
+        echo $i >$i.txt &&
+        git add $i.txt &&
+        git commit -m "commit $i" &&
+        git branch commits/$i
+     done &&
+     git repack'
+
+test_expect_success \
+    'write graph' \
+    'graph1=$(git graph --write) &&
+     test_path_is_file ${packdir}/graph-${graph1}.graph'
+
+test_expect_success \
+    'Add more commits' \
+    'git reset --hard commits/3 &&
+     for i in $(test_seq 6 10)
+     do
+        echo $i >$i.txt &&
+        git add $i.txt &&
+        git commit -m "commit $i" &&
+        git branch commits/$i
+     done &&
+     git reset --hard commits/7 &&
+     for i in $(test_seq 11 15)
+     do
+        echo $i >$i.txt &&
+        git add $i.txt &&
+        git commit -m "commit $i" &&
+        git branch commits/$i
+     done &&
+     git reset --hard commits/7 &&
+     git merge commits/4 &&
+     git branch merge/1 &&
+     git reset --hard commits/8 &&
+     git merge commits/11 &&
+     git branch merge/2 &&
+     git reset --hard commits/9 &&
+     git merge commits/5 commits/13 &&
+     git repack'
+
+test_expect_success \
+    'write graph with merges' \
+    'graph2=$(git graph --write) &&
+     test_path_is_file ${packdir}/graph-${graph2}.graph'
+
+test_expect_success \
+    'setup bare repo' \
+    'cd .. &&
+     git clone --bare full bare &&
+     cd bare &&
+     git config core.graph true &&
+     git config pack.threads 1 &&
+     baredir="objects/pack"'
+
+test_expect_success \
+    'write graph in bare repo' \
+    'graphbare=$(git graph --write) &&
+     test_path_is_file ${baredir}/graph-${graphbare}.graph'
+
+test_done

-- 
2.16.0