blob: f9370961f99f5e68c1bfe84d215513536fccbdaf [file] [log] [blame]
Johannes Schindelined09aef2006-10-30 20:09:06 +01001#include "cache.h"
Michael Haggerty6e122b42015-08-10 11:47:46 +02002#include "tempfile.h"
Michael Haggerty697cc8e2014-10-01 12:28:42 +02003#include "lockfile.h"
Johannes Schindelined09aef2006-10-30 20:09:06 +01004#include "commit.h"
Alexandre Julliardabef3a12006-11-11 14:57:23 +01005#include "tag.h"
Nguyễn Thái Ngọc Duy3125fe52013-08-16 16:52:02 +07006#include "pkt-line.h"
Nguyễn Thái Ngọc Duy58babff2013-12-05 20:02:35 +07007#include "remote.h"
8#include "refs.h"
9#include "sha1-array.h"
10#include "diff.h"
11#include "revision.h"
12#include "commit-slab.h"
Nguyễn Thái Ngọc Duy3d9ff4d2016-06-12 17:53:57 +070013#include "revision.h"
14#include "list-objects.h"
Johannes Schindelined09aef2006-10-30 20:09:06 +010015
16static int is_shallow = -1;
Jeff King0cc77c32014-02-27 05:56:31 -050017static struct stat_validity shallow_stat;
Nguyễn Thái Ngọc Duy6035d6a2013-05-26 08:16:15 +070018static char *alternate_shallow_file;
19
Nguyễn Thái Ngọc Duy069c0532013-12-05 20:02:45 +070020void set_alternate_shallow_file(const char *path, int override)
Nguyễn Thái Ngọc Duy6035d6a2013-05-26 08:16:15 +070021{
22 if (is_shallow != -1)
23 die("BUG: is_repository_shallow must not be called before set_alternate_shallow_file");
Nguyễn Thái Ngọc Duy069c0532013-12-05 20:02:45 +070024 if (alternate_shallow_file && !override)
25 return;
Nguyễn Thái Ngọc Duy6035d6a2013-05-26 08:16:15 +070026 free(alternate_shallow_file);
Jeff King8c53f072015-01-12 20:59:09 -050027 alternate_shallow_file = xstrdup_or_null(path);
Nguyễn Thái Ngọc Duy6035d6a2013-05-26 08:16:15 +070028}
Johannes Schindelined09aef2006-10-30 20:09:06 +010029
30int register_shallow(const unsigned char *sha1)
31{
32 struct commit_graft *graft =
33 xmalloc(sizeof(struct commit_graft));
34 struct commit *commit = lookup_commit(sha1);
35
brian m. carlson7683e2e2015-03-13 23:39:34 +000036 hashcpy(graft->oid.hash, sha1);
Johannes Schindelined09aef2006-10-30 20:09:06 +010037 graft->nr_parent = -1;
38 if (commit && commit->object.parsed)
39 commit->parents = NULL;
40 return register_commit_graft(graft, 0);
41}
42
Junio C Hamanof43117a2007-01-21 22:22:23 -080043int is_repository_shallow(void)
Johannes Schindelined09aef2006-10-30 20:09:06 +010044{
45 FILE *fp;
46 char buf[1024];
Nguyễn Thái Ngọc Duy6035d6a2013-05-26 08:16:15 +070047 const char *path = alternate_shallow_file;
Johannes Schindelined09aef2006-10-30 20:09:06 +010048
49 if (is_shallow >= 0)
50 return is_shallow;
51
Nguyễn Thái Ngọc Duy6035d6a2013-05-26 08:16:15 +070052 if (!path)
Jeff Kingf9327292015-08-10 05:38:57 -040053 path = git_path_shallow();
Nguyễn Thái Ngọc Duy6035d6a2013-05-26 08:16:15 +070054 /*
55 * fetch-pack sets '--shallow-file ""' as an indicator that no
56 * shallow file should be used. We could just open it and it
57 * will likely fail. But let's do an explicit check instead.
58 */
Jeff King0cc77c32014-02-27 05:56:31 -050059 if (!*path || (fp = fopen(path, "r")) == NULL) {
60 stat_validity_clear(&shallow_stat);
Johannes Schindelined09aef2006-10-30 20:09:06 +010061 is_shallow = 0;
62 return is_shallow;
63 }
Jeff King0cc77c32014-02-27 05:56:31 -050064 stat_validity_update(&shallow_stat, fileno(fp));
Johannes Schindelined09aef2006-10-30 20:09:06 +010065 is_shallow = 1;
66
67 while (fgets(buf, sizeof(buf), fp)) {
68 unsigned char sha1[20];
69 if (get_sha1_hex(buf, sha1))
70 die("bad shallow line: %s", buf);
71 register_shallow(sha1);
72 }
73 fclose(fp);
74 return is_shallow;
75}
76
Johannes Schindelinf53514b2006-10-30 20:09:53 +010077struct commit_list *get_shallow_commits(struct object_array *heads, int depth,
78 int shallow_flag, int not_shallow_flag)
Johannes Schindelined09aef2006-10-30 20:09:06 +010079{
80 int i = 0, cur_depth = 0;
81 struct commit_list *result = NULL;
Thiago Farina3cd47452010-08-28 23:04:17 -030082 struct object_array stack = OBJECT_ARRAY_INIT;
Johannes Schindelined09aef2006-10-30 20:09:06 +010083 struct commit *commit = NULL;
Nguyễn Thái Ngọc Duy79d3a232013-12-05 20:02:41 +070084 struct commit_graft *graft;
Johannes Schindelined09aef2006-10-30 20:09:06 +010085
86 while (commit || i < heads->nr || stack.nr) {
87 struct commit_list *p;
88 if (!commit) {
89 if (i < heads->nr) {
90 commit = (struct commit *)
Alexandre Julliardabef3a12006-11-11 14:57:23 +010091 deref_tag(heads->objects[i++].item, NULL, 0);
Martin Koegleraffeef12008-02-18 08:31:54 +010092 if (!commit || commit->object.type != OBJ_COMMIT) {
Johannes Schindelined09aef2006-10-30 20:09:06 +010093 commit = NULL;
94 continue;
95 }
Alexandre Julliardd64d6c92006-11-24 15:58:50 +010096 if (!commit->util)
97 commit->util = xmalloc(sizeof(int));
98 *(int *)commit->util = 0;
Johannes Schindelined09aef2006-10-30 20:09:06 +010099 cur_depth = 0;
100 } else {
101 commit = (struct commit *)
102 stack.objects[--stack.nr].item;
103 cur_depth = *(int *)commit->util;
104 }
105 }
Jeff King367068e2013-10-24 04:54:01 -0400106 parse_commit_or_die(commit);
Johannes Schindelined09aef2006-10-30 20:09:06 +0100107 cur_depth++;
Nguyễn Thái Ngọc Duy79d3a232013-12-05 20:02:41 +0700108 if ((depth != INFINITE_DEPTH && cur_depth >= depth) ||
109 (is_repository_shallow() && !commit->parents &&
brian m. carlsoned1c9972015-11-10 02:22:29 +0000110 (graft = lookup_commit_graft(commit->object.oid.hash)) != NULL &&
Nguyễn Thái Ngọc Duy79d3a232013-12-05 20:02:41 +0700111 graft->nr_parent < 0)) {
Nguyễn Thái Ngọc Duy682c7d22013-01-11 16:05:47 +0700112 commit_list_insert(commit, &result);
113 commit->object.flags |= shallow_flag;
114 commit = NULL;
115 continue;
116 }
117 commit->object.flags |= not_shallow_flag;
Johannes Schindelined09aef2006-10-30 20:09:06 +0100118 for (p = commit->parents, commit = NULL; p; p = p->next) {
119 if (!p->item->util) {
120 int *pointer = xmalloc(sizeof(int));
121 p->item->util = pointer;
122 *pointer = cur_depth;
123 } else {
124 int *pointer = p->item->util;
125 if (cur_depth >= *pointer)
126 continue;
127 *pointer = cur_depth;
128 }
Matthijs Kooijman4b796952013-07-11 13:25:52 +0200129 if (p->next)
130 add_object_array(&p->item->object,
131 NULL, &stack);
132 else {
133 commit = p->item;
134 cur_depth = *(int *)commit->util;
Johannes Schindelinf53514b2006-10-30 20:09:53 +0100135 }
Johannes Schindelined09aef2006-10-30 20:09:06 +0100136 }
137 }
138
139 return result;
140}
Nguyễn Thái Ngọc Duy6035d6a2013-05-26 08:16:15 +0700141
Nguyễn Thái Ngọc Duy3d9ff4d2016-06-12 17:53:57 +0700142static void show_commit(struct commit *commit, void *data)
143{
144 commit_list_insert(commit, data);
145}
146
147/*
148 * Given rev-list arguments, run rev-list. All reachable commits
149 * except border ones are marked with not_shallow_flag. Border commits
150 * are marked with shallow_flag. The list of border/shallow commits
151 * are also returned.
152 */
153struct commit_list *get_shallow_commits_by_rev_list(int ac, const char **av,
154 int shallow_flag,
155 int not_shallow_flag)
156{
157 struct commit_list *result = NULL, *p;
158 struct commit_list *not_shallow_list = NULL;
159 struct rev_info revs;
160 int both_flags = shallow_flag | not_shallow_flag;
161
162 /*
163 * SHALLOW (excluded) and NOT_SHALLOW (included) should not be
164 * set at this point. But better be safe than sorry.
165 */
166 clear_object_flags(both_flags);
167
168 is_repository_shallow(); /* make sure shallows are read */
169
170 init_revisions(&revs, NULL);
171 save_commit_buffer = 0;
172 setup_revisions(ac, av, &revs, NULL);
173
174 if (prepare_revision_walk(&revs))
175 die("revision walk setup failed");
176 traverse_commit_list(&revs, show_commit, NULL, &not_shallow_list);
177
178 /* Mark all reachable commits as NOT_SHALLOW */
179 for (p = not_shallow_list; p; p = p->next)
180 p->item->object.flags |= not_shallow_flag;
181
182 /*
183 * mark border commits SHALLOW + NOT_SHALLOW.
184 * We cannot clear NOT_SHALLOW right now. Imagine border
185 * commit A is processed first, then commit B, whose parent is
186 * A, later. If NOT_SHALLOW on A is cleared at step 1, B
187 * itself is considered border at step 2, which is incorrect.
188 */
189 for (p = not_shallow_list; p; p = p->next) {
190 struct commit *c = p->item;
191 struct commit_list *parent;
192
193 if (parse_commit(c))
194 die("unable to parse commit %s",
195 oid_to_hex(&c->object.oid));
196
197 for (parent = c->parents; parent; parent = parent->next)
198 if (!(parent->item->object.flags & not_shallow_flag)) {
199 c->object.flags |= shallow_flag;
200 commit_list_insert(c, &result);
201 break;
202 }
203 }
204 free_commit_list(not_shallow_list);
205
206 /*
207 * Now we can clean up NOT_SHALLOW on border commits. Having
208 * both flags set can confuse the caller.
209 */
210 for (p = result; p; p = p->next) {
211 struct object *o = &p->item->object;
212 if ((o->flags & both_flags) == both_flags)
213 o->flags &= ~not_shallow_flag;
214 }
215 return result;
216}
217
Junio C Hamano167832c2015-01-14 15:01:27 -0800218static void check_shallow_file_for_update(void)
Nguyễn Thái Ngọc Duy6035d6a2013-05-26 08:16:15 +0700219{
Jeff King0cc77c32014-02-27 05:56:31 -0500220 if (is_shallow == -1)
Nguyễn Thái Ngọc Duy6035d6a2013-05-26 08:16:15 +0700221 die("BUG: shallow must be initialized by now");
222
Jeff Kingf9327292015-08-10 05:38:57 -0400223 if (!stat_validity_check(&shallow_stat, git_path_shallow()))
Jeff King0cc77c32014-02-27 05:56:31 -0500224 die("shallow file has changed since we read it");
Nguyễn Thái Ngọc Duy6035d6a2013-05-26 08:16:15 +0700225}
Nguyễn Thái Ngọc Duy3125fe52013-08-16 16:52:02 +0700226
Nguyễn Thái Ngọc Duyeab32962013-12-05 20:02:54 +0700227#define SEEN_ONLY 1
228#define VERBOSE 2
229
Nguyễn Thái Ngọc Duy3125fe52013-08-16 16:52:02 +0700230struct write_shallow_data {
231 struct strbuf *out;
232 int use_pack_protocol;
233 int count;
Nguyễn Thái Ngọc Duyeab32962013-12-05 20:02:54 +0700234 unsigned flags;
Nguyễn Thái Ngọc Duy3125fe52013-08-16 16:52:02 +0700235};
236
237static int write_one_shallow(const struct commit_graft *graft, void *cb_data)
238{
239 struct write_shallow_data *data = cb_data;
brian m. carlson7683e2e2015-03-13 23:39:34 +0000240 const char *hex = oid_to_hex(&graft->oid);
Nguyễn Thái Ngọc Duy6a3bbb42013-08-16 16:52:03 +0700241 if (graft->nr_parent != -1)
242 return 0;
Nguyễn Thái Ngọc Duyeab32962013-12-05 20:02:54 +0700243 if (data->flags & SEEN_ONLY) {
brian m. carlson7683e2e2015-03-13 23:39:34 +0000244 struct commit *c = lookup_commit(graft->oid.hash);
Nguyễn Thái Ngọc Duyeab32962013-12-05 20:02:54 +0700245 if (!c || !(c->object.flags & SEEN)) {
246 if (data->flags & VERBOSE)
247 printf("Removing %s from .git/shallow\n",
brian m. carlsonf2fd0762015-11-10 02:22:28 +0000248 oid_to_hex(&c->object.oid));
Nguyễn Thái Ngọc Duyeab32962013-12-05 20:02:54 +0700249 return 0;
250 }
251 }
Nguyễn Thái Ngọc Duy3125fe52013-08-16 16:52:02 +0700252 data->count++;
253 if (data->use_pack_protocol)
254 packet_buf_write(data->out, "shallow %s", hex);
255 else {
256 strbuf_addstr(data->out, hex);
257 strbuf_addch(data->out, '\n');
258 }
259 return 0;
260}
261
Nguyễn Thái Ngọc Duyeab32962013-12-05 20:02:54 +0700262static int write_shallow_commits_1(struct strbuf *out, int use_pack_protocol,
brian m. carlson910650d2017-03-31 01:40:00 +0000263 const struct oid_array *extra,
Nguyễn Thái Ngọc Duyeab32962013-12-05 20:02:54 +0700264 unsigned flags)
Nguyễn Thái Ngọc Duy3125fe52013-08-16 16:52:02 +0700265{
266 struct write_shallow_data data;
Nguyễn Thái Ngọc Duy1a30f5a2013-12-05 20:02:34 +0700267 int i;
Nguyễn Thái Ngọc Duy3125fe52013-08-16 16:52:02 +0700268 data.out = out;
269 data.use_pack_protocol = use_pack_protocol;
270 data.count = 0;
Nguyễn Thái Ngọc Duyeab32962013-12-05 20:02:54 +0700271 data.flags = flags;
Nguyễn Thái Ngọc Duy3125fe52013-08-16 16:52:02 +0700272 for_each_commit_graft(write_one_shallow, &data);
Nguyễn Thái Ngọc Duy1a30f5a2013-12-05 20:02:34 +0700273 if (!extra)
274 return data.count;
275 for (i = 0; i < extra->nr; i++) {
brian m. carlsonee3051b2017-03-26 16:01:37 +0000276 strbuf_addstr(out, oid_to_hex(extra->oid + i));
Nguyễn Thái Ngọc Duy1a30f5a2013-12-05 20:02:34 +0700277 strbuf_addch(out, '\n');
278 data.count++;
279 }
Nguyễn Thái Ngọc Duy3125fe52013-08-16 16:52:02 +0700280 return data.count;
281}
282
Nguyễn Thái Ngọc Duyeab32962013-12-05 20:02:54 +0700283int write_shallow_commits(struct strbuf *out, int use_pack_protocol,
brian m. carlson910650d2017-03-31 01:40:00 +0000284 const struct oid_array *extra)
Nguyễn Thái Ngọc Duyeab32962013-12-05 20:02:54 +0700285{
286 return write_shallow_commits_1(out, use_pack_protocol, extra, 0);
287}
288
Michael Haggerty6e122b42015-08-10 11:47:46 +0200289static struct tempfile temporary_shallow;
Jeff King0179c942014-02-27 06:25:20 -0500290
brian m. carlson910650d2017-03-31 01:40:00 +0000291const char *setup_temporary_shallow(const struct oid_array *extra)
Jeff King0179c942014-02-27 06:25:20 -0500292{
Nguyễn Thái Ngọc Duy08ea65a2013-08-16 16:52:04 +0700293 struct strbuf sb = STRBUF_INIT;
294 int fd;
295
Nguyễn Thái Ngọc Duy1a30f5a2013-12-05 20:02:34 +0700296 if (write_shallow_commits(&sb, 0, extra)) {
Michael Haggerty6e122b42015-08-10 11:47:46 +0200297 fd = xmks_tempfile(&temporary_shallow, git_path("shallow_XXXXXX"));
Jeff King0179c942014-02-27 06:25:20 -0500298
Nguyễn Thái Ngọc Duy08ea65a2013-08-16 16:52:04 +0700299 if (write_in_full(fd, sb.buf, sb.len) != sb.len)
300 die_errno("failed to write to %s",
Michael Haggerty6e122b42015-08-10 11:47:46 +0200301 get_tempfile_path(&temporary_shallow));
302 close_tempfile(&temporary_shallow);
Nguyễn Thái Ngọc Duy08ea65a2013-08-16 16:52:04 +0700303 strbuf_release(&sb);
Michael Haggerty6e122b42015-08-10 11:47:46 +0200304 return get_tempfile_path(&temporary_shallow);
Nguyễn Thái Ngọc Duy08ea65a2013-08-16 16:52:04 +0700305 }
306 /*
307 * is_repository_shallow() sees empty string as "no shallow
308 * file".
309 */
Michael Haggerty6e122b42015-08-10 11:47:46 +0200310 return get_tempfile_path(&temporary_shallow);
Nguyễn Thái Ngọc Duy08ea65a2013-08-16 16:52:04 +0700311}
312
Nguyễn Thái Ngọc Duy3125fe52013-08-16 16:52:02 +0700313void setup_alternate_shallow(struct lock_file *shallow_lock,
Nguyễn Thái Ngọc Duy1a30f5a2013-12-05 20:02:34 +0700314 const char **alternate_shallow_file,
brian m. carlson910650d2017-03-31 01:40:00 +0000315 const struct oid_array *extra)
Nguyễn Thái Ngọc Duy3125fe52013-08-16 16:52:02 +0700316{
317 struct strbuf sb = STRBUF_INIT;
318 int fd;
319
Jeff Kingf9327292015-08-10 05:38:57 -0400320 fd = hold_lock_file_for_update(shallow_lock, git_path_shallow(),
Nguyễn Thái Ngọc Duy3125fe52013-08-16 16:52:02 +0700321 LOCK_DIE_ON_ERROR);
Jeff King78396322014-03-14 23:47:06 -0400322 check_shallow_file_for_update();
Nguyễn Thái Ngọc Duy1a30f5a2013-12-05 20:02:34 +0700323 if (write_shallow_commits(&sb, 0, extra)) {
Nguyễn Thái Ngọc Duy3125fe52013-08-16 16:52:02 +0700324 if (write_in_full(fd, sb.buf, sb.len) != sb.len)
325 die_errno("failed to write to %s",
Michael Haggertyb4fb09e2015-08-10 11:47:39 +0200326 get_lock_file_path(shallow_lock));
327 *alternate_shallow_file = get_lock_file_path(shallow_lock);
Nguyễn Thái Ngọc Duy3125fe52013-08-16 16:52:02 +0700328 } else
329 /*
330 * is_repository_shallow() sees empty string as "no
331 * shallow file".
332 */
333 *alternate_shallow_file = "";
334 strbuf_release(&sb);
335}
Nguyễn Thái Ngọc Duyad491362013-12-05 20:02:32 +0700336
337static int advertise_shallow_grafts_cb(const struct commit_graft *graft, void *cb)
338{
339 int fd = *(int *)cb;
340 if (graft->nr_parent == -1)
Lars Schneider81c634e2016-10-16 16:20:29 -0700341 packet_write_fmt(fd, "shallow %s\n", oid_to_hex(&graft->oid));
Nguyễn Thái Ngọc Duyad491362013-12-05 20:02:32 +0700342 return 0;
343}
344
345void advertise_shallow_grafts(int fd)
346{
347 if (!is_repository_shallow())
348 return;
349 for_each_commit_graft(advertise_shallow_grafts_cb, &fd);
350}
Nguyễn Thái Ngọc Duy58babff2013-12-05 20:02:35 +0700351
Nguyễn Thái Ngọc Duyeab32962013-12-05 20:02:54 +0700352/*
353 * mark_reachable_objects() should have been run prior to this and all
354 * reachable commits marked as "SEEN".
355 */
356void prune_shallow(int show_only)
357{
358 static struct lock_file shallow_lock;
359 struct strbuf sb = STRBUF_INIT;
360 int fd;
361
362 if (show_only) {
363 write_shallow_commits_1(&sb, 0, NULL, SEEN_ONLY | VERBOSE);
364 strbuf_release(&sb);
365 return;
366 }
Jeff Kingf9327292015-08-10 05:38:57 -0400367 fd = hold_lock_file_for_update(&shallow_lock, git_path_shallow(),
Nguyễn Thái Ngọc Duyeab32962013-12-05 20:02:54 +0700368 LOCK_DIE_ON_ERROR);
Jeff King78396322014-03-14 23:47:06 -0400369 check_shallow_file_for_update();
Nguyễn Thái Ngọc Duyeab32962013-12-05 20:02:54 +0700370 if (write_shallow_commits_1(&sb, 0, NULL, SEEN_ONLY)) {
371 if (write_in_full(fd, sb.buf, sb.len) != sb.len)
372 die_errno("failed to write to %s",
Michael Haggertyb4fb09e2015-08-10 11:47:39 +0200373 get_lock_file_path(&shallow_lock));
Nguyễn Thái Ngọc Duyeab32962013-12-05 20:02:54 +0700374 commit_lock_file(&shallow_lock);
375 } else {
Jeff Kingf9327292015-08-10 05:38:57 -0400376 unlink(git_path_shallow());
Nguyễn Thái Ngọc Duyeab32962013-12-05 20:02:54 +0700377 rollback_lock_file(&shallow_lock);
378 }
379 strbuf_release(&sb);
380}
381
Karsten Blees6aa30852014-07-12 02:00:06 +0200382struct trace_key trace_shallow = TRACE_KEY_INIT(SHALLOW);
Nguyễn Thái Ngọc Duy58babff2013-12-05 20:02:35 +0700383
384/*
385 * Step 1, split sender shallow commits into "ours" and "theirs"
386 * Step 2, clean "ours" based on .git/shallow
387 */
brian m. carlson910650d2017-03-31 01:40:00 +0000388void prepare_shallow_info(struct shallow_info *info, struct oid_array *sa)
Nguyễn Thái Ngọc Duy58babff2013-12-05 20:02:35 +0700389{
390 int i;
Karsten Blees6aa30852014-07-12 02:00:06 +0200391 trace_printf_key(&trace_shallow, "shallow: prepare_shallow_info\n");
Nguyễn Thái Ngọc Duy58babff2013-12-05 20:02:35 +0700392 memset(info, 0, sizeof(*info));
393 info->shallow = sa;
394 if (!sa)
395 return;
Jeff Kingb32fa952016-02-22 17:44:25 -0500396 ALLOC_ARRAY(info->ours, sa->nr);
397 ALLOC_ARRAY(info->theirs, sa->nr);
Nguyễn Thái Ngọc Duy58babff2013-12-05 20:02:35 +0700398 for (i = 0; i < sa->nr; i++) {
brian m. carlsonee3051b2017-03-26 16:01:37 +0000399 if (has_object_file(sa->oid + i)) {
Nguyễn Thái Ngọc Duy58babff2013-12-05 20:02:35 +0700400 struct commit_graft *graft;
brian m. carlsonee3051b2017-03-26 16:01:37 +0000401 graft = lookup_commit_graft(sa->oid[i].hash);
Nguyễn Thái Ngọc Duy58babff2013-12-05 20:02:35 +0700402 if (graft && graft->nr_parent < 0)
403 continue;
404 info->ours[info->nr_ours++] = i;
405 } else
406 info->theirs[info->nr_theirs++] = i;
407 }
408}
409
410void clear_shallow_info(struct shallow_info *info)
411{
412 free(info->ours);
413 free(info->theirs);
414}
415
416/* Step 4, remove non-existent ones in "theirs" after getting the pack */
417
418void remove_nonexistent_theirs_shallow(struct shallow_info *info)
419{
brian m. carlsonee3051b2017-03-26 16:01:37 +0000420 struct object_id *oid = info->shallow->oid;
Nguyễn Thái Ngọc Duy58babff2013-12-05 20:02:35 +0700421 int i, dst;
Karsten Blees6aa30852014-07-12 02:00:06 +0200422 trace_printf_key(&trace_shallow, "shallow: remove_nonexistent_theirs_shallow\n");
Nguyễn Thái Ngọc Duy58babff2013-12-05 20:02:35 +0700423 for (i = dst = 0; i < info->nr_theirs; i++) {
424 if (i != dst)
425 info->theirs[dst] = info->theirs[i];
brian m. carlsonee3051b2017-03-26 16:01:37 +0000426 if (has_object_file(oid + info->theirs[i]))
Nguyễn Thái Ngọc Duy58babff2013-12-05 20:02:35 +0700427 dst++;
428 }
429 info->nr_theirs = dst;
430}
431
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700432define_commit_slab(ref_bitmap, uint32_t *);
433
Nguyễn Thái Ngọc Duy6bc3d8c2016-12-06 19:53:35 +0700434#define POOL_SIZE (512 * 1024)
435
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700436struct paint_info {
437 struct ref_bitmap ref_bitmap;
438 unsigned nr_bits;
Nguyễn Thái Ngọc Duy0afd3072016-12-06 19:53:34 +0700439 char **pools;
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700440 char *free, *end;
Nguyễn Thái Ngọc Duy0afd3072016-12-06 19:53:34 +0700441 unsigned pool_count;
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700442};
443
444static uint32_t *paint_alloc(struct paint_info *info)
445{
446 unsigned nr = (info->nr_bits + 31) / 32;
447 unsigned size = nr * sizeof(uint32_t);
448 void *p;
Rasmus Villemoes381aa8e2016-12-06 19:53:37 +0700449 if (!info->pool_count || size > info->end - info->free) {
Nguyễn Thái Ngọc Duyf2386c62016-12-06 19:53:36 +0700450 if (size > POOL_SIZE)
451 die("BUG: pool size too small for %d in paint_alloc()",
452 size);
Nguyễn Thái Ngọc Duy0afd3072016-12-06 19:53:34 +0700453 info->pool_count++;
454 REALLOC_ARRAY(info->pools, info->pool_count);
Nguyễn Thái Ngọc Duy6bc3d8c2016-12-06 19:53:35 +0700455 info->free = xmalloc(POOL_SIZE);
Nguyễn Thái Ngọc Duy0afd3072016-12-06 19:53:34 +0700456 info->pools[info->pool_count - 1] = info->free;
Nguyễn Thái Ngọc Duy6bc3d8c2016-12-06 19:53:35 +0700457 info->end = info->free + POOL_SIZE;
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700458 }
459 p = info->free;
460 info->free += size;
461 return p;
462}
463
464/*
465 * Given a commit SHA-1, walk down to parents until either SEEN,
466 * UNINTERESTING or BOTTOM is hit. Set the id-th bit in ref_bitmap for
467 * all walked commits.
468 */
469static void paint_down(struct paint_info *info, const unsigned char *sha1,
Rasmus Villemoes1127b3c2016-12-06 19:53:38 +0700470 unsigned int id)
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700471{
472 unsigned int i, nr;
473 struct commit_list *head = NULL;
474 int bitmap_nr = (info->nr_bits + 31) / 32;
René Scharfe50492f72016-07-30 20:18:31 +0200475 size_t bitmap_size = st_mult(sizeof(uint32_t), bitmap_nr);
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700476 struct commit *c = lookup_commit_reference_gently(sha1, 1);
Johannes Schindelin7c565a62017-05-04 15:58:35 +0200477 uint32_t *tmp; /* to be freed before return */
478 uint32_t *bitmap;
479
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700480 if (!c)
481 return;
Johannes Schindelin7c565a62017-05-04 15:58:35 +0200482
483 tmp = xmalloc(bitmap_size);
484 bitmap = paint_alloc(info);
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700485 memset(bitmap, 0, bitmap_size);
Rasmus Villemoes1127b3c2016-12-06 19:53:38 +0700486 bitmap[id / 32] |= (1U << (id % 32));
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700487 commit_list_insert(c, &head);
488 while (head) {
489 struct commit_list *p;
René Scharfee510ab82015-10-24 18:21:31 +0200490 struct commit *c = pop_commit(&head);
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700491 uint32_t **refs = ref_bitmap_at(&info->ref_bitmap, c);
492
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700493 /* XXX check "UNINTERESTING" from pack bitmaps if available */
494 if (c->object.flags & (SEEN | UNINTERESTING))
495 continue;
496 else
497 c->object.flags |= SEEN;
498
499 if (*refs == NULL)
500 *refs = bitmap;
501 else {
502 memcpy(tmp, *refs, bitmap_size);
503 for (i = 0; i < bitmap_nr; i++)
504 tmp[i] |= bitmap[i];
505 if (memcmp(tmp, *refs, bitmap_size)) {
506 *refs = paint_alloc(info);
507 memcpy(*refs, tmp, bitmap_size);
508 }
509 }
510
511 if (c->object.flags & BOTTOM)
512 continue;
513
514 if (parse_commit(c))
515 die("unable to parse commit %s",
brian m. carlsonf2fd0762015-11-10 02:22:28 +0000516 oid_to_hex(&c->object.oid));
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700517
518 for (p = c->parents; p; p = p->next) {
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700519 if (p->item->object.flags & SEEN)
520 continue;
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700521 commit_list_insert(p->item, &head);
522 }
523 }
524
525 nr = get_max_object_index();
526 for (i = 0; i < nr; i++) {
527 struct object *o = get_indexed_object(i);
528 if (o && o->type == OBJ_COMMIT)
529 o->flags &= ~SEEN;
530 }
531
532 free(tmp);
533}
534
Michael Haggerty580b04e2015-05-25 18:39:06 +0000535static int mark_uninteresting(const char *refname, const struct object_id *oid,
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700536 int flags, void *cb_data)
537{
Michael Haggerty580b04e2015-05-25 18:39:06 +0000538 struct commit *commit = lookup_commit_reference_gently(oid->hash, 1);
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700539 if (!commit)
540 return 0;
541 commit->object.flags |= UNINTERESTING;
542 mark_parents_uninteresting(commit);
543 return 0;
544}
545
546static void post_assign_shallow(struct shallow_info *info,
547 struct ref_bitmap *ref_bitmap,
548 int *ref_status);
549/*
550 * Step 6(+7), associate shallow commits with new refs
551 *
552 * info->ref must be initialized before calling this function.
553 *
554 * If used is not NULL, it's an array of info->shallow->nr
555 * bitmaps. The n-th bit set in the m-th bitmap if ref[n] needs the
556 * m-th shallow commit from info->shallow.
557 *
558 * If used is NULL, "ours" and "theirs" are updated. And if ref_status
559 * is not NULL it's an array of ref->nr ints. ref_status[i] is true if
560 * the ref needs some shallow commits from either info->ours or
561 * info->theirs.
562 */
563void assign_shallow_commits_to_refs(struct shallow_info *info,
564 uint32_t **used, int *ref_status)
565{
brian m. carlsonee3051b2017-03-26 16:01:37 +0000566 struct object_id *oid = info->shallow->oid;
brian m. carlson910650d2017-03-31 01:40:00 +0000567 struct oid_array *ref = info->ref;
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700568 unsigned int i, nr;
569 int *shallow, nr_shallow = 0;
570 struct paint_info pi;
571
Karsten Blees6aa30852014-07-12 02:00:06 +0200572 trace_printf_key(&trace_shallow, "shallow: assign_shallow_commits_to_refs\n");
Jeff Kingb32fa952016-02-22 17:44:25 -0500573 ALLOC_ARRAY(shallow, info->nr_ours + info->nr_theirs);
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700574 for (i = 0; i < info->nr_ours; i++)
575 shallow[nr_shallow++] = info->ours[i];
576 for (i = 0; i < info->nr_theirs; i++)
577 shallow[nr_shallow++] = info->theirs[i];
578
579 /*
580 * Prepare the commit graph to track what refs can reach what
581 * (new) shallow commits.
582 */
583 nr = get_max_object_index();
584 for (i = 0; i < nr; i++) {
585 struct object *o = get_indexed_object(i);
586 if (!o || o->type != OBJ_COMMIT)
587 continue;
588
589 o->flags &= ~(UNINTERESTING | BOTTOM | SEEN);
590 }
591
592 memset(&pi, 0, sizeof(pi));
593 init_ref_bitmap(&pi.ref_bitmap);
594 pi.nr_bits = ref->nr;
595
596 /*
597 * "--not --all" to cut short the traversal if new refs
598 * connect to old refs. If not (e.g. force ref updates) it'll
599 * have to go down to the current shallow commits.
600 */
Michael Haggerty580b04e2015-05-25 18:39:06 +0000601 head_ref(mark_uninteresting, NULL);
602 for_each_ref(mark_uninteresting, NULL);
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700603
604 /* Mark potential bottoms so we won't go out of bound */
605 for (i = 0; i < nr_shallow; i++) {
brian m. carlsonee3051b2017-03-26 16:01:37 +0000606 struct commit *c = lookup_commit(oid[shallow[i]].hash);
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700607 c->object.flags |= BOTTOM;
608 }
609
610 for (i = 0; i < ref->nr; i++)
brian m. carlsonee3051b2017-03-26 16:01:37 +0000611 paint_down(&pi, ref->oid[i].hash, i);
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700612
613 if (used) {
614 int bitmap_size = ((pi.nr_bits + 31) / 32) * sizeof(uint32_t);
615 memset(used, 0, sizeof(*used) * info->shallow->nr);
616 for (i = 0; i < nr_shallow; i++) {
brian m. carlsonee3051b2017-03-26 16:01:37 +0000617 const struct commit *c = lookup_commit(oid[shallow[i]].hash);
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700618 uint32_t **map = ref_bitmap_at(&pi.ref_bitmap, c);
619 if (*map)
620 used[shallow[i]] = xmemdupz(*map, bitmap_size);
621 }
622 /*
623 * unreachable shallow commits are not removed from
624 * "ours" and "theirs". The user is supposed to run
625 * step 7 on every ref separately and not trust "ours"
626 * and "theirs" any more.
627 */
628 } else
629 post_assign_shallow(info, &pi.ref_bitmap, ref_status);
630
631 clear_ref_bitmap(&pi.ref_bitmap);
Nguyễn Thái Ngọc Duy0afd3072016-12-06 19:53:34 +0700632 for (i = 0; i < pi.pool_count; i++)
633 free(pi.pools[i]);
634 free(pi.pools);
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700635 free(shallow);
636}
637
638struct commit_array {
639 struct commit **commits;
640 int nr, alloc;
641};
642
Michael Haggerty580b04e2015-05-25 18:39:06 +0000643static int add_ref(const char *refname, const struct object_id *oid,
644 int flags, void *cb_data)
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700645{
646 struct commit_array *ca = cb_data;
647 ALLOC_GROW(ca->commits, ca->nr + 1, ca->alloc);
Michael Haggerty580b04e2015-05-25 18:39:06 +0000648 ca->commits[ca->nr] = lookup_commit_reference_gently(oid->hash, 1);
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700649 if (ca->commits[ca->nr])
650 ca->nr++;
651 return 0;
652}
653
654static void update_refstatus(int *ref_status, int nr, uint32_t *bitmap)
655{
Rasmus Villemoes1127b3c2016-12-06 19:53:38 +0700656 unsigned int i;
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700657 if (!ref_status)
658 return;
659 for (i = 0; i < nr; i++)
Rasmus Villemoes1127b3c2016-12-06 19:53:38 +0700660 if (bitmap[i / 32] & (1U << (i % 32)))
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700661 ref_status[i]++;
662}
663
664/*
665 * Step 7, reachability test on "ours" at commit level
666 */
667static void post_assign_shallow(struct shallow_info *info,
668 struct ref_bitmap *ref_bitmap,
669 int *ref_status)
670{
brian m. carlsonee3051b2017-03-26 16:01:37 +0000671 struct object_id *oid = info->shallow->oid;
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700672 struct commit *c;
673 uint32_t **bitmap;
674 int dst, i, j;
675 int bitmap_nr = (info->ref->nr + 31) / 32;
676 struct commit_array ca;
677
Karsten Blees6aa30852014-07-12 02:00:06 +0200678 trace_printf_key(&trace_shallow, "shallow: post_assign_shallow\n");
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700679 if (ref_status)
680 memset(ref_status, 0, sizeof(*ref_status) * info->ref->nr);
681
682 /* Remove unreachable shallow commits from "theirs" */
683 for (i = dst = 0; i < info->nr_theirs; i++) {
684 if (i != dst)
685 info->theirs[dst] = info->theirs[i];
brian m. carlsonee3051b2017-03-26 16:01:37 +0000686 c = lookup_commit(oid[info->theirs[i]].hash);
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700687 bitmap = ref_bitmap_at(ref_bitmap, c);
688 if (!*bitmap)
689 continue;
690 for (j = 0; j < bitmap_nr; j++)
691 if (bitmap[0][j]) {
692 update_refstatus(ref_status, info->ref->nr, *bitmap);
693 dst++;
694 break;
695 }
696 }
697 info->nr_theirs = dst;
698
699 memset(&ca, 0, sizeof(ca));
Michael Haggerty580b04e2015-05-25 18:39:06 +0000700 head_ref(add_ref, &ca);
701 for_each_ref(add_ref, &ca);
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700702
703 /* Remove unreachable shallow commits from "ours" */
704 for (i = dst = 0; i < info->nr_ours; i++) {
705 if (i != dst)
706 info->ours[dst] = info->ours[i];
brian m. carlsonee3051b2017-03-26 16:01:37 +0000707 c = lookup_commit(oid[info->ours[i]].hash);
Nguyễn Thái Ngọc Duy8e277382013-12-05 20:02:36 +0700708 bitmap = ref_bitmap_at(ref_bitmap, c);
709 if (!*bitmap)
710 continue;
711 for (j = 0; j < bitmap_nr; j++)
712 if (bitmap[0][j] &&
713 /* Step 7, reachability test at commit level */
714 !in_merge_bases_many(c, ca.nr, ca.commits)) {
715 update_refstatus(ref_status, info->ref->nr, *bitmap);
716 dst++;
717 break;
718 }
719 }
720 info->nr_ours = dst;
721
722 free(ca.commits);
723}
Nguyễn Thái Ngọc Duy0a1bc122013-12-05 20:02:47 +0700724
725/* (Delayed) step 7, reachability test at commit level */
726int delayed_reachability_test(struct shallow_info *si, int c)
727{
728 if (si->need_reachability_test[c]) {
brian m. carlsonee3051b2017-03-26 16:01:37 +0000729 struct commit *commit = lookup_commit(si->shallow->oid[c].hash);
Nguyễn Thái Ngọc Duy0a1bc122013-12-05 20:02:47 +0700730
731 if (!si->commits) {
732 struct commit_array ca;
Michael Haggerty2b2a5be2015-05-25 18:38:28 +0000733
Nguyễn Thái Ngọc Duy0a1bc122013-12-05 20:02:47 +0700734 memset(&ca, 0, sizeof(ca));
Michael Haggerty580b04e2015-05-25 18:39:06 +0000735 head_ref(add_ref, &ca);
736 for_each_ref(add_ref, &ca);
Nguyễn Thái Ngọc Duy0a1bc122013-12-05 20:02:47 +0700737 si->commits = ca.commits;
738 si->nr_commits = ca.nr;
739 }
740
741 si->reachable[c] = in_merge_bases_many(commit,
742 si->nr_commits,
743 si->commits);
744 si->need_reachability_test[c] = 0;
745 }
746 return si->reachable[c];
747}