]> git.ipfire.org Git - thirdparty/git.git/blame - builtin/commit-graph.c
commit-graph: fix "Collecting commits from input" progress line
[thirdparty/git.git] / builtin / commit-graph.c
CommitLineData
4ce58ee3
DS
1#include "builtin.h"
2#include "config.h"
f237c8b6
DS
3#include "dir.h"
4#include "lockfile.h"
4ce58ee3 5#include "parse-options.h"
283e68c7 6#include "repository.h"
f237c8b6 7#include "commit-graph.h"
3da4b609 8#include "object-store.h"
5b6653e5 9#include "progress.h"
2f00c355 10#include "tag.h"
4ce58ee3
DS
11
12static char const * const builtin_commit_graph_usage[] = {
73716122 13 N_("git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"),
4f027355
TB
14 N_("git commit-graph write [--object-dir <objdir>] [--append] "
15 "[--split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] "
9b6606f4 16 "[--changed-paths] [--[no-]progress] <split options>"),
f237c8b6
DS
17 NULL
18};
19
283e68c7 20static const char * const builtin_commit_graph_verify_usage[] = {
73716122 21 N_("git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"),
283e68c7
DS
22 NULL
23};
24
f237c8b6 25static const char * const builtin_commit_graph_write_usage[] = {
4f027355
TB
26 N_("git commit-graph write [--object-dir <objdir>] [--append] "
27 "[--split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] "
9b6606f4 28 "[--changed-paths] [--[no-]progress] <split options>"),
4ce58ee3
DS
29 NULL
30};
31
32static struct opts_commit_graph {
33 const char *obj_dir;
59fb8770 34 int reachable;
049d51a2 35 int stdin_packs;
3d5df01b 36 int stdin_commits;
7547b95b 37 int append;
135a7123 38 int split;
3da4b609 39 int shallow;
73716122 40 int progress;
d38e07b8 41 int enable_changed_paths;
4ce58ee3
DS
42} opts;
43
0bd52e27
TB
44static struct object_directory *find_odb(struct repository *r,
45 const char *obj_dir)
46{
47 struct object_directory *odb;
48 char *obj_dir_real = real_pathdup(obj_dir, 1);
3d7747e3 49 struct strbuf odb_path_real = STRBUF_INIT;
0bd52e27
TB
50
51 prepare_alt_odb(r);
52 for (odb = r->objects->odb; odb; odb = odb->next) {
3d7747e3
AM
53 strbuf_realpath(&odb_path_real, odb->path, 1);
54 if (!strcmp(obj_dir_real, odb_path_real.buf))
0bd52e27
TB
55 break;
56 }
57
58 free(obj_dir_real);
3d7747e3 59 strbuf_release(&odb_path_real);
0bd52e27
TB
60
61 if (!odb)
62 die(_("could not find object directory matching %s"), obj_dir);
63 return odb;
64}
65
283e68c7
DS
66static int graph_verify(int argc, const char **argv)
67{
68 struct commit_graph *graph = NULL;
0bd52e27 69 struct object_directory *odb = NULL;
283e68c7 70 char *graph_name;
61df89c8
ÆAB
71 int open_ok;
72 int fd;
73 struct stat st;
3da4b609 74 int flags = 0;
283e68c7
DS
75
76 static struct option builtin_commit_graph_verify_options[] = {
77 OPT_STRING(0, "object-dir", &opts.obj_dir,
78 N_("dir"),
79 N_("The object directory to store the graph")),
3da4b609
DS
80 OPT_BOOL(0, "shallow", &opts.shallow,
81 N_("if the commit-graph is split, only verify the tip file")),
73716122 82 OPT_BOOL(0, "progress", &opts.progress, N_("force progress reporting")),
283e68c7
DS
83 OPT_END(),
84 };
85
0bd7f578
GS
86 trace2_cmd_mode("verify");
87
73716122 88 opts.progress = isatty(2);
283e68c7
DS
89 argc = parse_options(argc, argv, NULL,
90 builtin_commit_graph_verify_options,
91 builtin_commit_graph_verify_usage, 0);
92
93 if (!opts.obj_dir)
94 opts.obj_dir = get_object_directory();
3da4b609
DS
95 if (opts.shallow)
96 flags |= COMMIT_GRAPH_VERIFY_SHALLOW;
73716122
GS
97 if (opts.progress)
98 flags |= COMMIT_GRAPH_WRITE_PROGRESS;
283e68c7 99
0bd52e27 100 odb = find_odb(the_repository, opts.obj_dir);
ad2dd5bb 101 graph_name = get_commit_graph_filename(odb);
61df89c8 102 open_ok = open_commit_graph(graph_name, &fd, &st);
3da4b609 103 if (!open_ok && errno != ENOENT)
7b8ce9c6 104 die_errno(_("Could not open commit-graph '%s'"), graph_name);
3da4b609 105
283e68c7
DS
106 FREE_AND_NULL(graph_name);
107
3da4b609 108 if (open_ok)
a7df60ca 109 graph = load_commit_graph_one_fd_st(fd, &st, odb);
0bd52e27 110 else
13c24992 111 graph = read_commit_graph_one(the_repository, odb);
3da4b609
DS
112
113 /* Return failure if open_ok predicted success */
283e68c7 114 if (!graph)
3da4b609 115 return !!open_ok;
283e68c7 116
0bfb48e6 117 UNLEAK(graph);
3da4b609 118 return verify_commit_graph(the_repository, graph, flags);
283e68c7
DS
119}
120
d6538246 121extern int read_replace_refs;
c2bc6e6a 122static struct split_commit_graph_opts split_opts;
d6538246 123
4f027355
TB
124static int write_option_parse_split(const struct option *opt, const char *arg,
125 int unset)
126{
fdbde82f
TB
127 enum commit_graph_split_flags *flags = opt->value;
128
4f027355
TB
129 opts.split = 1;
130 if (!arg)
131 return 0;
132
fdbde82f
TB
133 if (!strcmp(arg, "no-merge"))
134 *flags = COMMIT_GRAPH_SPLIT_MERGE_PROHIBITED;
8a6ac287
TB
135 else if (!strcmp(arg, "replace"))
136 *flags = COMMIT_GRAPH_SPLIT_REPLACE;
fdbde82f
TB
137 else
138 die(_("unrecognized --split argument, %s"), arg);
4f027355
TB
139
140 return 0;
141}
142
5b6653e5
TB
143static int read_one_commit(struct oidset *commits, struct progress *progress,
144 const char *hash)
fa8953cb 145{
2f00c355 146 struct object *result;
fa8953cb
TB
147 struct object_id oid;
148 const char *end;
149
150 if (parse_oid_hex(hash, &oid, &end))
151 return error(_("unexpected non-hex object ID: %s"), hash);
152
2f00c355
TB
153 result = deref_tag(the_repository, parse_object(the_repository, &oid),
154 NULL, 0);
155 if (!result)
156 return error(_("invalid object: %s"), hash);
157 else if (object_as_type(the_repository, result, OBJ_COMMIT, 1))
158 oidset_insert(commits, &result->oid);
5b6653e5
TB
159
160 display_progress(progress, oidset_size(commits));
161
fa8953cb
TB
162 return 0;
163}
164
f237c8b6
DS
165static int graph_write(int argc, const char **argv)
166{
fa8953cb
TB
167 struct string_list pack_indexes = STRING_LIST_INIT_NODUP;
168 struct strbuf buf = STRBUF_INIT;
6830c360 169 struct oidset commits = OIDSET_INIT;
0bd52e27 170 struct object_directory *odb = NULL;
e103f727 171 int result = 0;
73716122 172 enum commit_graph_write_flags flags = 0;
5b6653e5 173 struct progress *progress = NULL;
049d51a2 174
f237c8b6
DS
175 static struct option builtin_commit_graph_write_options[] = {
176 OPT_STRING(0, "object-dir", &opts.obj_dir,
177 N_("dir"),
178 N_("The object directory to store the graph")),
59fb8770
DS
179 OPT_BOOL(0, "reachable", &opts.reachable,
180 N_("start walk at all refs")),
049d51a2
DS
181 OPT_BOOL(0, "stdin-packs", &opts.stdin_packs,
182 N_("scan pack-indexes listed by stdin for commits")),
3d5df01b
DS
183 OPT_BOOL(0, "stdin-commits", &opts.stdin_commits,
184 N_("start walk at commits listed by stdin")),
7547b95b
DS
185 OPT_BOOL(0, "append", &opts.append,
186 N_("include all commits already in the commit-graph file")),
d38e07b8
GS
187 OPT_BOOL(0, "changed-paths", &opts.enable_changed_paths,
188 N_("enable computation for changed paths")),
73716122 189 OPT_BOOL(0, "progress", &opts.progress, N_("force progress reporting")),
4f027355
TB
190 OPT_CALLBACK_F(0, "split", &split_opts.flags, NULL,
191 N_("allow writing an incremental commit-graph file"),
192 PARSE_OPT_OPTARG | PARSE_OPT_NONEG,
193 write_option_parse_split),
c2bc6e6a
DS
194 OPT_INTEGER(0, "max-commits", &split_opts.max_commits,
195 N_("maximum number of commits in a non-base split commit-graph")),
196 OPT_INTEGER(0, "size-multiple", &split_opts.size_multiple,
197 N_("maximum ratio between two levels of a split commit-graph")),
198 OPT_EXPIRY_DATE(0, "expire-time", &split_opts.expire_time,
b09b785c 199 N_("only expire files older than a given date-time")),
f237c8b6
DS
200 OPT_END(),
201 };
202
73716122 203 opts.progress = isatty(2);
c2bc6e6a
DS
204 split_opts.size_multiple = 2;
205 split_opts.max_commits = 0;
206 split_opts.expire_time = 0;
207
0bd7f578
GS
208 trace2_cmd_mode("write");
209
f237c8b6
DS
210 argc = parse_options(argc, argv, NULL,
211 builtin_commit_graph_write_options,
212 builtin_commit_graph_write_usage, 0);
213
59fb8770
DS
214 if (opts.reachable + opts.stdin_packs + opts.stdin_commits > 1)
215 die(_("use at most one of --reachable, --stdin-commits, or --stdin-packs"));
f237c8b6
DS
216 if (!opts.obj_dir)
217 opts.obj_dir = get_object_directory();
5af80394 218 if (opts.append)
39d88318 219 flags |= COMMIT_GRAPH_WRITE_APPEND;
135a7123 220 if (opts.split)
39d88318 221 flags |= COMMIT_GRAPH_WRITE_SPLIT;
73716122
GS
222 if (opts.progress)
223 flags |= COMMIT_GRAPH_WRITE_PROGRESS;
d5b873c8
GS
224 if (opts.enable_changed_paths ||
225 git_env_bool(GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS, 0))
d38e07b8 226 flags |= COMMIT_GRAPH_WRITE_BLOOM_FILTERS;
f237c8b6 227
d6538246 228 read_replace_refs = 0;
0bd52e27 229 odb = find_odb(the_repository, opts.obj_dir);
d6538246 230
c2bc6e6a 231 if (opts.reachable) {
0bd52e27 232 if (write_commit_graph_reachable(odb, flags, &split_opts))
c2bc6e6a
DS
233 return 1;
234 return 0;
235 }
59fb8770 236
fa8953cb 237 if (opts.stdin_packs) {
d88b14b3 238 while (strbuf_getline(&buf, stdin) != EOF)
fa8953cb
TB
239 string_list_append(&pack_indexes,
240 strbuf_detach(&buf, NULL));
241 } else if (opts.stdin_commits) {
242 oidset_init(&commits, 0);
5b6653e5
TB
243 if (opts.progress)
244 progress = start_delayed_progress(
245 _("Collecting commits from input"), 0);
fa8953cb
TB
246
247 while (strbuf_getline(&buf, stdin) != EOF) {
5b6653e5 248 if (read_one_commit(&commits, progress, buf.buf)) {
fa8953cb
TB
249 result = 1;
250 goto cleanup;
6830c360 251 }
7c5c9b9c 252 }
5b6653e5 253
862aead2 254 stop_progress(&progress);
049d51a2
DS
255 }
256
0bd52e27 257 if (write_commit_graph(odb,
fa8953cb 258 opts.stdin_packs ? &pack_indexes : NULL,
6830c360 259 opts.stdin_commits ? &commits : NULL,
c2bc6e6a
DS
260 flags,
261 &split_opts))
e103f727 262 result = 1;
049d51a2 263
fa8953cb
TB
264cleanup:
265 string_list_clear(&pack_indexes, 0);
266 strbuf_release(&buf);
e103f727 267 return result;
f237c8b6 268}
4ce58ee3
DS
269
270int cmd_commit_graph(int argc, const char **argv, const char *prefix)
271{
272 static struct option builtin_commit_graph_options[] = {
273 OPT_STRING(0, "object-dir", &opts.obj_dir,
274 N_("dir"),
275 N_("The object directory to store the graph")),
276 OPT_END(),
277 };
278
279 if (argc == 2 && !strcmp(argv[1], "-h"))
280 usage_with_options(builtin_commit_graph_usage,
281 builtin_commit_graph_options);
282
283 git_config(git_default_config, NULL);
284 argc = parse_options(argc, argv, prefix,
285 builtin_commit_graph_options,
286 builtin_commit_graph_usage,
287 PARSE_OPT_STOP_AT_NON_OPTION);
288
dd2e50a8
JK
289 save_commit_buffer = 0;
290
f237c8b6 291 if (argc > 0) {
283e68c7
DS
292 if (!strcmp(argv[0], "verify"))
293 return graph_verify(argc, argv);
f237c8b6
DS
294 if (!strcmp(argv[0], "write"))
295 return graph_write(argc, argv);
296 }
297
4ce58ee3
DS
298 usage_with_options(builtin_commit_graph_usage,
299 builtin_commit_graph_options);
300}