]>
Commit | Line | Data |
---|---|---|
e724197f | 1 | |
752c0c24 | 2 | #include "cache.h" |
69aba532 | 3 | #include "repository.h" |
b2141fc1 | 4 | #include "config.h" |
851e18c3 | 5 | #include "submodule-config.h" |
752c0c24 JS |
6 | #include "submodule.h" |
7 | #include "dir.h" | |
8 | #include "diff.h" | |
9 | #include "commit.h" | |
10 | #include "revision.h" | |
ee6fc514 | 11 | #include "run-command.h" |
c7e1a736 | 12 | #include "diffcore.h" |
68d03e4a | 13 | #include "refs.h" |
aee9c7d6 | 14 | #include "string-list.h" |
fe299ec5 | 15 | #include "oid-array.h" |
dbbcd44f | 16 | #include "strvec.h" |
5fee9952 | 17 | #include "blob.h" |
fe85ee6e | 18 | #include "thread-utils.h" |
4638728c | 19 | #include "quote.h" |
06bf4ad1 | 20 | #include "remote.h" |
f6f85861 | 21 | #include "worktree.h" |
046b4823 | 22 | #include "parse-options.h" |
0d4a1321 | 23 | #include "object-store.h" |
64043556 | 24 | #include "commit-reach.h" |
aee9c7d6 | 25 | |
d7a3803f | 26 | static int config_update_recurse_submodules = RECURSE_SUBMODULES_OFF; |
6859de45 | 27 | static int initialized_fetch_ref_tips; |
910650d2 | 28 | static struct oid_array ref_tips_before_fetch; |
29 | static struct oid_array ref_tips_after_fetch; | |
6859de45 | 30 | |
d4e98b58 | 31 | /* |
34e2ba04 BW |
32 | * Check if the .gitmodules file is unmerged. Parsing of the .gitmodules file |
33 | * will be disabled because we can't guess what might be configured in | |
34 | * .gitmodules unless the user resolves the conflict. | |
d4e98b58 | 35 | */ |
847a9e5d | 36 | int is_gitmodules_unmerged(struct index_state *istate) |
34e2ba04 BW |
37 | { |
38 | int pos = index_name_pos(istate, GITMODULES_FILE, strlen(GITMODULES_FILE)); | |
39 | if (pos < 0) { /* .gitmodules not found or isn't merged */ | |
40 | pos = -1 - pos; | |
41 | if (istate->cache_nr > pos) { /* there is a .gitmodules */ | |
42 | const struct cache_entry *ce = istate->cache[pos]; | |
43 | if (ce_namelen(ce) == strlen(GITMODULES_FILE) && | |
44 | !strcmp(ce->name, GITMODULES_FILE)) | |
45 | return 1; | |
46 | } | |
47 | } | |
48 | ||
49 | return 0; | |
50 | } | |
752c0c24 | 51 | |
b5c259f2 AO |
52 | /* |
53 | * Check if the .gitmodules file is safe to write. | |
54 | * | |
55 | * Writing to the .gitmodules file requires that the file exists in the | |
56 | * working tree or, if it doesn't, that a brand new .gitmodules file is going | |
57 | * to be created (i.e. it's neither in the index nor in the current branch). | |
58 | * | |
59 | * It is not safe to write to .gitmodules if it's not in the working tree but | |
60 | * it is in the index or in the current branch, because writing new values | |
61 | * (and staging them) would blindly overwrite ALL the old content. | |
62 | */ | |
63 | int is_writing_gitmodules_ok(void) | |
64 | { | |
65 | struct object_id oid; | |
66 | return file_exists(GITMODULES_FILE) || | |
67 | (get_oid(GITMODULES_INDEX, &oid) < 0 && get_oid(GITMODULES_HEAD, &oid) < 0); | |
68 | } | |
69 | ||
5fee9952 | 70 | /* |
91b83480 BW |
71 | * Check if the .gitmodules file has unstaged modifications. This must be |
72 | * checked before allowing modifications to the .gitmodules file with the | |
73 | * intention to stage them later, because when continuing we would stage the | |
74 | * modifications the user didn't stage herself too. That might change in a | |
75 | * future version when we learn to stage the changes we do ourselves without | |
76 | * staging any previous modifications. | |
5fee9952 | 77 | */ |
7da9aba4 | 78 | int is_staging_gitmodules_ok(struct index_state *istate) |
5fee9952 | 79 | { |
91b83480 BW |
80 | int pos = index_name_pos(istate, GITMODULES_FILE, strlen(GITMODULES_FILE)); |
81 | ||
82 | if ((pos >= 0) && (pos < istate->cache_nr)) { | |
83 | struct stat st; | |
84 | if (lstat(GITMODULES_FILE, &st) == 0 && | |
7edee329 | 85 | ie_modified(istate, istate->cache[pos], &st, 0) & DATA_CHANGED) |
91b83480 BW |
86 | return 0; |
87 | } | |
88 | ||
89 | return 1; | |
5fee9952 JL |
90 | } |
91 | ||
2e2d4040 NTND |
92 | static int for_each_remote_ref_submodule(const char *submodule, |
93 | each_ref_fn fn, void *cb_data) | |
94 | { | |
95 | return refs_for_each_remote_ref(get_submodule_ref_store(submodule), | |
96 | fn, cb_data); | |
97 | } | |
98 | ||
0656781f JL |
99 | /* |
100 | * Try to update the "path" entry in the "submodule.<name>" section of the | |
101 | * .gitmodules file. Return 0 only if a .gitmodules file was found, a section | |
102 | * with the correct path=<oldpath> setting was found and we could update it. | |
103 | */ | |
104 | int update_path_in_gitmodules(const char *oldpath, const char *newpath) | |
105 | { | |
106 | struct strbuf entry = STRBUF_INIT; | |
851e18c3 | 107 | const struct submodule *submodule; |
45f5ef3d | 108 | int ret; |
0656781f | 109 | |
4c0eeafe | 110 | if (!file_exists(GITMODULES_FILE)) /* Do nothing without .gitmodules */ |
0656781f JL |
111 | return -1; |
112 | ||
68f08b4b | 113 | if (is_gitmodules_unmerged(the_repository->index)) |
0656781f JL |
114 | die(_("Cannot change unmerged .gitmodules, resolve merge conflicts first")); |
115 | ||
14228447 | 116 | submodule = submodule_from_path(the_repository, null_oid(), oldpath); |
851e18c3 | 117 | if (!submodule || !submodule->name) { |
0656781f JL |
118 | warning(_("Could not find section in .gitmodules where path=%s"), oldpath); |
119 | return -1; | |
120 | } | |
121 | strbuf_addstr(&entry, "submodule."); | |
851e18c3 | 122 | strbuf_addstr(&entry, submodule->name); |
0656781f | 123 | strbuf_addstr(&entry, ".path"); |
45f5ef3d | 124 | ret = config_set_in_gitmodules_file_gently(entry.buf, newpath); |
0656781f | 125 | strbuf_release(&entry); |
45f5ef3d | 126 | return ret; |
0656781f JL |
127 | } |
128 | ||
95c16418 JL |
129 | /* |
130 | * Try to remove the "submodule.<name>" section from .gitmodules where the given | |
131 | * path is configured. Return 0 only if a .gitmodules file was found, a section | |
132 | * with the correct path=<path> setting was found and we could remove it. | |
133 | */ | |
134 | int remove_path_from_gitmodules(const char *path) | |
135 | { | |
136 | struct strbuf sect = STRBUF_INIT; | |
851e18c3 | 137 | const struct submodule *submodule; |
95c16418 | 138 | |
4c0eeafe | 139 | if (!file_exists(GITMODULES_FILE)) /* Do nothing without .gitmodules */ |
95c16418 JL |
140 | return -1; |
141 | ||
68f08b4b | 142 | if (is_gitmodules_unmerged(the_repository->index)) |
95c16418 JL |
143 | die(_("Cannot change unmerged .gitmodules, resolve merge conflicts first")); |
144 | ||
14228447 | 145 | submodule = submodule_from_path(the_repository, null_oid(), path); |
851e18c3 | 146 | if (!submodule || !submodule->name) { |
95c16418 JL |
147 | warning(_("Could not find section in .gitmodules where path=%s"), path); |
148 | return -1; | |
149 | } | |
150 | strbuf_addstr(§, "submodule."); | |
851e18c3 | 151 | strbuf_addstr(§, submodule->name); |
4c0eeafe | 152 | if (git_config_rename_section_in_file(GITMODULES_FILE, sect.buf, NULL) < 0) { |
95c16418 JL |
153 | /* Maybe the user already did that, don't error out here */ |
154 | warning(_("Could not remove .gitmodules entry for %s"), path); | |
155 | strbuf_release(§); | |
156 | return -1; | |
157 | } | |
158 | strbuf_release(§); | |
159 | return 0; | |
160 | } | |
161 | ||
3b8317a9 | 162 | void stage_updated_gitmodules(struct index_state *istate) |
5fee9952 | 163 | { |
3b8317a9 | 164 | if (add_file_to_index(istate, GITMODULES_FILE, 0)) |
5fee9952 JL |
165 | die(_("staging updated .gitmodules failed")); |
166 | } | |
167 | ||
18cfc088 SB |
168 | /* TODO: remove this function, use repo_submodule_init instead. */ |
169 | int add_submodule_odb(const char *path) | |
752c0c24 JS |
170 | { |
171 | struct strbuf objects_directory = STRBUF_INIT; | |
de7a7960 | 172 | int ret = 0; |
752c0c24 | 173 | |
99b43a61 JK |
174 | ret = strbuf_git_path_submodule(&objects_directory, path, "objects/"); |
175 | if (ret) | |
176 | goto done; | |
de7a7960 JL |
177 | if (!is_directory(objects_directory.buf)) { |
178 | ret = -1; | |
179 | goto done; | |
180 | } | |
a5b34d21 | 181 | add_to_alternates_memory(objects_directory.buf); |
de7a7960 JL |
182 | done: |
183 | strbuf_release(&objects_directory); | |
184 | return ret; | |
752c0c24 JS |
185 | } |
186 | ||
aee9c7d6 JL |
187 | void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt, |
188 | const char *path) | |
189 | { | |
3b8fb393 | 190 | const struct submodule *submodule = submodule_from_path(the_repository, |
14228447 | 191 | null_oid(), |
192 | path); | |
851e18c3 | 193 | if (submodule) { |
fdfa9e97 BW |
194 | const char *ignore; |
195 | char *key; | |
aee9c7d6 | 196 | |
fdfa9e97 | 197 | key = xstrfmt("submodule.%s.ignore", submodule->name); |
f1de981e | 198 | if (repo_config_get_string_tmp(the_repository, key, &ignore)) |
fdfa9e97 BW |
199 | ignore = submodule->ignore; |
200 | free(key); | |
302ad7a9 | 201 | |
fdfa9e97 BW |
202 | if (ignore) |
203 | handle_ignore_submodules_arg(diffopt, ignore); | |
68f08b4b | 204 | else if (is_gitmodules_unmerged(the_repository->index)) |
0d1e0e78 | 205 | diffopt->flags.ignore_submodules = 1; |
046b4823 SB |
206 | } |
207 | } | |
208 | ||
209 | /* Cheap function that only determines if we're interested in submodules at all */ | |
210 | int git_default_submodule_config(const char *var, const char *value, void *cb) | |
211 | { | |
212 | if (!strcmp(var, "submodule.recurse")) { | |
213 | int v = git_config_bool(var, value) ? | |
214 | RECURSE_SUBMODULES_ON : RECURSE_SUBMODULES_OFF; | |
215 | config_update_recurse_submodules = v; | |
216 | } | |
217 | return 0; | |
1d789d08 SB |
218 | } |
219 | ||
d7a3803f SB |
220 | int option_parse_recurse_submodules_worktree_updater(const struct option *opt, |
221 | const char *arg, int unset) | |
222 | { | |
223 | if (unset) { | |
224 | config_update_recurse_submodules = RECURSE_SUBMODULES_OFF; | |
225 | return 0; | |
226 | } | |
227 | if (arg) | |
228 | config_update_recurse_submodules = | |
229 | parse_update_recurse_submodules_arg(opt->long_name, | |
230 | arg); | |
231 | else | |
232 | config_update_recurse_submodules = RECURSE_SUBMODULES_ON; | |
233 | ||
234 | return 0; | |
235 | } | |
236 | ||
f9f42560 BW |
237 | /* |
238 | * Determine if a submodule has been initialized at a given 'path' | |
239 | */ | |
627d9342 | 240 | int is_submodule_active(struct repository *repo, const char *path) |
f9f42560 BW |
241 | { |
242 | int ret = 0; | |
a086f921 BW |
243 | char *key = NULL; |
244 | char *value = NULL; | |
245 | const struct string_list *sl; | |
627d9342 BW |
246 | const struct submodule *module; |
247 | ||
14228447 | 248 | module = submodule_from_path(repo, null_oid(), path); |
f9f42560 | 249 | |
a086f921 BW |
250 | /* early return if there isn't a path->module mapping */ |
251 | if (!module) | |
252 | return 0; | |
f9f42560 | 253 | |
a086f921 BW |
254 | /* submodule.<name>.active is set */ |
255 | key = xstrfmt("submodule.%s.active", module->name); | |
627d9342 | 256 | if (!repo_config_get_bool(repo, key, &ret)) { |
a086f921 BW |
257 | free(key); |
258 | return ret; | |
259 | } | |
260 | free(key); | |
f9f42560 | 261 | |
a086f921 | 262 | /* submodule.active is set */ |
627d9342 | 263 | sl = repo_config_get_value_multi(repo, "submodule.active"); |
a086f921 BW |
264 | if (sl) { |
265 | struct pathspec ps; | |
c972bf4c | 266 | struct strvec args = STRVEC_INIT; |
a086f921 | 267 | const struct string_list_item *item; |
f9f42560 | 268 | |
a086f921 | 269 | for_each_string_list_item(item, sl) { |
c972bf4c | 270 | strvec_push(&args, item->string); |
a086f921 BW |
271 | } |
272 | ||
d70a9eb6 | 273 | parse_pathspec(&ps, 0, 0, NULL, args.v); |
68f08b4b | 274 | ret = match_pathspec(repo->index, &ps, path, strlen(path), 0, NULL, 1); |
a086f921 | 275 | |
c972bf4c | 276 | strvec_clear(&args); |
a086f921 BW |
277 | clear_pathspec(&ps); |
278 | return ret; | |
f9f42560 BW |
279 | } |
280 | ||
a086f921 BW |
281 | /* fallback to checking if the URL is set */ |
282 | key = xstrfmt("submodule.%s.url", module->name); | |
627d9342 | 283 | ret = !repo_config_get_string(repo, key, &value); |
a086f921 BW |
284 | |
285 | free(value); | |
286 | free(key); | |
f9f42560 BW |
287 | return ret; |
288 | } | |
289 | ||
15cdc647 | 290 | int is_submodule_populated_gently(const char *path, int *return_error_code) |
5688c28d BW |
291 | { |
292 | int ret = 0; | |
293 | char *gitdir = xstrfmt("%s/.git", path); | |
294 | ||
15cdc647 | 295 | if (resolve_gitdir_gently(gitdir, return_error_code)) |
5688c28d BW |
296 | ret = 1; |
297 | ||
298 | free(gitdir); | |
299 | return ret; | |
300 | } | |
301 | ||
bdab9721 BW |
302 | /* |
303 | * Dies if the provided 'prefix' corresponds to an unpopulated submodule | |
304 | */ | |
847a9e5d | 305 | void die_in_unpopulated_submodule(struct index_state *istate, |
bdab9721 BW |
306 | const char *prefix) |
307 | { | |
308 | int i, prefixlen; | |
309 | ||
310 | if (!prefix) | |
311 | return; | |
312 | ||
313 | prefixlen = strlen(prefix); | |
314 | ||
315 | for (i = 0; i < istate->cache_nr; i++) { | |
316 | struct cache_entry *ce = istate->cache[i]; | |
317 | int ce_len = ce_namelen(ce); | |
318 | ||
319 | if (!S_ISGITLINK(ce->ce_mode)) | |
320 | continue; | |
321 | if (prefixlen <= ce_len) | |
322 | continue; | |
323 | if (strncmp(ce->name, prefix, ce_len)) | |
324 | continue; | |
325 | if (prefix[ce_len] != '/') | |
326 | continue; | |
327 | ||
328 | die(_("in unpopulated submodule '%s'"), ce->name); | |
329 | } | |
330 | } | |
331 | ||
c08397e3 BW |
332 | /* |
333 | * Dies if any paths in the provided pathspec descends into a submodule | |
334 | */ | |
847a9e5d | 335 | void die_path_inside_submodule(struct index_state *istate, |
c08397e3 BW |
336 | const struct pathspec *ps) |
337 | { | |
338 | int i, j; | |
339 | ||
340 | for (i = 0; i < istate->cache_nr; i++) { | |
341 | struct cache_entry *ce = istate->cache[i]; | |
342 | int ce_len = ce_namelen(ce); | |
343 | ||
344 | if (!S_ISGITLINK(ce->ce_mode)) | |
345 | continue; | |
346 | ||
347 | for (j = 0; j < ps->nr ; j++) { | |
348 | const struct pathspec_item *item = &ps->items[j]; | |
349 | ||
350 | if (item->len <= ce_len) | |
351 | continue; | |
352 | if (item->match[ce_len] != '/') | |
353 | continue; | |
354 | if (strncmp(ce->name, item->match, ce_len)) | |
355 | continue; | |
356 | if (item->len == ce_len + 1) | |
357 | continue; | |
358 | ||
359 | die(_("Pathspec '%s' is in submodule '%.*s'"), | |
360 | item->original, ce_len, ce->name); | |
361 | } | |
362 | } | |
363 | } | |
364 | ||
ec6141a0 | 365 | enum submodule_update_type parse_submodule_update_type(const char *value) |
ea2fa5a3 | 366 | { |
ea2fa5a3 | 367 | if (!strcmp(value, "none")) |
ec6141a0 | 368 | return SM_UPDATE_NONE; |
ea2fa5a3 | 369 | else if (!strcmp(value, "checkout")) |
ec6141a0 | 370 | return SM_UPDATE_CHECKOUT; |
ea2fa5a3 | 371 | else if (!strcmp(value, "rebase")) |
ec6141a0 | 372 | return SM_UPDATE_REBASE; |
ea2fa5a3 | 373 | else if (!strcmp(value, "merge")) |
ec6141a0 BW |
374 | return SM_UPDATE_MERGE; |
375 | else if (*value == '!') | |
376 | return SM_UPDATE_COMMAND; | |
377 | else | |
378 | return SM_UPDATE_UNSPECIFIED; | |
379 | } | |
380 | ||
381 | int parse_submodule_update_strategy(const char *value, | |
382 | struct submodule_update_strategy *dst) | |
383 | { | |
384 | enum submodule_update_type type; | |
385 | ||
386 | free((void*)dst->command); | |
387 | dst->command = NULL; | |
388 | ||
389 | type = parse_submodule_update_type(value); | |
390 | if (type == SM_UPDATE_UNSPECIFIED) | |
ea2fa5a3 | 391 | return -1; |
ec6141a0 BW |
392 | |
393 | dst->type = type; | |
394 | if (type == SM_UPDATE_COMMAND) | |
395 | dst->command = xstrdup(value + 1); | |
396 | ||
ea2fa5a3 SB |
397 | return 0; |
398 | } | |
399 | ||
3604242f SB |
400 | const char *submodule_strategy_to_string(const struct submodule_update_strategy *s) |
401 | { | |
402 | struct strbuf sb = STRBUF_INIT; | |
403 | switch (s->type) { | |
404 | case SM_UPDATE_CHECKOUT: | |
405 | return "checkout"; | |
406 | case SM_UPDATE_MERGE: | |
407 | return "merge"; | |
408 | case SM_UPDATE_REBASE: | |
409 | return "rebase"; | |
410 | case SM_UPDATE_NONE: | |
411 | return "none"; | |
412 | case SM_UPDATE_UNSPECIFIED: | |
413 | return NULL; | |
414 | case SM_UPDATE_COMMAND: | |
415 | strbuf_addf(&sb, "!%s", s->command); | |
416 | return strbuf_detach(&sb, NULL); | |
417 | } | |
418 | return NULL; | |
419 | } | |
420 | ||
46a958b3 JL |
421 | void handle_ignore_submodules_arg(struct diff_options *diffopt, |
422 | const char *arg) | |
423 | { | |
8ef93124 | 424 | diffopt->flags.ignore_submodule_set = 1; |
0d1e0e78 BW |
425 | diffopt->flags.ignore_submodules = 0; |
426 | diffopt->flags.ignore_untracked_in_submodules = 0; | |
427 | diffopt->flags.ignore_dirty_submodules = 0; | |
be4f2b40 | 428 | |
46a958b3 | 429 | if (!strcmp(arg, "all")) |
0d1e0e78 | 430 | diffopt->flags.ignore_submodules = 1; |
46a958b3 | 431 | else if (!strcmp(arg, "untracked")) |
0d1e0e78 | 432 | diffopt->flags.ignore_untracked_in_submodules = 1; |
46a958b3 | 433 | else if (!strcmp(arg, "dirty")) |
0d1e0e78 | 434 | diffopt->flags.ignore_dirty_submodules = 1; |
aee9c7d6 | 435 | else if (strcmp(arg, "none")) |
a4ffbbbb | 436 | die(_("bad --ignore-submodules argument: %s"), arg); |
5a59a230 NTND |
437 | /* |
438 | * Please update _git_status() in git-completion.bash when you | |
439 | * add new options | |
440 | */ | |
46a958b3 JL |
441 | } |
442 | ||
4831c23f JH |
443 | static int prepare_submodule_diff_summary(struct repository *r, struct rev_info *rev, |
444 | const char *path, | |
445 | struct commit *left, struct commit *right, | |
446 | struct commit_list *merge_bases) | |
808a95dc | 447 | { |
8e6df650 | 448 | struct commit_list *list; |
808a95dc | 449 | |
85a1ec2c | 450 | repo_init_revisions(r, rev, NULL); |
808a95dc JN |
451 | setup_revisions(0, NULL, rev, NULL); |
452 | rev->left_right = 1; | |
453 | rev->first_parent_only = 1; | |
454 | left->object.flags |= SYMMETRIC_LEFT; | |
455 | add_pending_object(rev, &left->object, path); | |
456 | add_pending_object(rev, &right->object, path); | |
808a95dc JN |
457 | for (list = merge_bases; list; list = list->next) { |
458 | list->item->object.flags |= UNINTERESTING; | |
459 | add_pending_object(rev, &list->item->object, | |
f2fd0760 | 460 | oid_to_hex(&list->item->object.oid)); |
808a95dc JN |
461 | } |
462 | return prepare_revision_walk(rev); | |
463 | } | |
464 | ||
180b154b | 465 | static void print_submodule_diff_summary(struct repository *r, struct rev_info *rev, struct diff_options *o) |
808a95dc JN |
466 | { |
467 | static const char format[] = " %m %s"; | |
468 | struct strbuf sb = STRBUF_INIT; | |
469 | struct commit *commit; | |
470 | ||
471 | while ((commit = get_revision(rev))) { | |
472 | struct pretty_print_context ctx = {0}; | |
473 | ctx.date_mode = rev->date_mode; | |
ecaee805 | 474 | ctx.output_encoding = get_log_output_encoding(); |
808a95dc | 475 | strbuf_setlen(&sb, 0); |
605f0ec1 SB |
476 | repo_format_commit_message(r, commit, format, &sb, |
477 | &ctx); | |
808a95dc | 478 | strbuf_addch(&sb, '\n'); |
f3597138 SB |
479 | if (commit->object.flags & SYMMETRIC_LEFT) |
480 | diff_emit_submodule_del(o, sb.buf); | |
481 | else | |
482 | diff_emit_submodule_add(o, sb.buf); | |
808a95dc JN |
483 | } |
484 | strbuf_release(&sb); | |
485 | } | |
486 | ||
c972bf4c | 487 | static void prepare_submodule_repo_env_no_git_dir(struct strvec *out) |
6cd5757c SB |
488 | { |
489 | const char * const *var; | |
490 | ||
491 | for (var = local_repo_env; *var; var++) { | |
492 | if (strcmp(*var, CONFIG_DATA_ENVIRONMENT)) | |
c972bf4c | 493 | strvec_push(out, *var); |
6cd5757c SB |
494 | } |
495 | } | |
496 | ||
c972bf4c | 497 | void prepare_submodule_repo_env(struct strvec *out) |
6cd5757c SB |
498 | { |
499 | prepare_submodule_repo_env_no_git_dir(out); | |
c972bf4c | 500 | strvec_pushf(out, "%s=%s", GIT_DIR_ENVIRONMENT, |
f6d8942b | 501 | DEFAULT_GIT_DIR_ENVIRONMENT); |
6cd5757c SB |
502 | } |
503 | ||
c972bf4c | 504 | static void prepare_submodule_repo_env_in_gitdir(struct strvec *out) |
a62387b3 SB |
505 | { |
506 | prepare_submodule_repo_env_no_git_dir(out); | |
c972bf4c | 507 | strvec_pushf(out, "%s=.", GIT_DIR_ENVIRONMENT); |
a62387b3 SB |
508 | } |
509 | ||
605f0ec1 SB |
510 | /* |
511 | * Initialize a repository struct for a submodule based on the provided 'path'. | |
512 | * | |
513 | * Unlike repo_submodule_init, this tolerates submodules not present | |
514 | * in .gitmodules. This function exists only to preserve historical behavior, | |
515 | * | |
516 | * Returns the repository struct on success, | |
517 | * NULL when the submodule is not present. | |
8e6df650 | 518 | */ |
605f0ec1 SB |
519 | static struct repository *open_submodule(const char *path) |
520 | { | |
521 | struct strbuf sb = STRBUF_INIT; | |
522 | struct repository *out = xmalloc(sizeof(*out)); | |
523 | ||
524 | if (submodule_to_gitdir(&sb, path) || repo_init(out, sb.buf, NULL)) { | |
525 | strbuf_release(&sb); | |
526 | free(out); | |
527 | return NULL; | |
528 | } | |
529 | ||
530 | /* Mark it as a submodule */ | |
531 | out->submodule_prefix = xstrdup(path); | |
532 | ||
533 | strbuf_release(&sb); | |
534 | return out; | |
535 | } | |
536 | ||
537 | /* | |
538 | * Helper function to display the submodule header line prior to the full | |
539 | * summary output. | |
540 | * | |
541 | * If it can locate the submodule git directory it will create a repository | |
542 | * handle for the submodule and lookup both the left and right commits and | |
543 | * put them into the left and right pointers. | |
8e6df650 | 544 | */ |
605f0ec1 SB |
545 | static void show_submodule_header(struct diff_options *o, |
546 | const char *path, | |
602a283a | 547 | struct object_id *one, struct object_id *two, |
f3597138 | 548 | unsigned dirty_submodule, |
605f0ec1 | 549 | struct repository *sub, |
8e6df650 JK |
550 | struct commit **left, struct commit **right, |
551 | struct commit_list **merge_bases) | |
752c0c24 | 552 | { |
752c0c24 JS |
553 | const char *message = NULL; |
554 | struct strbuf sb = STRBUF_INIT; | |
752c0c24 JS |
555 | int fast_forward = 0, fast_backward = 0; |
556 | ||
c7e1a736 | 557 | if (dirty_submodule & DIRTY_SUBMODULE_UNTRACKED) |
f3597138 SB |
558 | diff_emit_submodule_untracked(o, path); |
559 | ||
c7e1a736 | 560 | if (dirty_submodule & DIRTY_SUBMODULE_MODIFIED) |
f3597138 | 561 | diff_emit_submodule_modified(o, path); |
c7e1a736 | 562 | |
8e6df650 JK |
563 | if (is_null_oid(one)) |
564 | message = "(new submodule)"; | |
565 | else if (is_null_oid(two)) | |
566 | message = "(submodule deleted)"; | |
567 | ||
605f0ec1 | 568 | if (!sub) { |
8e6df650 | 569 | if (!message) |
2d94dd2f | 570 | message = "(commits not present)"; |
8e6df650 JK |
571 | goto output_header; |
572 | } | |
573 | ||
574 | /* | |
575 | * Attempt to lookup the commit references, and determine if this is | |
576 | * a fast forward or fast backwards update. | |
577 | */ | |
605f0ec1 SB |
578 | *left = lookup_commit_reference(sub, one); |
579 | *right = lookup_commit_reference(sub, two); | |
8e6df650 JK |
580 | |
581 | /* | |
582 | * Warn about missing commits in the submodule project, but only if | |
583 | * they aren't null. | |
584 | */ | |
585 | if ((!is_null_oid(one) && !*left) || | |
586 | (!is_null_oid(two) && !*right)) | |
587 | message = "(commits not present)"; | |
588 | ||
605f0ec1 | 589 | *merge_bases = repo_get_merge_bases(sub, *left, *right); |
8e6df650 JK |
590 | if (*merge_bases) { |
591 | if ((*merge_bases)->item == *left) | |
592 | fast_forward = 1; | |
593 | else if ((*merge_bases)->item == *right) | |
594 | fast_backward = 1; | |
595 | } | |
596 | ||
4a7e27e9 | 597 | if (oideq(one, two)) { |
c7e1a736 JL |
598 | strbuf_release(&sb); |
599 | return; | |
600 | } | |
601 | ||
8e6df650 | 602 | output_header: |
f3597138 | 603 | strbuf_addf(&sb, "Submodule %s ", path); |
30e677e0 | 604 | strbuf_add_unique_abbrev(&sb, one, DEFAULT_ABBREV); |
a94bb683 | 605 | strbuf_addstr(&sb, (fast_backward || fast_forward) ? ".." : "..."); |
30e677e0 | 606 | strbuf_add_unique_abbrev(&sb, two, DEFAULT_ABBREV); |
752c0c24 | 607 | if (message) |
f3597138 | 608 | strbuf_addf(&sb, " %s\n", message); |
752c0c24 | 609 | else |
f3597138 SB |
610 | strbuf_addf(&sb, "%s:\n", fast_backward ? " (rewind)" : ""); |
611 | diff_emit_submodule_header(o, sb.buf); | |
752c0c24 | 612 | |
752c0c24 JS |
613 | strbuf_release(&sb); |
614 | } | |
ee6fc514 | 615 | |
180b154b | 616 | void show_submodule_diff_summary(struct diff_options *o, const char *path, |
8e6df650 | 617 | struct object_id *one, struct object_id *two, |
f3597138 | 618 | unsigned dirty_submodule) |
8e6df650 JK |
619 | { |
620 | struct rev_info rev; | |
621 | struct commit *left = NULL, *right = NULL; | |
622 | struct commit_list *merge_bases = NULL; | |
605f0ec1 | 623 | struct repository *sub; |
8e6df650 | 624 | |
605f0ec1 | 625 | sub = open_submodule(path); |
f3597138 | 626 | show_submodule_header(o, path, one, two, dirty_submodule, |
605f0ec1 | 627 | sub, &left, &right, &merge_bases); |
8e6df650 JK |
628 | |
629 | /* | |
630 | * If we don't have both a left and a right pointer, there is no | |
631 | * reason to try and display a summary. The header line should contain | |
632 | * all the information the user needs. | |
633 | */ | |
605f0ec1 | 634 | if (!left || !right || !sub) |
8e6df650 JK |
635 | goto out; |
636 | ||
637 | /* Treat revision walker failure the same as missing commits */ | |
4831c23f | 638 | if (prepare_submodule_diff_summary(sub, &rev, path, left, right, merge_bases)) { |
f3597138 | 639 | diff_emit_submodule_error(o, "(revision walker failed)\n"); |
8e6df650 JK |
640 | goto out; |
641 | } | |
642 | ||
180b154b | 643 | print_submodule_diff_summary(sub, &rev, o); |
8e6df650 JK |
644 | |
645 | out: | |
646 | if (merge_bases) | |
647 | free_commit_list(merge_bases); | |
648 | clear_commit_marks(left, ~0); | |
649 | clear_commit_marks(right, ~0); | |
605f0ec1 SB |
650 | if (sub) { |
651 | repo_clear(sub); | |
652 | free(sub); | |
653 | } | |
8e6df650 JK |
654 | } |
655 | ||
f3597138 | 656 | void show_submodule_inline_diff(struct diff_options *o, const char *path, |
fd47ae6a | 657 | struct object_id *one, struct object_id *two, |
f3597138 | 658 | unsigned dirty_submodule) |
fd47ae6a | 659 | { |
bc099914 | 660 | const struct object_id *old_oid = the_hash_algo->empty_tree, *new_oid = the_hash_algo->empty_tree; |
fd47ae6a JK |
661 | struct commit *left = NULL, *right = NULL; |
662 | struct commit_list *merge_bases = NULL; | |
fd47ae6a | 663 | struct child_process cp = CHILD_PROCESS_INIT; |
f3597138 | 664 | struct strbuf sb = STRBUF_INIT; |
605f0ec1 | 665 | struct repository *sub; |
fd47ae6a | 666 | |
605f0ec1 | 667 | sub = open_submodule(path); |
f3597138 | 668 | show_submodule_header(o, path, one, two, dirty_submodule, |
605f0ec1 | 669 | sub, &left, &right, &merge_bases); |
fd47ae6a JK |
670 | |
671 | /* We need a valid left and right commit to display a difference */ | |
672 | if (!(left || is_null_oid(one)) || | |
673 | !(right || is_null_oid(two))) | |
674 | goto done; | |
675 | ||
676 | if (left) | |
bc099914 | 677 | old_oid = one; |
fd47ae6a | 678 | if (right) |
bc099914 | 679 | new_oid = two; |
fd47ae6a | 680 | |
fd47ae6a JK |
681 | cp.git_cmd = 1; |
682 | cp.dir = path; | |
f3597138 | 683 | cp.out = -1; |
fd47ae6a JK |
684 | cp.no_stdin = 1; |
685 | ||
686 | /* TODO: other options may need to be passed here. */ | |
c972bf4c JK |
687 | strvec_pushl(&cp.args, "diff", "--submodule=diff", NULL); |
688 | strvec_pushf(&cp.args, "--color=%s", want_color(o->use_color) ? | |
f3597138 | 689 | "always" : "never"); |
5a522142 | 690 | |
0d1e0e78 | 691 | if (o->flags.reverse_diff) { |
c972bf4c | 692 | strvec_pushf(&cp.args, "--src-prefix=%s%s/", |
f6d8942b | 693 | o->b_prefix, path); |
c972bf4c | 694 | strvec_pushf(&cp.args, "--dst-prefix=%s%s/", |
f6d8942b | 695 | o->a_prefix, path); |
fd47ae6a | 696 | } else { |
c972bf4c | 697 | strvec_pushf(&cp.args, "--src-prefix=%s%s/", |
f6d8942b | 698 | o->a_prefix, path); |
c972bf4c | 699 | strvec_pushf(&cp.args, "--dst-prefix=%s%s/", |
f6d8942b | 700 | o->b_prefix, path); |
fd47ae6a | 701 | } |
c972bf4c | 702 | strvec_push(&cp.args, oid_to_hex(old_oid)); |
fd47ae6a JK |
703 | /* |
704 | * If the submodule has modified content, we will diff against the | |
705 | * work tree, under the assumption that the user has asked for the | |
706 | * diff format and wishes to actually see all differences even if they | |
707 | * haven't yet been committed to the submodule yet. | |
708 | */ | |
709 | if (!(dirty_submodule & DIRTY_SUBMODULE_MODIFIED)) | |
c972bf4c | 710 | strvec_push(&cp.args, oid_to_hex(new_oid)); |
fd47ae6a | 711 | |
17b254cd | 712 | prepare_submodule_repo_env(&cp.env_array); |
f3597138 SB |
713 | if (start_command(&cp)) |
714 | diff_emit_submodule_error(o, "(diff failed)\n"); | |
715 | ||
716 | while (strbuf_getwholeline_fd(&sb, cp.out, '\n') != EOF) | |
717 | diff_emit_submodule_pipethrough(o, sb.buf, sb.len); | |
718 | ||
719 | if (finish_command(&cp)) | |
720 | diff_emit_submodule_error(o, "(diff failed)\n"); | |
fd47ae6a JK |
721 | |
722 | done: | |
f3597138 | 723 | strbuf_release(&sb); |
fd47ae6a JK |
724 | if (merge_bases) |
725 | free_commit_list(merge_bases); | |
726 | if (left) | |
727 | clear_commit_marks(left, ~0); | |
728 | if (right) | |
729 | clear_commit_marks(right, ~0); | |
605f0ec1 SB |
730 | if (sub) { |
731 | repo_clear(sub); | |
732 | free(sub); | |
733 | } | |
fd47ae6a JK |
734 | } |
735 | ||
84f8925e SB |
736 | int should_update_submodules(void) |
737 | { | |
738 | return config_update_recurse_submodules == RECURSE_SUBMODULES_ON; | |
739 | } | |
740 | ||
741 | const struct submodule *submodule_from_ce(const struct cache_entry *ce) | |
742 | { | |
743 | if (!S_ISGITLINK(ce->ce_mode)) | |
744 | return NULL; | |
745 | ||
746 | if (!should_update_submodules()) | |
747 | return NULL; | |
748 | ||
14228447 | 749 | return submodule_from_path(the_repository, null_oid(), ce->name); |
84f8925e SB |
750 | } |
751 | ||
aacc5c1a | 752 | static struct oid_array *submodule_commits(struct string_list *submodules, |
c68f8375 | 753 | const char *name) |
aacc5c1a BW |
754 | { |
755 | struct string_list_item *item; | |
756 | ||
c68f8375 | 757 | item = string_list_insert(submodules, name); |
aacc5c1a BW |
758 | if (item->util) |
759 | return (struct oid_array *) item->util; | |
760 | ||
761 | /* NEEDSWORK: should we have oid_array_init()? */ | |
762 | item->util = xcalloc(1, sizeof(struct oid_array)); | |
763 | return (struct oid_array *) item->util; | |
764 | } | |
765 | ||
c68f8375 | 766 | struct collect_changed_submodules_cb_data { |
6245b98b | 767 | struct repository *repo; |
c68f8375 HV |
768 | struct string_list *changed; |
769 | const struct object_id *commit_oid; | |
770 | }; | |
771 | ||
772 | /* | |
773 | * this would normally be two functions: default_name_from_path() and | |
774 | * path_from_default_name(). Since the default name is the same as | |
775 | * the submodule path we can get away with just one function which only | |
776 | * checks whether there is a submodule in the working directory at that | |
777 | * location. | |
778 | */ | |
779 | static const char *default_name_or_path(const char *path_or_name) | |
780 | { | |
781 | int error_code; | |
782 | ||
783 | if (!is_submodule_populated_gently(path_or_name, &error_code)) | |
784 | return NULL; | |
785 | ||
786 | return path_or_name; | |
787 | } | |
788 | ||
aacc5c1a BW |
789 | static void collect_changed_submodules_cb(struct diff_queue_struct *q, |
790 | struct diff_options *options, | |
791 | void *data) | |
792 | { | |
c68f8375 HV |
793 | struct collect_changed_submodules_cb_data *me = data; |
794 | struct string_list *changed = me->changed; | |
795 | const struct object_id *commit_oid = me->commit_oid; | |
aacc5c1a | 796 | int i; |
aacc5c1a BW |
797 | |
798 | for (i = 0; i < q->nr; i++) { | |
799 | struct diff_filepair *p = q->queue[i]; | |
800 | struct oid_array *commits; | |
c68f8375 HV |
801 | const struct submodule *submodule; |
802 | const char *name; | |
803 | ||
aacc5c1a BW |
804 | if (!S_ISGITLINK(p->two->mode)) |
805 | continue; | |
806 | ||
6245b98b | 807 | submodule = submodule_from_path(me->repo, |
3b8fb393 | 808 | commit_oid, p->two->path); |
c68f8375 HV |
809 | if (submodule) |
810 | name = submodule->name; | |
811 | else { | |
812 | name = default_name_or_path(p->two->path); | |
813 | /* make sure name does not collide with existing one */ | |
5fc84755 | 814 | if (name) |
6245b98b | 815 | submodule = submodule_from_name(me->repo, |
5fc84755 | 816 | commit_oid, name); |
c68f8375 | 817 | if (submodule) { |
a4ffbbbb | 818 | warning(_("Submodule in commit %s at path: " |
c68f8375 | 819 | "'%s' collides with a submodule named " |
a4ffbbbb | 820 | "the same. Skipping it."), |
5fc84755 | 821 | oid_to_hex(commit_oid), p->two->path); |
c68f8375 HV |
822 | name = NULL; |
823 | } | |
aacc5c1a | 824 | } |
c68f8375 HV |
825 | |
826 | if (!name) | |
827 | continue; | |
828 | ||
829 | commits = submodule_commits(changed, name); | |
830 | oid_array_append(commits, &p->two->oid); | |
aacc5c1a BW |
831 | } |
832 | } | |
833 | ||
834 | /* | |
835 | * Collect the paths of submodules in 'changed' which have changed based on | |
836 | * the revisions as specified in 'argv'. Each entry in 'changed' will also | |
837 | * have a corresponding 'struct oid_array' (in the 'util' field) which lists | |
838 | * what the submodule pointers were updated to during the change. | |
839 | */ | |
6245b98b | 840 | static void collect_changed_submodules(struct repository *r, |
174d131f | 841 | struct string_list *changed, |
c972bf4c | 842 | struct strvec *argv) |
aacc5c1a BW |
843 | { |
844 | struct rev_info rev; | |
845 | const struct commit *commit; | |
a462bee5 OS |
846 | int save_warning; |
847 | struct setup_revision_opt s_r_opt = { | |
848 | .assume_dashdash = 1, | |
849 | }; | |
aacc5c1a | 850 | |
a462bee5 OS |
851 | save_warning = warn_on_object_refname_ambiguity; |
852 | warn_on_object_refname_ambiguity = 0; | |
6245b98b | 853 | repo_init_revisions(r, &rev, NULL); |
a462bee5 OS |
854 | setup_revisions(argv->nr, argv->v, &rev, &s_r_opt); |
855 | warn_on_object_refname_ambiguity = save_warning; | |
aacc5c1a | 856 | if (prepare_revision_walk(&rev)) |
a4ffbbbb | 857 | die(_("revision walk setup failed")); |
aacc5c1a BW |
858 | |
859 | while ((commit = get_revision(&rev))) { | |
860 | struct rev_info diff_rev; | |
c68f8375 | 861 | struct collect_changed_submodules_cb_data data; |
6245b98b | 862 | data.repo = r; |
c68f8375 HV |
863 | data.changed = changed; |
864 | data.commit_oid = &commit->object.oid; | |
aacc5c1a | 865 | |
6245b98b | 866 | repo_init_revisions(r, &diff_rev, NULL); |
aacc5c1a BW |
867 | diff_rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK; |
868 | diff_rev.diffopt.format_callback = collect_changed_submodules_cb; | |
c68f8375 | 869 | diff_rev.diffopt.format_callback_data = &data; |
d01141de SO |
870 | diff_rev.dense_combined_merges = 1; |
871 | diff_tree_combined_merge(commit, &diff_rev); | |
aacc5c1a BW |
872 | } |
873 | ||
874 | reset_revision_walk(); | |
875 | } | |
876 | ||
877 | static void free_submodules_oids(struct string_list *submodules) | |
878 | { | |
879 | struct string_list_item *item; | |
880 | for_each_string_list_item(item, submodules) | |
881 | oid_array_clear((struct oid_array *) item->util); | |
882 | string_list_clear(submodules, 1); | |
883 | } | |
884 | ||
7290ef58 MH |
885 | static int has_remote(const char *refname, const struct object_id *oid, |
886 | int flags, void *cb_data) | |
d2b17b32 FG |
887 | { |
888 | return 1; | |
889 | } | |
890 | ||
1b7ba794 | 891 | static int append_oid_to_argv(const struct object_id *oid, void *data) |
d2b17b32 | 892 | { |
c972bf4c JK |
893 | struct strvec *argv = data; |
894 | strvec_push(argv, oid_to_hex(oid)); | |
9cfa1c26 HV |
895 | return 0; |
896 | } | |
897 | ||
3c96aa97 | 898 | struct has_commit_data { |
6245b98b | 899 | struct repository *repo; |
3c96aa97 SB |
900 | int result; |
901 | const char *path; | |
902 | }; | |
903 | ||
1b7ba794 | 904 | static int check_has_commit(const struct object_id *oid, void *data) |
d2b17b32 | 905 | { |
3c96aa97 | 906 | struct has_commit_data *cb = data; |
5b6607d2 | 907 | |
6245b98b | 908 | enum object_type type = oid_object_info(cb->repo, oid, NULL); |
5b6607d2 | 909 | |
3c96aa97 SB |
910 | switch (type) { |
911 | case OBJ_COMMIT: | |
912 | return 0; | |
913 | case OBJ_BAD: | |
914 | /* | |
915 | * Object is missing or invalid. If invalid, an error message | |
916 | * has already been printed. | |
917 | */ | |
918 | cb->result = 0; | |
919 | return 0; | |
920 | default: | |
921 | die(_("submodule entry '%s' (%s) is a %s, not a commit"), | |
debca9d2 | 922 | cb->path, oid_to_hex(oid), type_name(type)); |
3c96aa97 | 923 | } |
5b6607d2 HV |
924 | } |
925 | ||
6245b98b NTND |
926 | static int submodule_has_commits(struct repository *r, |
927 | const char *path, | |
928 | struct oid_array *commits) | |
5b6607d2 | 929 | { |
6245b98b | 930 | struct has_commit_data has_commit = { r, 1, path }; |
5b6607d2 | 931 | |
7c8d2b00 | 932 | /* |
64127575 | 933 | * Perform a cheap, but incorrect check for the existence of 'commits'. |
7c8d2b00 | 934 | * This is done by adding the submodule's object store to the in-core |
64127575 | 935 | * object store, and then querying for each commit's existence. If we |
7c8d2b00 BW |
936 | * do not have the commit object anywhere, there is no chance we have |
937 | * it in the object store of the correct submodule and have it | |
938 | * reachable from a ref, so we can fail early without spawning rev-list | |
939 | * which is expensive. | |
940 | */ | |
5b6607d2 HV |
941 | if (add_submodule_odb(path)) |
942 | return 0; | |
943 | ||
910650d2 | 944 | oid_array_for_each_unique(commits, check_has_commit, &has_commit); |
7c8d2b00 | 945 | |
3c96aa97 | 946 | if (has_commit.result) { |
7c8d2b00 BW |
947 | /* |
948 | * Even if the submodule is checked out and the commit is | |
949 | * present, make sure it exists in the submodule's object store | |
950 | * and that it is reachable from a ref. | |
951 | */ | |
952 | struct child_process cp = CHILD_PROCESS_INIT; | |
953 | struct strbuf out = STRBUF_INIT; | |
954 | ||
c972bf4c | 955 | strvec_pushl(&cp.args, "rev-list", "-n", "1", NULL); |
7c8d2b00 | 956 | oid_array_for_each_unique(commits, append_oid_to_argv, &cp.args); |
c972bf4c | 957 | strvec_pushl(&cp.args, "--not", "--all", NULL); |
7c8d2b00 BW |
958 | |
959 | prepare_submodule_repo_env(&cp.env_array); | |
960 | cp.git_cmd = 1; | |
961 | cp.no_stdin = 1; | |
962 | cp.dir = path; | |
963 | ||
964 | if (capture_command(&cp, &out, GIT_MAX_HEXSZ + 1) || out.len) | |
3c96aa97 | 965 | has_commit.result = 0; |
7c8d2b00 BW |
966 | |
967 | strbuf_release(&out); | |
968 | } | |
969 | ||
3c96aa97 | 970 | return has_commit.result; |
5b6607d2 HV |
971 | } |
972 | ||
6245b98b NTND |
973 | static int submodule_needs_pushing(struct repository *r, |
974 | const char *path, | |
975 | struct oid_array *commits) | |
5b6607d2 | 976 | { |
6245b98b | 977 | if (!submodule_has_commits(r, path, commits)) |
250ab24a HV |
978 | /* |
979 | * NOTE: We do consider it safe to return "no" here. The | |
980 | * correct answer would be "We do not know" instead of | |
981 | * "No push needed", but it is quite hard to change | |
982 | * the submodule pointer without having the submodule | |
983 | * around. If a user did however change the submodules | |
984 | * without having the submodule around, this indicates | |
985 | * an expert who knows what they are doing or a | |
986 | * maintainer integrating work from other people. In | |
987 | * both cases it should be safe to skip this check. | |
988 | */ | |
d2b17b32 FG |
989 | return 0; |
990 | ||
991 | if (for_each_remote_ref_submodule(path, has_remote, NULL) > 0) { | |
d3180279 | 992 | struct child_process cp = CHILD_PROCESS_INIT; |
d2b17b32 FG |
993 | struct strbuf buf = STRBUF_INIT; |
994 | int needs_pushing = 0; | |
995 | ||
c972bf4c | 996 | strvec_push(&cp.args, "rev-list"); |
910650d2 | 997 | oid_array_for_each_unique(commits, append_oid_to_argv, &cp.args); |
c972bf4c | 998 | strvec_pushl(&cp.args, "--not", "--remotes", "-n", "1" , NULL); |
5b6607d2 | 999 | |
c12e8656 | 1000 | prepare_submodule_repo_env(&cp.env_array); |
d2b17b32 FG |
1001 | cp.git_cmd = 1; |
1002 | cp.no_stdin = 1; | |
1003 | cp.out = -1; | |
1004 | cp.dir = path; | |
1005 | if (start_command(&cp)) | |
a4ffbbbb | 1006 | die(_("Could not run 'git rev-list <commits> --not --remotes -n 1' command in submodule %s"), |
5b6607d2 | 1007 | path); |
db1ba2a2 | 1008 | if (strbuf_read(&buf, cp.out, the_hash_algo->hexsz + 1)) |
d2b17b32 FG |
1009 | needs_pushing = 1; |
1010 | finish_command(&cp); | |
1011 | close(cp.out); | |
1012 | strbuf_release(&buf); | |
1013 | return needs_pushing; | |
1014 | } | |
1015 | ||
1016 | return 0; | |
1017 | } | |
1018 | ||
6245b98b | 1019 | int find_unpushed_submodules(struct repository *r, |
174d131f NTND |
1020 | struct oid_array *commits, |
1021 | const char *remotes_name, | |
1022 | struct string_list *needs_pushing) | |
d2b17b32 | 1023 | { |
14739447 | 1024 | struct string_list submodules = STRING_LIST_INIT_DUP; |
c68f8375 | 1025 | struct string_list_item *name; |
c972bf4c | 1026 | struct strvec argv = STRVEC_INIT; |
a762e51e | 1027 | |
d70a9eb6 | 1028 | /* argv.v[0] will be ignored by setup_revisions */ |
c972bf4c | 1029 | strvec_push(&argv, "find_unpushed_submodules"); |
910650d2 | 1030 | oid_array_for_each_unique(commits, append_oid_to_argv, &argv); |
c972bf4c JK |
1031 | strvec_push(&argv, "--not"); |
1032 | strvec_pushf(&argv, "--remotes=%s", remotes_name); | |
9cfa1c26 | 1033 | |
6245b98b | 1034 | collect_changed_submodules(r, &submodules, &argv); |
d2b17b32 | 1035 | |
c68f8375 HV |
1036 | for_each_string_list_item(name, &submodules) { |
1037 | struct oid_array *commits = name->util; | |
1038 | const struct submodule *submodule; | |
1039 | const char *path = NULL; | |
1040 | ||
14228447 | 1041 | submodule = submodule_from_name(r, null_oid(), name->string); |
c68f8375 HV |
1042 | if (submodule) |
1043 | path = submodule->path; | |
1044 | else | |
1045 | path = default_name_or_path(name->string); | |
1046 | ||
1047 | if (!path) | |
1048 | continue; | |
5b6607d2 | 1049 | |
6245b98b | 1050 | if (submodule_needs_pushing(r, path, commits)) |
aacc5c1a | 1051 | string_list_insert(needs_pushing, path); |
14739447 | 1052 | } |
610b2337 BW |
1053 | |
1054 | free_submodules_oids(&submodules); | |
c972bf4c | 1055 | strvec_clear(&argv); |
d2b17b32 | 1056 | |
a762e51e | 1057 | return needs_pushing->nr; |
d2b17b32 FG |
1058 | } |
1059 | ||
2a90556d | 1060 | static int push_submodule(const char *path, |
06bf4ad1 | 1061 | const struct remote *remote, |
60fba4bf | 1062 | const struct refspec *rs, |
2a90556d BW |
1063 | const struct string_list *push_options, |
1064 | int dry_run) | |
eb21c732 | 1065 | { |
eb21c732 | 1066 | if (for_each_remote_ref_submodule(path, has_remote, NULL) > 0) { |
d3180279 | 1067 | struct child_process cp = CHILD_PROCESS_INIT; |
c972bf4c | 1068 | strvec_push(&cp.args, "push"); |
0301c821 | 1069 | if (dry_run) |
c972bf4c | 1070 | strvec_push(&cp.args, "--dry-run"); |
eb21c732 | 1071 | |
2a90556d BW |
1072 | if (push_options && push_options->nr) { |
1073 | const struct string_list_item *item; | |
1074 | for_each_string_list_item(item, push_options) | |
c972bf4c | 1075 | strvec_pushf(&cp.args, "--push-option=%s", |
f6d8942b | 1076 | item->string); |
2a90556d | 1077 | } |
06bf4ad1 BW |
1078 | |
1079 | if (remote->origin != REMOTE_UNCONFIGURED) { | |
1080 | int i; | |
c972bf4c | 1081 | strvec_push(&cp.args, remote->name); |
60fba4bf | 1082 | for (i = 0; i < rs->raw_nr; i++) |
c972bf4c | 1083 | strvec_push(&cp.args, rs->raw[i]); |
06bf4ad1 BW |
1084 | } |
1085 | ||
c12e8656 | 1086 | prepare_submodule_repo_env(&cp.env_array); |
eb21c732 HV |
1087 | cp.git_cmd = 1; |
1088 | cp.no_stdin = 1; | |
1089 | cp.dir = path; | |
1090 | if (run_command(&cp)) | |
1091 | return 0; | |
1092 | close(cp.out); | |
1093 | } | |
1094 | ||
1095 | return 1; | |
1096 | } | |
1097 | ||
06bf4ad1 BW |
1098 | /* |
1099 | * Perform a check in the submodule to see if the remote and refspec work. | |
1100 | * Die if the submodule can't be pushed. | |
1101 | */ | |
c7be7201 BW |
1102 | static void submodule_push_check(const char *path, const char *head, |
1103 | const struct remote *remote, | |
60fba4bf | 1104 | const struct refspec *rs) |
06bf4ad1 BW |
1105 | { |
1106 | struct child_process cp = CHILD_PROCESS_INIT; | |
1107 | int i; | |
1108 | ||
c972bf4c JK |
1109 | strvec_push(&cp.args, "submodule--helper"); |
1110 | strvec_push(&cp.args, "push-check"); | |
1111 | strvec_push(&cp.args, head); | |
1112 | strvec_push(&cp.args, remote->name); | |
06bf4ad1 | 1113 | |
60fba4bf | 1114 | for (i = 0; i < rs->raw_nr; i++) |
c972bf4c | 1115 | strvec_push(&cp.args, rs->raw[i]); |
06bf4ad1 BW |
1116 | |
1117 | prepare_submodule_repo_env(&cp.env_array); | |
1118 | cp.git_cmd = 1; | |
1119 | cp.no_stdin = 1; | |
1120 | cp.no_stdout = 1; | |
1121 | cp.dir = path; | |
1122 | ||
1123 | /* | |
1124 | * Simply indicate if 'submodule--helper push-check' failed. | |
1125 | * More detailed error information will be provided by the | |
1126 | * child process. | |
1127 | */ | |
1128 | if (run_command(&cp)) | |
a4ffbbbb | 1129 | die(_("process for submodule '%s' failed"), path); |
06bf4ad1 BW |
1130 | } |
1131 | ||
6245b98b | 1132 | int push_unpushed_submodules(struct repository *r, |
174d131f | 1133 | struct oid_array *commits, |
06bf4ad1 | 1134 | const struct remote *remote, |
60fba4bf | 1135 | const struct refspec *rs, |
2a90556d | 1136 | const struct string_list *push_options, |
0301c821 | 1137 | int dry_run) |
eb21c732 HV |
1138 | { |
1139 | int i, ret = 1; | |
f93d7c6f | 1140 | struct string_list needs_pushing = STRING_LIST_INIT_DUP; |
eb21c732 | 1141 | |
6245b98b | 1142 | if (!find_unpushed_submodules(r, commits, |
174d131f | 1143 | remote->name, &needs_pushing)) |
eb21c732 HV |
1144 | return 1; |
1145 | ||
06bf4ad1 BW |
1146 | /* |
1147 | * Verify that the remote and refspec can be propagated to all | |
1148 | * submodules. This check can be skipped if the remote and refspec | |
1149 | * won't be propagated due to the remote being unconfigured (e.g. a URL | |
1150 | * instead of a remote name). | |
1151 | */ | |
c7be7201 BW |
1152 | if (remote->origin != REMOTE_UNCONFIGURED) { |
1153 | char *head; | |
1154 | struct object_id head_oid; | |
1155 | ||
0f2dc722 | 1156 | head = resolve_refdup("HEAD", 0, &head_oid, NULL); |
c7be7201 BW |
1157 | if (!head) |
1158 | die(_("Failed to resolve HEAD as a valid ref.")); | |
1159 | ||
06bf4ad1 BW |
1160 | for (i = 0; i < needs_pushing.nr; i++) |
1161 | submodule_push_check(needs_pushing.items[i].string, | |
60fba4bf | 1162 | head, remote, rs); |
c7be7201 BW |
1163 | free(head); |
1164 | } | |
06bf4ad1 BW |
1165 | |
1166 | /* Actually push the submodules */ | |
eb21c732 HV |
1167 | for (i = 0; i < needs_pushing.nr; i++) { |
1168 | const char *path = needs_pushing.items[i].string; | |
a4ffbbbb | 1169 | fprintf(stderr, _("Pushing submodule '%s'\n"), path); |
60fba4bf | 1170 | if (!push_submodule(path, remote, rs, |
06bf4ad1 | 1171 | push_options, dry_run)) { |
a4ffbbbb | 1172 | fprintf(stderr, _("Unable to push submodule '%s'\n"), path); |
eb21c732 HV |
1173 | ret = 0; |
1174 | } | |
1175 | } | |
1176 | ||
1177 | string_list_clear(&needs_pushing, 0); | |
1178 | ||
1179 | return ret; | |
1180 | } | |
1181 | ||
419fd786 BW |
1182 | static int append_oid_to_array(const char *ref, const struct object_id *oid, |
1183 | int flags, void *data) | |
6859de45 | 1184 | { |
419fd786 BW |
1185 | struct oid_array *array = data; |
1186 | oid_array_append(array, oid); | |
6859de45 JK |
1187 | return 0; |
1188 | } | |
1189 | ||
2eb80bcd | 1190 | void check_for_new_submodule_commits(struct object_id *oid) |
6859de45 JK |
1191 | { |
1192 | if (!initialized_fetch_ref_tips) { | |
419fd786 | 1193 | for_each_ref(append_oid_to_array, &ref_tips_before_fetch); |
6859de45 JK |
1194 | initialized_fetch_ref_tips = 1; |
1195 | } | |
1196 | ||
910650d2 | 1197 | oid_array_append(&ref_tips_after_fetch, oid); |
6859de45 JK |
1198 | } |
1199 | ||
16dd6fe1 SB |
1200 | static void calculate_changed_submodule_paths(struct repository *r, |
1201 | struct string_list *changed_submodule_names) | |
88a21979 | 1202 | { |
c972bf4c | 1203 | struct strvec argv = STRVEC_INIT; |
bcd73372 | 1204 | struct string_list_item *name; |
88a21979 | 1205 | |
18322bad | 1206 | /* No need to check if there are no submodules configured */ |
6245b98b | 1207 | if (!submodule_from_path(r, NULL, NULL)) |
18322bad JL |
1208 | return; |
1209 | ||
c972bf4c | 1210 | strvec_push(&argv, "--"); /* argv[0] program name */ |
910650d2 | 1211 | oid_array_for_each_unique(&ref_tips_after_fetch, |
d1a8460c | 1212 | append_oid_to_argv, &argv); |
c972bf4c | 1213 | strvec_push(&argv, "--not"); |
910650d2 | 1214 | oid_array_for_each_unique(&ref_tips_before_fetch, |
d1a8460c | 1215 | append_oid_to_argv, &argv); |
88a21979 JL |
1216 | |
1217 | /* | |
1218 | * Collect all submodules (whether checked out or not) for which new | |
c68f8375 | 1219 | * commits have been recorded upstream in "changed_submodule_names". |
88a21979 | 1220 | */ |
bcd73372 | 1221 | collect_changed_submodules(r, changed_submodule_names, &argv); |
aacc5c1a | 1222 | |
bcd73372 | 1223 | for_each_string_list_item(name, changed_submodule_names) { |
c68f8375 HV |
1224 | struct oid_array *commits = name->util; |
1225 | const struct submodule *submodule; | |
1226 | const char *path = NULL; | |
1227 | ||
14228447 | 1228 | submodule = submodule_from_name(r, null_oid(), name->string); |
c68f8375 HV |
1229 | if (submodule) |
1230 | path = submodule->path; | |
1231 | else | |
1232 | path = default_name_or_path(name->string); | |
1233 | ||
1234 | if (!path) | |
1235 | continue; | |
aacc5c1a | 1236 | |
bcd73372 SB |
1237 | if (submodule_has_commits(r, path, commits)) { |
1238 | oid_array_clear(commits); | |
1239 | *name->string = '\0'; | |
1240 | } | |
88a21979 | 1241 | } |
6859de45 | 1242 | |
bcd73372 SB |
1243 | string_list_remove_empty_items(changed_submodule_names, 1); |
1244 | ||
c972bf4c | 1245 | strvec_clear(&argv); |
910650d2 | 1246 | oid_array_clear(&ref_tips_before_fetch); |
1247 | oid_array_clear(&ref_tips_after_fetch); | |
6859de45 | 1248 | initialized_fetch_ref_tips = 0; |
88a21979 JL |
1249 | } |
1250 | ||
6245b98b | 1251 | int submodule_touches_in_range(struct repository *r, |
174d131f | 1252 | struct object_id *excl_oid, |
a6d7eb2c SB |
1253 | struct object_id *incl_oid) |
1254 | { | |
1255 | struct string_list subs = STRING_LIST_INIT_DUP; | |
c972bf4c | 1256 | struct strvec args = STRVEC_INIT; |
a6d7eb2c SB |
1257 | int ret; |
1258 | ||
a6d7eb2c | 1259 | /* No need to check if there are no submodules configured */ |
6245b98b | 1260 | if (!submodule_from_path(r, NULL, NULL)) |
a6d7eb2c SB |
1261 | return 0; |
1262 | ||
c972bf4c JK |
1263 | strvec_push(&args, "--"); /* args[0] program name */ |
1264 | strvec_push(&args, oid_to_hex(incl_oid)); | |
4d36f88b | 1265 | if (!is_null_oid(excl_oid)) { |
c972bf4c JK |
1266 | strvec_push(&args, "--not"); |
1267 | strvec_push(&args, oid_to_hex(excl_oid)); | |
4d36f88b | 1268 | } |
a6d7eb2c | 1269 | |
6245b98b | 1270 | collect_changed_submodules(r, &subs, &args); |
a6d7eb2c SB |
1271 | ret = subs.nr; |
1272 | ||
c972bf4c | 1273 | strvec_clear(&args); |
a6d7eb2c SB |
1274 | |
1275 | free_submodules_oids(&subs); | |
1276 | return ret; | |
1277 | } | |
1278 | ||
fe85ee6e SB |
1279 | struct submodule_parallel_fetch { |
1280 | int count; | |
c972bf4c | 1281 | struct strvec args; |
e724197f | 1282 | struct repository *r; |
fe85ee6e SB |
1283 | const char *prefix; |
1284 | int command_line_option; | |
8fa29159 | 1285 | int default_option; |
fe85ee6e SB |
1286 | int quiet; |
1287 | int result; | |
16dd6fe1 SB |
1288 | |
1289 | struct string_list changed_submodule_names; | |
be76c212 SB |
1290 | |
1291 | /* Pending fetches by OIDs */ | |
1292 | struct fetch_task **oid_fetch_tasks; | |
1293 | int oid_fetch_tasks_nr, oid_fetch_tasks_alloc; | |
02225408 ES |
1294 | |
1295 | struct strbuf submodules_with_errors; | |
fe85ee6e | 1296 | }; |
c972bf4c | 1297 | #define SPF_INIT {0, STRVEC_INIT, NULL, NULL, 0, 0, 0, 0, \ |
be76c212 | 1298 | STRING_LIST_INIT_DUP, \ |
02225408 | 1299 | NULL, 0, 0, STRBUF_INIT} |
fe85ee6e | 1300 | |
4b4acedd HV |
1301 | static int get_fetch_recurse_config(const struct submodule *submodule, |
1302 | struct submodule_parallel_fetch *spf) | |
1303 | { | |
1304 | if (spf->command_line_option != RECURSE_SUBMODULES_DEFAULT) | |
1305 | return spf->command_line_option; | |
1306 | ||
1307 | if (submodule) { | |
1308 | char *key; | |
1309 | const char *value; | |
1310 | ||
1311 | int fetch_recurse = submodule->fetch_recurse; | |
1312 | key = xstrfmt("submodule.%s.fetchRecurseSubmodules", submodule->name); | |
f1de981e | 1313 | if (!repo_config_get_string_tmp(spf->r, key, &value)) { |
4b4acedd HV |
1314 | fetch_recurse = parse_fetch_recurse_submodules_arg(key, value); |
1315 | } | |
1316 | free(key); | |
1317 | ||
1318 | if (fetch_recurse != RECURSE_SUBMODULES_NONE) | |
1319 | /* local config overrules everything except commandline */ | |
1320 | return fetch_recurse; | |
1321 | } | |
1322 | ||
1323 | return spf->default_option; | |
1324 | } | |
1325 | ||
be76c212 SB |
1326 | /* |
1327 | * Fetch in progress (if callback data) or | |
1328 | * pending (if in oid_fetch_tasks in struct submodule_parallel_fetch) | |
1329 | */ | |
1330 | struct fetch_task { | |
1331 | struct repository *repo; | |
1332 | const struct submodule *sub; | |
1333 | unsigned free_sub : 1; /* Do we need to free the submodule? */ | |
1334 | ||
1335 | struct oid_array *commits; /* Ensure these commits are fetched */ | |
1336 | }; | |
1337 | ||
1338 | /** | |
1339 | * When a submodule is not defined in .gitmodules, we cannot access it | |
1340 | * via the regular submodule-config. Create a fake submodule, which we can | |
1341 | * work on. | |
1342 | */ | |
1343 | static const struct submodule *get_non_gitmodules_submodule(const char *path) | |
1344 | { | |
1345 | struct submodule *ret = NULL; | |
1346 | const char *name = default_name_or_path(path); | |
1347 | ||
1348 | if (!name) | |
1349 | return NULL; | |
1350 | ||
1351 | ret = xmalloc(sizeof(*ret)); | |
1352 | memset(ret, 0, sizeof(*ret)); | |
1353 | ret->path = name; | |
1354 | ret->name = name; | |
1355 | ||
1356 | return (const struct submodule *) ret; | |
1357 | } | |
1358 | ||
1359 | static struct fetch_task *fetch_task_create(struct repository *r, | |
1360 | const char *path) | |
1361 | { | |
1362 | struct fetch_task *task = xmalloc(sizeof(*task)); | |
1363 | memset(task, 0, sizeof(*task)); | |
1364 | ||
14228447 | 1365 | task->sub = submodule_from_path(r, null_oid(), path); |
be76c212 SB |
1366 | if (!task->sub) { |
1367 | /* | |
1368 | * No entry in .gitmodules? Technically not a submodule, | |
1369 | * but historically we supported repositories that happen to be | |
1370 | * in-place where a gitlink is. Keep supporting them. | |
1371 | */ | |
1372 | task->sub = get_non_gitmodules_submodule(path); | |
1373 | if (!task->sub) { | |
1374 | free(task); | |
1375 | return NULL; | |
1376 | } | |
1377 | ||
1378 | task->free_sub = 1; | |
1379 | } | |
1380 | ||
1381 | return task; | |
1382 | } | |
1383 | ||
1384 | static void fetch_task_release(struct fetch_task *p) | |
1385 | { | |
1386 | if (p->free_sub) | |
1387 | free((void*)p->sub); | |
1388 | p->free_sub = 0; | |
1389 | p->sub = NULL; | |
1390 | ||
1391 | if (p->repo) | |
1392 | repo_clear(p->repo); | |
1393 | FREE_AND_NULL(p->repo); | |
1394 | } | |
1395 | ||
26f80ccf SB |
1396 | static struct repository *get_submodule_repo_for(struct repository *r, |
1397 | const struct submodule *sub) | |
1398 | { | |
1399 | struct repository *ret = xmalloc(sizeof(*ret)); | |
1400 | ||
1401 | if (repo_submodule_init(ret, r, sub)) { | |
1402 | /* | |
1403 | * No entry in .gitmodules? Technically not a submodule, | |
1404 | * but historically we supported repositories that happen to be | |
1405 | * in-place where a gitlink is. Keep supporting them. | |
1406 | */ | |
1407 | struct strbuf gitdir = STRBUF_INIT; | |
1408 | strbuf_repo_worktree_path(&gitdir, r, "%s/.git", sub->path); | |
1409 | if (repo_init(ret, gitdir.buf, NULL)) { | |
1410 | strbuf_release(&gitdir); | |
1411 | free(ret); | |
1412 | return NULL; | |
1413 | } | |
1414 | strbuf_release(&gitdir); | |
1415 | } | |
1416 | ||
1417 | return ret; | |
1418 | } | |
1419 | ||
fe85ee6e SB |
1420 | static int get_next_submodule(struct child_process *cp, |
1421 | struct strbuf *err, void *data, void **task_cb) | |
7dce19d3 | 1422 | { |
fe85ee6e | 1423 | struct submodule_parallel_fetch *spf = data; |
6859de45 | 1424 | |
e724197f | 1425 | for (; spf->count < spf->r->index->cache_nr; spf->count++) { |
e724197f | 1426 | const struct cache_entry *ce = spf->r->index->cache[spf->count]; |
26f80ccf | 1427 | const char *default_argv; |
be76c212 | 1428 | struct fetch_task *task; |
7dce19d3 JL |
1429 | |
1430 | if (!S_ISGITLINK(ce->ce_mode)) | |
1431 | continue; | |
1432 | ||
be76c212 SB |
1433 | task = fetch_task_create(spf->r, ce->name); |
1434 | if (!task) | |
1435 | continue; | |
492c6c46 | 1436 | |
be76c212 | 1437 | switch (get_fetch_recurse_config(task->sub, spf)) |
4b4acedd HV |
1438 | { |
1439 | default: | |
1440 | case RECURSE_SUBMODULES_DEFAULT: | |
1441 | case RECURSE_SUBMODULES_ON_DEMAND: | |
be76c212 | 1442 | if (!task->sub || |
08a297bd | 1443 | !string_list_lookup( |
16dd6fe1 | 1444 | &spf->changed_submodule_names, |
be76c212 | 1445 | task->sub->name)) |
8f0700dd JL |
1446 | continue; |
1447 | default_argv = "on-demand"; | |
4b4acedd HV |
1448 | break; |
1449 | case RECURSE_SUBMODULES_ON: | |
1450 | default_argv = "yes"; | |
1451 | break; | |
1452 | case RECURSE_SUBMODULES_OFF: | |
1453 | continue; | |
be254a0e JL |
1454 | } |
1455 | ||
be76c212 SB |
1456 | task->repo = get_submodule_repo_for(spf->r, task->sub); |
1457 | if (task->repo) { | |
1458 | struct strbuf submodule_prefix = STRBUF_INIT; | |
fe85ee6e | 1459 | child_process_init(cp); |
be76c212 | 1460 | cp->dir = task->repo->gitdir; |
a62387b3 | 1461 | prepare_submodule_repo_env_in_gitdir(&cp->env_array); |
fe85ee6e SB |
1462 | cp->git_cmd = 1; |
1463 | if (!spf->quiet) | |
a4ffbbbb | 1464 | strbuf_addf(err, _("Fetching submodule %s%s\n"), |
fe85ee6e | 1465 | spf->prefix, ce->name); |
c972bf4c | 1466 | strvec_init(&cp->args); |
d70a9eb6 | 1467 | strvec_pushv(&cp->args, spf->args.v); |
c972bf4c JK |
1468 | strvec_push(&cp->args, default_argv); |
1469 | strvec_push(&cp->args, "--submodule-prefix"); | |
be76c212 SB |
1470 | |
1471 | strbuf_addf(&submodule_prefix, "%s%s/", | |
1472 | spf->prefix, | |
1473 | task->sub->path); | |
c972bf4c | 1474 | strvec_push(&cp->args, submodule_prefix.buf); |
26f80ccf | 1475 | |
fe85ee6e | 1476 | spf->count++; |
be76c212 SB |
1477 | *task_cb = task; |
1478 | ||
1479 | strbuf_release(&submodule_prefix); | |
fe85ee6e | 1480 | return 1; |
26f80ccf | 1481 | } else { |
505a2765 | 1482 | struct strbuf empty_submodule_path = STRBUF_INIT; |
be76c212 SB |
1483 | |
1484 | fetch_task_release(task); | |
1485 | free(task); | |
1486 | ||
26f80ccf SB |
1487 | /* |
1488 | * An empty directory is normal, | |
1489 | * the submodule is not initialized | |
1490 | */ | |
505a2765 PK |
1491 | strbuf_addf(&empty_submodule_path, "%s/%s/", |
1492 | spf->r->worktree, | |
1493 | ce->name); | |
26f80ccf | 1494 | if (S_ISGITLINK(ce->ce_mode) && |
505a2765 | 1495 | !is_empty_dir(empty_submodule_path.buf)) { |
26f80ccf SB |
1496 | spf->result = 1; |
1497 | strbuf_addf(err, | |
303b3c1c | 1498 | _("Could not access submodule '%s'\n"), |
26f80ccf SB |
1499 | ce->name); |
1500 | } | |
505a2765 | 1501 | strbuf_release(&empty_submodule_path); |
fe85ee6e | 1502 | } |
7dce19d3 | 1503 | } |
be76c212 SB |
1504 | |
1505 | if (spf->oid_fetch_tasks_nr) { | |
1506 | struct fetch_task *task = | |
1507 | spf->oid_fetch_tasks[spf->oid_fetch_tasks_nr - 1]; | |
1508 | struct strbuf submodule_prefix = STRBUF_INIT; | |
1509 | spf->oid_fetch_tasks_nr--; | |
1510 | ||
1511 | strbuf_addf(&submodule_prefix, "%s%s/", | |
1512 | spf->prefix, task->sub->path); | |
1513 | ||
1514 | child_process_init(cp); | |
1515 | prepare_submodule_repo_env_in_gitdir(&cp->env_array); | |
1516 | cp->git_cmd = 1; | |
1517 | cp->dir = task->repo->gitdir; | |
1518 | ||
c972bf4c | 1519 | strvec_init(&cp->args); |
d70a9eb6 | 1520 | strvec_pushv(&cp->args, spf->args.v); |
c972bf4c JK |
1521 | strvec_push(&cp->args, "on-demand"); |
1522 | strvec_push(&cp->args, "--submodule-prefix"); | |
1523 | strvec_push(&cp->args, submodule_prefix.buf); | |
be76c212 SB |
1524 | |
1525 | /* NEEDSWORK: have get_default_remote from submodule--helper */ | |
c972bf4c | 1526 | strvec_push(&cp->args, "origin"); |
be76c212 SB |
1527 | oid_array_for_each_unique(task->commits, |
1528 | append_oid_to_argv, &cp->args); | |
1529 | ||
1530 | *task_cb = task; | |
7dce19d3 | 1531 | strbuf_release(&submodule_prefix); |
be76c212 | 1532 | return 1; |
7dce19d3 | 1533 | } |
be76c212 | 1534 | |
fe85ee6e SB |
1535 | return 0; |
1536 | } | |
1537 | ||
2a73b3da | 1538 | static int fetch_start_failure(struct strbuf *err, |
fe85ee6e SB |
1539 | void *cb, void *task_cb) |
1540 | { | |
1541 | struct submodule_parallel_fetch *spf = cb; | |
be76c212 | 1542 | struct fetch_task *task = task_cb; |
fe85ee6e SB |
1543 | |
1544 | spf->result = 1; | |
1545 | ||
be76c212 | 1546 | fetch_task_release(task); |
fe85ee6e SB |
1547 | return 0; |
1548 | } | |
1549 | ||
be76c212 SB |
1550 | static int commit_missing_in_sub(const struct object_id *oid, void *data) |
1551 | { | |
1552 | struct repository *subrepo = data; | |
1553 | ||
1554 | enum object_type type = oid_object_info(subrepo, oid, NULL); | |
1555 | ||
1556 | return type != OBJ_COMMIT; | |
1557 | } | |
1558 | ||
2a73b3da SB |
1559 | static int fetch_finish(int retvalue, struct strbuf *err, |
1560 | void *cb, void *task_cb) | |
fe85ee6e SB |
1561 | { |
1562 | struct submodule_parallel_fetch *spf = cb; | |
be76c212 SB |
1563 | struct fetch_task *task = task_cb; |
1564 | ||
1565 | struct string_list_item *it; | |
1566 | struct oid_array *commits; | |
fe85ee6e | 1567 | |
02225408 ES |
1568 | if (!task || !task->sub) |
1569 | BUG("callback cookie bogus"); | |
1570 | ||
1571 | if (retvalue) { | |
bd5e567d JT |
1572 | /* |
1573 | * NEEDSWORK: This indicates that the overall fetch | |
1574 | * failed, even though there may be a subsequent fetch | |
1575 | * by commit hash that might work. It may be a good | |
1576 | * idea to not indicate failure in this case, and only | |
1577 | * indicate failure if the subsequent fetch fails. | |
1578 | */ | |
fe85ee6e SB |
1579 | spf->result = 1; |
1580 | ||
02225408 ES |
1581 | strbuf_addf(&spf->submodules_with_errors, "\t%s\n", |
1582 | task->sub->name); | |
1583 | } | |
be76c212 SB |
1584 | |
1585 | /* Is this the second time we process this submodule? */ | |
1586 | if (task->commits) | |
1587 | goto out; | |
1588 | ||
1589 | it = string_list_lookup(&spf->changed_submodule_names, task->sub->name); | |
1590 | if (!it) | |
1591 | /* Could be an unchanged submodule, not contained in the list */ | |
1592 | goto out; | |
1593 | ||
1594 | commits = it->util; | |
1595 | oid_array_filter(commits, | |
1596 | commit_missing_in_sub, | |
1597 | task->repo); | |
1598 | ||
1599 | /* Are there commits we want, but do not exist? */ | |
1600 | if (commits->nr) { | |
1601 | task->commits = commits; | |
1602 | ALLOC_GROW(spf->oid_fetch_tasks, | |
1603 | spf->oid_fetch_tasks_nr + 1, | |
1604 | spf->oid_fetch_tasks_alloc); | |
1605 | spf->oid_fetch_tasks[spf->oid_fetch_tasks_nr] = task; | |
1606 | spf->oid_fetch_tasks_nr++; | |
1607 | return 0; | |
1608 | } | |
1609 | ||
1610 | out: | |
1611 | fetch_task_release(task); | |
1612 | ||
fe85ee6e SB |
1613 | return 0; |
1614 | } | |
1615 | ||
e724197f | 1616 | int fetch_populated_submodules(struct repository *r, |
c972bf4c | 1617 | const struct strvec *options, |
fe85ee6e | 1618 | const char *prefix, int command_line_option, |
8fa29159 | 1619 | int default_option, |
62104ba1 | 1620 | int quiet, int max_parallel_jobs) |
fe85ee6e SB |
1621 | { |
1622 | int i; | |
fe85ee6e SB |
1623 | struct submodule_parallel_fetch spf = SPF_INIT; |
1624 | ||
e724197f | 1625 | spf.r = r; |
fe85ee6e | 1626 | spf.command_line_option = command_line_option; |
8fa29159 | 1627 | spf.default_option = default_option; |
fe85ee6e SB |
1628 | spf.quiet = quiet; |
1629 | spf.prefix = prefix; | |
1630 | ||
e724197f | 1631 | if (!r->worktree) |
fe85ee6e SB |
1632 | goto out; |
1633 | ||
e724197f | 1634 | if (repo_read_index(r) < 0) |
a4ffbbbb | 1635 | die(_("index file corrupt")); |
fe85ee6e | 1636 | |
c972bf4c | 1637 | strvec_push(&spf.args, "fetch"); |
d70a9eb6 JK |
1638 | for (i = 0; i < options->nr; i++) |
1639 | strvec_push(&spf.args, options->v[i]); | |
c972bf4c | 1640 | strvec_push(&spf.args, "--recurse-submodules-default"); |
fe85ee6e SB |
1641 | /* default value, "--submodule-prefix" and its value are added later */ |
1642 | ||
16dd6fe1 SB |
1643 | calculate_changed_submodule_paths(r, &spf.changed_submodule_names); |
1644 | string_list_sort(&spf.changed_submodule_names); | |
ee4512ed JH |
1645 | run_processes_parallel_tr2(max_parallel_jobs, |
1646 | get_next_submodule, | |
1647 | fetch_start_failure, | |
1648 | fetch_finish, | |
1649 | &spf, | |
1650 | "submodule", "parallel/fetch"); | |
fe85ee6e | 1651 | |
02225408 ES |
1652 | if (spf.submodules_with_errors.len > 0) |
1653 | fprintf(stderr, _("Errors during submodule fetch:\n%s"), | |
1654 | spf.submodules_with_errors.buf); | |
1655 | ||
1656 | ||
c972bf4c | 1657 | strvec_clear(&spf.args); |
88a21979 | 1658 | out: |
bcd73372 | 1659 | free_submodules_oids(&spf.changed_submodule_names); |
fe85ee6e | 1660 | return spf.result; |
7dce19d3 JL |
1661 | } |
1662 | ||
3bfc4504 | 1663 | unsigned is_submodule_modified(const char *path, int ignore_untracked) |
ee6fc514 | 1664 | { |
d3180279 | 1665 | struct child_process cp = CHILD_PROCESS_INIT; |
ee6fc514 | 1666 | struct strbuf buf = STRBUF_INIT; |
af6865a7 | 1667 | FILE *fp; |
c7e1a736 | 1668 | unsigned dirty_submodule = 0; |
eee49b6c | 1669 | const char *git_dir; |
af6865a7 | 1670 | int ignore_cp_exit_code = 0; |
ee6fc514 | 1671 | |
eee49b6c | 1672 | strbuf_addf(&buf, "%s/.git", path); |
13d6ec91 | 1673 | git_dir = read_gitfile(buf.buf); |
eee49b6c JL |
1674 | if (!git_dir) |
1675 | git_dir = buf.buf; | |
5c896f7c SB |
1676 | if (!is_git_directory(git_dir)) { |
1677 | if (is_directory(git_dir)) | |
1678 | die(_("'%s' not recognized as a git repository"), git_dir); | |
ee6fc514 JL |
1679 | strbuf_release(&buf); |
1680 | /* The submodule is not checked out, so it is not modified */ | |
1681 | return 0; | |
ee6fc514 JL |
1682 | } |
1683 | strbuf_reset(&buf); | |
1684 | ||
c972bf4c | 1685 | strvec_pushl(&cp.args, "status", "--porcelain=2", NULL); |
3bfc4504 | 1686 | if (ignore_untracked) |
c972bf4c | 1687 | strvec_push(&cp.args, "-uno"); |
3bfc4504 | 1688 | |
c12e8656 | 1689 | prepare_submodule_repo_env(&cp.env_array); |
ee6fc514 JL |
1690 | cp.git_cmd = 1; |
1691 | cp.no_stdin = 1; | |
1692 | cp.out = -1; | |
eee49b6c | 1693 | cp.dir = path; |
ee6fc514 | 1694 | if (start_command(&cp)) |
a4ffbbbb | 1695 | die(_("Could not run 'git status --porcelain=2' in submodule %s"), path); |
ee6fc514 | 1696 | |
af6865a7 SB |
1697 | fp = xfdopen(cp.out, "r"); |
1698 | while (strbuf_getwholeline(&buf, fp, '\n') != EOF) { | |
fcecf0b9 SB |
1699 | /* regular untracked files */ |
1700 | if (buf.buf[0] == '?') | |
c7e1a736 | 1701 | dirty_submodule |= DIRTY_SUBMODULE_UNTRACKED; |
40069d6e SB |
1702 | |
1703 | if (buf.buf[0] == 'u' || | |
1704 | buf.buf[0] == '1' || | |
1705 | buf.buf[0] == '2') { | |
1706 | /* T = line type, XY = status, SSSS = submodule state */ | |
1707 | if (buf.len < strlen("T XY SSSS")) | |
033abf97 | 1708 | BUG("invalid status --porcelain=2 line %s", |
40069d6e SB |
1709 | buf.buf); |
1710 | ||
1711 | if (buf.buf[5] == 'S' && buf.buf[8] == 'U') | |
1712 | /* nested untracked file */ | |
1713 | dirty_submodule |= DIRTY_SUBMODULE_UNTRACKED; | |
1714 | ||
1715 | if (buf.buf[0] == 'u' || | |
1716 | buf.buf[0] == '2' || | |
1717 | memcmp(buf.buf + 5, "S..U", 4)) | |
1718 | /* other change */ | |
1719 | dirty_submodule |= DIRTY_SUBMODULE_MODIFIED; | |
c7e1a736 | 1720 | } |
64f9a946 SB |
1721 | |
1722 | if ((dirty_submodule & DIRTY_SUBMODULE_MODIFIED) && | |
1723 | ((dirty_submodule & DIRTY_SUBMODULE_UNTRACKED) || | |
af6865a7 SB |
1724 | ignore_untracked)) { |
1725 | /* | |
1726 | * We're not interested in any further information from | |
1727 | * the child any more, neither output nor its exit code. | |
1728 | */ | |
1729 | ignore_cp_exit_code = 1; | |
c7e1a736 | 1730 | break; |
af6865a7 | 1731 | } |
c7e1a736 | 1732 | } |
af6865a7 | 1733 | fclose(fp); |
ee6fc514 | 1734 | |
af6865a7 | 1735 | if (finish_command(&cp) && !ignore_cp_exit_code) |
a4ffbbbb | 1736 | die(_("'git status --porcelain=2' failed in submodule %s"), path); |
ee6fc514 | 1737 | |
ee6fc514 | 1738 | strbuf_release(&buf); |
c7e1a736 | 1739 | return dirty_submodule; |
ee6fc514 | 1740 | } |
68d03e4a | 1741 | |
293ab15e JL |
1742 | int submodule_uses_gitfile(const char *path) |
1743 | { | |
d3180279 | 1744 | struct child_process cp = CHILD_PROCESS_INIT; |
293ab15e JL |
1745 | struct strbuf buf = STRBUF_INIT; |
1746 | const char *git_dir; | |
1747 | ||
1748 | strbuf_addf(&buf, "%s/.git", path); | |
1749 | git_dir = read_gitfile(buf.buf); | |
1750 | if (!git_dir) { | |
1751 | strbuf_release(&buf); | |
1752 | return 0; | |
1753 | } | |
1754 | strbuf_release(&buf); | |
1755 | ||
1756 | /* Now test that all nested submodules use a gitfile too */ | |
afbdba39 JH |
1757 | strvec_pushl(&cp.args, |
1758 | "submodule", "foreach", "--quiet", "--recursive", | |
1759 | "test -f .git", NULL); | |
1760 | ||
c12e8656 | 1761 | prepare_submodule_repo_env(&cp.env_array); |
293ab15e JL |
1762 | cp.git_cmd = 1; |
1763 | cp.no_stdin = 1; | |
1764 | cp.no_stderr = 1; | |
1765 | cp.no_stdout = 1; | |
1766 | cp.dir = path; | |
1767 | if (run_command(&cp)) | |
1768 | return 0; | |
1769 | ||
1770 | return 1; | |
1771 | } | |
1772 | ||
83b76966 SB |
1773 | /* |
1774 | * Check if it is a bad idea to remove a submodule, i.e. if we'd lose data | |
1775 | * when doing so. | |
1776 | * | |
1777 | * Return 1 if we'd lose data, return 0 if the removal is fine, | |
1778 | * and negative values for errors. | |
1779 | */ | |
1780 | int bad_to_remove_submodule(const char *path, unsigned flags) | |
293ab15e | 1781 | { |
293ab15e | 1782 | ssize_t len; |
d3180279 | 1783 | struct child_process cp = CHILD_PROCESS_INIT; |
293ab15e | 1784 | struct strbuf buf = STRBUF_INIT; |
83b76966 | 1785 | int ret = 0; |
293ab15e | 1786 | |
dbe44faa | 1787 | if (!file_exists(path) || is_empty_dir(path)) |
83b76966 | 1788 | return 0; |
293ab15e JL |
1789 | |
1790 | if (!submodule_uses_gitfile(path)) | |
83b76966 | 1791 | return 1; |
293ab15e | 1792 | |
c972bf4c | 1793 | strvec_pushl(&cp.args, "status", "--porcelain", |
f6d8942b | 1794 | "--ignore-submodules=none", NULL); |
83b76966 SB |
1795 | |
1796 | if (flags & SUBMODULE_REMOVAL_IGNORE_UNTRACKED) | |
c972bf4c | 1797 | strvec_push(&cp.args, "-uno"); |
83b76966 | 1798 | else |
c972bf4c | 1799 | strvec_push(&cp.args, "-uall"); |
83b76966 SB |
1800 | |
1801 | if (!(flags & SUBMODULE_REMOVAL_IGNORE_IGNORED_UNTRACKED)) | |
c972bf4c | 1802 | strvec_push(&cp.args, "--ignored"); |
293ab15e | 1803 | |
c12e8656 | 1804 | prepare_submodule_repo_env(&cp.env_array); |
293ab15e JL |
1805 | cp.git_cmd = 1; |
1806 | cp.no_stdin = 1; | |
1807 | cp.out = -1; | |
1808 | cp.dir = path; | |
83b76966 SB |
1809 | if (start_command(&cp)) { |
1810 | if (flags & SUBMODULE_REMOVAL_DIE_ON_ERROR) | |
35ad44cb | 1811 | die(_("could not start 'git status' in submodule '%s'"), |
83b76966 SB |
1812 | path); |
1813 | ret = -1; | |
1814 | goto out; | |
1815 | } | |
293ab15e JL |
1816 | |
1817 | len = strbuf_read(&buf, cp.out, 1024); | |
1818 | if (len > 2) | |
83b76966 | 1819 | ret = 1; |
293ab15e JL |
1820 | close(cp.out); |
1821 | ||
83b76966 SB |
1822 | if (finish_command(&cp)) { |
1823 | if (flags & SUBMODULE_REMOVAL_DIE_ON_ERROR) | |
35ad44cb | 1824 | die(_("could not run 'git status' in submodule '%s'"), |
83b76966 SB |
1825 | path); |
1826 | ret = -1; | |
1827 | } | |
1828 | out: | |
293ab15e | 1829 | strbuf_release(&buf); |
83b76966 | 1830 | return ret; |
293ab15e JL |
1831 | } |
1832 | ||
898c2e65 SB |
1833 | void submodule_unset_core_worktree(const struct submodule *sub) |
1834 | { | |
1835 | char *config_path = xstrfmt("%s/modules/%s/config", | |
a9472afb | 1836 | get_git_dir(), sub->name); |
898c2e65 SB |
1837 | |
1838 | if (git_config_set_in_file_gently(config_path, "core.worktree", NULL)) | |
1839 | warning(_("Could not unset core.worktree setting in submodule '%s'"), | |
1840 | sub->path); | |
1841 | ||
1842 | free(config_path); | |
1843 | } | |
1844 | ||
202275b9 SB |
1845 | static const char *get_super_prefix_or_empty(void) |
1846 | { | |
1847 | const char *s = get_super_prefix(); | |
1848 | if (!s) | |
1849 | s = ""; | |
1850 | return s; | |
1851 | } | |
1852 | ||
6e3c1595 SB |
1853 | static int submodule_has_dirty_index(const struct submodule *sub) |
1854 | { | |
1855 | struct child_process cp = CHILD_PROCESS_INIT; | |
1856 | ||
da27bc81 | 1857 | prepare_submodule_repo_env(&cp.env_array); |
6e3c1595 SB |
1858 | |
1859 | cp.git_cmd = 1; | |
c972bf4c | 1860 | strvec_pushl(&cp.args, "diff-index", "--quiet", |
f6d8942b | 1861 | "--cached", "HEAD", NULL); |
6e3c1595 SB |
1862 | cp.no_stdin = 1; |
1863 | cp.no_stdout = 1; | |
1864 | cp.dir = sub->path; | |
1865 | if (start_command(&cp)) | |
a4ffbbbb | 1866 | die(_("could not recurse into submodule '%s'"), sub->path); |
6e3c1595 SB |
1867 | |
1868 | return finish_command(&cp); | |
1869 | } | |
1870 | ||
1871 | static void submodule_reset_index(const char *path) | |
1872 | { | |
1873 | struct child_process cp = CHILD_PROCESS_INIT; | |
da27bc81 | 1874 | prepare_submodule_repo_env(&cp.env_array); |
6e3c1595 SB |
1875 | |
1876 | cp.git_cmd = 1; | |
1877 | cp.no_stdin = 1; | |
1878 | cp.dir = path; | |
1879 | ||
c972bf4c | 1880 | strvec_pushf(&cp.args, "--super-prefix=%s%s/", |
f6d8942b | 1881 | get_super_prefix_or_empty(), path); |
c972bf4c | 1882 | strvec_pushl(&cp.args, "read-tree", "-u", "--reset", NULL); |
6e3c1595 | 1883 | |
c972bf4c | 1884 | strvec_push(&cp.args, empty_tree_oid_hex()); |
6e3c1595 SB |
1885 | |
1886 | if (run_command(&cp)) | |
a4ffbbbb | 1887 | die(_("could not reset submodule index")); |
6e3c1595 SB |
1888 | } |
1889 | ||
1890 | /** | |
1891 | * Moves a submodule at a given path from a given head to another new head. | |
1892 | * For edge cases (a submodule coming into existence or removing a submodule) | |
1893 | * pass NULL for old or new respectively. | |
1894 | */ | |
1895 | int submodule_move_head(const char *path, | |
bc099914 BW |
1896 | const char *old_head, |
1897 | const char *new_head, | |
6e3c1595 SB |
1898 | unsigned flags) |
1899 | { | |
1900 | int ret = 0; | |
1901 | struct child_process cp = CHILD_PROCESS_INIT; | |
1902 | const struct submodule *sub; | |
f2d48994 | 1903 | int *error_code_ptr, error_code; |
6e3c1595 | 1904 | |
627d9342 | 1905 | if (!is_submodule_active(the_repository, path)) |
823bab09 SB |
1906 | return 0; |
1907 | ||
f2d48994 SB |
1908 | if (flags & SUBMODULE_MOVE_HEAD_FORCE) |
1909 | /* | |
1910 | * Pass non NULL pointer to is_submodule_populated_gently | |
1911 | * to prevent die()-ing. We'll use connect_work_tree_and_git_dir | |
1912 | * to fixup the submodule in the force case later. | |
1913 | */ | |
1914 | error_code_ptr = &error_code; | |
1915 | else | |
1916 | error_code_ptr = NULL; | |
1917 | ||
bc099914 | 1918 | if (old_head && !is_submodule_populated_gently(path, error_code_ptr)) |
f2d48994 | 1919 | return 0; |
6e3c1595 | 1920 | |
14228447 | 1921 | sub = submodule_from_path(the_repository, null_oid(), path); |
6e3c1595 SB |
1922 | |
1923 | if (!sub) | |
033abf97 | 1924 | BUG("could not get submodule information for '%s'", path); |
6e3c1595 | 1925 | |
bc099914 | 1926 | if (old_head && !(flags & SUBMODULE_MOVE_HEAD_FORCE)) { |
6e3c1595 SB |
1927 | /* Check if the submodule has a dirty index. */ |
1928 | if (submodule_has_dirty_index(sub)) | |
1929 | return error(_("submodule '%s' has dirty index"), path); | |
1930 | } | |
1931 | ||
1932 | if (!(flags & SUBMODULE_MOVE_HEAD_DRY_RUN)) { | |
bc099914 | 1933 | if (old_head) { |
6e3c1595 | 1934 | if (!submodule_uses_gitfile(path)) |
cf7a901a | 1935 | absorb_git_dir_into_superproject(path, |
6e3c1595 SB |
1936 | ABSORB_GITDIR_RECURSE_SUBMODULES); |
1937 | } else { | |
f2d48994 | 1938 | char *gitdir = xstrfmt("%s/modules/%s", |
a9472afb | 1939 | get_git_dir(), sub->name); |
da62f786 | 1940 | connect_work_tree_and_git_dir(path, gitdir, 0); |
f2d48994 | 1941 | free(gitdir); |
6e3c1595 SB |
1942 | |
1943 | /* make sure the index is clean as well */ | |
1944 | submodule_reset_index(path); | |
1945 | } | |
f2d48994 | 1946 | |
bc099914 | 1947 | if (old_head && (flags & SUBMODULE_MOVE_HEAD_FORCE)) { |
f2d48994 | 1948 | char *gitdir = xstrfmt("%s/modules/%s", |
a9472afb | 1949 | get_git_dir(), sub->name); |
da62f786 | 1950 | connect_work_tree_and_git_dir(path, gitdir, 1); |
f2d48994 SB |
1951 | free(gitdir); |
1952 | } | |
6e3c1595 SB |
1953 | } |
1954 | ||
da27bc81 | 1955 | prepare_submodule_repo_env(&cp.env_array); |
6e3c1595 SB |
1956 | |
1957 | cp.git_cmd = 1; | |
1958 | cp.no_stdin = 1; | |
1959 | cp.dir = path; | |
1960 | ||
c972bf4c | 1961 | strvec_pushf(&cp.args, "--super-prefix=%s%s/", |
f6d8942b | 1962 | get_super_prefix_or_empty(), path); |
c972bf4c | 1963 | strvec_pushl(&cp.args, "read-tree", "--recurse-submodules", NULL); |
6e3c1595 SB |
1964 | |
1965 | if (flags & SUBMODULE_MOVE_HEAD_DRY_RUN) | |
c972bf4c | 1966 | strvec_push(&cp.args, "-n"); |
6e3c1595 | 1967 | else |
c972bf4c | 1968 | strvec_push(&cp.args, "-u"); |
6e3c1595 SB |
1969 | |
1970 | if (flags & SUBMODULE_MOVE_HEAD_FORCE) | |
c972bf4c | 1971 | strvec_push(&cp.args, "--reset"); |
6e3c1595 | 1972 | else |
c972bf4c | 1973 | strvec_push(&cp.args, "-m"); |
6e3c1595 | 1974 | |
7dcc1f4d | 1975 | if (!(flags & SUBMODULE_MOVE_HEAD_FORCE)) |
c972bf4c | 1976 | strvec_push(&cp.args, old_head ? old_head : empty_tree_oid_hex()); |
7dcc1f4d | 1977 | |
c972bf4c | 1978 | strvec_push(&cp.args, new_head ? new_head : empty_tree_oid_hex()); |
6e3c1595 SB |
1979 | |
1980 | if (run_command(&cp)) { | |
ba95d4e4 | 1981 | ret = error(_("Submodule '%s' could not be updated."), path); |
6e3c1595 SB |
1982 | goto out; |
1983 | } | |
1984 | ||
1985 | if (!(flags & SUBMODULE_MOVE_HEAD_DRY_RUN)) { | |
bc099914 | 1986 | if (new_head) { |
a17062cf | 1987 | child_process_init(&cp); |
6e3c1595 | 1988 | /* also set the HEAD accordingly */ |
a17062cf SB |
1989 | cp.git_cmd = 1; |
1990 | cp.no_stdin = 1; | |
1991 | cp.dir = path; | |
6e3c1595 | 1992 | |
218c8837 | 1993 | prepare_submodule_repo_env(&cp.env_array); |
c972bf4c | 1994 | strvec_pushl(&cp.args, "update-ref", "HEAD", |
f6d8942b | 1995 | "--no-deref", new_head, NULL); |
6e3c1595 | 1996 | |
a17062cf | 1997 | if (run_command(&cp)) { |
6e3c1595 SB |
1998 | ret = -1; |
1999 | goto out; | |
2000 | } | |
2001 | } else { | |
2002 | struct strbuf sb = STRBUF_INIT; | |
2003 | ||
2004 | strbuf_addf(&sb, "%s/.git", path); | |
2005 | unlink_or_warn(sb.buf); | |
2006 | strbuf_release(&sb); | |
2007 | ||
2008 | if (is_empty_dir(path)) | |
2009 | rmdir_or_warn(path); | |
898c2e65 SB |
2010 | |
2011 | submodule_unset_core_worktree(sub); | |
6e3c1595 SB |
2012 | } |
2013 | } | |
2014 | out: | |
2015 | return ret; | |
2016 | } | |
2017 | ||
a8dee3ca JS |
2018 | int validate_submodule_git_dir(char *git_dir, const char *submodule_name) |
2019 | { | |
2020 | size_t len = strlen(git_dir), suffix_len = strlen(submodule_name); | |
2021 | char *p; | |
2022 | int ret = 0; | |
2023 | ||
2024 | if (len <= suffix_len || (p = git_dir + len - suffix_len)[-1] != '/' || | |
2025 | strcmp(p, submodule_name)) | |
2026 | BUG("submodule name '%s' not a suffix of git dir '%s'", | |
2027 | submodule_name, git_dir); | |
2028 | ||
2029 | /* | |
2030 | * We prevent the contents of sibling submodules' git directories to | |
2031 | * clash. | |
2032 | * | |
2033 | * Example: having a submodule named `hippo` and another one named | |
2034 | * `hippo/hooks` would result in the git directories | |
2035 | * `.git/modules/hippo/` and `.git/modules/hippo/hooks/`, respectively, | |
2036 | * but the latter directory is already designated to contain the hooks | |
2037 | * of the former. | |
2038 | */ | |
2039 | for (; *p; p++) { | |
2040 | if (is_dir_sep(*p)) { | |
2041 | char c = *p; | |
2042 | ||
2043 | *p = '\0'; | |
2044 | if (is_git_directory(git_dir)) | |
2045 | ret = -1; | |
2046 | *p = c; | |
2047 | ||
2048 | if (ret < 0) | |
2049 | return error(_("submodule git dir '%s' is " | |
2050 | "inside git dir '%.*s'"), | |
2051 | git_dir, | |
2052 | (int)(p - git_dir), git_dir); | |
2053 | } | |
2054 | } | |
2055 | ||
2056 | return 0; | |
2057 | } | |
2058 | ||
f6f85861 SB |
2059 | /* |
2060 | * Embeds a single submodules git directory into the superprojects git dir, | |
2061 | * non recursively. | |
2062 | */ | |
cf7a901a | 2063 | static void relocate_single_git_dir_into_superproject(const char *path) |
f6f85861 SB |
2064 | { |
2065 | char *old_git_dir = NULL, *real_old_git_dir = NULL, *real_new_git_dir = NULL; | |
a8dee3ca | 2066 | char *new_git_dir; |
f6f85861 SB |
2067 | const struct submodule *sub; |
2068 | ||
2069 | if (submodule_uses_worktrees(path)) | |
2070 | die(_("relocate_gitdir for submodule '%s' with " | |
2071 | "more than one worktree not supported"), path); | |
2072 | ||
2073 | old_git_dir = xstrfmt("%s/.git", path); | |
2074 | if (read_gitfile(old_git_dir)) | |
2075 | /* If it is an actual gitfile, it doesn't need migration. */ | |
2076 | return; | |
2077 | ||
ce83eadd | 2078 | real_old_git_dir = real_pathdup(old_git_dir, 1); |
f6f85861 | 2079 | |
14228447 | 2080 | sub = submodule_from_path(the_repository, null_oid(), path); |
f6f85861 SB |
2081 | if (!sub) |
2082 | die(_("could not lookup name for submodule '%s'"), path); | |
2083 | ||
a8dee3ca JS |
2084 | new_git_dir = git_pathdup("modules/%s", sub->name); |
2085 | if (validate_submodule_git_dir(new_git_dir, sub->name) < 0) | |
2086 | die(_("refusing to move '%s' into an existing git dir"), | |
2087 | real_old_git_dir); | |
f6f85861 SB |
2088 | if (safe_create_leading_directories_const(new_git_dir) < 0) |
2089 | die(_("could not create directory '%s'"), new_git_dir); | |
ce83eadd | 2090 | real_new_git_dir = real_pathdup(new_git_dir, 1); |
a8dee3ca | 2091 | free(new_git_dir); |
f6f85861 | 2092 | |
f6f85861 | 2093 | fprintf(stderr, _("Migrating git directory of '%s%s' from\n'%s' to\n'%s'\n"), |
202275b9 | 2094 | get_super_prefix_or_empty(), path, |
f6f85861 SB |
2095 | real_old_git_dir, real_new_git_dir); |
2096 | ||
2097 | relocate_gitdir(path, real_old_git_dir, real_new_git_dir); | |
2098 | ||
2099 | free(old_git_dir); | |
2100 | free(real_old_git_dir); | |
2101 | free(real_new_git_dir); | |
2102 | } | |
2103 | ||
2104 | /* | |
2105 | * Migrate the git directory of the submodule given by path from | |
2106 | * having its git directory within the working tree to the git dir nested | |
2107 | * in its superprojects git dir under modules/. | |
2108 | */ | |
cf7a901a | 2109 | void absorb_git_dir_into_superproject(const char *path, |
f6f85861 SB |
2110 | unsigned flags) |
2111 | { | |
ec9629b3 SB |
2112 | int err_code; |
2113 | const char *sub_git_dir; | |
f6f85861 | 2114 | struct strbuf gitdir = STRBUF_INIT; |
f6f85861 | 2115 | strbuf_addf(&gitdir, "%s/.git", path); |
ec9629b3 | 2116 | sub_git_dir = resolve_gitdir_gently(gitdir.buf, &err_code); |
f6f85861 SB |
2117 | |
2118 | /* Not populated? */ | |
ec9629b3 | 2119 | if (!sub_git_dir) { |
ec9629b3 SB |
2120 | const struct submodule *sub; |
2121 | ||
2122 | if (err_code == READ_GITFILE_ERR_STAT_FAILED) { | |
2123 | /* unpopulated as expected */ | |
2124 | strbuf_release(&gitdir); | |
2125 | return; | |
2126 | } | |
2127 | ||
2128 | if (err_code != READ_GITFILE_ERR_NOT_A_REPO) | |
2129 | /* We don't know what broke here. */ | |
2130 | read_gitfile_error_die(err_code, path, NULL); | |
2131 | ||
2132 | /* | |
2133 | * Maybe populated, but no git directory was found? | |
2134 | * This can happen if the superproject is a submodule | |
2135 | * itself and was just absorbed. The absorption of the | |
2136 | * superproject did not rewrite the git file links yet, | |
2137 | * fix it now. | |
2138 | */ | |
14228447 | 2139 | sub = submodule_from_path(the_repository, null_oid(), path); |
ec9629b3 SB |
2140 | if (!sub) |
2141 | die(_("could not lookup name for submodule '%s'"), path); | |
365444a6 | 2142 | connect_work_tree_and_git_dir(path, |
da62f786 | 2143 | git_path("modules/%s", sub->name), 0); |
ec9629b3 SB |
2144 | } else { |
2145 | /* Is it already absorbed into the superprojects git dir? */ | |
ce83eadd JS |
2146 | char *real_sub_git_dir = real_pathdup(sub_git_dir, 1); |
2147 | char *real_common_git_dir = real_pathdup(get_git_common_dir(), 1); | |
f6f85861 | 2148 | |
ec9629b3 | 2149 | if (!starts_with(real_sub_git_dir, real_common_git_dir)) |
cf7a901a | 2150 | relocate_single_git_dir_into_superproject(path); |
ec9629b3 SB |
2151 | |
2152 | free(real_sub_git_dir); | |
2153 | free(real_common_git_dir); | |
2154 | } | |
2155 | strbuf_release(&gitdir); | |
f6f85861 SB |
2156 | |
2157 | if (flags & ABSORB_GITDIR_RECURSE_SUBMODULES) { | |
2158 | struct child_process cp = CHILD_PROCESS_INIT; | |
2159 | struct strbuf sb = STRBUF_INIT; | |
2160 | ||
2161 | if (flags & ~ABSORB_GITDIR_RECURSE_SUBMODULES) | |
033abf97 | 2162 | BUG("we don't know how to pass the flags down?"); |
f6f85861 | 2163 | |
202275b9 | 2164 | strbuf_addstr(&sb, get_super_prefix_or_empty()); |
f6f85861 SB |
2165 | strbuf_addstr(&sb, path); |
2166 | strbuf_addch(&sb, '/'); | |
2167 | ||
2168 | cp.dir = path; | |
2169 | cp.git_cmd = 1; | |
2170 | cp.no_stdin = 1; | |
c972bf4c | 2171 | strvec_pushl(&cp.args, "--super-prefix", sb.buf, |
f6d8942b JK |
2172 | "submodule--helper", |
2173 | "absorb-git-dirs", NULL); | |
f6f85861 SB |
2174 | prepare_submodule_repo_env(&cp.env_array); |
2175 | if (run_command(&cp)) | |
2176 | die(_("could not recurse into submodule '%s'"), path); | |
2177 | ||
2178 | strbuf_release(&sb); | |
2179 | } | |
f6f85861 | 2180 | } |
bf0231c6 | 2181 | |
49d3c4b4 | 2182 | int get_superproject_working_tree(struct strbuf *buf) |
bf0231c6 SB |
2183 | { |
2184 | struct child_process cp = CHILD_PROCESS_INIT; | |
2185 | struct strbuf sb = STRBUF_INIT; | |
4530a85b | 2186 | struct strbuf one_up = STRBUF_INIT; |
bf0231c6 | 2187 | const char *cwd = xgetcwd(); |
49d3c4b4 | 2188 | int ret = 0; |
bf0231c6 SB |
2189 | const char *subpath; |
2190 | int code; | |
2191 | ssize_t len; | |
2192 | ||
2193 | if (!is_inside_work_tree()) | |
2194 | /* | |
2195 | * FIXME: | |
2196 | * We might have a superproject, but it is harder | |
2197 | * to determine. | |
2198 | */ | |
49d3c4b4 | 2199 | return 0; |
bf0231c6 | 2200 | |
4530a85b | 2201 | if (!strbuf_realpath(&one_up, "../", 0)) |
49d3c4b4 | 2202 | return 0; |
bf0231c6 | 2203 | |
4530a85b AM |
2204 | subpath = relative_path(cwd, one_up.buf, &sb); |
2205 | strbuf_release(&one_up); | |
bf0231c6 SB |
2206 | |
2207 | prepare_submodule_repo_env(&cp.env_array); | |
c972bf4c | 2208 | strvec_pop(&cp.env_array); |
bf0231c6 | 2209 | |
c972bf4c | 2210 | strvec_pushl(&cp.args, "--literal-pathspecs", "-C", "..", |
f6d8942b JK |
2211 | "ls-files", "-z", "--stage", "--full-name", "--", |
2212 | subpath, NULL); | |
bf0231c6 SB |
2213 | strbuf_reset(&sb); |
2214 | ||
2215 | cp.no_stdin = 1; | |
2216 | cp.no_stderr = 1; | |
2217 | cp.out = -1; | |
2218 | cp.git_cmd = 1; | |
2219 | ||
2220 | if (start_command(&cp)) | |
2221 | die(_("could not start ls-files in ..")); | |
2222 | ||
2223 | len = strbuf_read(&sb, cp.out, PATH_MAX); | |
2224 | close(cp.out); | |
2225 | ||
2226 | if (starts_with(sb.buf, "160000")) { | |
2227 | int super_sub_len; | |
2228 | int cwd_len = strlen(cwd); | |
2229 | char *super_sub, *super_wt; | |
2230 | ||
2231 | /* | |
2232 | * There is a superproject having this repo as a submodule. | |
2233 | * The format is <mode> SP <hash> SP <stage> TAB <full name> \0, | |
2234 | * We're only interested in the name after the tab. | |
2235 | */ | |
2236 | super_sub = strchr(sb.buf, '\t') + 1; | |
c5cbb27c | 2237 | super_sub_len = strlen(super_sub); |
bf0231c6 SB |
2238 | |
2239 | if (super_sub_len > cwd_len || | |
2240 | strcmp(&cwd[cwd_len - super_sub_len], super_sub)) | |
c3c3486b | 2241 | BUG("returned path string doesn't match cwd?"); |
bf0231c6 SB |
2242 | |
2243 | super_wt = xstrdup(cwd); | |
2244 | super_wt[cwd_len - super_sub_len] = '\0'; | |
2245 | ||
49d3c4b4 AM |
2246 | strbuf_realpath(buf, super_wt, 1); |
2247 | ret = 1; | |
bf0231c6 SB |
2248 | free(super_wt); |
2249 | } | |
2250 | strbuf_release(&sb); | |
2251 | ||
2252 | code = finish_command(&cp); | |
2253 | ||
2254 | if (code == 128) | |
2255 | /* '../' is not a git repository */ | |
49d3c4b4 | 2256 | return 0; |
bf0231c6 SB |
2257 | if (code == 0 && len == 0) |
2258 | /* There is an unrelated git repository at '../' */ | |
49d3c4b4 | 2259 | return 0; |
bf0231c6 SB |
2260 | if (code) |
2261 | die(_("ls-tree returned unexpected return code %d"), code); | |
2262 | ||
2263 | return ret; | |
2264 | } | |
bbbb7de7 | 2265 | |
3ce08548 HWN |
2266 | /* |
2267 | * Put the gitdir for a submodule (given relative to the main | |
2268 | * repository worktree) into `buf`, or return -1 on error. | |
2269 | */ | |
bbbb7de7 NTND |
2270 | int submodule_to_gitdir(struct strbuf *buf, const char *submodule) |
2271 | { | |
2272 | const struct submodule *sub; | |
2273 | const char *git_dir; | |
2274 | int ret = 0; | |
2275 | ||
2276 | strbuf_reset(buf); | |
2277 | strbuf_addstr(buf, submodule); | |
2278 | strbuf_complete(buf, '/'); | |
2279 | strbuf_addstr(buf, ".git"); | |
2280 | ||
2281 | git_dir = read_gitfile(buf->buf); | |
2282 | if (git_dir) { | |
2283 | strbuf_reset(buf); | |
2284 | strbuf_addstr(buf, git_dir); | |
2285 | } | |
2286 | if (!is_git_directory(buf->buf)) { | |
14228447 | 2287 | sub = submodule_from_path(the_repository, null_oid(), |
2288 | submodule); | |
bbbb7de7 NTND |
2289 | if (!sub) { |
2290 | ret = -1; | |
2291 | goto cleanup; | |
2292 | } | |
2293 | strbuf_reset(buf); | |
2294 | strbuf_git_path(buf, "%s/%s", "modules", sub->name); | |
2295 | } | |
2296 | ||
2297 | cleanup: | |
2298 | return ret; | |
2299 | } |