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