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