Elijah Newren | bc5c5ec | 2023-05-16 06:33:57 +0000 | [diff] [blame] | 1 | #include "git-compat-util.h" |
Elijah Newren | 6c6ddf9 | 2023-04-11 03:00:39 +0000 | [diff] [blame] | 2 | #include "advice.h" |
Jeff King | dbbcd44 | 2020-07-28 16:23:39 -0400 | [diff] [blame] | 3 | #include "strvec.h" |
Brandon Williams | 3302871 | 2017-08-03 11:19:59 -0700 | [diff] [blame] | 4 | #include "repository.h" |
Calvin Wan | b1bda75 | 2023-09-29 14:20:51 -0700 | [diff] [blame] | 5 | #include "parse.h" |
Junio C Hamano | f8a9d42 | 2006-12-04 16:00:46 -0800 | [diff] [blame] | 6 | #include "dir.h" |
Elijah Newren | 32a8f51 | 2023-03-21 06:26:03 +0000 | [diff] [blame] | 7 | #include "environment.h" |
Elijah Newren | f394e09 | 2023-03-21 06:25:54 +0000 | [diff] [blame] | 8 | #include "gettext.h" |
Elijah Newren | 41771fa | 2023-02-24 00:09:27 +0000 | [diff] [blame] | 9 | #include "hex.h" |
Elijah Newren | f565385 | 2023-05-16 06:33:50 +0000 | [diff] [blame] | 10 | #include "name-hash.h" |
Johannes Schindelin | 16da134 | 2006-07-30 20:25:18 +0200 | [diff] [blame] | 11 | #include "tree.h" |
| 12 | #include "tree-walk.h" |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 13 | #include "cache-tree.h" |
Johannes Schindelin | 16da134 | 2006-07-30 20:25:18 +0200 | [diff] [blame] | 14 | #include "unpack-trees.h" |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 15 | #include "progress.h" |
Sven Verdoolaege | 0cf7375 | 2007-07-17 20:28:28 +0200 | [diff] [blame] | 16 | #include "refs.h" |
Junio C Hamano | 06f33c1 | 2009-03-13 21:24:08 -0700 | [diff] [blame] | 17 | #include "attr.h" |
Elijah Newren | 08c46a4 | 2023-05-16 06:33:56 +0000 | [diff] [blame] | 18 | #include "read-cache.h" |
Nguyễn Thái Ngọc Duy | 5fc2fc8 | 2014-06-13 19:19:36 +0700 | [diff] [blame] | 19 | #include "split-index.h" |
Victoria Dye | 0f329b9 | 2022-05-10 23:32:32 +0000 | [diff] [blame] | 20 | #include "sparse-index.h" |
Stefan Beller | a7bc845 | 2017-03-14 14:46:39 -0700 | [diff] [blame] | 21 | #include "submodule.h" |
| 22 | #include "submodule-config.h" |
Elijah Newren | cb2a513 | 2023-04-22 20:17:09 +0000 | [diff] [blame] | 23 | #include "symlinks.h" |
Elijah Newren | 74ea5c9 | 2023-04-11 03:00:38 +0000 | [diff] [blame] | 24 | #include "trace2.h" |
Ben Peart | 883e248 | 2017-09-22 12:35:40 -0400 | [diff] [blame] | 25 | #include "fsmonitor.h" |
Elijah Newren | a034e91 | 2023-05-16 06:34:06 +0000 | [diff] [blame] | 26 | #include "object-store-ll.h" |
Christian Couder | b14ed5a | 2019-06-25 15:40:31 +0200 | [diff] [blame] | 27 | #include "promisor-remote.h" |
Matheus Tavares | d052cc0 | 2021-03-23 11:19:32 -0300 | [diff] [blame] | 28 | #include "entry.h" |
Matheus Tavares | 04155bd | 2021-04-18 21:14:53 -0300 | [diff] [blame] | 29 | #include "parallel-checkout.h" |
Elijah Newren | e38da48 | 2023-03-21 06:26:05 +0000 | [diff] [blame] | 30 | #include "setup.h" |
Johannes Schindelin | 16da134 | 2006-07-30 20:25:18 +0200 | [diff] [blame] | 31 | |
Junio C Hamano | 8ccba00 | 2008-05-17 12:03:49 -0700 | [diff] [blame] | 32 | /* |
| 33 | * Error messages expected by scripts out of plumbing commands such as |
| 34 | * read-tree. Non-scripted Porcelain is not required to use these messages |
| 35 | * and in fact are encouraged to reword them to better suit their particular |
Diane Gasselin | 23cbf11 | 2010-08-11 10:38:05 +0200 | [diff] [blame] | 36 | * situation better. See how "git checkout" and "git merge" replaces |
Matthieu Moy | dc1166e | 2010-09-02 13:57:33 +0200 | [diff] [blame] | 37 | * them using setup_unpack_trees_porcelain(), for example. |
Junio C Hamano | 8ccba00 | 2008-05-17 12:03:49 -0700 | [diff] [blame] | 38 | */ |
Elijah Newren | 6271d77 | 2020-03-27 00:48:57 +0000 | [diff] [blame] | 39 | static const char *unpack_plumbing_errors[NB_UNPACK_TREES_WARNING_TYPES] = { |
Matthieu Moy | 08353eb | 2010-08-11 10:38:04 +0200 | [diff] [blame] | 40 | /* ERROR_WOULD_OVERWRITE */ |
Junio C Hamano | 8ccba00 | 2008-05-17 12:03:49 -0700 | [diff] [blame] | 41 | "Entry '%s' would be overwritten by merge. Cannot merge.", |
| 42 | |
Matthieu Moy | 08353eb | 2010-08-11 10:38:04 +0200 | [diff] [blame] | 43 | /* ERROR_NOT_UPTODATE_FILE */ |
Junio C Hamano | 8ccba00 | 2008-05-17 12:03:49 -0700 | [diff] [blame] | 44 | "Entry '%s' not uptodate. Cannot merge.", |
| 45 | |
Matthieu Moy | 08353eb | 2010-08-11 10:38:04 +0200 | [diff] [blame] | 46 | /* ERROR_NOT_UPTODATE_DIR */ |
Junio C Hamano | 8ccba00 | 2008-05-17 12:03:49 -0700 | [diff] [blame] | 47 | "Updating '%s' would lose untracked files in it", |
| 48 | |
Elijah Newren | b817e54 | 2021-12-09 05:08:27 +0000 | [diff] [blame] | 49 | /* ERROR_CWD_IN_THE_WAY */ |
| 50 | "Refusing to remove '%s' since it is the current working directory.", |
| 51 | |
Matthieu Moy | 08402b0 | 2010-08-11 10:38:06 +0200 | [diff] [blame] | 52 | /* ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN */ |
| 53 | "Untracked working tree file '%s' would be overwritten by merge.", |
Junio C Hamano | 8ccba00 | 2008-05-17 12:03:49 -0700 | [diff] [blame] | 54 | |
Matthieu Moy | 08402b0 | 2010-08-11 10:38:06 +0200 | [diff] [blame] | 55 | /* ERROR_WOULD_LOSE_UNTRACKED_REMOVED */ |
| 56 | "Untracked working tree file '%s' would be removed by merge.", |
Junio C Hamano | 8ccba00 | 2008-05-17 12:03:49 -0700 | [diff] [blame] | 57 | |
Matthieu Moy | 08353eb | 2010-08-11 10:38:04 +0200 | [diff] [blame] | 58 | /* ERROR_BIND_OVERLAP */ |
Junio C Hamano | 8ccba00 | 2008-05-17 12:03:49 -0700 | [diff] [blame] | 59 | "Entry '%s' overlaps with '%s'. Cannot bind.", |
Nguyễn Thái Ngọc Duy | e800ec9 | 2009-08-20 20:47:09 +0700 | [diff] [blame] | 60 | |
Stefan Beller | a7bc845 | 2017-03-14 14:46:39 -0700 | [diff] [blame] | 61 | /* ERROR_WOULD_LOSE_SUBMODULE */ |
| 62 | "Submodule '%s' cannot checkout new HEAD.", |
Elijah Newren | cd002c1 | 2020-03-27 00:48:55 +0000 | [diff] [blame] | 63 | |
Elijah Newren | 6271d77 | 2020-03-27 00:48:57 +0000 | [diff] [blame] | 64 | /* NB_UNPACK_TREES_ERROR_TYPES; just a meta value */ |
| 65 | "", |
| 66 | |
Elijah Newren | 1ac83f4 | 2020-03-27 00:48:56 +0000 | [diff] [blame] | 67 | /* WARNING_SPARSE_NOT_UPTODATE_FILE */ |
Elijah Newren | 22ab0b3 | 2020-03-27 00:48:58 +0000 | [diff] [blame] | 68 | "Path '%s' not uptodate; will not remove from working tree.", |
Nguyễn Thái Ngọc Duy | e800ec9 | 2009-08-20 20:47:09 +0700 | [diff] [blame] | 69 | |
Elijah Newren | ebb568b | 2020-03-27 00:48:59 +0000 | [diff] [blame] | 70 | /* WARNING_SPARSE_UNMERGED_FILE */ |
| 71 | "Path '%s' unmerged; will not remove from working tree.", |
| 72 | |
Elijah Newren | 1ac83f4 | 2020-03-27 00:48:56 +0000 | [diff] [blame] | 73 | /* WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN */ |
Elijah Newren | 22ab0b3 | 2020-03-27 00:48:58 +0000 | [diff] [blame] | 74 | "Path '%s' already present; will not overwrite with sparse update.", |
Junio C Hamano | 8ccba00 | 2008-05-17 12:03:49 -0700 | [diff] [blame] | 75 | }; |
| 76 | |
Matthieu Moy | 08353eb | 2010-08-11 10:38:04 +0200 | [diff] [blame] | 77 | #define ERRORMSG(o,type) \ |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 78 | ( ((o) && (o)->internal.msgs[(type)]) \ |
| 79 | ? ((o)->internal.msgs[(type)]) \ |
Matthieu Moy | 08353eb | 2010-08-11 10:38:04 +0200 | [diff] [blame] | 80 | : (unpack_plumbing_errors[(type)]) ) |
Junio C Hamano | 8ccba00 | 2008-05-17 12:03:49 -0700 | [diff] [blame] | 81 | |
Ævar Arnfjörð Bjarmason | 4002ec3 | 2022-12-20 13:39:56 +0100 | [diff] [blame] | 82 | static const char *super_prefixed(const char *path, const char *super_prefix) |
Stefan Beller | 3d41542 | 2017-01-17 17:05:20 -0800 | [diff] [blame] | 83 | { |
| 84 | /* |
| 85 | * It is necessary and sufficient to have two static buffers |
| 86 | * here, as the return value of this function is fed to |
| 87 | * error() using the unpack_*_errors[] templates we see above. |
| 88 | */ |
| 89 | static struct strbuf buf[2] = {STRBUF_INIT, STRBUF_INIT}; |
| 90 | static int super_prefix_len = -1; |
| 91 | static unsigned idx = ARRAY_SIZE(buf) - 1; |
| 92 | |
| 93 | if (super_prefix_len < 0) { |
Stefan Beller | 3d41542 | 2017-01-17 17:05:20 -0800 | [diff] [blame] | 94 | if (!super_prefix) { |
| 95 | super_prefix_len = 0; |
| 96 | } else { |
| 97 | int i; |
| 98 | for (i = 0; i < ARRAY_SIZE(buf); i++) |
| 99 | strbuf_addstr(&buf[i], super_prefix); |
| 100 | super_prefix_len = buf[0].len; |
| 101 | } |
| 102 | } |
| 103 | |
| 104 | if (!super_prefix_len) |
| 105 | return path; |
| 106 | |
| 107 | if (++idx >= ARRAY_SIZE(buf)) |
| 108 | idx = 0; |
| 109 | |
| 110 | strbuf_setlen(&buf[idx], super_prefix_len); |
| 111 | strbuf_addstr(&buf[idx], path); |
| 112 | |
| 113 | return buf[idx].buf; |
| 114 | } |
| 115 | |
Matthieu Moy | e294030 | 2010-09-02 13:57:34 +0200 | [diff] [blame] | 116 | void setup_unpack_trees_porcelain(struct unpack_trees_options *opts, |
| 117 | const char *cmd) |
Matthieu Moy | dc1166e | 2010-09-02 13:57:33 +0200 | [diff] [blame] | 118 | { |
Clemens Buchacher | 7980872 | 2010-11-15 20:52:19 +0100 | [diff] [blame] | 119 | int i; |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 120 | const char **msgs = opts->internal.msgs; |
Matthieu Moy | dc1166e | 2010-09-02 13:57:33 +0200 | [diff] [blame] | 121 | const char *msg; |
Jeff King | fa3f60b | 2014-06-18 16:02:13 -0400 | [diff] [blame] | 122 | |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 123 | strvec_init(&opts->internal.msgs_to_free); |
Martin Ågren | 1c41d28 | 2018-05-21 16:54:28 +0200 | [diff] [blame] | 124 | |
Vasco Almeida | 2e3926b | 2016-05-12 23:16:26 +0000 | [diff] [blame] | 125 | if (!strcmp(cmd, "checkout")) |
Ben Boeckel | ed9bff0 | 2021-08-23 12:44:00 +0200 | [diff] [blame] | 126 | msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE) |
Vasco Almeida | 2e3926b | 2016-05-12 23:16:26 +0000 | [diff] [blame] | 127 | ? _("Your local changes to the following files would be overwritten by checkout:\n%%s" |
Alex Henrie | c2691e2 | 2016-06-25 00:34:04 -0600 | [diff] [blame] | 128 | "Please commit your changes or stash them before you switch branches.") |
Vasco Almeida | 2e3926b | 2016-05-12 23:16:26 +0000 | [diff] [blame] | 129 | : _("Your local changes to the following files would be overwritten by checkout:\n%%s"); |
| 130 | else if (!strcmp(cmd, "merge")) |
Ben Boeckel | ed9bff0 | 2021-08-23 12:44:00 +0200 | [diff] [blame] | 131 | msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE) |
Vasco Almeida | 2e3926b | 2016-05-12 23:16:26 +0000 | [diff] [blame] | 132 | ? _("Your local changes to the following files would be overwritten by merge:\n%%s" |
Alex Henrie | c2691e2 | 2016-06-25 00:34:04 -0600 | [diff] [blame] | 133 | "Please commit your changes or stash them before you merge.") |
Vasco Almeida | 2e3926b | 2016-05-12 23:16:26 +0000 | [diff] [blame] | 134 | : _("Your local changes to the following files would be overwritten by merge:\n%%s"); |
Matthieu Moy | dc1166e | 2010-09-02 13:57:33 +0200 | [diff] [blame] | 135 | else |
Ben Boeckel | ed9bff0 | 2021-08-23 12:44:00 +0200 | [diff] [blame] | 136 | msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE) |
Vasco Almeida | 2e3926b | 2016-05-12 23:16:26 +0000 | [diff] [blame] | 137 | ? _("Your local changes to the following files would be overwritten by %s:\n%%s" |
Alex Henrie | c2691e2 | 2016-06-25 00:34:04 -0600 | [diff] [blame] | 138 | "Please commit your changes or stash them before you %s.") |
Vasco Almeida | 2e3926b | 2016-05-12 23:16:26 +0000 | [diff] [blame] | 139 | : _("Your local changes to the following files would be overwritten by %s:\n%%s"); |
Jeff King | fa3f60b | 2014-06-18 16:02:13 -0400 | [diff] [blame] | 140 | msgs[ERROR_WOULD_OVERWRITE] = msgs[ERROR_NOT_UPTODATE_FILE] = |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 141 | strvec_pushf(&opts->internal.msgs_to_free, msg, cmd, cmd); |
Matthieu Moy | dc1166e | 2010-09-02 13:57:33 +0200 | [diff] [blame] | 142 | |
| 143 | msgs[ERROR_NOT_UPTODATE_DIR] = |
Stefan Beller | 584f99c | 2016-12-02 11:17:41 -0800 | [diff] [blame] | 144 | _("Updating the following directories would lose untracked files in them:\n%s"); |
Matthieu Moy | dc1166e | 2010-09-02 13:57:33 +0200 | [diff] [blame] | 145 | |
Elijah Newren | b817e54 | 2021-12-09 05:08:27 +0000 | [diff] [blame] | 146 | msgs[ERROR_CWD_IN_THE_WAY] = |
| 147 | _("Refusing to remove the current working directory:\n%s"); |
| 148 | |
Vasco Almeida | 2e3926b | 2016-05-12 23:16:26 +0000 | [diff] [blame] | 149 | if (!strcmp(cmd, "checkout")) |
Ben Boeckel | ed9bff0 | 2021-08-23 12:44:00 +0200 | [diff] [blame] | 150 | msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE) |
Vasco Almeida | 2e3926b | 2016-05-12 23:16:26 +0000 | [diff] [blame] | 151 | ? _("The following untracked working tree files would be removed by checkout:\n%%s" |
Alex Henrie | c2691e2 | 2016-06-25 00:34:04 -0600 | [diff] [blame] | 152 | "Please move or remove them before you switch branches.") |
Vasco Almeida | 2e3926b | 2016-05-12 23:16:26 +0000 | [diff] [blame] | 153 | : _("The following untracked working tree files would be removed by checkout:\n%%s"); |
| 154 | else if (!strcmp(cmd, "merge")) |
Ben Boeckel | ed9bff0 | 2021-08-23 12:44:00 +0200 | [diff] [blame] | 155 | msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE) |
Vasco Almeida | 2e3926b | 2016-05-12 23:16:26 +0000 | [diff] [blame] | 156 | ? _("The following untracked working tree files would be removed by merge:\n%%s" |
Alex Henrie | c2691e2 | 2016-06-25 00:34:04 -0600 | [diff] [blame] | 157 | "Please move or remove them before you merge.") |
Vasco Almeida | 2e3926b | 2016-05-12 23:16:26 +0000 | [diff] [blame] | 158 | : _("The following untracked working tree files would be removed by merge:\n%%s"); |
Matthieu Moy | dc1166e | 2010-09-02 13:57:33 +0200 | [diff] [blame] | 159 | else |
Ben Boeckel | ed9bff0 | 2021-08-23 12:44:00 +0200 | [diff] [blame] | 160 | msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE) |
Vasco Almeida | 2e3926b | 2016-05-12 23:16:26 +0000 | [diff] [blame] | 161 | ? _("The following untracked working tree files would be removed by %s:\n%%s" |
Alex Henrie | c2691e2 | 2016-06-25 00:34:04 -0600 | [diff] [blame] | 162 | "Please move or remove them before you %s.") |
Vasco Almeida | 2e3926b | 2016-05-12 23:16:26 +0000 | [diff] [blame] | 163 | : _("The following untracked working tree files would be removed by %s:\n%%s"); |
Martin Ågren | 1c41d28 | 2018-05-21 16:54:28 +0200 | [diff] [blame] | 164 | msgs[ERROR_WOULD_LOSE_UNTRACKED_REMOVED] = |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 165 | strvec_pushf(&opts->internal.msgs_to_free, msg, cmd, cmd); |
Jeff King | fa3f60b | 2014-06-18 16:02:13 -0400 | [diff] [blame] | 166 | |
Vasco Almeida | 2e3926b | 2016-05-12 23:16:26 +0000 | [diff] [blame] | 167 | if (!strcmp(cmd, "checkout")) |
Ben Boeckel | ed9bff0 | 2021-08-23 12:44:00 +0200 | [diff] [blame] | 168 | msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE) |
Vasco Almeida | 2e3926b | 2016-05-12 23:16:26 +0000 | [diff] [blame] | 169 | ? _("The following untracked working tree files would be overwritten by checkout:\n%%s" |
Alex Henrie | c2691e2 | 2016-06-25 00:34:04 -0600 | [diff] [blame] | 170 | "Please move or remove them before you switch branches.") |
Vasco Almeida | 2e3926b | 2016-05-12 23:16:26 +0000 | [diff] [blame] | 171 | : _("The following untracked working tree files would be overwritten by checkout:\n%%s"); |
| 172 | else if (!strcmp(cmd, "merge")) |
Ben Boeckel | ed9bff0 | 2021-08-23 12:44:00 +0200 | [diff] [blame] | 173 | msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE) |
Vasco Almeida | 2e3926b | 2016-05-12 23:16:26 +0000 | [diff] [blame] | 174 | ? _("The following untracked working tree files would be overwritten by merge:\n%%s" |
Alex Henrie | c2691e2 | 2016-06-25 00:34:04 -0600 | [diff] [blame] | 175 | "Please move or remove them before you merge.") |
Vasco Almeida | 2e3926b | 2016-05-12 23:16:26 +0000 | [diff] [blame] | 176 | : _("The following untracked working tree files would be overwritten by merge:\n%%s"); |
| 177 | else |
Ben Boeckel | ed9bff0 | 2021-08-23 12:44:00 +0200 | [diff] [blame] | 178 | msg = advice_enabled(ADVICE_COMMIT_BEFORE_MERGE) |
Vasco Almeida | 2e3926b | 2016-05-12 23:16:26 +0000 | [diff] [blame] | 179 | ? _("The following untracked working tree files would be overwritten by %s:\n%%s" |
Alex Henrie | c2691e2 | 2016-06-25 00:34:04 -0600 | [diff] [blame] | 180 | "Please move or remove them before you %s.") |
Vasco Almeida | 2e3926b | 2016-05-12 23:16:26 +0000 | [diff] [blame] | 181 | : _("The following untracked working tree files would be overwritten by %s:\n%%s"); |
Martin Ågren | 1c41d28 | 2018-05-21 16:54:28 +0200 | [diff] [blame] | 182 | msgs[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN] = |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 183 | strvec_pushf(&opts->internal.msgs_to_free, msg, cmd, cmd); |
Matthieu Moy | dc1166e | 2010-09-02 13:57:33 +0200 | [diff] [blame] | 184 | |
| 185 | /* |
| 186 | * Special case: ERROR_BIND_OVERLAP refers to a pair of paths, we |
| 187 | * cannot easily display it as a list. |
| 188 | */ |
Vasco Almeida | ed47fdf | 2016-04-09 20:38:39 +0000 | [diff] [blame] | 189 | msgs[ERROR_BIND_OVERLAP] = _("Entry '%s' overlaps with '%s'. Cannot bind."); |
Matthieu Moy | dc1166e | 2010-09-02 13:57:33 +0200 | [diff] [blame] | 190 | |
Stefan Beller | a7bc845 | 2017-03-14 14:46:39 -0700 | [diff] [blame] | 191 | msgs[ERROR_WOULD_LOSE_SUBMODULE] = |
Stefan Beller | 6362ed0 | 2017-03-29 15:34:24 -0700 | [diff] [blame] | 192 | _("Cannot update submodule:\n%s"); |
Matthieu Moy | 5e65ee3 | 2010-09-02 18:08:15 +0200 | [diff] [blame] | 193 | |
Elijah Newren | 1ac83f4 | 2020-03-27 00:48:56 +0000 | [diff] [blame] | 194 | msgs[WARNING_SPARSE_NOT_UPTODATE_FILE] = |
Elijah Newren | 22ab0b3 | 2020-03-27 00:48:58 +0000 | [diff] [blame] | 195 | _("The following paths are not up to date and were left despite sparse patterns:\n%s"); |
Elijah Newren | ebb568b | 2020-03-27 00:48:59 +0000 | [diff] [blame] | 196 | msgs[WARNING_SPARSE_UNMERGED_FILE] = |
| 197 | _("The following paths are unmerged and were left despite sparse patterns:\n%s"); |
Elijah Newren | 1ac83f4 | 2020-03-27 00:48:56 +0000 | [diff] [blame] | 198 | msgs[WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN] = |
Elijah Newren | 22ab0b3 | 2020-03-27 00:48:58 +0000 | [diff] [blame] | 199 | _("The following paths were already present and thus not updated despite sparse patterns:\n%s"); |
Matthieu Moy | 5e65ee3 | 2010-09-02 18:08:15 +0200 | [diff] [blame] | 200 | |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 201 | opts->internal.show_all_errors = 1; |
Clemens Buchacher | 7980872 | 2010-11-15 20:52:19 +0100 | [diff] [blame] | 202 | /* rejected paths may not have a static buffer */ |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 203 | for (i = 0; i < ARRAY_SIZE(opts->internal.unpack_rejects); i++) |
| 204 | opts->internal.unpack_rejects[i].strdup_strings = 1; |
Matthieu Moy | dc1166e | 2010-09-02 13:57:33 +0200 | [diff] [blame] | 205 | } |
| 206 | |
Martin Ågren | 1c41d28 | 2018-05-21 16:54:28 +0200 | [diff] [blame] | 207 | void clear_unpack_trees_porcelain(struct unpack_trees_options *opts) |
| 208 | { |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 209 | strvec_clear(&opts->internal.msgs_to_free); |
| 210 | memset(opts->internal.msgs, 0, sizeof(opts->internal.msgs)); |
Martin Ågren | 1c41d28 | 2018-05-21 16:54:28 +0200 | [diff] [blame] | 211 | } |
| 212 | |
Jeff King | 4616918 | 2014-11-24 13:36:51 -0500 | [diff] [blame] | 213 | static int do_add_entry(struct unpack_trees_options *o, struct cache_entry *ce, |
René Scharfe | 6ff264e | 2012-03-06 20:37:23 +0100 | [diff] [blame] | 214 | unsigned int set, unsigned int clear) |
| 215 | { |
Karsten Blees | 419a597 | 2013-11-14 20:22:27 +0100 | [diff] [blame] | 216 | clear |= CE_HASHED; |
René Scharfe | 6ff264e | 2012-03-06 20:37:23 +0100 | [diff] [blame] | 217 | |
| 218 | if (set & CE_REMOVE) |
| 219 | set |= CE_WT_REMOVE; |
| 220 | |
René Scharfe | 6ff264e | 2012-03-06 20:37:23 +0100 | [diff] [blame] | 221 | ce->ce_flags = (ce->ce_flags & ~clear) | set; |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 222 | return add_index_entry(&o->internal.result, ce, |
Jeff King | 4616918 | 2014-11-24 13:36:51 -0500 | [diff] [blame] | 223 | ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE); |
René Scharfe | 6ff264e | 2012-03-06 20:37:23 +0100 | [diff] [blame] | 224 | } |
| 225 | |
René Scharfe | a33bd4d | 2013-06-02 17:46:53 +0200 | [diff] [blame] | 226 | static void add_entry(struct unpack_trees_options *o, |
| 227 | const struct cache_entry *ce, |
| 228 | unsigned int set, unsigned int clear) |
| 229 | { |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 230 | do_add_entry(o, dup_cache_entry(ce, &o->internal.result), set, clear); |
Linus Torvalds | b48d5a0 | 2007-08-10 12:15:54 -0700 | [diff] [blame] | 231 | } |
| 232 | |
Kjetil Barvik | 7847892 | 2009-02-09 21:54:07 +0100 | [diff] [blame] | 233 | /* |
Matthieu Moy | e6c111b | 2010-08-11 10:38:07 +0200 | [diff] [blame] | 234 | * add error messages on path <path> |
| 235 | * corresponding to the type <e> with the message <msg> |
| 236 | * indicating if it should be display in porcelain or not |
| 237 | */ |
| 238 | static int add_rejected_path(struct unpack_trees_options *o, |
| 239 | enum unpack_trees_error_types e, |
| 240 | const char *path) |
| 241 | { |
Nguyễn Thái Ngọc Duy | b165fac | 2019-03-22 16:31:36 +0700 | [diff] [blame] | 242 | if (o->quiet) |
Nguyễn Thái Ngọc Duy | 191e9d2 | 2019-03-22 16:31:35 +0700 | [diff] [blame] | 243 | return -1; |
| 244 | |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 245 | if (!o->internal.show_all_errors) |
Ævar Arnfjörð Bjarmason | 4002ec3 | 2022-12-20 13:39:56 +0100 | [diff] [blame] | 246 | return error(ERRORMSG(o, e), super_prefixed(path, |
| 247 | o->super_prefix)); |
Matthieu Moy | e6c111b | 2010-08-11 10:38:07 +0200 | [diff] [blame] | 248 | |
| 249 | /* |
| 250 | * Otherwise, insert in a list for future display by |
Elijah Newren | 6271d77 | 2020-03-27 00:48:57 +0000 | [diff] [blame] | 251 | * display_(error|warning)_msgs() |
Matthieu Moy | e6c111b | 2010-08-11 10:38:07 +0200 | [diff] [blame] | 252 | */ |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 253 | string_list_append(&o->internal.unpack_rejects[e], path); |
Matthieu Moy | e6c111b | 2010-08-11 10:38:07 +0200 | [diff] [blame] | 254 | return -1; |
| 255 | } |
| 256 | |
| 257 | /* |
Matthieu Moy | e6c111b | 2010-08-11 10:38:07 +0200 | [diff] [blame] | 258 | * display all the error messages stored in a nice way |
| 259 | */ |
| 260 | static void display_error_msgs(struct unpack_trees_options *o) |
| 261 | { |
Elijah Newren | 6271d77 | 2020-03-27 00:48:57 +0000 | [diff] [blame] | 262 | int e; |
| 263 | unsigned error_displayed = 0; |
Matthieu Moy | e6c111b | 2010-08-11 10:38:07 +0200 | [diff] [blame] | 264 | for (e = 0; e < NB_UNPACK_TREES_ERROR_TYPES; e++) { |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 265 | struct string_list *rejects = &o->internal.unpack_rejects[e]; |
Elijah Newren | 6271d77 | 2020-03-27 00:48:57 +0000 | [diff] [blame] | 266 | |
Clemens Buchacher | 7980872 | 2010-11-15 20:52:19 +0100 | [diff] [blame] | 267 | if (rejects->nr > 0) { |
Elijah Newren | 6271d77 | 2020-03-27 00:48:57 +0000 | [diff] [blame] | 268 | int i; |
Matthieu Moy | e6c111b | 2010-08-11 10:38:07 +0200 | [diff] [blame] | 269 | struct strbuf path = STRBUF_INIT; |
Elijah Newren | 6271d77 | 2020-03-27 00:48:57 +0000 | [diff] [blame] | 270 | |
| 271 | error_displayed = 1; |
Clemens Buchacher | 7980872 | 2010-11-15 20:52:19 +0100 | [diff] [blame] | 272 | for (i = 0; i < rejects->nr; i++) |
| 273 | strbuf_addf(&path, "\t%s\n", rejects->items[i].string); |
Ævar Arnfjörð Bjarmason | 4002ec3 | 2022-12-20 13:39:56 +0100 | [diff] [blame] | 274 | error(ERRORMSG(o, e), super_prefixed(path.buf, |
| 275 | o->super_prefix)); |
Matthieu Moy | e6c111b | 2010-08-11 10:38:07 +0200 | [diff] [blame] | 276 | strbuf_release(&path); |
Matthieu Moy | e6c111b | 2010-08-11 10:38:07 +0200 | [diff] [blame] | 277 | } |
Clemens Buchacher | 7980872 | 2010-11-15 20:52:19 +0100 | [diff] [blame] | 278 | string_list_clear(rejects, 0); |
Matthieu Moy | e6c111b | 2010-08-11 10:38:07 +0200 | [diff] [blame] | 279 | } |
Elijah Newren | 6271d77 | 2020-03-27 00:48:57 +0000 | [diff] [blame] | 280 | if (error_displayed) |
Vasco Almeida | ed47fdf | 2016-04-09 20:38:39 +0000 | [diff] [blame] | 281 | fprintf(stderr, _("Aborting\n")); |
Matthieu Moy | e6c111b | 2010-08-11 10:38:07 +0200 | [diff] [blame] | 282 | } |
| 283 | |
Elijah Newren | 6271d77 | 2020-03-27 00:48:57 +0000 | [diff] [blame] | 284 | /* |
| 285 | * display all the warning messages stored in a nice way |
| 286 | */ |
| 287 | static void display_warning_msgs(struct unpack_trees_options *o) |
| 288 | { |
| 289 | int e; |
| 290 | unsigned warning_displayed = 0; |
| 291 | for (e = NB_UNPACK_TREES_ERROR_TYPES + 1; |
| 292 | e < NB_UNPACK_TREES_WARNING_TYPES; e++) { |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 293 | struct string_list *rejects = &o->internal.unpack_rejects[e]; |
Elijah Newren | 6271d77 | 2020-03-27 00:48:57 +0000 | [diff] [blame] | 294 | |
| 295 | if (rejects->nr > 0) { |
| 296 | int i; |
| 297 | struct strbuf path = STRBUF_INIT; |
| 298 | |
| 299 | warning_displayed = 1; |
| 300 | for (i = 0; i < rejects->nr; i++) |
| 301 | strbuf_addf(&path, "\t%s\n", rejects->items[i].string); |
Ævar Arnfjörð Bjarmason | 4002ec3 | 2022-12-20 13:39:56 +0100 | [diff] [blame] | 302 | warning(ERRORMSG(o, e), super_prefixed(path.buf, |
| 303 | o->super_prefix)); |
Elijah Newren | 6271d77 | 2020-03-27 00:48:57 +0000 | [diff] [blame] | 304 | strbuf_release(&path); |
| 305 | } |
| 306 | string_list_clear(rejects, 0); |
| 307 | } |
| 308 | if (warning_displayed) |
| 309 | fprintf(stderr, _("After fixing the above paths, you may want to run `git sparse-checkout reapply`.\n")); |
| 310 | } |
Stefan Beller | a7bc845 | 2017-03-14 14:46:39 -0700 | [diff] [blame] | 311 | static int check_submodule_move_head(const struct cache_entry *ce, |
| 312 | const char *old_id, |
| 313 | const char *new_id, |
| 314 | struct unpack_trees_options *o) |
| 315 | { |
Stefan Beller | cd279e2 | 2017-04-18 14:37:22 -0700 | [diff] [blame] | 316 | unsigned flags = SUBMODULE_MOVE_HEAD_DRY_RUN; |
Stefan Beller | a7bc845 | 2017-03-14 14:46:39 -0700 | [diff] [blame] | 317 | const struct submodule *sub = submodule_from_ce(ce); |
Brandon Williams | 7463e2e | 2017-08-03 11:19:53 -0700 | [diff] [blame] | 318 | |
Stefan Beller | a7bc845 | 2017-03-14 14:46:39 -0700 | [diff] [blame] | 319 | if (!sub) |
| 320 | return 0; |
| 321 | |
Stefan Beller | cd279e2 | 2017-04-18 14:37:22 -0700 | [diff] [blame] | 322 | if (o->reset) |
| 323 | flags |= SUBMODULE_MOVE_HEAD_FORCE; |
| 324 | |
Ævar Arnfjörð Bjarmason | 4002ec3 | 2022-12-20 13:39:56 +0100 | [diff] [blame] | 325 | if (submodule_move_head(ce->name, o->super_prefix, old_id, new_id, |
| 326 | flags)) |
Nguyễn Thái Ngọc Duy | 191e9d2 | 2019-03-22 16:31:35 +0700 | [diff] [blame] | 327 | return add_rejected_path(o, ERROR_WOULD_LOSE_SUBMODULE, ce->name); |
Brandon Williams | 7463e2e | 2017-08-03 11:19:53 -0700 | [diff] [blame] | 328 | return 0; |
Stefan Beller | a7bc845 | 2017-03-14 14:46:39 -0700 | [diff] [blame] | 329 | } |
| 330 | |
Brandon Williams | 3302871 | 2017-08-03 11:19:59 -0700 | [diff] [blame] | 331 | /* |
Elijah Newren | 15beaaa | 2019-11-05 17:07:23 +0000 | [diff] [blame] | 332 | * Perform the loading of the repository's gitmodules file. This function is |
Brandon Williams | 3302871 | 2017-08-03 11:19:59 -0700 | [diff] [blame] | 333 | * used by 'check_update()' to perform loading of the gitmodules file in two |
Elijah Newren | 15beaaa | 2019-11-05 17:07:23 +0000 | [diff] [blame] | 334 | * different situations: |
Brandon Williams | 3302871 | 2017-08-03 11:19:59 -0700 | [diff] [blame] | 335 | * (1) before removing entries from the working tree if the gitmodules file has |
| 336 | * been marked for removal. This situation is specified by 'state' == NULL. |
| 337 | * (2) before checking out entries to the working tree if the gitmodules file |
| 338 | * has been marked for update. This situation is specified by 'state' != NULL. |
| 339 | */ |
| 340 | static void load_gitmodules_file(struct index_state *index, |
| 341 | struct checkout *state) |
Stefan Beller | a7bc845 | 2017-03-14 14:46:39 -0700 | [diff] [blame] | 342 | { |
Brandon Williams | 3302871 | 2017-08-03 11:19:59 -0700 | [diff] [blame] | 343 | int pos = index_name_pos(index, GITMODULES_FILE, strlen(GITMODULES_FILE)); |
| 344 | |
| 345 | if (pos >= 0) { |
| 346 | struct cache_entry *ce = index->cache[pos]; |
| 347 | if (!state && ce->ce_flags & CE_WT_REMOVE) { |
Matheus Tavares | d799242 | 2020-01-15 23:39:55 -0300 | [diff] [blame] | 348 | repo_read_gitmodules(the_repository, 0); |
Brandon Williams | 3302871 | 2017-08-03 11:19:59 -0700 | [diff] [blame] | 349 | } else if (state && (ce->ce_flags & CE_UPDATE)) { |
Stefan Beller | f793b89 | 2018-03-28 15:35:28 -0700 | [diff] [blame] | 350 | submodule_free(the_repository); |
Nguyễn Thái Ngọc Duy | 0f086e6 | 2018-11-13 19:28:00 +0100 | [diff] [blame] | 351 | checkout_entry(ce, state, NULL, NULL); |
Matheus Tavares | d799242 | 2020-01-15 23:39:55 -0300 | [diff] [blame] | 352 | repo_read_gitmodules(the_repository, 0); |
Stefan Beller | a7bc845 | 2017-03-14 14:46:39 -0700 | [diff] [blame] | 353 | } |
| 354 | } |
| 355 | } |
| 356 | |
Elijah Newren | 6c34239 | 2020-05-14 19:53:22 +0000 | [diff] [blame] | 357 | static struct progress *get_progress(struct unpack_trees_options *o, |
| 358 | struct index_state *index) |
Johannes Schindelin | 16da134 | 2006-07-30 20:25:18 +0200 | [diff] [blame] | 359 | { |
Nicolas Pitre | 96a02f8 | 2007-04-18 14:27:45 -0400 | [diff] [blame] | 360 | unsigned cnt = 0, total = 0; |
Johannes Schindelin | 16da134 | 2006-07-30 20:25:18 +0200 | [diff] [blame] | 361 | |
Stefan Beller | 384f1a1 | 2017-01-09 11:46:19 -0800 | [diff] [blame] | 362 | if (!o->update || !o->verbose_update) |
| 363 | return NULL; |
Johannes Schindelin | 16da134 | 2006-07-30 20:25:18 +0200 | [diff] [blame] | 364 | |
Stefan Beller | 384f1a1 | 2017-01-09 11:46:19 -0800 | [diff] [blame] | 365 | for (; cnt < index->cache_nr; cnt++) { |
| 366 | const struct cache_entry *ce = index->cache[cnt]; |
| 367 | if (ce->ce_flags & (CE_UPDATE | CE_WT_REMOVE)) |
| 368 | total++; |
Johannes Schindelin | 16da134 | 2006-07-30 20:25:18 +0200 | [diff] [blame] | 369 | } |
| 370 | |
Nguyễn Thái Ngọc Duy | 328c6cb | 2019-03-29 17:39:19 +0700 | [diff] [blame] | 371 | return start_delayed_progress(_("Updating files"), total); |
Stefan Beller | 384f1a1 | 2017-01-09 11:46:19 -0800 | [diff] [blame] | 372 | } |
| 373 | |
Duy Nguyen | b878579 | 2018-08-17 20:00:39 +0200 | [diff] [blame] | 374 | static void setup_collided_checkout_detection(struct checkout *state, |
| 375 | struct index_state *index) |
| 376 | { |
| 377 | int i; |
| 378 | |
| 379 | state->clone = 1; |
| 380 | for (i = 0; i < index->cache_nr; i++) |
| 381 | index->cache[i]->ce_flags &= ~CE_MATCHED; |
| 382 | } |
| 383 | |
| 384 | static void report_collided_checkout(struct index_state *index) |
| 385 | { |
| 386 | struct string_list list = STRING_LIST_INIT_NODUP; |
| 387 | int i; |
| 388 | |
| 389 | for (i = 0; i < index->cache_nr; i++) { |
| 390 | struct cache_entry *ce = index->cache[i]; |
| 391 | |
| 392 | if (!(ce->ce_flags & CE_MATCHED)) |
| 393 | continue; |
| 394 | |
| 395 | string_list_append(&list, ce->name); |
| 396 | ce->ce_flags &= ~CE_MATCHED; |
| 397 | } |
| 398 | |
| 399 | list.cmp = fspathcmp; |
| 400 | string_list_sort(&list); |
| 401 | |
| 402 | if (list.nr) { |
| 403 | warning(_("the following paths have collided (e.g. case-sensitive paths\n" |
| 404 | "on a case-insensitive filesystem) and only one from the same\n" |
| 405 | "colliding group is in the working tree:\n")); |
| 406 | |
| 407 | for (i = 0; i < list.nr; i++) |
| 408 | fprintf(stderr, " '%s'\n", list.items[i].string); |
| 409 | } |
| 410 | |
| 411 | string_list_clear(&list, 0); |
| 412 | } |
| 413 | |
Jonathan Tan | b2896d2 | 2021-07-23 11:52:22 -0700 | [diff] [blame] | 414 | static int must_checkout(const struct cache_entry *ce) |
| 415 | { |
| 416 | return ce->ce_flags & CE_UPDATE; |
| 417 | } |
| 418 | |
Elijah Newren | b0a5a12 | 2020-03-27 00:48:49 +0000 | [diff] [blame] | 419 | static int check_updates(struct unpack_trees_options *o, |
| 420 | struct index_state *index) |
Stefan Beller | 384f1a1 | 2017-01-09 11:46:19 -0800 | [diff] [blame] | 421 | { |
| 422 | unsigned cnt = 0; |
Stefan Beller | 30ac275 | 2017-01-09 11:46:17 -0800 | [diff] [blame] | 423 | int errs = 0; |
Carlo Marcelo Arenas Belón | 07f967a | 2018-10-18 11:46:04 -0700 | [diff] [blame] | 424 | struct progress *progress; |
Stefan Beller | 30ac275 | 2017-01-09 11:46:17 -0800 | [diff] [blame] | 425 | struct checkout state = CHECKOUT_INIT; |
Matheus Tavares | 7531e4b | 2021-04-18 21:14:55 -0300 | [diff] [blame] | 426 | int i, pc_workers, pc_threshold; |
Stefan Beller | 30ac275 | 2017-01-09 11:46:17 -0800 | [diff] [blame] | 427 | |
Nguyễn Thái Ngọc Duy | 0d1ed59 | 2018-08-18 16:41:23 +0200 | [diff] [blame] | 428 | trace_performance_enter(); |
Ævar Arnfjörð Bjarmason | 4002ec3 | 2022-12-20 13:39:56 +0100 | [diff] [blame] | 429 | state.super_prefix = o->super_prefix; |
Stefan Beller | 30ac275 | 2017-01-09 11:46:17 -0800 | [diff] [blame] | 430 | state.force = 1; |
| 431 | state.quiet = 1; |
| 432 | state.refresh_cache = 1; |
| 433 | state.istate = index; |
brian m. carlson | 13e7ed6 | 2020-03-16 18:05:04 +0000 | [diff] [blame] | 434 | clone_checkout_metadata(&state.meta, &o->meta, NULL); |
Johannes Schindelin | 16da134 | 2006-07-30 20:25:18 +0200 | [diff] [blame] | 435 | |
Elijah Newren | 26f924d | 2020-01-07 06:57:57 +0000 | [diff] [blame] | 436 | if (!o->update || o->dry_run) { |
| 437 | remove_marked_cache_entries(index, 0); |
| 438 | trace_performance_leave("check_updates"); |
| 439 | return 0; |
| 440 | } |
| 441 | |
Duy Nguyen | b878579 | 2018-08-17 20:00:39 +0200 | [diff] [blame] | 442 | if (o->clone) |
| 443 | setup_collided_checkout_detection(&state, index); |
| 444 | |
Elijah Newren | 6c34239 | 2020-05-14 19:53:22 +0000 | [diff] [blame] | 445 | progress = get_progress(o, index); |
Johannes Schindelin | 16da134 | 2006-07-30 20:25:18 +0200 | [diff] [blame] | 446 | |
Matheus Tavares | 22539ec | 2021-02-02 22:37:10 +0100 | [diff] [blame] | 447 | /* Start with clean cache to avoid using any possibly outdated info. */ |
| 448 | invalidate_lstat_cache(); |
| 449 | |
Elijah Newren | 26f924d | 2020-01-07 06:57:57 +0000 | [diff] [blame] | 450 | git_attr_set_direction(GIT_ATTR_CHECKOUT); |
Brandon Williams | 3302871 | 2017-08-03 11:19:59 -0700 | [diff] [blame] | 451 | |
Elijah Newren | 26f924d | 2020-01-07 06:57:57 +0000 | [diff] [blame] | 452 | if (should_update_submodules()) |
Brandon Williams | 3302871 | 2017-08-03 11:19:59 -0700 | [diff] [blame] | 453 | load_gitmodules_file(index, NULL); |
| 454 | |
Linus Torvalds | 34110cd | 2008-03-06 18:12:28 -0800 | [diff] [blame] | 455 | for (i = 0; i < index->cache_nr; i++) { |
Nguyễn Thái Ngọc Duy | 9c5e6c8 | 2013-07-09 22:29:00 +0700 | [diff] [blame] | 456 | const struct cache_entry *ce = index->cache[i]; |
Johannes Schindelin | 16da134 | 2006-07-30 20:25:18 +0200 | [diff] [blame] | 457 | |
Nguyễn Thái Ngọc Duy | e663db2 | 2009-08-20 20:47:06 +0700 | [diff] [blame] | 458 | if (ce->ce_flags & CE_WT_REMOVE) { |
| 459 | display_progress(progress, ++cnt); |
Ævar Arnfjörð Bjarmason | 4002ec3 | 2022-12-20 13:39:56 +0100 | [diff] [blame] | 460 | unlink_entry(ce, o->super_prefix); |
Nguyễn Thái Ngọc Duy | e663db2 | 2009-08-20 20:47:06 +0700 | [diff] [blame] | 461 | } |
Linus Torvalds | 1fa6ead | 2008-03-22 09:48:41 -0700 | [diff] [blame] | 462 | } |
Elijah Newren | 26f924d | 2020-01-07 06:57:57 +0000 | [diff] [blame] | 463 | |
Thomas Gummerer | 6fdc205 | 2018-12-20 13:48:16 +0000 | [diff] [blame] | 464 | remove_marked_cache_entries(index, 0); |
Kjetil Barvik | 7847892 | 2009-02-09 21:54:07 +0100 | [diff] [blame] | 465 | remove_scheduled_dirs(); |
Linus Torvalds | 1fa6ead | 2008-03-22 09:48:41 -0700 | [diff] [blame] | 466 | |
Elijah Newren | 26f924d | 2020-01-07 06:57:57 +0000 | [diff] [blame] | 467 | if (should_update_submodules()) |
Brandon Williams | 3302871 | 2017-08-03 11:19:59 -0700 | [diff] [blame] | 468 | load_gitmodules_file(index, &state); |
Stefan Beller | a7bc845 | 2017-03-14 14:46:39 -0700 | [diff] [blame] | 469 | |
Ævar Arnfjörð Bjarmason | a5183d7 | 2023-03-28 15:58:53 +0200 | [diff] [blame] | 470 | if (repo_has_promisor_remote(the_repository)) |
Jonathan Tan | c0c578b | 2017-12-08 15:58:47 +0000 | [diff] [blame] | 471 | /* |
| 472 | * Prefetch the objects that are to be checked out in the loop |
| 473 | * below. |
| 474 | */ |
Jonathan Tan | b2896d2 | 2021-07-23 11:52:22 -0700 | [diff] [blame] | 475 | prefetch_cache_entries(index, must_checkout); |
Matheus Tavares | 04155bd | 2021-04-18 21:14:53 -0300 | [diff] [blame] | 476 | |
Matheus Tavares | 7531e4b | 2021-04-18 21:14:55 -0300 | [diff] [blame] | 477 | get_parallel_checkout_configs(&pc_workers, &pc_threshold); |
| 478 | |
Matheus Tavares | 04155bd | 2021-04-18 21:14:53 -0300 | [diff] [blame] | 479 | enable_delayed_checkout(&state); |
Matheus Tavares | 7531e4b | 2021-04-18 21:14:55 -0300 | [diff] [blame] | 480 | if (pc_workers > 1) |
| 481 | init_parallel_checkout(); |
Linus Torvalds | 1fa6ead | 2008-03-22 09:48:41 -0700 | [diff] [blame] | 482 | for (i = 0; i < index->cache_nr; i++) { |
| 483 | struct cache_entry *ce = index->cache[i]; |
| 484 | |
Jonathan Tan | b2896d2 | 2021-07-23 11:52:22 -0700 | [diff] [blame] | 485 | if (must_checkout(ce)) { |
Matheus Tavares | 1c4d6f4 | 2021-04-18 21:14:56 -0300 | [diff] [blame] | 486 | size_t last_pc_queue_size = pc_queue_size(); |
| 487 | |
David Turner | 7d78241 | 2015-07-17 17:19:27 -0400 | [diff] [blame] | 488 | if (ce->ce_flags & CE_WT_REMOVE) |
Johannes Schindelin | 033abf9 | 2018-05-02 11:38:39 +0200 | [diff] [blame] | 489 | BUG("both update and delete flags are set on %s", |
David Turner | 7d78241 | 2015-07-17 17:19:27 -0400 | [diff] [blame] | 490 | ce->name); |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 491 | ce->ce_flags &= ~CE_UPDATE; |
Elijah Newren | 26f924d | 2020-01-07 06:57:57 +0000 | [diff] [blame] | 492 | errs |= checkout_entry(ce, &state, NULL, NULL); |
Matheus Tavares | 1c4d6f4 | 2021-04-18 21:14:56 -0300 | [diff] [blame] | 493 | |
| 494 | if (last_pc_queue_size == pc_queue_size()) |
| 495 | display_progress(progress, ++cnt); |
Johannes Schindelin | 16da134 | 2006-07-30 20:25:18 +0200 | [diff] [blame] | 496 | } |
| 497 | } |
Matheus Tavares | 7531e4b | 2021-04-18 21:14:55 -0300 | [diff] [blame] | 498 | if (pc_workers > 1) |
Matheus Tavares | 1c4d6f4 | 2021-04-18 21:14:56 -0300 | [diff] [blame] | 499 | errs |= run_parallel_checkout(&state, pc_workers, pc_threshold, |
| 500 | progress, &cnt); |
Nicolas Pitre | 4d4fcc5 | 2007-10-30 14:57:33 -0400 | [diff] [blame] | 501 | stop_progress(&progress); |
Matheus Tavares | 611c778 | 2022-07-14 08:49:12 -0300 | [diff] [blame] | 502 | errs |= finish_delayed_checkout(&state, o->verbose_update); |
Elijah Newren | 26f924d | 2020-01-07 06:57:57 +0000 | [diff] [blame] | 503 | git_attr_set_direction(GIT_ATTR_CHECKIN); |
Duy Nguyen | b878579 | 2018-08-17 20:00:39 +0200 | [diff] [blame] | 504 | |
| 505 | if (o->clone) |
| 506 | report_collided_checkout(index); |
| 507 | |
Nguyễn Thái Ngọc Duy | 0d1ed59 | 2018-08-18 16:41:23 +0200 | [diff] [blame] | 508 | trace_performance_leave("check_updates"); |
Junio C Hamano | c4758d3 | 2008-03-18 22:01:28 -0700 | [diff] [blame] | 509 | return errs != 0; |
Johannes Schindelin | 16da134 | 2006-07-30 20:25:18 +0200 | [diff] [blame] | 510 | } |
| 511 | |
René Scharfe | eb9ae4b | 2013-06-02 17:46:55 +0200 | [diff] [blame] | 512 | static int verify_uptodate_sparse(const struct cache_entry *ce, |
| 513 | struct unpack_trees_options *o); |
| 514 | static int verify_absent_sparse(const struct cache_entry *ce, |
| 515 | enum unpack_trees_error_types, |
| 516 | struct unpack_trees_options *o); |
Nguyễn Thái Ngọc Duy | e800ec9 | 2009-08-20 20:47:09 +0700 | [diff] [blame] | 517 | |
Nguyễn Thái Ngọc Duy | a5c446f | 2014-06-13 19:19:30 +0700 | [diff] [blame] | 518 | static int apply_sparse_checkout(struct index_state *istate, |
| 519 | struct cache_entry *ce, |
| 520 | struct unpack_trees_options *o) |
Nguyễn Thái Ngọc Duy | e800ec9 | 2009-08-20 20:47:09 +0700 | [diff] [blame] | 521 | { |
| 522 | int was_skip_worktree = ce_skip_worktree(ce); |
| 523 | |
Nguyễn Thái Ngọc Duy | 2431afb | 2010-11-27 13:24:04 +0700 | [diff] [blame] | 524 | if (ce->ce_flags & CE_NEW_SKIP_WORKTREE) |
Nguyễn Thái Ngọc Duy | e800ec9 | 2009-08-20 20:47:09 +0700 | [diff] [blame] | 525 | ce->ce_flags |= CE_SKIP_WORKTREE; |
| 526 | else |
| 527 | ce->ce_flags &= ~CE_SKIP_WORKTREE; |
Nguyễn Thái Ngọc Duy | 078a58e | 2014-06-13 19:19:39 +0700 | [diff] [blame] | 528 | if (was_skip_worktree != ce_skip_worktree(ce)) { |
| 529 | ce->ce_flags |= CE_UPDATE_IN_BASE; |
Ben Peart | 883e248 | 2017-09-22 12:35:40 -0400 | [diff] [blame] | 530 | mark_fsmonitor_invalid(istate, ce); |
Nguyễn Thái Ngọc Duy | a5c446f | 2014-06-13 19:19:30 +0700 | [diff] [blame] | 531 | istate->cache_changed |= CE_ENTRY_CHANGED; |
Nguyễn Thái Ngọc Duy | 078a58e | 2014-06-13 19:19:39 +0700 | [diff] [blame] | 532 | } |
Nguyễn Thái Ngọc Duy | e800ec9 | 2009-08-20 20:47:09 +0700 | [diff] [blame] | 533 | |
| 534 | /* |
Nguyễn Thái Ngọc Duy | eec3fc0 | 2010-07-31 13:14:26 +0700 | [diff] [blame] | 535 | * if (!was_skip_worktree && !ce_skip_worktree()) { |
| 536 | * This is perfectly normal. Move on; |
| 537 | * } |
Nguyễn Thái Ngọc Duy | e800ec9 | 2009-08-20 20:47:09 +0700 | [diff] [blame] | 538 | */ |
Nguyễn Thái Ngọc Duy | eec3fc0 | 2010-07-31 13:14:26 +0700 | [diff] [blame] | 539 | |
| 540 | /* |
| 541 | * Merge strategies may set CE_UPDATE|CE_REMOVE outside checkout |
| 542 | * area as a result of ce_skip_worktree() shortcuts in |
Nguyễn Thái Ngọc Duy | 700e66d | 2010-07-31 13:14:27 +0700 | [diff] [blame] | 543 | * verify_absent() and verify_uptodate(). |
| 544 | * Make sure they don't modify worktree if they are already |
| 545 | * outside checkout area |
Nguyễn Thái Ngọc Duy | eec3fc0 | 2010-07-31 13:14:26 +0700 | [diff] [blame] | 546 | */ |
Nguyễn Thái Ngọc Duy | 700e66d | 2010-07-31 13:14:27 +0700 | [diff] [blame] | 547 | if (was_skip_worktree && ce_skip_worktree(ce)) { |
| 548 | ce->ce_flags &= ~CE_UPDATE; |
| 549 | |
| 550 | /* |
| 551 | * By default, when CE_REMOVE is on, CE_WT_REMOVE is also |
| 552 | * on to get that file removed from both index and worktree. |
| 553 | * If that file is already outside worktree area, don't |
| 554 | * bother remove it. |
| 555 | */ |
| 556 | if (ce->ce_flags & CE_REMOVE) |
| 557 | ce->ce_flags &= ~CE_WT_REMOVE; |
| 558 | } |
Nguyễn Thái Ngọc Duy | e800ec9 | 2009-08-20 20:47:09 +0700 | [diff] [blame] | 559 | |
| 560 | if (!was_skip_worktree && ce_skip_worktree(ce)) { |
| 561 | /* |
| 562 | * If CE_UPDATE is set, verify_uptodate() must be called already |
| 563 | * also stat info may have lost after merged_entry() so calling |
| 564 | * verify_uptodate() again may fail |
| 565 | */ |
Elijah Newren | 3cc7c50 | 2020-03-27 00:48:50 +0000 | [diff] [blame] | 566 | if (!(ce->ce_flags & CE_UPDATE) && |
| 567 | verify_uptodate_sparse(ce, o)) { |
| 568 | ce->ce_flags &= ~CE_SKIP_WORKTREE; |
Nguyễn Thái Ngọc Duy | e800ec9 | 2009-08-20 20:47:09 +0700 | [diff] [blame] | 569 | return -1; |
Elijah Newren | 3cc7c50 | 2020-03-27 00:48:50 +0000 | [diff] [blame] | 570 | } |
Nguyễn Thái Ngọc Duy | e800ec9 | 2009-08-20 20:47:09 +0700 | [diff] [blame] | 571 | ce->ce_flags |= CE_WT_REMOVE; |
David Turner | 7d78241 | 2015-07-17 17:19:27 -0400 | [diff] [blame] | 572 | ce->ce_flags &= ~CE_UPDATE; |
Nguyễn Thái Ngọc Duy | e800ec9 | 2009-08-20 20:47:09 +0700 | [diff] [blame] | 573 | } |
| 574 | if (was_skip_worktree && !ce_skip_worktree(ce)) { |
Elijah Newren | 1ac83f4 | 2020-03-27 00:48:56 +0000 | [diff] [blame] | 575 | if (verify_absent_sparse(ce, WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN, o)) |
Nguyễn Thái Ngọc Duy | e800ec9 | 2009-08-20 20:47:09 +0700 | [diff] [blame] | 576 | return -1; |
| 577 | ce->ce_flags |= CE_UPDATE; |
| 578 | } |
| 579 | return 0; |
| 580 | } |
| 581 | |
Elijah Newren | ebb568b | 2020-03-27 00:48:59 +0000 | [diff] [blame] | 582 | static int warn_conflicted_path(struct index_state *istate, |
| 583 | int i, |
| 584 | struct unpack_trees_options *o) |
| 585 | { |
| 586 | char *conflicting_path = istate->cache[i]->name; |
| 587 | int count = 0; |
| 588 | |
| 589 | add_rejected_path(o, WARNING_SPARSE_UNMERGED_FILE, conflicting_path); |
| 590 | |
Derrick Stolee | 0eeb3be | 2020-05-07 13:17:33 +0000 | [diff] [blame] | 591 | /* Find out how many higher stage entries are at same path */ |
| 592 | while ((++count) + i < istate->cache_nr && |
| 593 | !strcmp(conflicting_path, istate->cache[count + i]->name)) |
| 594 | ; /* do nothing */ |
| 595 | |
Elijah Newren | ebb568b | 2020-03-27 00:48:59 +0000 | [diff] [blame] | 596 | return count; |
| 597 | } |
| 598 | |
René Scharfe | 5828e83 | 2013-06-02 17:46:56 +0200 | [diff] [blame] | 599 | static inline int call_unpack_fn(const struct cache_entry * const *src, |
| 600 | struct unpack_trees_options *o) |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 601 | { |
Linus Torvalds | 34110cd | 2008-03-06 18:12:28 -0800 | [diff] [blame] | 602 | int ret = o->fn(src, o); |
| 603 | if (ret > 0) |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 604 | ret = 0; |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 605 | return ret; |
| 606 | } |
| 607 | |
Junio C Hamano | da165f4 | 2010-01-07 14:59:54 -0800 | [diff] [blame] | 608 | static void mark_ce_used(struct cache_entry *ce, struct unpack_trees_options *o) |
| 609 | { |
| 610 | ce->ce_flags |= CE_UNPACKED; |
| 611 | |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 612 | if (o->internal.cache_bottom < o->src_index->cache_nr && |
| 613 | o->src_index->cache[o->internal.cache_bottom] == ce) { |
| 614 | int bottom = o->internal.cache_bottom; |
| 615 | |
Junio C Hamano | da165f4 | 2010-01-07 14:59:54 -0800 | [diff] [blame] | 616 | while (bottom < o->src_index->cache_nr && |
| 617 | o->src_index->cache[bottom]->ce_flags & CE_UNPACKED) |
| 618 | bottom++; |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 619 | o->internal.cache_bottom = bottom; |
Junio C Hamano | da165f4 | 2010-01-07 14:59:54 -0800 | [diff] [blame] | 620 | } |
| 621 | } |
| 622 | |
| 623 | static void mark_all_ce_unused(struct index_state *index) |
| 624 | { |
| 625 | int i; |
| 626 | for (i = 0; i < index->cache_nr; i++) |
Nguyễn Thái Ngọc Duy | 2431afb | 2010-11-27 13:24:04 +0700 | [diff] [blame] | 627 | index->cache[i]->ce_flags &= ~(CE_UNPACKED | CE_ADDED | CE_NEW_SKIP_WORKTREE); |
Junio C Hamano | da165f4 | 2010-01-07 14:59:54 -0800 | [diff] [blame] | 628 | } |
| 629 | |
René Scharfe | eb9ae4b | 2013-06-02 17:46:55 +0200 | [diff] [blame] | 630 | static int locate_in_src_index(const struct cache_entry *ce, |
Junio C Hamano | da165f4 | 2010-01-07 14:59:54 -0800 | [diff] [blame] | 631 | struct unpack_trees_options *o) |
| 632 | { |
| 633 | struct index_state *index = o->src_index; |
| 634 | int len = ce_namelen(ce); |
| 635 | int pos = index_name_pos(index, ce->name, len); |
| 636 | if (pos < 0) |
| 637 | pos = -1 - pos; |
| 638 | return pos; |
| 639 | } |
| 640 | |
| 641 | /* |
| 642 | * We call unpack_index_entry() with an unmerged cache entry |
| 643 | * only in diff-index, and it wants a single callback. Skip |
| 644 | * the other unmerged entry with the same name. |
| 645 | */ |
| 646 | static void mark_ce_used_same_name(struct cache_entry *ce, |
| 647 | struct unpack_trees_options *o) |
| 648 | { |
| 649 | struct index_state *index = o->src_index; |
| 650 | int len = ce_namelen(ce); |
| 651 | int pos; |
| 652 | |
| 653 | for (pos = locate_in_src_index(ce, o); pos < index->cache_nr; pos++) { |
| 654 | struct cache_entry *next = index->cache[pos]; |
| 655 | if (len != ce_namelen(next) || |
| 656 | memcmp(ce->name, next->name, len)) |
| 657 | break; |
| 658 | mark_ce_used(next, o); |
| 659 | } |
| 660 | } |
| 661 | |
Victoria Dye | 99430aa | 2022-03-17 15:55:36 +0000 | [diff] [blame] | 662 | static struct cache_entry *next_cache_entry(struct unpack_trees_options *o) |
Junio C Hamano | da165f4 | 2010-01-07 14:59:54 -0800 | [diff] [blame] | 663 | { |
| 664 | const struct index_state *index = o->src_index; |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 665 | int pos = o->internal.cache_bottom; |
Junio C Hamano | da165f4 | 2010-01-07 14:59:54 -0800 | [diff] [blame] | 666 | |
| 667 | while (pos < index->cache_nr) { |
| 668 | struct cache_entry *ce = index->cache[pos]; |
Victoria Dye | 99430aa | 2022-03-17 15:55:36 +0000 | [diff] [blame] | 669 | if (!(ce->ce_flags & CE_UNPACKED)) |
Junio C Hamano | da165f4 | 2010-01-07 14:59:54 -0800 | [diff] [blame] | 670 | return ce; |
| 671 | pos++; |
| 672 | } |
| 673 | return NULL; |
| 674 | } |
| 675 | |
Nguyễn Thái Ngọc Duy | 9c5e6c8 | 2013-07-09 22:29:00 +0700 | [diff] [blame] | 676 | static void add_same_unmerged(const struct cache_entry *ce, |
Junio C Hamano | da165f4 | 2010-01-07 14:59:54 -0800 | [diff] [blame] | 677 | struct unpack_trees_options *o) |
| 678 | { |
| 679 | struct index_state *index = o->src_index; |
| 680 | int len = ce_namelen(ce); |
| 681 | int pos = index_name_pos(index, ce->name, len); |
| 682 | |
| 683 | if (0 <= pos) |
| 684 | die("programming error in a caller of mark_ce_used_same_name"); |
| 685 | for (pos = -pos - 1; pos < index->cache_nr; pos++) { |
| 686 | struct cache_entry *next = index->cache[pos]; |
| 687 | if (len != ce_namelen(next) || |
| 688 | memcmp(ce->name, next->name, len)) |
| 689 | break; |
| 690 | add_entry(o, next, 0, 0); |
| 691 | mark_ce_used(next, o); |
| 692 | } |
| 693 | } |
| 694 | |
| 695 | static int unpack_index_entry(struct cache_entry *ce, |
| 696 | struct unpack_trees_options *o) |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 697 | { |
René Scharfe | 5828e83 | 2013-06-02 17:46:56 +0200 | [diff] [blame] | 698 | const struct cache_entry *src[MAX_UNPACK_TREES + 1] = { NULL, }; |
Junio C Hamano | da165f4 | 2010-01-07 14:59:54 -0800 | [diff] [blame] | 699 | int ret; |
Linus Torvalds | 34110cd | 2008-03-06 18:12:28 -0800 | [diff] [blame] | 700 | |
Gary V. Vaughan | 66dbfd5 | 2010-05-14 09:31:33 +0000 | [diff] [blame] | 701 | src[0] = ce; |
| 702 | |
Junio C Hamano | da165f4 | 2010-01-07 14:59:54 -0800 | [diff] [blame] | 703 | mark_ce_used(ce, o); |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 704 | if (ce_stage(ce)) { |
| 705 | if (o->skip_unmerged) { |
Linus Torvalds | 34110cd | 2008-03-06 18:12:28 -0800 | [diff] [blame] | 706 | add_entry(o, ce, 0, 0); |
| 707 | return 0; |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 708 | } |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 709 | } |
Junio C Hamano | da165f4 | 2010-01-07 14:59:54 -0800 | [diff] [blame] | 710 | ret = call_unpack_fn(src, o); |
| 711 | if (ce_stage(ce)) |
| 712 | mark_ce_used_same_name(ce, o); |
| 713 | return ret; |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 714 | } |
| 715 | |
Jeff King | 9055384 | 2019-07-31 00:38:15 -0400 | [diff] [blame] | 716 | static int find_cache_pos(struct traverse_info *, const char *p, size_t len); |
Junio C Hamano | 730f728 | 2009-09-20 00:03:39 -0700 | [diff] [blame] | 717 | |
| 718 | static void restore_cache_bottom(struct traverse_info *info, int bottom) |
| 719 | { |
| 720 | struct unpack_trees_options *o = info->data; |
| 721 | |
| 722 | if (o->diff_index_cached) |
| 723 | return; |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 724 | o->internal.cache_bottom = bottom; |
Junio C Hamano | 730f728 | 2009-09-20 00:03:39 -0700 | [diff] [blame] | 725 | } |
| 726 | |
| 727 | static int switch_cache_bottom(struct traverse_info *info) |
| 728 | { |
| 729 | struct unpack_trees_options *o = info->data; |
| 730 | int ret, pos; |
| 731 | |
| 732 | if (o->diff_index_cached) |
| 733 | return 0; |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 734 | ret = o->internal.cache_bottom; |
Jeff King | 9055384 | 2019-07-31 00:38:15 -0400 | [diff] [blame] | 735 | pos = find_cache_pos(info->prev, info->name, info->namelen); |
Junio C Hamano | 730f728 | 2009-09-20 00:03:39 -0700 | [diff] [blame] | 736 | |
| 737 | if (pos < -1) |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 738 | o->internal.cache_bottom = -2 - pos; |
Junio C Hamano | 730f728 | 2009-09-20 00:03:39 -0700 | [diff] [blame] | 739 | else if (pos < 0) |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 740 | o->internal.cache_bottom = o->src_index->cache_nr; |
Junio C Hamano | 730f728 | 2009-09-20 00:03:39 -0700 | [diff] [blame] | 741 | return ret; |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 742 | } |
| 743 | |
Jeff Hostetler | d12a8cf | 2017-04-14 19:25:54 +0000 | [diff] [blame] | 744 | static inline int are_same_oid(struct name_entry *name_j, struct name_entry *name_k) |
| 745 | { |
brian m. carlson | ea82b2a | 2019-01-15 00:39:44 +0000 | [diff] [blame] | 746 | return !is_null_oid(&name_j->oid) && !is_null_oid(&name_k->oid) && oideq(&name_j->oid, &name_k->oid); |
Jeff Hostetler | d12a8cf | 2017-04-14 19:25:54 +0000 | [diff] [blame] | 747 | } |
| 748 | |
Nguyễn Thái Ngọc Duy | b4da373 | 2018-08-18 16:41:24 +0200 | [diff] [blame] | 749 | static int all_trees_same_as_cache_tree(int n, unsigned long dirmask, |
| 750 | struct name_entry *names, |
| 751 | struct traverse_info *info) |
| 752 | { |
| 753 | struct unpack_trees_options *o = info->data; |
| 754 | int i; |
| 755 | |
| 756 | if (!o->merge || dirmask != ((1 << n) - 1)) |
| 757 | return 0; |
| 758 | |
| 759 | for (i = 1; i < n; i++) |
| 760 | if (!are_same_oid(names, names + i)) |
| 761 | return 0; |
| 762 | |
| 763 | return cache_tree_matches_traversal(o->src_index->cache_tree, names, info); |
| 764 | } |
| 765 | |
| 766 | static int index_pos_by_traverse_info(struct name_entry *names, |
| 767 | struct traverse_info *info) |
| 768 | { |
| 769 | struct unpack_trees_options *o = info->data; |
Jeff King | c43ab06 | 2019-07-31 00:38:23 -0400 | [diff] [blame] | 770 | struct strbuf name = STRBUF_INIT; |
Nguyễn Thái Ngọc Duy | b4da373 | 2018-08-18 16:41:24 +0200 | [diff] [blame] | 771 | int pos; |
| 772 | |
Jeff King | c43ab06 | 2019-07-31 00:38:23 -0400 | [diff] [blame] | 773 | strbuf_make_traverse_path(&name, info, names->path, names->pathlen); |
| 774 | strbuf_addch(&name, '/'); |
| 775 | pos = index_name_pos(o->src_index, name.buf, name.len); |
Derrick Stolee | 13e1331 | 2021-03-30 13:10:57 +0000 | [diff] [blame] | 776 | if (pos >= 0) { |
| 777 | if (!o->src_index->sparse_index || |
| 778 | !(o->src_index->cache[pos]->ce_flags & CE_SKIP_WORKTREE)) |
| 779 | BUG("This is a directory and should not exist in index"); |
| 780 | } else { |
| 781 | pos = -pos - 1; |
| 782 | } |
Emily Shaffer | 573117d | 2020-01-07 18:31:27 -0800 | [diff] [blame] | 783 | if (pos >= o->src_index->cache_nr || |
| 784 | !starts_with(o->src_index->cache[pos]->name, name.buf) || |
Jeff King | c43ab06 | 2019-07-31 00:38:23 -0400 | [diff] [blame] | 785 | (pos > 0 && starts_with(o->src_index->cache[pos-1]->name, name.buf))) |
Emily Shaffer | 573117d | 2020-01-07 18:31:27 -0800 | [diff] [blame] | 786 | BUG("pos %d doesn't point to the first entry of %s in index", |
| 787 | pos, name.buf); |
Jeff King | c43ab06 | 2019-07-31 00:38:23 -0400 | [diff] [blame] | 788 | strbuf_release(&name); |
Nguyễn Thái Ngọc Duy | b4da373 | 2018-08-18 16:41:24 +0200 | [diff] [blame] | 789 | return pos; |
| 790 | } |
| 791 | |
| 792 | /* |
| 793 | * Fast path if we detect that all trees are the same as cache-tree at this |
Nguyễn Thái Ngọc Duy | 5f4436a | 2018-08-25 15:02:09 +0200 | [diff] [blame] | 794 | * path. We'll walk these trees in an iterative loop using cache-tree/index |
| 795 | * instead of ODB since we already know what these trees contain. |
Nguyễn Thái Ngọc Duy | b4da373 | 2018-08-18 16:41:24 +0200 | [diff] [blame] | 796 | */ |
| 797 | static int traverse_by_cache_tree(int pos, int nr_entries, int nr_names, |
Nguyễn Thái Ngọc Duy | b4da373 | 2018-08-18 16:41:24 +0200 | [diff] [blame] | 798 | struct traverse_info *info) |
| 799 | { |
| 800 | struct cache_entry *src[MAX_UNPACK_TREES + 1] = { NULL, }; |
| 801 | struct unpack_trees_options *o = info->data; |
Nguyễn Thái Ngọc Duy | f1e11c6 | 2018-08-18 16:41:25 +0200 | [diff] [blame] | 802 | struct cache_entry *tree_ce = NULL; |
| 803 | int ce_len = 0; |
Nguyễn Thái Ngọc Duy | b4da373 | 2018-08-18 16:41:24 +0200 | [diff] [blame] | 804 | int i, d; |
| 805 | |
| 806 | if (!o->merge) |
| 807 | BUG("We need cache-tree to do this optimization"); |
| 808 | |
| 809 | /* |
Derrick Stolee | bd6a3fd | 2021-07-14 13:12:32 +0000 | [diff] [blame] | 810 | * Do what unpack_callback() and unpack_single_entry() normally |
Nguyễn Thái Ngọc Duy | b4da373 | 2018-08-18 16:41:24 +0200 | [diff] [blame] | 811 | * do. But we walk all paths in an iterative loop instead. |
| 812 | * |
| 813 | * D/F conflicts and higher stage entries are not a concern |
| 814 | * because cache-tree would be invalidated and we would never |
| 815 | * get here in the first place. |
| 816 | */ |
| 817 | for (i = 0; i < nr_entries; i++) { |
Nguyễn Thái Ngọc Duy | f1e11c6 | 2018-08-18 16:41:25 +0200 | [diff] [blame] | 818 | int new_ce_len, len, rc; |
Nguyễn Thái Ngọc Duy | b4da373 | 2018-08-18 16:41:24 +0200 | [diff] [blame] | 819 | |
| 820 | src[0] = o->src_index->cache[pos + i]; |
| 821 | |
| 822 | len = ce_namelen(src[0]); |
Nguyễn Thái Ngọc Duy | f1e11c6 | 2018-08-18 16:41:25 +0200 | [diff] [blame] | 823 | new_ce_len = cache_entry_size(len); |
| 824 | |
| 825 | if (new_ce_len > ce_len) { |
| 826 | new_ce_len <<= 1; |
| 827 | tree_ce = xrealloc(tree_ce, new_ce_len); |
| 828 | memset(tree_ce, 0, new_ce_len); |
| 829 | ce_len = new_ce_len; |
| 830 | |
| 831 | tree_ce->ce_flags = create_ce_flags(0); |
| 832 | |
| 833 | for (d = 1; d <= nr_names; d++) |
| 834 | src[d] = tree_ce; |
| 835 | } |
Nguyễn Thái Ngọc Duy | b4da373 | 2018-08-18 16:41:24 +0200 | [diff] [blame] | 836 | |
| 837 | tree_ce->ce_mode = src[0]->ce_mode; |
Nguyễn Thái Ngọc Duy | b4da373 | 2018-08-18 16:41:24 +0200 | [diff] [blame] | 838 | tree_ce->ce_namelen = len; |
| 839 | oidcpy(&tree_ce->oid, &src[0]->oid); |
| 840 | memcpy(tree_ce->name, src[0]->name, len + 1); |
| 841 | |
Nguyễn Thái Ngọc Duy | b4da373 | 2018-08-18 16:41:24 +0200 | [diff] [blame] | 842 | rc = call_unpack_fn((const struct cache_entry * const *)src, o); |
Nguyễn Thái Ngọc Duy | f1e11c6 | 2018-08-18 16:41:25 +0200 | [diff] [blame] | 843 | if (rc < 0) { |
| 844 | free(tree_ce); |
Nguyễn Thái Ngọc Duy | b4da373 | 2018-08-18 16:41:24 +0200 | [diff] [blame] | 845 | return rc; |
Nguyễn Thái Ngọc Duy | f1e11c6 | 2018-08-18 16:41:25 +0200 | [diff] [blame] | 846 | } |
Nguyễn Thái Ngọc Duy | b4da373 | 2018-08-18 16:41:24 +0200 | [diff] [blame] | 847 | |
| 848 | mark_ce_used(src[0], o); |
| 849 | } |
Nguyễn Thái Ngọc Duy | f1e11c6 | 2018-08-18 16:41:25 +0200 | [diff] [blame] | 850 | free(tree_ce); |
Elijah Newren | 1ca13dd | 2023-02-27 15:28:19 +0000 | [diff] [blame] | 851 | if (o->internal.debug_unpack) |
Nguyễn Thái Ngọc Duy | b4da373 | 2018-08-18 16:41:24 +0200 | [diff] [blame] | 852 | printf("Unpacked %d entries from %s to %s using cache-tree\n", |
| 853 | nr_entries, |
| 854 | o->src_index->cache[pos]->name, |
| 855 | o->src_index->cache[pos + nr_entries - 1]->name); |
| 856 | return 0; |
| 857 | } |
| 858 | |
Junio C Hamano | 84563a6 | 2010-12-22 09:09:55 -0800 | [diff] [blame] | 859 | static int traverse_trees_recursive(int n, unsigned long dirmask, |
| 860 | unsigned long df_conflicts, |
| 861 | struct name_entry *names, |
| 862 | struct traverse_info *info) |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 863 | { |
Nguyễn Thái Ngọc Duy | 67022e0 | 2018-11-18 17:47:57 +0100 | [diff] [blame] | 864 | struct unpack_trees_options *o = info->data; |
Junio C Hamano | 730f728 | 2009-09-20 00:03:39 -0700 | [diff] [blame] | 865 | int i, ret, bottom; |
Jeff Hostetler | d12a8cf | 2017-04-14 19:25:54 +0000 | [diff] [blame] | 866 | int nr_buf = 0; |
Jeff King | 59c4c7d | 2023-08-31 02:17:54 -0400 | [diff] [blame] | 867 | struct tree_desc *t; |
| 868 | void **buf; |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 869 | struct traverse_info newinfo; |
| 870 | struct name_entry *p; |
Nguyễn Thái Ngọc Duy | b4da373 | 2018-08-18 16:41:24 +0200 | [diff] [blame] | 871 | int nr_entries; |
| 872 | |
| 873 | nr_entries = all_trees_same_as_cache_tree(n, dirmask, names, info); |
| 874 | if (nr_entries > 0) { |
Nguyễn Thái Ngọc Duy | b4da373 | 2018-08-18 16:41:24 +0200 | [diff] [blame] | 875 | int pos = index_pos_by_traverse_info(names, info); |
| 876 | |
| 877 | if (!o->merge || df_conflicts) |
| 878 | BUG("Wrong condition to get here buddy"); |
| 879 | |
| 880 | /* |
| 881 | * All entries up to 'pos' must have been processed |
| 882 | * (i.e. marked CE_UNPACKED) at this point. But to be safe, |
| 883 | * save and restore cache_bottom anyway to not miss |
| 884 | * unprocessed entries before 'pos'. |
| 885 | */ |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 886 | bottom = o->internal.cache_bottom; |
Jeff King | 6642969 | 2019-03-20 04:15:07 -0400 | [diff] [blame] | 887 | ret = traverse_by_cache_tree(pos, nr_entries, n, info); |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 888 | o->internal.cache_bottom = bottom; |
Nguyễn Thái Ngọc Duy | b4da373 | 2018-08-18 16:41:24 +0200 | [diff] [blame] | 889 | return ret; |
| 890 | } |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 891 | |
| 892 | p = names; |
| 893 | while (!p->mode) |
| 894 | p++; |
| 895 | |
| 896 | newinfo = *info; |
| 897 | newinfo.prev = info; |
Junio C Hamano | 40e3725 | 2011-08-29 12:31:06 -0700 | [diff] [blame] | 898 | newinfo.pathspec = info->pathspec; |
Jeff King | 9055384 | 2019-07-31 00:38:15 -0400 | [diff] [blame] | 899 | newinfo.name = p->path; |
| 900 | newinfo.namelen = p->pathlen; |
| 901 | newinfo.mode = p->mode; |
Jeff King | 3780608 | 2019-07-31 00:38:18 -0400 | [diff] [blame] | 902 | newinfo.pathlen = st_add3(newinfo.pathlen, tree_entry_len(p), 1); |
René Scharfe | 603d249 | 2013-06-16 01:44:43 +0200 | [diff] [blame] | 903 | newinfo.df_conflicts |= df_conflicts; |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 904 | |
Jeff King | 59c4c7d | 2023-08-31 02:17:54 -0400 | [diff] [blame] | 905 | ALLOC_ARRAY(t, n); |
| 906 | ALLOC_ARRAY(buf, n); |
| 907 | |
Jeff Hostetler | d12a8cf | 2017-04-14 19:25:54 +0000 | [diff] [blame] | 908 | /* |
| 909 | * Fetch the tree from the ODB for each peer directory in the |
| 910 | * n commits. |
| 911 | * |
| 912 | * For 2- and 3-way traversals, we try to avoid hitting the |
| 913 | * ODB twice for the same OID. This should yield a nice speed |
| 914 | * up in checkouts and merges when the commits are similar. |
| 915 | * |
| 916 | * We don't bother doing the full O(n^2) search for larger n, |
| 917 | * because wider traversals don't happen that often and we |
| 918 | * avoid the search setup. |
| 919 | * |
| 920 | * When 2 peer OIDs are the same, we just copy the tree |
| 921 | * descriptor data. This implicitly borrows the buffer |
| 922 | * data from the earlier cell. |
| 923 | */ |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 924 | for (i = 0; i < n; i++, dirmask >>= 1) { |
Jeff Hostetler | d12a8cf | 2017-04-14 19:25:54 +0000 | [diff] [blame] | 925 | if (i > 0 && are_same_oid(&names[i], &names[i - 1])) |
| 926 | t[i] = t[i - 1]; |
| 927 | else if (i > 1 && are_same_oid(&names[i], &names[i - 2])) |
| 928 | t[i] = t[i - 2]; |
| 929 | else { |
René Scharfe | 5c377d3 | 2017-08-12 10:32:59 +0200 | [diff] [blame] | 930 | const struct object_id *oid = NULL; |
Jeff Hostetler | d12a8cf | 2017-04-14 19:25:54 +0000 | [diff] [blame] | 931 | if (dirmask & 1) |
brian m. carlson | ea82b2a | 2019-01-15 00:39:44 +0000 | [diff] [blame] | 932 | oid = &names[i].oid; |
Nguyễn Thái Ngọc Duy | 5e57580 | 2019-06-27 16:28:48 +0700 | [diff] [blame] | 933 | buf[nr_buf++] = fill_tree_descriptor(the_repository, t + i, oid); |
Jeff Hostetler | d12a8cf | 2017-04-14 19:25:54 +0000 | [diff] [blame] | 934 | } |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 935 | } |
Junio C Hamano | 730f728 | 2009-09-20 00:03:39 -0700 | [diff] [blame] | 936 | |
| 937 | bottom = switch_cache_bottom(&newinfo); |
Nguyễn Thái Ngọc Duy | 67022e0 | 2018-11-18 17:47:57 +0100 | [diff] [blame] | 938 | ret = traverse_trees(o->src_index, n, t, &newinfo); |
Junio C Hamano | 730f728 | 2009-09-20 00:03:39 -0700 | [diff] [blame] | 939 | restore_cache_bottom(&newinfo, bottom); |
Jonathan Nieder | 1ce584b | 2010-08-09 22:33:44 -0500 | [diff] [blame] | 940 | |
Jeff Hostetler | d12a8cf | 2017-04-14 19:25:54 +0000 | [diff] [blame] | 941 | for (i = 0; i < nr_buf; i++) |
Jonathan Nieder | 1ce584b | 2010-08-09 22:33:44 -0500 | [diff] [blame] | 942 | free(buf[i]); |
Jeff King | 59c4c7d | 2023-08-31 02:17:54 -0400 | [diff] [blame] | 943 | free(buf); |
| 944 | free(t); |
Jonathan Nieder | 1ce584b | 2010-08-09 22:33:44 -0500 | [diff] [blame] | 945 | |
Junio C Hamano | 730f728 | 2009-09-20 00:03:39 -0700 | [diff] [blame] | 946 | return ret; |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 947 | } |
| 948 | |
| 949 | /* |
| 950 | * Compare the traverse-path to the cache entry without actually |
| 951 | * having to generate the textual representation of the traverse |
| 952 | * path. |
| 953 | * |
| 954 | * NOTE! This *only* compares up to the size of the traverse path |
| 955 | * itself - the caller needs to do the final check for the cache |
| 956 | * entry having more data at the end! |
| 957 | */ |
Jeff King | 9055384 | 2019-07-31 00:38:15 -0400 | [diff] [blame] | 958 | static int do_compare_entry_piecewise(const struct cache_entry *ce, |
| 959 | const struct traverse_info *info, |
| 960 | const char *name, size_t namelen, |
| 961 | unsigned mode) |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 962 | { |
Jeff King | 9055384 | 2019-07-31 00:38:15 -0400 | [diff] [blame] | 963 | int pathlen, ce_len; |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 964 | const char *ce_name; |
| 965 | |
| 966 | if (info->prev) { |
David Turner | d9c2bd5 | 2015-12-21 17:34:20 -0500 | [diff] [blame] | 967 | int cmp = do_compare_entry_piecewise(ce, info->prev, |
Jeff King | 9055384 | 2019-07-31 00:38:15 -0400 | [diff] [blame] | 968 | info->name, info->namelen, |
| 969 | info->mode); |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 970 | if (cmp) |
| 971 | return cmp; |
| 972 | } |
| 973 | pathlen = info->pathlen; |
| 974 | ce_len = ce_namelen(ce); |
| 975 | |
| 976 | /* If ce_len < pathlen then we must have previously hit "name == directory" entry */ |
| 977 | if (ce_len < pathlen) |
| 978 | return -1; |
| 979 | |
| 980 | ce_len -= pathlen; |
| 981 | ce_name = ce->name + pathlen; |
| 982 | |
Jeff King | 9055384 | 2019-07-31 00:38:15 -0400 | [diff] [blame] | 983 | return df_name_compare(ce_name, ce_len, S_IFREG, name, namelen, mode); |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 984 | } |
| 985 | |
David Turner | d9c2bd5 | 2015-12-21 17:34:20 -0500 | [diff] [blame] | 986 | static int do_compare_entry(const struct cache_entry *ce, |
| 987 | const struct traverse_info *info, |
Jeff King | 9055384 | 2019-07-31 00:38:15 -0400 | [diff] [blame] | 988 | const char *name, size_t namelen, |
| 989 | unsigned mode) |
David Turner | d9c2bd5 | 2015-12-21 17:34:20 -0500 | [diff] [blame] | 990 | { |
Jeff King | 9055384 | 2019-07-31 00:38:15 -0400 | [diff] [blame] | 991 | int pathlen, ce_len; |
David Turner | d9c2bd5 | 2015-12-21 17:34:20 -0500 | [diff] [blame] | 992 | const char *ce_name; |
| 993 | int cmp; |
Derrick Stolee | cd807a5 | 2021-07-14 13:12:31 +0000 | [diff] [blame] | 994 | unsigned ce_mode; |
David Turner | d9c2bd5 | 2015-12-21 17:34:20 -0500 | [diff] [blame] | 995 | |
| 996 | /* |
| 997 | * If we have not precomputed the traverse path, it is quicker |
| 998 | * to avoid doing so. But if we have precomputed it, |
| 999 | * it is quicker to use the precomputed version. |
| 1000 | */ |
| 1001 | if (!info->traverse_path) |
Jeff King | 9055384 | 2019-07-31 00:38:15 -0400 | [diff] [blame] | 1002 | return do_compare_entry_piecewise(ce, info, name, namelen, mode); |
David Turner | d9c2bd5 | 2015-12-21 17:34:20 -0500 | [diff] [blame] | 1003 | |
| 1004 | cmp = strncmp(ce->name, info->traverse_path, info->pathlen); |
| 1005 | if (cmp) |
| 1006 | return cmp; |
| 1007 | |
| 1008 | pathlen = info->pathlen; |
| 1009 | ce_len = ce_namelen(ce); |
| 1010 | |
| 1011 | if (ce_len < pathlen) |
| 1012 | return -1; |
| 1013 | |
| 1014 | ce_len -= pathlen; |
| 1015 | ce_name = ce->name + pathlen; |
| 1016 | |
Derrick Stolee | cd807a5 | 2021-07-14 13:12:31 +0000 | [diff] [blame] | 1017 | ce_mode = S_ISSPARSEDIR(ce->ce_mode) ? S_IFDIR : S_IFREG; |
| 1018 | return df_name_compare(ce_name, ce_len, ce_mode, name, namelen, mode); |
David Turner | d9c2bd5 | 2015-12-21 17:34:20 -0500 | [diff] [blame] | 1019 | } |
| 1020 | |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 1021 | static int compare_entry(const struct cache_entry *ce, const struct traverse_info *info, const struct name_entry *n) |
| 1022 | { |
Jeff King | 9055384 | 2019-07-31 00:38:15 -0400 | [diff] [blame] | 1023 | int cmp = do_compare_entry(ce, info, n->path, n->pathlen, n->mode); |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 1024 | if (cmp) |
| 1025 | return cmp; |
| 1026 | |
| 1027 | /* |
Derrick Stolee | cd807a5 | 2021-07-14 13:12:31 +0000 | [diff] [blame] | 1028 | * At this point, we know that we have a prefix match. If ce |
| 1029 | * is a sparse directory, then allow an exact match. This only |
| 1030 | * works when the input name is a directory, since ce->name |
| 1031 | * ends in a directory separator. |
| 1032 | */ |
| 1033 | if (S_ISSPARSEDIR(ce->ce_mode) && |
| 1034 | ce->ce_namelen == traverse_path_len(info, tree_entry_len(n)) + 1) |
| 1035 | return 0; |
| 1036 | |
| 1037 | /* |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 1038 | * Even if the beginning compared identically, the ce should |
| 1039 | * compare as bigger than a directory leading up to it! |
| 1040 | */ |
Jeff King | b3b3cbc | 2019-07-31 00:38:20 -0400 | [diff] [blame] | 1041 | return ce_namelen(ce) > traverse_path_len(info, tree_entry_len(n)); |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 1042 | } |
| 1043 | |
Junio C Hamano | da165f4 | 2010-01-07 14:59:54 -0800 | [diff] [blame] | 1044 | static int ce_in_traverse_path(const struct cache_entry *ce, |
| 1045 | const struct traverse_info *info) |
| 1046 | { |
| 1047 | if (!info->prev) |
| 1048 | return 1; |
Jeff King | 9055384 | 2019-07-31 00:38:15 -0400 | [diff] [blame] | 1049 | if (do_compare_entry(ce, info->prev, |
| 1050 | info->name, info->namelen, info->mode)) |
Junio C Hamano | da165f4 | 2010-01-07 14:59:54 -0800 | [diff] [blame] | 1051 | return 0; |
| 1052 | /* |
| 1053 | * If ce (blob) is the same name as the path (which is a tree |
| 1054 | * we will be descending into), it won't be inside it. |
| 1055 | */ |
| 1056 | return (info->pathlen < ce_namelen(ce)); |
| 1057 | } |
| 1058 | |
Jameson Miller | a849735 | 2018-07-02 19:49:31 +0000 | [diff] [blame] | 1059 | static struct cache_entry *create_ce_entry(const struct traverse_info *info, |
| 1060 | const struct name_entry *n, |
| 1061 | int stage, |
| 1062 | struct index_state *istate, |
Derrick Stolee | 523506d | 2021-07-14 13:12:33 +0000 | [diff] [blame] | 1063 | int is_transient, |
| 1064 | int is_sparse_directory) |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 1065 | { |
Jeff King | b3b3cbc | 2019-07-31 00:38:20 -0400 | [diff] [blame] | 1066 | size_t len = traverse_path_len(info, tree_entry_len(n)); |
Derrick Stolee | 523506d | 2021-07-14 13:12:33 +0000 | [diff] [blame] | 1067 | size_t alloc_len = is_sparse_directory ? len + 1 : len; |
Jameson Miller | a849735 | 2018-07-02 19:49:31 +0000 | [diff] [blame] | 1068 | struct cache_entry *ce = |
| 1069 | is_transient ? |
Derrick Stolee | 523506d | 2021-07-14 13:12:33 +0000 | [diff] [blame] | 1070 | make_empty_transient_cache_entry(alloc_len, NULL) : |
| 1071 | make_empty_cache_entry(istate, alloc_len); |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 1072 | |
| 1073 | ce->ce_mode = create_ce_mode(n->mode); |
Thomas Gummerer | b60e188 | 2012-07-11 11:22:37 +0200 | [diff] [blame] | 1074 | ce->ce_flags = create_ce_flags(stage); |
| 1075 | ce->ce_namelen = len; |
brian m. carlson | ea82b2a | 2019-01-15 00:39:44 +0000 | [diff] [blame] | 1076 | oidcpy(&ce->oid, &n->oid); |
Jeff King | 5aa02f9 | 2019-07-31 00:38:25 -0400 | [diff] [blame] | 1077 | /* len+1 because the cache_entry allocates space for NUL */ |
| 1078 | make_traverse_path(ce->name, len + 1, info, n->path, n->pathlen); |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 1079 | |
Derrick Stolee | 523506d | 2021-07-14 13:12:33 +0000 | [diff] [blame] | 1080 | if (is_sparse_directory) { |
| 1081 | ce->name[len] = '/'; |
| 1082 | ce->name[len + 1] = '\0'; |
| 1083 | ce->ce_namelen++; |
| 1084 | ce->ce_flags |= CE_SKIP_WORKTREE; |
| 1085 | } |
| 1086 | |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 1087 | return ce; |
| 1088 | } |
| 1089 | |
Nguyễn Thái Ngọc Duy | b4da373 | 2018-08-18 16:41:24 +0200 | [diff] [blame] | 1090 | /* |
Victoria Dye | b15207b | 2022-08-08 19:07:52 +0000 | [diff] [blame] | 1091 | * Determine whether the path specified by 'p' should be unpacked as a new |
| 1092 | * sparse directory in a sparse index. A new sparse directory 'A/': |
| 1093 | * - must be outside the sparse cone. |
| 1094 | * - must not already be in the index (i.e., no index entry with name 'A/' |
| 1095 | * exists). |
| 1096 | * - must not have any child entries in the index (i.e., no index entry |
| 1097 | * 'A/<something>' exists). |
| 1098 | * If 'p' meets the above requirements, return 1; otherwise, return 0. |
| 1099 | */ |
| 1100 | static int entry_is_new_sparse_dir(const struct traverse_info *info, |
| 1101 | const struct name_entry *p) |
| 1102 | { |
| 1103 | int res, pos; |
| 1104 | struct strbuf dirpath = STRBUF_INIT; |
| 1105 | struct unpack_trees_options *o = info->data; |
| 1106 | |
| 1107 | if (!S_ISDIR(p->mode)) |
| 1108 | return 0; |
| 1109 | |
| 1110 | /* |
| 1111 | * If the path is inside the sparse cone, it can't be a sparse directory. |
| 1112 | */ |
| 1113 | strbuf_add(&dirpath, info->traverse_path, info->pathlen); |
| 1114 | strbuf_add(&dirpath, p->path, p->pathlen); |
| 1115 | strbuf_addch(&dirpath, '/'); |
| 1116 | if (path_in_cone_mode_sparse_checkout(dirpath.buf, o->src_index)) { |
| 1117 | res = 0; |
| 1118 | goto cleanup; |
| 1119 | } |
| 1120 | |
| 1121 | pos = index_name_pos_sparse(o->src_index, dirpath.buf, dirpath.len); |
| 1122 | if (pos >= 0) { |
| 1123 | /* Path is already in the index, not a new sparse dir */ |
| 1124 | res = 0; |
| 1125 | goto cleanup; |
| 1126 | } |
| 1127 | |
| 1128 | /* Where would this sparse dir be inserted into the index? */ |
| 1129 | pos = -pos - 1; |
| 1130 | if (pos >= o->src_index->cache_nr) { |
| 1131 | /* |
| 1132 | * Sparse dir would be inserted at the end of the index, so we |
| 1133 | * know it has no child entries. |
| 1134 | */ |
| 1135 | res = 1; |
| 1136 | goto cleanup; |
| 1137 | } |
| 1138 | |
| 1139 | /* |
| 1140 | * If the dir has child entries in the index, the first would be at the |
| 1141 | * position the sparse directory would be inserted. If the entry at this |
| 1142 | * position is inside the dir, not a new sparse dir. |
| 1143 | */ |
| 1144 | res = strncmp(o->src_index->cache[pos]->name, dirpath.buf, dirpath.len); |
| 1145 | |
| 1146 | cleanup: |
| 1147 | strbuf_release(&dirpath); |
| 1148 | return res; |
| 1149 | } |
| 1150 | |
| 1151 | /* |
Nguyễn Thái Ngọc Duy | b4da373 | 2018-08-18 16:41:24 +0200 | [diff] [blame] | 1152 | * Note that traverse_by_cache_tree() duplicates some logic in this function |
| 1153 | * without actually calling it. If you change the logic here you may need to |
| 1154 | * check and change there as well. |
| 1155 | */ |
Derrick Stolee | bd6a3fd | 2021-07-14 13:12:32 +0000 | [diff] [blame] | 1156 | static int unpack_single_entry(int n, unsigned long mask, |
| 1157 | unsigned long dirmask, |
| 1158 | struct cache_entry **src, |
| 1159 | const struct name_entry *names, |
Victoria Dye | b15207b | 2022-08-08 19:07:52 +0000 | [diff] [blame] | 1160 | const struct traverse_info *info, |
| 1161 | int *is_new_sparse_dir) |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 1162 | { |
| 1163 | int i; |
| 1164 | struct unpack_trees_options *o = info->data; |
René Scharfe | 603d249 | 2013-06-16 01:44:43 +0200 | [diff] [blame] | 1165 | unsigned long conflicts = info->df_conflicts | dirmask; |
Victoria Dye | b15207b | 2022-08-08 19:07:52 +0000 | [diff] [blame] | 1166 | const struct name_entry *p = names; |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 1167 | |
Victoria Dye | b15207b | 2022-08-08 19:07:52 +0000 | [diff] [blame] | 1168 | *is_new_sparse_dir = 0; |
| 1169 | if (mask == dirmask && !src[0]) { |
| 1170 | /* |
| 1171 | * If we're not in a sparse index, we can't unpack a directory |
| 1172 | * without recursing into it, so we return. |
| 1173 | */ |
| 1174 | if (!o->src_index->sparse_index) |
| 1175 | return 0; |
| 1176 | |
| 1177 | /* Find first entry with a real name (we could use "mask" too) */ |
| 1178 | while (!p->mode) |
| 1179 | p++; |
| 1180 | |
| 1181 | /* |
| 1182 | * If the directory is completely missing from the index but |
| 1183 | * would otherwise be a sparse directory, we should unpack it. |
| 1184 | * If not, we'll return and continue recursively traversing the |
| 1185 | * tree. |
| 1186 | */ |
| 1187 | *is_new_sparse_dir = entry_is_new_sparse_dir(info, p); |
| 1188 | if (!*is_new_sparse_dir) |
| 1189 | return 0; |
| 1190 | } |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 1191 | |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 1192 | /* |
Victoria Dye | b15207b | 2022-08-08 19:07:52 +0000 | [diff] [blame] | 1193 | * When we are unpacking a sparse directory, then this isn't necessarily |
| 1194 | * a directory-file conflict. |
Derrick Stolee | 523506d | 2021-07-14 13:12:33 +0000 | [diff] [blame] | 1195 | */ |
Victoria Dye | b15207b | 2022-08-08 19:07:52 +0000 | [diff] [blame] | 1196 | if (mask == dirmask && |
| 1197 | (*is_new_sparse_dir || (src[0] && S_ISSPARSEDIR(src[0]->ce_mode)))) |
Derrick Stolee | 523506d | 2021-07-14 13:12:33 +0000 | [diff] [blame] | 1198 | conflicts = 0; |
| 1199 | |
| 1200 | /* |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 1201 | * Ok, we've filled in up to any potential index entry in src[0], |
| 1202 | * now do the rest. |
| 1203 | */ |
| 1204 | for (i = 0; i < n; i++) { |
| 1205 | int stage; |
| 1206 | unsigned int bit = 1ul << i; |
| 1207 | if (conflicts & bit) { |
| 1208 | src[i + o->merge] = o->df_conflict_entry; |
| 1209 | continue; |
| 1210 | } |
| 1211 | if (!(mask & bit)) |
| 1212 | continue; |
| 1213 | if (!o->merge) |
| 1214 | stage = 0; |
| 1215 | else if (i + 1 < o->head_idx) |
| 1216 | stage = 1; |
| 1217 | else if (i + 1 > o->head_idx) |
| 1218 | stage = 3; |
| 1219 | else |
| 1220 | stage = 2; |
Jameson Miller | a849735 | 2018-07-02 19:49:31 +0000 | [diff] [blame] | 1221 | |
| 1222 | /* |
| 1223 | * If the merge bit is set, then the cache entries are |
| 1224 | * discarded in the following block. In this case, |
| 1225 | * construct "transient" cache_entries, as they are |
| 1226 | * not stored in the index. otherwise construct the |
| 1227 | * cache entry from the index aware logic. |
| 1228 | */ |
Derrick Stolee | 523506d | 2021-07-14 13:12:33 +0000 | [diff] [blame] | 1229 | src[i + o->merge] = create_ce_entry(info, names + i, stage, |
Elijah Newren | 0d680a7 | 2023-02-27 15:28:18 +0000 | [diff] [blame] | 1230 | &o->internal.result, |
| 1231 | o->merge, bit & dirmask); |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 1232 | } |
| 1233 | |
René Scharfe | 5d80ef5 | 2013-06-02 17:46:57 +0200 | [diff] [blame] | 1234 | if (o->merge) { |
| 1235 | int rc = call_unpack_fn((const struct cache_entry * const *)src, |
| 1236 | o); |
| 1237 | for (i = 0; i < n; i++) { |
| 1238 | struct cache_entry *ce = src[i + o->merge]; |
| 1239 | if (ce != o->df_conflict_entry) |
Jameson Miller | a849735 | 2018-07-02 19:49:31 +0000 | [diff] [blame] | 1240 | discard_cache_entry(ce); |
René Scharfe | 5d80ef5 | 2013-06-02 17:46:57 +0200 | [diff] [blame] | 1241 | } |
| 1242 | return rc; |
| 1243 | } |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 1244 | |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 1245 | for (i = 0; i < n; i++) |
Junio C Hamano | aab3b9a | 2009-03-12 00:02:12 -0700 | [diff] [blame] | 1246 | if (src[i] && src[i] != o->df_conflict_entry) |
Jeff King | 4616918 | 2014-11-24 13:36:51 -0500 | [diff] [blame] | 1247 | if (do_add_entry(o, src[i], 0, 0)) |
| 1248 | return -1; |
| 1249 | |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 1250 | return 0; |
| 1251 | } |
| 1252 | |
Junio C Hamano | 353c5ee | 2009-09-19 16:36:45 -0700 | [diff] [blame] | 1253 | static int unpack_failed(struct unpack_trees_options *o, const char *message) |
| 1254 | { |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 1255 | discard_index(&o->internal.result); |
Nguyễn Thái Ngọc Duy | b165fac | 2019-03-22 16:31:36 +0700 | [diff] [blame] | 1256 | if (!o->quiet && !o->exiting_early) { |
Junio C Hamano | 353c5ee | 2009-09-19 16:36:45 -0700 | [diff] [blame] | 1257 | if (message) |
| 1258 | return error("%s", message); |
| 1259 | return -1; |
| 1260 | } |
| 1261 | return -1; |
| 1262 | } |
| 1263 | |
Junio C Hamano | 730f728 | 2009-09-20 00:03:39 -0700 | [diff] [blame] | 1264 | /* |
| 1265 | * The tree traversal is looking at name p. If we have a matching entry, |
| 1266 | * return it. If name p is a directory in the index, do not return |
| 1267 | * anything, as we will want to match it when the traversal descends into |
| 1268 | * the directory. |
| 1269 | */ |
| 1270 | static int find_cache_pos(struct traverse_info *info, |
Jeff King | 9055384 | 2019-07-31 00:38:15 -0400 | [diff] [blame] | 1271 | const char *p, size_t p_len) |
Junio C Hamano | 730f728 | 2009-09-20 00:03:39 -0700 | [diff] [blame] | 1272 | { |
| 1273 | int pos; |
| 1274 | struct unpack_trees_options *o = info->data; |
| 1275 | struct index_state *index = o->src_index; |
| 1276 | int pfxlen = info->pathlen; |
Junio C Hamano | 730f728 | 2009-09-20 00:03:39 -0700 | [diff] [blame] | 1277 | |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 1278 | for (pos = o->internal.cache_bottom; pos < index->cache_nr; pos++) { |
Nguyễn Thái Ngọc Duy | 9c5e6c8 | 2013-07-09 22:29:00 +0700 | [diff] [blame] | 1279 | const struct cache_entry *ce = index->cache[pos]; |
Junio C Hamano | 730f728 | 2009-09-20 00:03:39 -0700 | [diff] [blame] | 1280 | const char *ce_name, *ce_slash; |
| 1281 | int cmp, ce_len; |
| 1282 | |
Brian Downing | e53e6b4 | 2010-06-10 21:59:07 -0500 | [diff] [blame] | 1283 | if (ce->ce_flags & CE_UNPACKED) { |
| 1284 | /* |
| 1285 | * cache_bottom entry is already unpacked, so |
| 1286 | * we can never match it; don't check it |
| 1287 | * again. |
| 1288 | */ |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 1289 | if (pos == o->internal.cache_bottom) |
| 1290 | ++o->internal.cache_bottom; |
Junio C Hamano | 730f728 | 2009-09-20 00:03:39 -0700 | [diff] [blame] | 1291 | continue; |
Brian Downing | e53e6b4 | 2010-06-10 21:59:07 -0500 | [diff] [blame] | 1292 | } |
David Turner | a672095 | 2016-01-22 14:58:43 -0500 | [diff] [blame] | 1293 | if (!ce_in_traverse_path(ce, info)) { |
| 1294 | /* |
| 1295 | * Check if we can skip future cache checks |
| 1296 | * (because we're already past all possible |
| 1297 | * entries in the traverse path). |
| 1298 | */ |
| 1299 | if (info->traverse_path) { |
| 1300 | if (strncmp(ce->name, info->traverse_path, |
| 1301 | info->pathlen) > 0) |
| 1302 | break; |
| 1303 | } |
Junio C Hamano | 730f728 | 2009-09-20 00:03:39 -0700 | [diff] [blame] | 1304 | continue; |
David Turner | a672095 | 2016-01-22 14:58:43 -0500 | [diff] [blame] | 1305 | } |
Junio C Hamano | 730f728 | 2009-09-20 00:03:39 -0700 | [diff] [blame] | 1306 | ce_name = ce->name + pfxlen; |
| 1307 | ce_slash = strchr(ce_name, '/'); |
| 1308 | if (ce_slash) |
| 1309 | ce_len = ce_slash - ce_name; |
| 1310 | else |
| 1311 | ce_len = ce_namelen(ce) - pfxlen; |
Jeff King | 9055384 | 2019-07-31 00:38:15 -0400 | [diff] [blame] | 1312 | cmp = name_compare(p, p_len, ce_name, ce_len); |
Junio C Hamano | 730f728 | 2009-09-20 00:03:39 -0700 | [diff] [blame] | 1313 | /* |
| 1314 | * Exact match; if we have a directory we need to |
| 1315 | * delay returning it. |
| 1316 | */ |
| 1317 | if (!cmp) |
| 1318 | return ce_slash ? -2 - pos : pos; |
| 1319 | if (0 < cmp) |
| 1320 | continue; /* keep looking */ |
| 1321 | /* |
| 1322 | * ce_name sorts after p->path; could it be that we |
| 1323 | * have files under p->path directory in the index? |
| 1324 | * E.g. ce_name == "t-i", and p->path == "t"; we may |
| 1325 | * have "t/a" in the index. |
| 1326 | */ |
Jeff King | 9055384 | 2019-07-31 00:38:15 -0400 | [diff] [blame] | 1327 | if (p_len < ce_len && !memcmp(ce_name, p, p_len) && |
Junio C Hamano | 730f728 | 2009-09-20 00:03:39 -0700 | [diff] [blame] | 1328 | ce_name[p_len] < '/') |
| 1329 | continue; /* keep looking */ |
| 1330 | break; |
| 1331 | } |
| 1332 | return -1; |
| 1333 | } |
| 1334 | |
Derrick Stolee | 523506d | 2021-07-14 13:12:33 +0000 | [diff] [blame] | 1335 | /* |
| 1336 | * Given a sparse directory entry 'ce', compare ce->name to |
Derrick Stolee | 8c5de0d | 2021-12-06 14:10:37 +0000 | [diff] [blame] | 1337 | * info->traverse_path + p->path + '/' if info->traverse_path |
| 1338 | * is non-empty. |
| 1339 | * |
Derrick Stolee | 523506d | 2021-07-14 13:12:33 +0000 | [diff] [blame] | 1340 | * Compare ce->name to p->path + '/' otherwise. Note that |
| 1341 | * ce->name must end in a trailing '/' because it is a sparse |
| 1342 | * directory entry. |
| 1343 | */ |
| 1344 | static int sparse_dir_matches_path(const struct cache_entry *ce, |
| 1345 | struct traverse_info *info, |
| 1346 | const struct name_entry *p) |
| 1347 | { |
| 1348 | assert(S_ISSPARSEDIR(ce->ce_mode)); |
| 1349 | assert(ce->name[ce->ce_namelen - 1] == '/'); |
| 1350 | |
Derrick Stolee | 8c5de0d | 2021-12-06 14:10:37 +0000 | [diff] [blame] | 1351 | if (info->pathlen) |
| 1352 | return ce->ce_namelen == info->pathlen + p->pathlen + 1 && |
| 1353 | ce->name[info->pathlen - 1] == '/' && |
| 1354 | !strncmp(ce->name, info->traverse_path, info->pathlen) && |
| 1355 | !strncmp(ce->name + info->pathlen, p->path, p->pathlen); |
Derrick Stolee | 523506d | 2021-07-14 13:12:33 +0000 | [diff] [blame] | 1356 | return ce->ce_namelen == p->pathlen + 1 && |
| 1357 | !strncmp(ce->name, p->path, p->pathlen); |
| 1358 | } |
| 1359 | |
Junio C Hamano | 730f728 | 2009-09-20 00:03:39 -0700 | [diff] [blame] | 1360 | static struct cache_entry *find_cache_entry(struct traverse_info *info, |
| 1361 | const struct name_entry *p) |
| 1362 | { |
Derrick Stolee | 72d84ea | 2021-09-08 01:42:27 +0000 | [diff] [blame] | 1363 | const char *path; |
Jeff King | 9055384 | 2019-07-31 00:38:15 -0400 | [diff] [blame] | 1364 | int pos = find_cache_pos(info, p->path, p->pathlen); |
Junio C Hamano | 730f728 | 2009-09-20 00:03:39 -0700 | [diff] [blame] | 1365 | struct unpack_trees_options *o = info->data; |
| 1366 | |
| 1367 | if (0 <= pos) |
| 1368 | return o->src_index->cache[pos]; |
Derrick Stolee | 523506d | 2021-07-14 13:12:33 +0000 | [diff] [blame] | 1369 | |
| 1370 | /* |
| 1371 | * Check for a sparse-directory entry named "path/". |
| 1372 | * Due to the input p->path not having a trailing |
| 1373 | * slash, the negative 'pos' value overshoots the |
| 1374 | * expected position, hence "-2" instead of "-1". |
| 1375 | */ |
| 1376 | pos = -pos - 2; |
| 1377 | |
| 1378 | if (pos < 0 || pos >= o->src_index->cache_nr) |
Junio C Hamano | 730f728 | 2009-09-20 00:03:39 -0700 | [diff] [blame] | 1379 | return NULL; |
Derrick Stolee | 523506d | 2021-07-14 13:12:33 +0000 | [diff] [blame] | 1380 | |
| 1381 | /* |
| 1382 | * Due to lexicographic sorting and sparse directory |
| 1383 | * entries ending with a trailing slash, our path as a |
| 1384 | * sparse directory (e.g "subdir/") and our path as a |
| 1385 | * file (e.g. "subdir") might be separated by other |
| 1386 | * paths (e.g. "subdir-"). |
| 1387 | */ |
| 1388 | while (pos >= 0) { |
Derrick Stolee | 72d84ea | 2021-09-08 01:42:27 +0000 | [diff] [blame] | 1389 | struct cache_entry *ce = o->src_index->cache[pos]; |
Derrick Stolee | 523506d | 2021-07-14 13:12:33 +0000 | [diff] [blame] | 1390 | |
Derrick Stolee | 72d84ea | 2021-09-08 01:42:27 +0000 | [diff] [blame] | 1391 | if (!skip_prefix(ce->name, info->traverse_path, &path) || |
| 1392 | strncmp(path, p->path, p->pathlen) || |
| 1393 | path[p->pathlen] != '/') |
Derrick Stolee | 523506d | 2021-07-14 13:12:33 +0000 | [diff] [blame] | 1394 | return NULL; |
| 1395 | |
| 1396 | if (S_ISSPARSEDIR(ce->ce_mode) && |
| 1397 | sparse_dir_matches_path(ce, info, p)) |
| 1398 | return ce; |
| 1399 | |
| 1400 | pos--; |
| 1401 | } |
| 1402 | |
| 1403 | return NULL; |
Junio C Hamano | 730f728 | 2009-09-20 00:03:39 -0700 | [diff] [blame] | 1404 | } |
| 1405 | |
Junio C Hamano | ba655da | 2009-09-14 02:22:00 -0700 | [diff] [blame] | 1406 | static void debug_path(struct traverse_info *info) |
| 1407 | { |
| 1408 | if (info->prev) { |
| 1409 | debug_path(info->prev); |
Jeff King | 9055384 | 2019-07-31 00:38:15 -0400 | [diff] [blame] | 1410 | if (*info->prev->name) |
Junio C Hamano | ba655da | 2009-09-14 02:22:00 -0700 | [diff] [blame] | 1411 | putchar('/'); |
| 1412 | } |
Jeff King | 9055384 | 2019-07-31 00:38:15 -0400 | [diff] [blame] | 1413 | printf("%s", info->name); |
Junio C Hamano | ba655da | 2009-09-14 02:22:00 -0700 | [diff] [blame] | 1414 | } |
| 1415 | |
| 1416 | static void debug_name_entry(int i, struct name_entry *n) |
| 1417 | { |
| 1418 | printf("ent#%d %06o %s\n", i, |
| 1419 | n->path ? n->mode : 0, |
| 1420 | n->path ? n->path : "(missing)"); |
| 1421 | } |
| 1422 | |
| 1423 | static void debug_unpack_callback(int n, |
| 1424 | unsigned long mask, |
| 1425 | unsigned long dirmask, |
| 1426 | struct name_entry *names, |
| 1427 | struct traverse_info *info) |
| 1428 | { |
| 1429 | int i; |
| 1430 | printf("* unpack mask %lu, dirmask %lu, cnt %d ", |
| 1431 | mask, dirmask, n); |
| 1432 | debug_path(info); |
| 1433 | putchar('\n'); |
| 1434 | for (i = 0; i < n; i++) |
| 1435 | debug_name_entry(i, names + i); |
| 1436 | } |
| 1437 | |
Nguyễn Thái Ngọc Duy | b4da373 | 2018-08-18 16:41:24 +0200 | [diff] [blame] | 1438 | /* |
Derrick Stolee | 523506d | 2021-07-14 13:12:33 +0000 | [diff] [blame] | 1439 | * Returns true if and only if the given cache_entry is a |
| 1440 | * sparse-directory entry that matches the given name_entry |
| 1441 | * from the tree walk at the given traverse_info. |
| 1442 | */ |
| 1443 | static int is_sparse_directory_entry(struct cache_entry *ce, |
Victoria Dye | 037f8ea | 2022-09-01 21:02:33 +0000 | [diff] [blame] | 1444 | const struct name_entry *name, |
Derrick Stolee | 523506d | 2021-07-14 13:12:33 +0000 | [diff] [blame] | 1445 | struct traverse_info *info) |
| 1446 | { |
| 1447 | if (!ce || !name || !S_ISSPARSEDIR(ce->ce_mode)) |
| 1448 | return 0; |
| 1449 | |
| 1450 | return sparse_dir_matches_path(ce, info, name); |
| 1451 | } |
| 1452 | |
Victoria Dye | ab81047 | 2022-03-01 20:24:30 +0000 | [diff] [blame] | 1453 | static int unpack_sparse_callback(int n, unsigned long mask, unsigned long dirmask, struct name_entry *names, struct traverse_info *info) |
| 1454 | { |
| 1455 | struct cache_entry *src[MAX_UNPACK_TREES + 1] = { NULL, }; |
| 1456 | struct unpack_trees_options *o = info->data; |
Victoria Dye | b15207b | 2022-08-08 19:07:52 +0000 | [diff] [blame] | 1457 | int ret, is_new_sparse_dir; |
Victoria Dye | ab81047 | 2022-03-01 20:24:30 +0000 | [diff] [blame] | 1458 | |
| 1459 | assert(o->merge); |
| 1460 | |
| 1461 | /* |
| 1462 | * Unlike in 'unpack_callback', where src[0] is derived from the index when |
| 1463 | * merging, src[0] is a transient cache entry derived from the first tree |
| 1464 | * provided. Create the temporary entry as if it came from a non-sparse index. |
| 1465 | */ |
| 1466 | if (!is_null_oid(&names[0].oid)) { |
| 1467 | src[0] = create_ce_entry(info, &names[0], 0, |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 1468 | &o->internal.result, 1, |
Victoria Dye | ab81047 | 2022-03-01 20:24:30 +0000 | [diff] [blame] | 1469 | dirmask & (1ul << 0)); |
| 1470 | src[0]->ce_flags |= (CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE); |
| 1471 | } |
| 1472 | |
| 1473 | /* |
| 1474 | * 'unpack_single_entry' assumes that src[0] is derived directly from |
| 1475 | * the index, rather than from an entry in 'names'. This is *not* true when |
| 1476 | * merging a sparse directory, in which case names[0] is the "index" source |
| 1477 | * entry. To match the expectations of 'unpack_single_entry', shift past the |
| 1478 | * "index" tree (i.e., names[0]) and adjust 'names', 'n', 'mask', and |
| 1479 | * 'dirmask' accordingly. |
| 1480 | */ |
Victoria Dye | b15207b | 2022-08-08 19:07:52 +0000 | [diff] [blame] | 1481 | ret = unpack_single_entry(n - 1, mask >> 1, dirmask >> 1, src, names + 1, info, &is_new_sparse_dir); |
Victoria Dye | ab81047 | 2022-03-01 20:24:30 +0000 | [diff] [blame] | 1482 | |
| 1483 | if (src[0]) |
| 1484 | discard_cache_entry(src[0]); |
| 1485 | |
| 1486 | return ret >= 0 ? mask : -1; |
| 1487 | } |
| 1488 | |
Derrick Stolee | 523506d | 2021-07-14 13:12:33 +0000 | [diff] [blame] | 1489 | /* |
Nguyễn Thái Ngọc Duy | b4da373 | 2018-08-18 16:41:24 +0200 | [diff] [blame] | 1490 | * Note that traverse_by_cache_tree() duplicates some logic in this function |
| 1491 | * without actually calling it. If you change the logic here you may need to |
| 1492 | * check and change there as well. |
| 1493 | */ |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 1494 | static int unpack_callback(int n, unsigned long mask, unsigned long dirmask, struct name_entry *names, struct traverse_info *info) |
| 1495 | { |
René Scharfe | c7cddc1 | 2009-01-31 15:39:10 +0100 | [diff] [blame] | 1496 | struct cache_entry *src[MAX_UNPACK_TREES + 1] = { NULL, }; |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 1497 | struct unpack_trees_options *o = info->data; |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 1498 | const struct name_entry *p = names; |
Victoria Dye | b15207b | 2022-08-08 19:07:52 +0000 | [diff] [blame] | 1499 | int is_new_sparse_dir; |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 1500 | |
| 1501 | /* Find first entry with a real name (we could use "mask" too) */ |
| 1502 | while (!p->mode) |
| 1503 | p++; |
| 1504 | |
Elijah Newren | 1ca13dd | 2023-02-27 15:28:19 +0000 | [diff] [blame] | 1505 | if (o->internal.debug_unpack) |
Junio C Hamano | ba655da | 2009-09-14 02:22:00 -0700 | [diff] [blame] | 1506 | debug_unpack_callback(n, mask, dirmask, names, info); |
| 1507 | |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 1508 | /* Are we supposed to look at the index too? */ |
| 1509 | if (o->merge) { |
Junio C Hamano | da165f4 | 2010-01-07 14:59:54 -0800 | [diff] [blame] | 1510 | while (1) { |
Junio C Hamano | da165f4 | 2010-01-07 14:59:54 -0800 | [diff] [blame] | 1511 | int cmp; |
Junio C Hamano | 730f728 | 2009-09-20 00:03:39 -0700 | [diff] [blame] | 1512 | struct cache_entry *ce; |
| 1513 | |
| 1514 | if (o->diff_index_cached) |
Victoria Dye | 99430aa | 2022-03-17 15:55:36 +0000 | [diff] [blame] | 1515 | ce = next_cache_entry(o); |
Junio C Hamano | 730f728 | 2009-09-20 00:03:39 -0700 | [diff] [blame] | 1516 | else |
| 1517 | ce = find_cache_entry(info, p); |
| 1518 | |
Junio C Hamano | da165f4 | 2010-01-07 14:59:54 -0800 | [diff] [blame] | 1519 | if (!ce) |
| 1520 | break; |
| 1521 | cmp = compare_entry(ce, info, p); |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 1522 | if (cmp < 0) { |
| 1523 | if (unpack_index_entry(ce, o) < 0) |
Junio C Hamano | 353c5ee | 2009-09-19 16:36:45 -0700 | [diff] [blame] | 1524 | return unpack_failed(o, NULL); |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 1525 | continue; |
| 1526 | } |
| 1527 | if (!cmp) { |
| 1528 | if (ce_stage(ce)) { |
| 1529 | /* |
Junio C Hamano | da165f4 | 2010-01-07 14:59:54 -0800 | [diff] [blame] | 1530 | * If we skip unmerged index |
| 1531 | * entries, we'll skip this |
| 1532 | * entry *and* the tree |
| 1533 | * entries associated with it! |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 1534 | */ |
Linus Torvalds | 34110cd | 2008-03-06 18:12:28 -0800 | [diff] [blame] | 1535 | if (o->skip_unmerged) { |
Junio C Hamano | da165f4 | 2010-01-07 14:59:54 -0800 | [diff] [blame] | 1536 | add_same_unmerged(ce, o); |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 1537 | return mask; |
Linus Torvalds | 34110cd | 2008-03-06 18:12:28 -0800 | [diff] [blame] | 1538 | } |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 1539 | } |
| 1540 | src[0] = ce; |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 1541 | } |
| 1542 | break; |
| 1543 | } |
| 1544 | } |
| 1545 | |
Victoria Dye | b15207b | 2022-08-08 19:07:52 +0000 | [diff] [blame] | 1546 | if (unpack_single_entry(n, mask, dirmask, src, names, info, &is_new_sparse_dir)) |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 1547 | return -1; |
| 1548 | |
René Scharfe | 97e5954 | 2012-04-10 20:55:58 +0200 | [diff] [blame] | 1549 | if (o->merge && src[0]) { |
Junio C Hamano | da165f4 | 2010-01-07 14:59:54 -0800 | [diff] [blame] | 1550 | if (ce_stage(src[0])) |
| 1551 | mark_ce_used_same_name(src[0], o); |
| 1552 | else |
| 1553 | mark_ce_used(src[0], o); |
| 1554 | } |
| 1555 | |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 1556 | /* Now handle any directories.. */ |
| 1557 | if (dirmask) { |
Junio C Hamano | b65982b | 2009-05-20 15:57:22 -0700 | [diff] [blame] | 1558 | /* special case: "diff-index --cached" looking at a tree */ |
| 1559 | if (o->diff_index_cached && |
| 1560 | n == 1 && dirmask == 1 && S_ISDIR(names->mode)) { |
| 1561 | int matches; |
| 1562 | matches = cache_tree_matches_traversal(o->src_index->cache_tree, |
| 1563 | names, info); |
| 1564 | /* |
Junio C Hamano | da165f4 | 2010-01-07 14:59:54 -0800 | [diff] [blame] | 1565 | * Everything under the name matches; skip the |
| 1566 | * entire hierarchy. diff_index_cached codepath |
| 1567 | * special cases D/F conflicts in such a way that |
| 1568 | * it does not do any look-ahead, so this is safe. |
Junio C Hamano | b65982b | 2009-05-20 15:57:22 -0700 | [diff] [blame] | 1569 | */ |
| 1570 | if (matches) { |
Victoria Dye | bfc763d | 2022-03-17 15:55:35 +0000 | [diff] [blame] | 1571 | /* |
| 1572 | * Only increment the cache_bottom if the |
| 1573 | * directory isn't a sparse directory index |
| 1574 | * entry (if it is, it was already incremented) |
| 1575 | * in 'mark_ce_used()' |
| 1576 | */ |
| 1577 | if (!src[0] || !S_ISSPARSEDIR(src[0]->ce_mode)) |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 1578 | o->internal.cache_bottom += matches; |
Junio C Hamano | b65982b | 2009-05-20 15:57:22 -0700 | [diff] [blame] | 1579 | return mask; |
| 1580 | } |
| 1581 | } |
| 1582 | |
Victoria Dye | 037f8ea | 2022-09-01 21:02:33 +0000 | [diff] [blame] | 1583 | if (!is_sparse_directory_entry(src[0], p, info) && |
Victoria Dye | b15207b | 2022-08-08 19:07:52 +0000 | [diff] [blame] | 1584 | !is_new_sparse_dir && |
Derrick Stolee | 523506d | 2021-07-14 13:12:33 +0000 | [diff] [blame] | 1585 | traverse_trees_recursive(n, dirmask, mask & ~dirmask, |
| 1586 | names, info) < 0) { |
Junio C Hamano | 542c264 | 2008-03-10 01:26:23 -0700 | [diff] [blame] | 1587 | return -1; |
Derrick Stolee | 523506d | 2021-07-14 13:12:33 +0000 | [diff] [blame] | 1588 | } |
| 1589 | |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 1590 | return mask; |
| 1591 | } |
| 1592 | |
| 1593 | return mask; |
| 1594 | } |
| 1595 | |
Nguyễn Thái Ngọc Duy | 27c82fb | 2018-08-13 18:14:28 +0200 | [diff] [blame] | 1596 | static int clear_ce_flags_1(struct index_state *istate, |
| 1597 | struct cache_entry **cache, int nr, |
Antoine Pelisse | fc2b621 | 2013-12-14 12:31:16 +0100 | [diff] [blame] | 1598 | struct strbuf *prefix, |
Nguyễn Thái Ngọc Duy | 2891109 | 2011-05-09 22:43:01 +0700 | [diff] [blame] | 1599 | int select_mask, int clear_mask, |
Derrick Stolee | 468ce99 | 2019-09-03 11:04:58 -0700 | [diff] [blame] | 1600 | struct pattern_list *pl, |
Derrick Stolee | 4dcd4de | 2019-11-21 22:04:44 +0000 | [diff] [blame] | 1601 | enum pattern_match_result default_match, |
| 1602 | int progress_nr); |
Nguyễn Thái Ngọc Duy | 2891109 | 2011-05-09 22:43:01 +0700 | [diff] [blame] | 1603 | |
Nguyễn Thái Ngọc Duy | 9037026 | 2010-11-27 01:17:46 +0700 | [diff] [blame] | 1604 | /* Whole directory matching */ |
Nguyễn Thái Ngọc Duy | 27c82fb | 2018-08-13 18:14:28 +0200 | [diff] [blame] | 1605 | static int clear_ce_flags_dir(struct index_state *istate, |
| 1606 | struct cache_entry **cache, int nr, |
Antoine Pelisse | fc2b621 | 2013-12-14 12:31:16 +0100 | [diff] [blame] | 1607 | struct strbuf *prefix, |
Nguyễn Thái Ngọc Duy | 9037026 | 2010-11-27 01:17:46 +0700 | [diff] [blame] | 1608 | char *basename, |
| 1609 | int select_mask, int clear_mask, |
Derrick Stolee | 468ce99 | 2019-09-03 11:04:58 -0700 | [diff] [blame] | 1610 | struct pattern_list *pl, |
Derrick Stolee | 4dcd4de | 2019-11-21 22:04:44 +0000 | [diff] [blame] | 1611 | enum pattern_match_result default_match, |
| 1612 | int progress_nr) |
Nguyễn Thái Ngọc Duy | 9037026 | 2010-11-27 01:17:46 +0700 | [diff] [blame] | 1613 | { |
Nguyễn Thái Ngọc Duy | 2891109 | 2011-05-09 22:43:01 +0700 | [diff] [blame] | 1614 | struct cache_entry **cache_end; |
Nguyễn Thái Ngọc Duy | 9037026 | 2010-11-27 01:17:46 +0700 | [diff] [blame] | 1615 | int dtype = DT_DIR; |
Antoine Pelisse | fc2b621 | 2013-12-14 12:31:16 +0100 | [diff] [blame] | 1616 | int rc; |
Derrick Stolee | eb42fec | 2019-11-21 22:04:43 +0000 | [diff] [blame] | 1617 | enum pattern_match_result ret, orig_ret; |
| 1618 | orig_ret = path_matches_pattern_list(prefix->buf, prefix->len, |
| 1619 | basename, &dtype, pl, istate); |
Nguyễn Thái Ngọc Duy | 9037026 | 2010-11-27 01:17:46 +0700 | [diff] [blame] | 1620 | |
Antoine Pelisse | fc2b621 | 2013-12-14 12:31:16 +0100 | [diff] [blame] | 1621 | strbuf_addch(prefix, '/'); |
Nguyễn Thái Ngọc Duy | 9037026 | 2010-11-27 01:17:46 +0700 | [diff] [blame] | 1622 | |
Nguyễn Thái Ngọc Duy | 2891109 | 2011-05-09 22:43:01 +0700 | [diff] [blame] | 1623 | /* If undecided, use matching result of parent dir in defval */ |
Derrick Stolee | eb42fec | 2019-11-21 22:04:43 +0000 | [diff] [blame] | 1624 | if (orig_ret == UNDECIDED) |
Derrick Stolee | 468ce99 | 2019-09-03 11:04:58 -0700 | [diff] [blame] | 1625 | ret = default_match; |
Derrick Stolee | eb42fec | 2019-11-21 22:04:43 +0000 | [diff] [blame] | 1626 | else |
| 1627 | ret = orig_ret; |
Nguyễn Thái Ngọc Duy | 2891109 | 2011-05-09 22:43:01 +0700 | [diff] [blame] | 1628 | |
| 1629 | for (cache_end = cache; cache_end != cache + nr; cache_end++) { |
| 1630 | struct cache_entry *ce = *cache_end; |
Antoine Pelisse | fc2b621 | 2013-12-14 12:31:16 +0100 | [diff] [blame] | 1631 | if (strncmp(ce->name, prefix->buf, prefix->len)) |
Nguyễn Thái Ngọc Duy | 2891109 | 2011-05-09 22:43:01 +0700 | [diff] [blame] | 1632 | break; |
Nguyễn Thái Ngọc Duy | 9037026 | 2010-11-27 01:17:46 +0700 | [diff] [blame] | 1633 | } |
| 1634 | |
Derrick Stolee | eb42fec | 2019-11-21 22:04:43 +0000 | [diff] [blame] | 1635 | if (pl->use_cone_patterns && orig_ret == MATCHED_RECURSIVE) { |
| 1636 | struct cache_entry **ce = cache; |
Derrick Stolee via GitGitGadget | 4c6c797 | 2020-01-10 01:59:30 +0000 | [diff] [blame] | 1637 | rc = cache_end - cache; |
Derrick Stolee | eb42fec | 2019-11-21 22:04:43 +0000 | [diff] [blame] | 1638 | |
| 1639 | while (ce < cache_end) { |
| 1640 | (*ce)->ce_flags &= ~clear_mask; |
| 1641 | ce++; |
| 1642 | } |
| 1643 | } else if (pl->use_cone_patterns && orig_ret == NOT_MATCHED) { |
Derrick Stolee via GitGitGadget | 4c6c797 | 2020-01-10 01:59:30 +0000 | [diff] [blame] | 1644 | rc = cache_end - cache; |
Derrick Stolee | eb42fec | 2019-11-21 22:04:43 +0000 | [diff] [blame] | 1645 | } else { |
| 1646 | rc = clear_ce_flags_1(istate, cache, cache_end - cache, |
| 1647 | prefix, |
| 1648 | select_mask, clear_mask, |
Derrick Stolee | 4dcd4de | 2019-11-21 22:04:44 +0000 | [diff] [blame] | 1649 | pl, ret, |
| 1650 | progress_nr); |
Derrick Stolee | eb42fec | 2019-11-21 22:04:43 +0000 | [diff] [blame] | 1651 | } |
| 1652 | |
Antoine Pelisse | fc2b621 | 2013-12-14 12:31:16 +0100 | [diff] [blame] | 1653 | strbuf_setlen(prefix, prefix->len - 1); |
| 1654 | return rc; |
Nguyễn Thái Ngọc Duy | 9037026 | 2010-11-27 01:17:46 +0700 | [diff] [blame] | 1655 | } |
| 1656 | |
| 1657 | /* |
| 1658 | * Traverse the index, find every entry that matches according to |
Derrick Stolee | caa3d55 | 2019-09-03 11:04:56 -0700 | [diff] [blame] | 1659 | * o->pl. Do "ce_flags &= ~clear_mask" on those entries. Return the |
Nguyễn Thái Ngọc Duy | 9037026 | 2010-11-27 01:17:46 +0700 | [diff] [blame] | 1660 | * number of traversed entries. |
| 1661 | * |
| 1662 | * If select_mask is non-zero, only entries whose ce_flags has on of |
| 1663 | * those bits enabled are traversed. |
| 1664 | * |
| 1665 | * cache : pointer to an index entry |
| 1666 | * prefix_len : an offset to its path |
| 1667 | * |
| 1668 | * The current path ("prefix") including the trailing '/' is |
| 1669 | * cache[0]->name[0..(prefix_len-1)] |
| 1670 | * Top level path has prefix_len zero. |
| 1671 | */ |
Nguyễn Thái Ngọc Duy | 27c82fb | 2018-08-13 18:14:28 +0200 | [diff] [blame] | 1672 | static int clear_ce_flags_1(struct index_state *istate, |
| 1673 | struct cache_entry **cache, int nr, |
Antoine Pelisse | fc2b621 | 2013-12-14 12:31:16 +0100 | [diff] [blame] | 1674 | struct strbuf *prefix, |
Nguyễn Thái Ngọc Duy | 9037026 | 2010-11-27 01:17:46 +0700 | [diff] [blame] | 1675 | int select_mask, int clear_mask, |
Derrick Stolee | 468ce99 | 2019-09-03 11:04:58 -0700 | [diff] [blame] | 1676 | struct pattern_list *pl, |
Derrick Stolee | 4dcd4de | 2019-11-21 22:04:44 +0000 | [diff] [blame] | 1677 | enum pattern_match_result default_match, |
| 1678 | int progress_nr) |
Nguyễn Thái Ngọc Duy | 9037026 | 2010-11-27 01:17:46 +0700 | [diff] [blame] | 1679 | { |
Jeff King | d20bc01 | 2020-01-29 00:46:47 -0500 | [diff] [blame] | 1680 | struct cache_entry **cache_end = nr ? cache + nr : cache; |
Nguyễn Thái Ngọc Duy | 9037026 | 2010-11-27 01:17:46 +0700 | [diff] [blame] | 1681 | |
| 1682 | /* |
| 1683 | * Process all entries that have the given prefix and meet |
| 1684 | * select_mask condition |
| 1685 | */ |
| 1686 | while(cache != cache_end) { |
| 1687 | struct cache_entry *ce = *cache; |
| 1688 | const char *name, *slash; |
Derrick Stolee | 468ce99 | 2019-09-03 11:04:58 -0700 | [diff] [blame] | 1689 | int len, dtype; |
| 1690 | enum pattern_match_result ret; |
Nguyễn Thái Ngọc Duy | 9037026 | 2010-11-27 01:17:46 +0700 | [diff] [blame] | 1691 | |
Derrick Stolee | 4dcd4de | 2019-11-21 22:04:44 +0000 | [diff] [blame] | 1692 | display_progress(istate->progress, progress_nr); |
| 1693 | |
Nguyễn Thái Ngọc Duy | 9037026 | 2010-11-27 01:17:46 +0700 | [diff] [blame] | 1694 | if (select_mask && !(ce->ce_flags & select_mask)) { |
| 1695 | cache++; |
Derrick Stolee | 4dcd4de | 2019-11-21 22:04:44 +0000 | [diff] [blame] | 1696 | progress_nr++; |
Nguyễn Thái Ngọc Duy | 9037026 | 2010-11-27 01:17:46 +0700 | [diff] [blame] | 1697 | continue; |
| 1698 | } |
| 1699 | |
Antoine Pelisse | fc2b621 | 2013-12-14 12:31:16 +0100 | [diff] [blame] | 1700 | if (prefix->len && strncmp(ce->name, prefix->buf, prefix->len)) |
Nguyễn Thái Ngọc Duy | 9037026 | 2010-11-27 01:17:46 +0700 | [diff] [blame] | 1701 | break; |
| 1702 | |
Antoine Pelisse | fc2b621 | 2013-12-14 12:31:16 +0100 | [diff] [blame] | 1703 | name = ce->name + prefix->len; |
Nguyễn Thái Ngọc Duy | 9037026 | 2010-11-27 01:17:46 +0700 | [diff] [blame] | 1704 | slash = strchr(name, '/'); |
| 1705 | |
| 1706 | /* If it's a directory, try whole directory match first */ |
| 1707 | if (slash) { |
| 1708 | int processed; |
| 1709 | |
| 1710 | len = slash - name; |
Antoine Pelisse | fc2b621 | 2013-12-14 12:31:16 +0100 | [diff] [blame] | 1711 | strbuf_add(prefix, name, len); |
Nguyễn Thái Ngọc Duy | 9037026 | 2010-11-27 01:17:46 +0700 | [diff] [blame] | 1712 | |
Nguyễn Thái Ngọc Duy | 27c82fb | 2018-08-13 18:14:28 +0200 | [diff] [blame] | 1713 | processed = clear_ce_flags_dir(istate, cache, cache_end - cache, |
Antoine Pelisse | fc2b621 | 2013-12-14 12:31:16 +0100 | [diff] [blame] | 1714 | prefix, |
| 1715 | prefix->buf + prefix->len - len, |
Nguyễn Thái Ngọc Duy | 9037026 | 2010-11-27 01:17:46 +0700 | [diff] [blame] | 1716 | select_mask, clear_mask, |
Derrick Stolee | 4dcd4de | 2019-11-21 22:04:44 +0000 | [diff] [blame] | 1717 | pl, default_match, |
| 1718 | progress_nr); |
Nguyễn Thái Ngọc Duy | 9037026 | 2010-11-27 01:17:46 +0700 | [diff] [blame] | 1719 | |
| 1720 | /* clear_c_f_dir eats a whole dir already? */ |
| 1721 | if (processed) { |
| 1722 | cache += processed; |
Derrick Stolee | 4dcd4de | 2019-11-21 22:04:44 +0000 | [diff] [blame] | 1723 | progress_nr += processed; |
Antoine Pelisse | fc2b621 | 2013-12-14 12:31:16 +0100 | [diff] [blame] | 1724 | strbuf_setlen(prefix, prefix->len - len); |
Nguyễn Thái Ngọc Duy | 9037026 | 2010-11-27 01:17:46 +0700 | [diff] [blame] | 1725 | continue; |
| 1726 | } |
| 1727 | |
Antoine Pelisse | fc2b621 | 2013-12-14 12:31:16 +0100 | [diff] [blame] | 1728 | strbuf_addch(prefix, '/'); |
Derrick Stolee | 4dcd4de | 2019-11-21 22:04:44 +0000 | [diff] [blame] | 1729 | processed = clear_ce_flags_1(istate, cache, cache_end - cache, |
| 1730 | prefix, |
| 1731 | select_mask, clear_mask, pl, |
| 1732 | default_match, progress_nr); |
| 1733 | |
| 1734 | cache += processed; |
| 1735 | progress_nr += processed; |
| 1736 | |
Antoine Pelisse | fc2b621 | 2013-12-14 12:31:16 +0100 | [diff] [blame] | 1737 | strbuf_setlen(prefix, prefix->len - len - 1); |
Nguyễn Thái Ngọc Duy | 9037026 | 2010-11-27 01:17:46 +0700 | [diff] [blame] | 1738 | continue; |
| 1739 | } |
| 1740 | |
| 1741 | /* Non-directory */ |
| 1742 | dtype = ce_to_dtype(ce); |
Derrick Stolee | 468ce99 | 2019-09-03 11:04:58 -0700 | [diff] [blame] | 1743 | ret = path_matches_pattern_list(ce->name, |
| 1744 | ce_namelen(ce), |
| 1745 | name, &dtype, pl, istate); |
| 1746 | if (ret == UNDECIDED) |
| 1747 | ret = default_match; |
Derrick Stolee | f998a3f | 2020-01-31 20:16:15 +0000 | [diff] [blame] | 1748 | if (ret == MATCHED || ret == MATCHED_RECURSIVE) |
Nguyễn Thái Ngọc Duy | 9037026 | 2010-11-27 01:17:46 +0700 | [diff] [blame] | 1749 | ce->ce_flags &= ~clear_mask; |
| 1750 | cache++; |
Derrick Stolee | 4dcd4de | 2019-11-21 22:04:44 +0000 | [diff] [blame] | 1751 | progress_nr++; |
Nguyễn Thái Ngọc Duy | 9037026 | 2010-11-27 01:17:46 +0700 | [diff] [blame] | 1752 | } |
Derrick Stolee | 4dcd4de | 2019-11-21 22:04:44 +0000 | [diff] [blame] | 1753 | |
| 1754 | display_progress(istate->progress, progress_nr); |
Nguyễn Thái Ngọc Duy | 9037026 | 2010-11-27 01:17:46 +0700 | [diff] [blame] | 1755 | return nr - (cache_end - cache); |
| 1756 | } |
| 1757 | |
Nguyễn Thái Ngọc Duy | 27c82fb | 2018-08-13 18:14:28 +0200 | [diff] [blame] | 1758 | static int clear_ce_flags(struct index_state *istate, |
| 1759 | int select_mask, int clear_mask, |
Derrick Stolee | 4dcd4de | 2019-11-21 22:04:44 +0000 | [diff] [blame] | 1760 | struct pattern_list *pl, |
| 1761 | int show_progress) |
Nguyễn Thái Ngọc Duy | 9037026 | 2010-11-27 01:17:46 +0700 | [diff] [blame] | 1762 | { |
Antoine Pelisse | fc2b621 | 2013-12-14 12:31:16 +0100 | [diff] [blame] | 1763 | static struct strbuf prefix = STRBUF_INIT; |
Jeff Hostetler | e6152e3 | 2019-11-21 22:04:39 +0000 | [diff] [blame] | 1764 | char label[100]; |
| 1765 | int rval; |
Antoine Pelisse | fc2b621 | 2013-12-14 12:31:16 +0100 | [diff] [blame] | 1766 | |
| 1767 | strbuf_reset(&prefix); |
Derrick Stolee | 4dcd4de | 2019-11-21 22:04:44 +0000 | [diff] [blame] | 1768 | if (show_progress) |
| 1769 | istate->progress = start_delayed_progress( |
| 1770 | _("Updating index flags"), |
| 1771 | istate->cache_nr); |
Antoine Pelisse | fc2b621 | 2013-12-14 12:31:16 +0100 | [diff] [blame] | 1772 | |
Jeff Hostetler | e6152e3 | 2019-11-21 22:04:39 +0000 | [diff] [blame] | 1773 | xsnprintf(label, sizeof(label), "clear_ce_flags(0x%08lx,0x%08lx)", |
| 1774 | (unsigned long)select_mask, (unsigned long)clear_mask); |
| 1775 | trace2_region_enter("unpack_trees", label, the_repository); |
| 1776 | rval = clear_ce_flags_1(istate, |
Nguyễn Thái Ngọc Duy | 27c82fb | 2018-08-13 18:14:28 +0200 | [diff] [blame] | 1777 | istate->cache, |
| 1778 | istate->cache_nr, |
Antoine Pelisse | fc2b621 | 2013-12-14 12:31:16 +0100 | [diff] [blame] | 1779 | &prefix, |
Nguyễn Thái Ngọc Duy | 9037026 | 2010-11-27 01:17:46 +0700 | [diff] [blame] | 1780 | select_mask, clear_mask, |
Derrick Stolee | 4dcd4de | 2019-11-21 22:04:44 +0000 | [diff] [blame] | 1781 | pl, 0, 0); |
Jeff Hostetler | e6152e3 | 2019-11-21 22:04:39 +0000 | [diff] [blame] | 1782 | trace2_region_leave("unpack_trees", label, the_repository); |
| 1783 | |
Derrick Stolee | 4dcd4de | 2019-11-21 22:04:44 +0000 | [diff] [blame] | 1784 | stop_progress(&istate->progress); |
Jeff Hostetler | e6152e3 | 2019-11-21 22:04:39 +0000 | [diff] [blame] | 1785 | return rval; |
Nguyễn Thái Ngọc Duy | 9037026 | 2010-11-27 01:17:46 +0700 | [diff] [blame] | 1786 | } |
| 1787 | |
Junio C Hamano | 2e2b887 | 2008-05-28 15:12:30 -0700 | [diff] [blame] | 1788 | /* |
Nguyễn Thái Ngọc Duy | 2431afb | 2010-11-27 13:24:04 +0700 | [diff] [blame] | 1789 | * Set/Clear CE_NEW_SKIP_WORKTREE according to $GIT_DIR/info/sparse-checkout |
| 1790 | */ |
Derrick Stolee | caa3d55 | 2019-09-03 11:04:56 -0700 | [diff] [blame] | 1791 | static void mark_new_skip_worktree(struct pattern_list *pl, |
Nguyễn Thái Ngọc Duy | 86016ec | 2018-08-13 18:14:27 +0200 | [diff] [blame] | 1792 | struct index_state *istate, |
Derrick Stolee | 4dcd4de | 2019-11-21 22:04:44 +0000 | [diff] [blame] | 1793 | int select_flag, int skip_wt_flag, |
| 1794 | int show_progress) |
Nguyễn Thái Ngọc Duy | 2431afb | 2010-11-27 13:24:04 +0700 | [diff] [blame] | 1795 | { |
| 1796 | int i; |
| 1797 | |
Nguyễn Thái Ngọc Duy | 9037026 | 2010-11-27 01:17:46 +0700 | [diff] [blame] | 1798 | /* |
| 1799 | * 1. Pretend the narrowest worktree: only unmerged entries |
| 1800 | * are checked out |
| 1801 | */ |
Nguyễn Thái Ngọc Duy | 86016ec | 2018-08-13 18:14:27 +0200 | [diff] [blame] | 1802 | for (i = 0; i < istate->cache_nr; i++) { |
| 1803 | struct cache_entry *ce = istate->cache[i]; |
Nguyễn Thái Ngọc Duy | 2431afb | 2010-11-27 13:24:04 +0700 | [diff] [blame] | 1804 | |
| 1805 | if (select_flag && !(ce->ce_flags & select_flag)) |
| 1806 | continue; |
| 1807 | |
Max Kirillov | b33fdfc | 2018-07-10 22:17:48 +0300 | [diff] [blame] | 1808 | if (!ce_stage(ce) && !(ce->ce_flags & CE_CONFLICTED)) |
Nguyễn Thái Ngọc Duy | 2431afb | 2010-11-27 13:24:04 +0700 | [diff] [blame] | 1809 | ce->ce_flags |= skip_wt_flag; |
| 1810 | else |
| 1811 | ce->ce_flags &= ~skip_wt_flag; |
| 1812 | } |
Nguyễn Thái Ngọc Duy | 9037026 | 2010-11-27 01:17:46 +0700 | [diff] [blame] | 1813 | |
| 1814 | /* |
| 1815 | * 2. Widen worktree according to sparse-checkout file. |
| 1816 | * Matched entries will have skip_wt_flag cleared (i.e. "in") |
| 1817 | */ |
Derrick Stolee | 4dcd4de | 2019-11-21 22:04:44 +0000 | [diff] [blame] | 1818 | clear_ce_flags(istate, select_flag, skip_wt_flag, pl, show_progress); |
Nguyễn Thái Ngọc Duy | 2431afb | 2010-11-27 13:24:04 +0700 | [diff] [blame] | 1819 | } |
| 1820 | |
Elijah Newren | 30e89c1 | 2020-03-27 00:48:51 +0000 | [diff] [blame] | 1821 | static void populate_from_existing_patterns(struct unpack_trees_options *o, |
| 1822 | struct pattern_list *pl) |
| 1823 | { |
Derrick Stolee | dd23022 | 2021-01-23 19:58:17 +0000 | [diff] [blame] | 1824 | if (get_sparse_checkout_patterns(pl) < 0) |
Elijah Newren | 30e89c1 | 2020-03-27 00:48:51 +0000 | [diff] [blame] | 1825 | o->skip_sparse_checkout = 1; |
| 1826 | else |
Elijah Newren | 576de3d | 2023-02-27 15:28:16 +0000 | [diff] [blame] | 1827 | o->internal.pl = pl; |
Elijah Newren | 30e89c1 | 2020-03-27 00:48:51 +0000 | [diff] [blame] | 1828 | } |
| 1829 | |
Victoria Dye | 7497039 | 2022-03-01 20:24:29 +0000 | [diff] [blame] | 1830 | static void update_sparsity_for_prefix(const char *prefix, |
| 1831 | struct index_state *istate) |
| 1832 | { |
| 1833 | int prefix_len = strlen(prefix); |
| 1834 | struct strbuf ce_prefix = STRBUF_INIT; |
| 1835 | |
| 1836 | if (!istate->sparse_index) |
| 1837 | return; |
| 1838 | |
| 1839 | while (prefix_len > 0 && prefix[prefix_len - 1] == '/') |
| 1840 | prefix_len--; |
| 1841 | |
| 1842 | if (prefix_len <= 0) |
| 1843 | BUG("Invalid prefix passed to update_sparsity_for_prefix"); |
| 1844 | |
| 1845 | strbuf_grow(&ce_prefix, prefix_len + 1); |
| 1846 | strbuf_add(&ce_prefix, prefix, prefix_len); |
| 1847 | strbuf_addch(&ce_prefix, '/'); |
| 1848 | |
| 1849 | /* |
| 1850 | * If the prefix points to a sparse directory or a path inside a sparse |
| 1851 | * directory, the index should be expanded. This is accomplished in one |
| 1852 | * of two ways: |
| 1853 | * - if the prefix is inside a sparse directory, it will be expanded by |
| 1854 | * the 'ensure_full_index(...)' call in 'index_name_pos(...)'. |
| 1855 | * - if the prefix matches an existing sparse directory entry, |
| 1856 | * 'index_name_pos(...)' will return its index position, triggering |
| 1857 | * the 'ensure_full_index(...)' below. |
| 1858 | */ |
| 1859 | if (!path_in_cone_mode_sparse_checkout(ce_prefix.buf, istate) && |
| 1860 | index_name_pos(istate, ce_prefix.buf, ce_prefix.len) >= 0) |
| 1861 | ensure_full_index(istate); |
| 1862 | |
| 1863 | strbuf_release(&ce_prefix); |
| 1864 | } |
Elijah Newren | 30e89c1 | 2020-03-27 00:48:51 +0000 | [diff] [blame] | 1865 | |
René Scharfe | eb9ae4b | 2013-06-02 17:46:55 +0200 | [diff] [blame] | 1866 | static int verify_absent(const struct cache_entry *, |
| 1867 | enum unpack_trees_error_types, |
| 1868 | struct unpack_trees_options *); |
Junio C Hamano | 2e2b887 | 2008-05-28 15:12:30 -0700 | [diff] [blame] | 1869 | /* |
| 1870 | * N-way merge "len" trees. Returns 0 on success, -1 on failure to manipulate the |
| 1871 | * resulting index, -2 on failure to reflect the changes to the work tree. |
Nguyễn Thái Ngọc Duy | 2431afb | 2010-11-27 13:24:04 +0700 | [diff] [blame] | 1872 | * |
| 1873 | * CE_ADDED, CE_UNPACKED and CE_NEW_SKIP_WORKTREE are used internally |
Junio C Hamano | 2e2b887 | 2008-05-28 15:12:30 -0700 | [diff] [blame] | 1874 | */ |
Linus Torvalds | 933bf40 | 2007-08-09 22:21:29 -0700 | [diff] [blame] | 1875 | int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options *o) |
Johannes Schindelin | 16da134 | 2006-07-30 20:25:18 +0200 | [diff] [blame] | 1876 | { |
Derrick Stolee | 6863df3 | 2021-03-30 13:10:52 +0000 | [diff] [blame] | 1877 | struct repository *repo = the_repository; |
Victoria Dye | 99430aa | 2022-03-17 15:55:36 +0000 | [diff] [blame] | 1878 | int i, ret; |
Junio C Hamano | 0fb1eaa | 2006-12-04 02:11:39 -0800 | [diff] [blame] | 1879 | static struct cache_entry *dfc; |
Derrick Stolee | caa3d55 | 2019-09-03 11:04:56 -0700 | [diff] [blame] | 1880 | struct pattern_list pl; |
Elijah Newren | fa0bde4 | 2020-03-27 00:48:47 +0000 | [diff] [blame] | 1881 | int free_pattern_list = 0; |
Elijah Newren | c42e0b6 | 2021-09-27 16:33:42 +0000 | [diff] [blame] | 1882 | struct dir_struct dir = DIR_INIT; |
Johannes Schindelin | 16da134 | 2006-07-30 20:25:18 +0200 | [diff] [blame] | 1883 | |
Elijah Newren | 480d3d6 | 2021-09-27 16:33:44 +0000 | [diff] [blame] | 1884 | if (o->reset == UNPACK_RESET_INVALID) |
| 1885 | BUG("o->reset had a value of 1; should be UNPACK_TREES_*_UNTRACKED"); |
Johannes Schindelin | 16da134 | 2006-07-30 20:25:18 +0200 | [diff] [blame] | 1886 | |
Junio C Hamano | ca885a4 | 2008-03-13 22:07:18 -0700 | [diff] [blame] | 1887 | if (len > MAX_UNPACK_TREES) |
| 1888 | die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES); |
Elijah Newren | 576de3d | 2023-02-27 15:28:16 +0000 | [diff] [blame] | 1889 | if (o->internal.dir) |
| 1890 | BUG("o->internal.dir is for internal use only"); |
| 1891 | if (o->internal.pl) |
| 1892 | BUG("o->internal.pl is for internal use only"); |
Elijah Newren | f297424 | 2023-02-27 15:28:20 +0000 | [diff] [blame] | 1893 | if (o->df_conflict_entry) |
| 1894 | BUG("o->df_conflict_entry is an output only field"); |
Johannes Schindelin | 16da134 | 2006-07-30 20:25:18 +0200 | [diff] [blame] | 1895 | |
Nguyễn Thái Ngọc Duy | 0d1ed59 | 2018-08-18 16:41:23 +0200 | [diff] [blame] | 1896 | trace_performance_enter(); |
Derrick Stolee | c338898 | 2021-01-04 03:09:11 +0000 | [diff] [blame] | 1897 | trace2_region_enter("unpack_trees", "unpack_trees", the_repository); |
| 1898 | |
Derrick Stolee | 6863df3 | 2021-03-30 13:10:52 +0000 | [diff] [blame] | 1899 | prepare_repo_settings(repo); |
| 1900 | if (repo->settings.command_requires_full_index) { |
| 1901 | ensure_full_index(o->src_index); |
Ævar Arnfjörð Bjarmason | 29fefaf | 2023-01-12 13:55:25 +0100 | [diff] [blame] | 1902 | if (o->dst_index) |
| 1903 | ensure_full_index(o->dst_index); |
Derrick Stolee | 6863df3 | 2021-03-30 13:10:52 +0000 | [diff] [blame] | 1904 | } |
| 1905 | |
Elijah Newren | 480d3d6 | 2021-09-27 16:33:44 +0000 | [diff] [blame] | 1906 | if (o->reset == UNPACK_RESET_OVERWRITE_UNTRACKED && |
| 1907 | o->preserve_ignored) |
| 1908 | BUG("UNPACK_RESET_OVERWRITE_UNTRACKED incompatible with preserved ignored files"); |
| 1909 | |
Elijah Newren | 04988c8 | 2021-09-27 16:33:41 +0000 | [diff] [blame] | 1910 | if (!o->preserve_ignored) { |
Elijah Newren | 576de3d | 2023-02-27 15:28:16 +0000 | [diff] [blame] | 1911 | o->internal.dir = &dir; |
| 1912 | o->internal.dir->flags |= DIR_SHOW_IGNORED; |
| 1913 | setup_standard_excludes(o->internal.dir); |
Elijah Newren | 04988c8 | 2021-09-27 16:33:41 +0000 | [diff] [blame] | 1914 | } |
| 1915 | |
Victoria Dye | 7497039 | 2022-03-01 20:24:29 +0000 | [diff] [blame] | 1916 | if (o->prefix) |
| 1917 | update_sparsity_for_prefix(o->prefix, o->src_index); |
| 1918 | |
Nguyễn Thái Ngọc Duy | 08aefc9 | 2009-08-20 20:47:08 +0700 | [diff] [blame] | 1919 | if (!core_apply_sparse_checkout || !o->update) |
| 1920 | o->skip_sparse_checkout = 1; |
Elijah Newren | 5d4f4a5 | 2023-02-27 15:28:13 +0000 | [diff] [blame] | 1921 | if (!o->skip_sparse_checkout) { |
Elijah Newren | 30e89c1 | 2020-03-27 00:48:51 +0000 | [diff] [blame] | 1922 | memset(&pl, 0, sizeof(pl)); |
Elijah Newren | fa0bde4 | 2020-03-27 00:48:47 +0000 | [diff] [blame] | 1923 | free_pattern_list = 1; |
Elijah Newren | 30e89c1 | 2020-03-27 00:48:51 +0000 | [diff] [blame] | 1924 | populate_from_existing_patterns(o, &pl); |
Nguyễn Thái Ngọc Duy | 08aefc9 | 2009-08-20 20:47:08 +0700 | [diff] [blame] | 1925 | } |
| 1926 | |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 1927 | index_state_init(&o->internal.result, o->src_index->repo); |
| 1928 | o->internal.result.initialized = 1; |
| 1929 | o->internal.result.timestamp.sec = o->src_index->timestamp.sec; |
| 1930 | o->internal.result.timestamp.nsec = o->src_index->timestamp.nsec; |
| 1931 | o->internal.result.version = o->src_index->version; |
Elijah Newren | 7db1183 | 2018-04-23 23:50:45 -0700 | [diff] [blame] | 1932 | if (!o->src_index->split_index) { |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 1933 | o->internal.result.split_index = NULL; |
Elijah Newren | 7db1183 | 2018-04-23 23:50:45 -0700 | [diff] [blame] | 1934 | } else if (o->src_index == o->dst_index) { |
| 1935 | /* |
| 1936 | * o->dst_index (and thus o->src_index) will be discarded |
Elijah Newren | 0d680a7 | 2023-02-27 15:28:18 +0000 | [diff] [blame] | 1937 | * and overwritten with o->internal.result at the end of |
| 1938 | * this function, so just use src_index's split_index to |
| 1939 | * avoid having to create a new one. |
Elijah Newren | 7db1183 | 2018-04-23 23:50:45 -0700 | [diff] [blame] | 1940 | */ |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 1941 | o->internal.result.split_index = o->src_index->split_index; |
Johannes Schindelin | 061dd72 | 2023-03-26 22:45:43 +0000 | [diff] [blame] | 1942 | if (o->src_index->cache_changed & SPLIT_INDEX_ORDERED) |
Junio C Hamano | f315a8b | 2023-04-04 14:28:27 -0700 | [diff] [blame] | 1943 | o->internal.result.cache_changed |= SPLIT_INDEX_ORDERED; |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 1944 | o->internal.result.split_index->refcount++; |
Elijah Newren | 7db1183 | 2018-04-23 23:50:45 -0700 | [diff] [blame] | 1945 | } else { |
Elijah Newren | 0d680a7 | 2023-02-27 15:28:18 +0000 | [diff] [blame] | 1946 | o->internal.result.split_index = |
| 1947 | init_split_index(&o->internal.result); |
Elijah Newren | 7db1183 | 2018-04-23 23:50:45 -0700 | [diff] [blame] | 1948 | } |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 1949 | oidcpy(&o->internal.result.oid, &o->src_index->oid); |
Elijah Newren | 1ca13dd | 2023-02-27 15:28:19 +0000 | [diff] [blame] | 1950 | o->internal.merge_size = len; |
Junio C Hamano | da165f4 | 2010-01-07 14:59:54 -0800 | [diff] [blame] | 1951 | mark_all_ce_unused(o->src_index); |
Junio C Hamano | 0fb1eaa | 2006-12-04 02:11:39 -0800 | [diff] [blame] | 1952 | |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 1953 | o->internal.result.fsmonitor_last_update = |
Johannes Schindelin | 3dfd305 | 2021-03-17 15:30:48 +0000 | [diff] [blame] | 1954 | xstrdup_or_null(o->src_index->fsmonitor_last_update); |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 1955 | o->internal.result.fsmonitor_has_run_once = o->src_index->fsmonitor_has_run_once; |
Utsav Shah | 679f2f9 | 2019-11-20 08:32:17 +0000 | [diff] [blame] | 1956 | |
Victoria Dye | 0f329b9 | 2022-05-10 23:32:32 +0000 | [diff] [blame] | 1957 | if (!o->src_index->initialized && |
| 1958 | !repo->settings.command_requires_full_index && |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 1959 | is_sparse_index_allowed(&o->internal.result, 0)) |
| 1960 | o->internal.result.sparse_index = 1; |
Victoria Dye | 0f329b9 | 2022-05-10 23:32:32 +0000 | [diff] [blame] | 1961 | |
Nguyễn Thái Ngọc Duy | 2431afb | 2010-11-27 13:24:04 +0700 | [diff] [blame] | 1962 | /* |
| 1963 | * Sparse checkout loop #1: set NEW_SKIP_WORKTREE on existing entries |
| 1964 | */ |
| 1965 | if (!o->skip_sparse_checkout) |
Elijah Newren | 576de3d | 2023-02-27 15:28:16 +0000 | [diff] [blame] | 1966 | mark_new_skip_worktree(o->internal.pl, o->src_index, 0, |
Derrick Stolee | 4dcd4de | 2019-11-21 22:04:44 +0000 | [diff] [blame] | 1967 | CE_NEW_SKIP_WORKTREE, o->verbose_update); |
Nguyễn Thái Ngọc Duy | 2431afb | 2010-11-27 13:24:04 +0700 | [diff] [blame] | 1968 | |
Junio C Hamano | 0fb1eaa | 2006-12-04 02:11:39 -0800 | [diff] [blame] | 1969 | if (!dfc) |
Jeff King | 13494ed | 2008-10-23 04:30:58 +0000 | [diff] [blame] | 1970 | dfc = xcalloc(1, cache_entry_size(0)); |
Junio C Hamano | 0fb1eaa | 2006-12-04 02:11:39 -0800 | [diff] [blame] | 1971 | o->df_conflict_entry = dfc; |
Johannes Schindelin | 16da134 | 2006-07-30 20:25:18 +0200 | [diff] [blame] | 1972 | |
| 1973 | if (len) { |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 1974 | const char *prefix = o->prefix ? o->prefix : ""; |
| 1975 | struct traverse_info info; |
Linus Torvalds | 933bf40 | 2007-08-09 22:21:29 -0700 | [diff] [blame] | 1976 | |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 1977 | setup_traverse_info(&info, prefix); |
| 1978 | info.fn = unpack_callback; |
| 1979 | info.data = o; |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 1980 | info.show_all_errors = o->internal.show_all_errors; |
Junio C Hamano | 40e3725 | 2011-08-29 12:31:06 -0700 | [diff] [blame] | 1981 | info.pathspec = o->pathspec; |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 1982 | |
Junio C Hamano | da165f4 | 2010-01-07 14:59:54 -0800 | [diff] [blame] | 1983 | if (o->prefix) { |
| 1984 | /* |
| 1985 | * Unpack existing index entries that sort before the |
| 1986 | * prefix the tree is spliced into. Note that o->merge |
| 1987 | * is always true in this case. |
| 1988 | */ |
| 1989 | while (1) { |
Victoria Dye | 99430aa | 2022-03-17 15:55:36 +0000 | [diff] [blame] | 1990 | struct cache_entry *ce = next_cache_entry(o); |
Junio C Hamano | da165f4 | 2010-01-07 14:59:54 -0800 | [diff] [blame] | 1991 | if (!ce) |
| 1992 | break; |
| 1993 | if (ce_in_traverse_path(ce, &info)) |
| 1994 | break; |
| 1995 | if (unpack_index_entry(ce, o) < 0) |
| 1996 | goto return_failed; |
| 1997 | } |
Nguyễn Thái Ngọc Duy | 08aefc9 | 2009-08-20 20:47:08 +0700 | [diff] [blame] | 1998 | } |
Junio C Hamano | da165f4 | 2010-01-07 14:59:54 -0800 | [diff] [blame] | 1999 | |
Nguyễn Thái Ngọc Duy | 0d1ed59 | 2018-08-18 16:41:23 +0200 | [diff] [blame] | 2000 | trace_performance_enter(); |
Derrick Stolee | c338898 | 2021-01-04 03:09:11 +0000 | [diff] [blame] | 2001 | trace2_region_enter("unpack_trees", "traverse_trees", the_repository); |
Nguyễn Thái Ngọc Duy | 67022e0 | 2018-11-18 17:47:57 +0100 | [diff] [blame] | 2002 | ret = traverse_trees(o->src_index, len, t, &info); |
Derrick Stolee | c338898 | 2021-01-04 03:09:11 +0000 | [diff] [blame] | 2003 | trace2_region_leave("unpack_trees", "traverse_trees", the_repository); |
Nguyễn Thái Ngọc Duy | 0d1ed59 | 2018-08-18 16:41:23 +0200 | [diff] [blame] | 2004 | trace_performance_leave("traverse_trees"); |
| 2005 | if (ret < 0) |
Junio C Hamano | da165f4 | 2010-01-07 14:59:54 -0800 | [diff] [blame] | 2006 | goto return_failed; |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 2007 | } |
| 2008 | |
| 2009 | /* Any left-over entries in the index? */ |
| 2010 | if (o->merge) { |
Junio C Hamano | da165f4 | 2010-01-07 14:59:54 -0800 | [diff] [blame] | 2011 | while (1) { |
Victoria Dye | 99430aa | 2022-03-17 15:55:36 +0000 | [diff] [blame] | 2012 | struct cache_entry *ce = next_cache_entry(o); |
Junio C Hamano | da165f4 | 2010-01-07 14:59:54 -0800 | [diff] [blame] | 2013 | if (!ce) |
| 2014 | break; |
Linus Torvalds | 0190457 | 2008-03-05 20:15:44 -0800 | [diff] [blame] | 2015 | if (unpack_index_entry(ce, o) < 0) |
Junio C Hamano | da165f4 | 2010-01-07 14:59:54 -0800 | [diff] [blame] | 2016 | goto return_failed; |
Daniel Barkalow | 17e4642 | 2008-02-07 11:39:52 -0500 | [diff] [blame] | 2017 | } |
Johannes Schindelin | 16da134 | 2006-07-30 20:25:18 +0200 | [diff] [blame] | 2018 | } |
Junio C Hamano | da165f4 | 2010-01-07 14:59:54 -0800 | [diff] [blame] | 2019 | mark_all_ce_unused(o->src_index); |
Johannes Schindelin | 16da134 | 2006-07-30 20:25:18 +0200 | [diff] [blame] | 2020 | |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 2021 | if (o->trivial_merges_only && o->internal.nontrivial_merge) { |
Nguyễn Thái Ngọc Duy | 08aefc9 | 2009-08-20 20:47:08 +0700 | [diff] [blame] | 2022 | ret = unpack_failed(o, "Merge requires file-level merging"); |
| 2023 | goto done; |
| 2024 | } |
Johannes Schindelin | 16da134 | 2006-07-30 20:25:18 +0200 | [diff] [blame] | 2025 | |
Nguyễn Thái Ngọc Duy | e800ec9 | 2009-08-20 20:47:09 +0700 | [diff] [blame] | 2026 | if (!o->skip_sparse_checkout) { |
Nguyễn Thái Ngọc Duy | 2431afb | 2010-11-27 13:24:04 +0700 | [diff] [blame] | 2027 | /* |
| 2028 | * Sparse checkout loop #2: set NEW_SKIP_WORKTREE on entries not in loop #1 |
Elijah Newren | 031ba55 | 2020-03-27 00:48:44 +0000 | [diff] [blame] | 2029 | * If they will have NEW_SKIP_WORKTREE, also set CE_SKIP_WORKTREE |
Nguyễn Thái Ngọc Duy | 2431afb | 2010-11-27 13:24:04 +0700 | [diff] [blame] | 2030 | * so apply_sparse_checkout() won't attempt to remove it from worktree |
| 2031 | */ |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 2032 | mark_new_skip_worktree(o->internal.pl, &o->internal.result, |
Derrick Stolee | 4dcd4de | 2019-11-21 22:04:44 +0000 | [diff] [blame] | 2033 | CE_ADDED, CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE, |
| 2034 | o->verbose_update); |
Nguyễn Thái Ngọc Duy | 2431afb | 2010-11-27 13:24:04 +0700 | [diff] [blame] | 2035 | |
Nguyễn Thái Ngọc Duy | 17d26a4 | 2011-09-22 21:24:22 +1000 | [diff] [blame] | 2036 | ret = 0; |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 2037 | for (i = 0; i < o->internal.result.cache_nr; i++) { |
| 2038 | struct cache_entry *ce = o->internal.result.cache[i]; |
Nguyễn Thái Ngọc Duy | e800ec9 | 2009-08-20 20:47:09 +0700 | [diff] [blame] | 2039 | |
Nguyễn Thái Ngọc Duy | 2431afb | 2010-11-27 13:24:04 +0700 | [diff] [blame] | 2040 | /* |
| 2041 | * Entries marked with CE_ADDED in merged_entry() do not have |
| 2042 | * verify_absent() check (the check is effectively disabled |
| 2043 | * because CE_NEW_SKIP_WORKTREE is set unconditionally). |
| 2044 | * |
| 2045 | * Do the real check now because we have had |
| 2046 | * correct CE_NEW_SKIP_WORKTREE |
| 2047 | */ |
| 2048 | if (ce->ce_flags & CE_ADDED && |
Elijah Newren | 681c637 | 2020-03-27 00:49:00 +0000 | [diff] [blame] | 2049 | verify_absent(ce, WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN, o)) |
| 2050 | ret = 1; |
Nguyễn Thái Ngọc Duy | 2431afb | 2010-11-27 13:24:04 +0700 | [diff] [blame] | 2051 | |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 2052 | if (apply_sparse_checkout(&o->internal.result, ce, o)) |
Elijah Newren | 681c637 | 2020-03-27 00:49:00 +0000 | [diff] [blame] | 2053 | ret = 1; |
Nguyễn Thái Ngọc Duy | 9e1afb1 | 2009-08-20 20:47:13 +0700 | [diff] [blame] | 2054 | } |
Elijah Newren | 681c637 | 2020-03-27 00:49:00 +0000 | [diff] [blame] | 2055 | if (ret == 1) { |
| 2056 | /* |
| 2057 | * Inability to sparsify or de-sparsify individual |
| 2058 | * paths is not an error, but just a warning. |
| 2059 | */ |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 2060 | if (o->internal.show_all_errors) |
Elijah Newren | 681c637 | 2020-03-27 00:49:00 +0000 | [diff] [blame] | 2061 | display_warning_msgs(o); |
| 2062 | ret = 0; |
| 2063 | } |
Nguyễn Thái Ngọc Duy | e800ec9 | 2009-08-20 20:47:09 +0700 | [diff] [blame] | 2064 | } |
Johannes Schindelin | 16da134 | 2006-07-30 20:25:18 +0200 | [diff] [blame] | 2065 | |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 2066 | ret = check_updates(o, &o->internal.result) ? (-2) : 0; |
Felipe Contreras | e28f764 | 2013-08-13 20:27:58 +0200 | [diff] [blame] | 2067 | if (o->dst_index) { |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 2068 | move_index_extensions(&o->internal.result, o->src_index); |
Brian Degenhardt | 52fca21 | 2015-07-28 15:30:40 -0400 | [diff] [blame] | 2069 | if (!ret) { |
Nguyễn Thái Ngọc Duy | 4592e60 | 2018-08-18 16:41:28 +0200 | [diff] [blame] | 2070 | if (git_env_bool("GIT_TEST_CHECK_CACHE_TREE", 0)) |
Elijah Newren | 0d680a7 | 2023-02-27 15:28:18 +0000 | [diff] [blame] | 2071 | cache_tree_verify(the_repository, |
| 2072 | &o->internal.result); |
Victoria Dye | 68fcd48 | 2022-11-10 19:06:02 +0000 | [diff] [blame] | 2073 | if (!o->skip_cache_tree_update && |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 2074 | !cache_tree_fully_valid(o->internal.result.cache_tree)) |
| 2075 | cache_tree_update(&o->internal.result, |
Brian Degenhardt | 52fca21 | 2015-07-28 15:30:40 -0400 | [diff] [blame] | 2076 | WRITE_TREE_SILENT | |
| 2077 | WRITE_TREE_REPAIR); |
| 2078 | } |
Ben Peart | 1956ecd | 2019-02-15 12:59:21 -0500 | [diff] [blame] | 2079 | |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 2080 | o->internal.result.updated_workdir = 1; |
Felipe Contreras | e28f764 | 2013-08-13 20:27:58 +0200 | [diff] [blame] | 2081 | discard_index(o->dst_index); |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 2082 | *o->dst_index = o->internal.result; |
Junio C Hamano | a16cc8b | 2014-11-17 12:12:41 -0800 | [diff] [blame] | 2083 | } else { |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 2084 | discard_index(&o->internal.result); |
Felipe Contreras | e28f764 | 2013-08-13 20:27:58 +0200 | [diff] [blame] | 2085 | } |
Elijah Newren | 7db1183 | 2018-04-23 23:50:45 -0700 | [diff] [blame] | 2086 | o->src_index = NULL; |
Nguyễn Thái Ngọc Duy | 08aefc9 | 2009-08-20 20:47:08 +0700 | [diff] [blame] | 2087 | |
| 2088 | done: |
Elijah Newren | fa0bde4 | 2020-03-27 00:48:47 +0000 | [diff] [blame] | 2089 | if (free_pattern_list) |
Derrick Stolee | e091228 | 2019-11-21 22:04:46 +0000 | [diff] [blame] | 2090 | clear_pattern_list(&pl); |
Elijah Newren | 576de3d | 2023-02-27 15:28:16 +0000 | [diff] [blame] | 2091 | if (o->internal.dir) { |
| 2092 | dir_clear(o->internal.dir); |
| 2093 | o->internal.dir = NULL; |
Elijah Newren | 04988c8 | 2021-09-27 16:33:41 +0000 | [diff] [blame] | 2094 | } |
Derrick Stolee | c338898 | 2021-01-04 03:09:11 +0000 | [diff] [blame] | 2095 | trace2_region_leave("unpack_trees", "unpack_trees", the_repository); |
Elijah Newren | fa0bde4 | 2020-03-27 00:48:47 +0000 | [diff] [blame] | 2096 | trace_performance_leave("unpack_trees"); |
Junio C Hamano | 2e2b887 | 2008-05-28 15:12:30 -0700 | [diff] [blame] | 2097 | return ret; |
Junio C Hamano | da165f4 | 2010-01-07 14:59:54 -0800 | [diff] [blame] | 2098 | |
| 2099 | return_failed: |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 2100 | if (o->internal.show_all_errors) |
Matthieu Moy | e6c111b | 2010-08-11 10:38:07 +0200 | [diff] [blame] | 2101 | display_error_msgs(o); |
Junio C Hamano | da165f4 | 2010-01-07 14:59:54 -0800 | [diff] [blame] | 2102 | mark_all_ce_unused(o->src_index); |
Junio C Hamano | 026680f | 2010-01-24 17:35:58 -0800 | [diff] [blame] | 2103 | ret = unpack_failed(o, NULL); |
Junio C Hamano | b419482 | 2011-05-31 10:06:44 -0700 | [diff] [blame] | 2104 | if (o->exiting_early) |
| 2105 | ret = 0; |
Junio C Hamano | 026680f | 2010-01-24 17:35:58 -0800 | [diff] [blame] | 2106 | goto done; |
Johannes Schindelin | 16da134 | 2006-07-30 20:25:18 +0200 | [diff] [blame] | 2107 | } |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2108 | |
Elijah Newren | 7af7a25 | 2020-03-27 00:48:52 +0000 | [diff] [blame] | 2109 | /* |
| 2110 | * Update SKIP_WORKTREE bits according to sparsity patterns, and update |
| 2111 | * working directory to match. |
| 2112 | * |
| 2113 | * CE_NEW_SKIP_WORKTREE is used internally. |
| 2114 | */ |
Elijah Newren | 1147c56 | 2023-02-27 15:28:14 +0000 | [diff] [blame] | 2115 | enum update_sparsity_result update_sparsity(struct unpack_trees_options *o, |
| 2116 | struct pattern_list *pl) |
Elijah Newren | 7af7a25 | 2020-03-27 00:48:52 +0000 | [diff] [blame] | 2117 | { |
| 2118 | enum update_sparsity_result ret = UPDATE_SPARSITY_SUCCESS; |
Derrick Stolee | ace224a | 2020-05-04 18:27:43 +0000 | [diff] [blame] | 2119 | int i; |
Elijah Newren | 7af7a25 | 2020-03-27 00:48:52 +0000 | [diff] [blame] | 2120 | unsigned old_show_all_errors; |
| 2121 | int free_pattern_list = 0; |
| 2122 | |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 2123 | old_show_all_errors = o->internal.show_all_errors; |
| 2124 | o->internal.show_all_errors = 1; |
| 2125 | index_state_init(&o->internal.result, o->src_index->repo); |
Elijah Newren | 7af7a25 | 2020-03-27 00:48:52 +0000 | [diff] [blame] | 2126 | |
| 2127 | /* Sanity checks */ |
| 2128 | if (!o->update || o->index_only || o->skip_sparse_checkout) |
| 2129 | BUG("update_sparsity() is for reflecting sparsity patterns in working directory"); |
| 2130 | if (o->src_index != o->dst_index || o->fn) |
| 2131 | BUG("update_sparsity() called wrong"); |
| 2132 | |
| 2133 | trace_performance_enter(); |
| 2134 | |
| 2135 | /* If we weren't given patterns, use the recorded ones */ |
Elijah Newren | 1147c56 | 2023-02-27 15:28:14 +0000 | [diff] [blame] | 2136 | if (!pl) { |
Elijah Newren | 7af7a25 | 2020-03-27 00:48:52 +0000 | [diff] [blame] | 2137 | free_pattern_list = 1; |
Elijah Newren | 1147c56 | 2023-02-27 15:28:14 +0000 | [diff] [blame] | 2138 | pl = xcalloc(1, sizeof(*pl)); |
| 2139 | populate_from_existing_patterns(o, pl); |
Elijah Newren | 7af7a25 | 2020-03-27 00:48:52 +0000 | [diff] [blame] | 2140 | } |
Elijah Newren | 576de3d | 2023-02-27 15:28:16 +0000 | [diff] [blame] | 2141 | o->internal.pl = pl; |
Elijah Newren | 7af7a25 | 2020-03-27 00:48:52 +0000 | [diff] [blame] | 2142 | |
Derrick Stolee | 598b1e7 | 2022-05-23 13:48:46 +0000 | [diff] [blame] | 2143 | /* Expand sparse directories as needed */ |
Elijah Newren | 576de3d | 2023-02-27 15:28:16 +0000 | [diff] [blame] | 2144 | expand_index(o->src_index, o->internal.pl); |
Derrick Stolee | 598b1e7 | 2022-05-23 13:48:46 +0000 | [diff] [blame] | 2145 | |
Elijah Newren | 7af7a25 | 2020-03-27 00:48:52 +0000 | [diff] [blame] | 2146 | /* Set NEW_SKIP_WORKTREE on existing entries. */ |
| 2147 | mark_all_ce_unused(o->src_index); |
Elijah Newren | 576de3d | 2023-02-27 15:28:16 +0000 | [diff] [blame] | 2148 | mark_new_skip_worktree(o->internal.pl, o->src_index, 0, |
Elijah Newren | 7af7a25 | 2020-03-27 00:48:52 +0000 | [diff] [blame] | 2149 | CE_NEW_SKIP_WORKTREE, o->verbose_update); |
| 2150 | |
| 2151 | /* Then loop over entries and update/remove as needed */ |
| 2152 | ret = UPDATE_SPARSITY_SUCCESS; |
Elijah Newren | 7af7a25 | 2020-03-27 00:48:52 +0000 | [diff] [blame] | 2153 | for (i = 0; i < o->src_index->cache_nr; i++) { |
| 2154 | struct cache_entry *ce = o->src_index->cache[i]; |
| 2155 | |
Elijah Newren | ebb568b | 2020-03-27 00:48:59 +0000 | [diff] [blame] | 2156 | |
| 2157 | if (ce_stage(ce)) { |
| 2158 | /* -1 because for loop will increment by 1 */ |
| 2159 | i += warn_conflicted_path(o->src_index, i, o) - 1; |
| 2160 | ret = UPDATE_SPARSITY_WARNINGS; |
| 2161 | continue; |
| 2162 | } |
| 2163 | |
Elijah Newren | 7af7a25 | 2020-03-27 00:48:52 +0000 | [diff] [blame] | 2164 | if (apply_sparse_checkout(o->src_index, ce, o)) |
| 2165 | ret = UPDATE_SPARSITY_WARNINGS; |
Elijah Newren | 7af7a25 | 2020-03-27 00:48:52 +0000 | [diff] [blame] | 2166 | } |
| 2167 | |
Elijah Newren | 7af7a25 | 2020-03-27 00:48:52 +0000 | [diff] [blame] | 2168 | if (check_updates(o, o->src_index)) |
| 2169 | ret = UPDATE_SPARSITY_WORKTREE_UPDATE_FAILURES; |
| 2170 | |
Elijah Newren | 6271d77 | 2020-03-27 00:48:57 +0000 | [diff] [blame] | 2171 | display_warning_msgs(o); |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 2172 | o->internal.show_all_errors = old_show_all_errors; |
Elijah Newren | 1147c56 | 2023-02-27 15:28:14 +0000 | [diff] [blame] | 2173 | if (free_pattern_list) { |
| 2174 | clear_pattern_list(pl); |
| 2175 | free(pl); |
Elijah Newren | 576de3d | 2023-02-27 15:28:16 +0000 | [diff] [blame] | 2176 | o->internal.pl = NULL; |
Elijah Newren | 1147c56 | 2023-02-27 15:28:14 +0000 | [diff] [blame] | 2177 | } |
Elijah Newren | 7af7a25 | 2020-03-27 00:48:52 +0000 | [diff] [blame] | 2178 | trace_performance_leave("update_sparsity"); |
| 2179 | return ret; |
| 2180 | } |
| 2181 | |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2182 | /* Here come the merge functions */ |
| 2183 | |
René Scharfe | eb9ae4b | 2013-06-02 17:46:55 +0200 | [diff] [blame] | 2184 | static int reject_merge(const struct cache_entry *ce, |
| 2185 | struct unpack_trees_options *o) |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2186 | { |
Nguyễn Thái Ngọc Duy | 191e9d2 | 2019-03-22 16:31:35 +0700 | [diff] [blame] | 2187 | return add_rejected_path(o, ERROR_WOULD_OVERWRITE, ce->name); |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2188 | } |
| 2189 | |
René Scharfe | eb9ae4b | 2013-06-02 17:46:55 +0200 | [diff] [blame] | 2190 | static int same(const struct cache_entry *a, const struct cache_entry *b) |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2191 | { |
| 2192 | if (!!a != !!b) |
| 2193 | return 0; |
| 2194 | if (!a && !b) |
| 2195 | return 1; |
Junio C Hamano | e11d7b5 | 2009-12-31 23:04:04 -0800 | [diff] [blame] | 2196 | if ((a->ce_flags | b->ce_flags) & CE_CONFLICTED) |
| 2197 | return 0; |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2198 | return a->ce_mode == b->ce_mode && |
Jeff King | 4a7e27e | 2018-08-28 17:22:40 -0400 | [diff] [blame] | 2199 | oideq(&a->oid, &b->oid); |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2200 | } |
| 2201 | |
| 2202 | |
| 2203 | /* |
| 2204 | * When a CE gets turned into an unmerged entry, we |
| 2205 | * want it to be up-to-date |
| 2206 | */ |
René Scharfe | eb9ae4b | 2013-06-02 17:46:55 +0200 | [diff] [blame] | 2207 | static int verify_uptodate_1(const struct cache_entry *ce, |
| 2208 | struct unpack_trees_options *o, |
| 2209 | enum unpack_trees_error_types error_type) |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2210 | { |
| 2211 | struct stat st; |
| 2212 | |
Nguyễn Thái Ngọc Duy | d5b6629 | 2011-07-30 10:55:05 +0700 | [diff] [blame] | 2213 | if (o->index_only) |
| 2214 | return 0; |
| 2215 | |
| 2216 | /* |
| 2217 | * CE_VALID and CE_SKIP_WORKTREE cheat, we better check again |
| 2218 | * if this entry is truly up-to-date because this file may be |
| 2219 | * overwritten. |
| 2220 | */ |
| 2221 | if ((ce->ce_flags & CE_VALID) || ce_skip_worktree(ce)) |
| 2222 | ; /* keep checking */ |
| 2223 | else if (o->reset || ce_uptodate(ce)) |
Daniel Barkalow | 203a2fe | 2008-02-07 11:39:48 -0500 | [diff] [blame] | 2224 | return 0; |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2225 | |
| 2226 | if (!lstat(ce->name, &st)) { |
Nguyễn Thái Ngọc Duy | d5b6629 | 2011-07-30 10:55:05 +0700 | [diff] [blame] | 2227 | int flags = CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE; |
| 2228 | unsigned changed = ie_match_stat(o->src_index, ce, &st, flags); |
Stefan Beller | a7bc845 | 2017-03-14 14:46:39 -0700 | [diff] [blame] | 2229 | |
| 2230 | if (submodule_from_ce(ce)) { |
| 2231 | int r = check_submodule_move_head(ce, |
| 2232 | "HEAD", oid_to_hex(&ce->oid), o); |
| 2233 | if (r) |
Nguyễn Thái Ngọc Duy | 191e9d2 | 2019-03-22 16:31:35 +0700 | [diff] [blame] | 2234 | return add_rejected_path(o, error_type, ce->name); |
Stefan Beller | a7bc845 | 2017-03-14 14:46:39 -0700 | [diff] [blame] | 2235 | return 0; |
| 2236 | } |
| 2237 | |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2238 | if (!changed) |
Daniel Barkalow | 203a2fe | 2008-02-07 11:39:48 -0500 | [diff] [blame] | 2239 | return 0; |
Junio C Hamano | 936492d | 2007-08-03 22:13:09 -0700 | [diff] [blame] | 2240 | /* |
Stefan Beller | a7bc845 | 2017-03-14 14:46:39 -0700 | [diff] [blame] | 2241 | * Historic default policy was to allow submodule to be out |
| 2242 | * of sync wrt the superproject index. If the submodule was |
| 2243 | * not considered interesting above, we don't care here. |
Junio C Hamano | 936492d | 2007-08-03 22:13:09 -0700 | [diff] [blame] | 2244 | */ |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 2245 | if (S_ISGITLINK(ce->ce_mode)) |
Daniel Barkalow | 203a2fe | 2008-02-07 11:39:48 -0500 | [diff] [blame] | 2246 | return 0; |
Stefan Beller | a7bc845 | 2017-03-14 14:46:39 -0700 | [diff] [blame] | 2247 | |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2248 | errno = 0; |
| 2249 | } |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2250 | if (errno == ENOENT) |
Daniel Barkalow | 203a2fe | 2008-02-07 11:39:48 -0500 | [diff] [blame] | 2251 | return 0; |
Nguyễn Thái Ngọc Duy | 191e9d2 | 2019-03-22 16:31:35 +0700 | [diff] [blame] | 2252 | return add_rejected_path(o, error_type, ce->name); |
Nguyễn Thái Ngọc Duy | 35a5aa7 | 2009-08-20 20:47:07 +0700 | [diff] [blame] | 2253 | } |
| 2254 | |
Elijah Newren | 64b1abe | 2018-04-19 10:58:12 -0700 | [diff] [blame] | 2255 | int verify_uptodate(const struct cache_entry *ce, |
| 2256 | struct unpack_trees_options *o) |
Nguyễn Thái Ngọc Duy | 35a5aa7 | 2009-08-20 20:47:07 +0700 | [diff] [blame] | 2257 | { |
Elijah Newren | 26b5d6b | 2022-01-14 15:59:40 +0000 | [diff] [blame] | 2258 | if (!o->skip_sparse_checkout && |
| 2259 | (ce->ce_flags & CE_SKIP_WORKTREE) && |
| 2260 | (ce->ce_flags & CE_NEW_SKIP_WORKTREE)) |
Nguyễn Thái Ngọc Duy | f1f523e | 2009-08-20 20:47:10 +0700 | [diff] [blame] | 2261 | return 0; |
Matthieu Moy | 08402b0 | 2010-08-11 10:38:06 +0200 | [diff] [blame] | 2262 | return verify_uptodate_1(ce, o, ERROR_NOT_UPTODATE_FILE); |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2263 | } |
| 2264 | |
René Scharfe | eb9ae4b | 2013-06-02 17:46:55 +0200 | [diff] [blame] | 2265 | static int verify_uptodate_sparse(const struct cache_entry *ce, |
Nguyễn Thái Ngọc Duy | e800ec9 | 2009-08-20 20:47:09 +0700 | [diff] [blame] | 2266 | struct unpack_trees_options *o) |
| 2267 | { |
Elijah Newren | 1ac83f4 | 2020-03-27 00:48:56 +0000 | [diff] [blame] | 2268 | return verify_uptodate_1(ce, o, WARNING_SPARSE_NOT_UPTODATE_FILE); |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2269 | } |
| 2270 | |
Nguyễn Thái Ngọc Duy | 383480b | 2018-08-13 18:14:26 +0200 | [diff] [blame] | 2271 | /* |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 2272 | * TODO: We should actually invalidate o->internal.result, not src_index [1]. |
Nguyễn Thái Ngọc Duy | 383480b | 2018-08-13 18:14:26 +0200 | [diff] [blame] | 2273 | * But since cache tree and untracked cache both are not copied to |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 2274 | * o->internal.result until unpacking is complete, we invalidate them on |
Nguyễn Thái Ngọc Duy | 383480b | 2018-08-13 18:14:26 +0200 | [diff] [blame] | 2275 | * src_index instead with the assumption that they will be copied to |
| 2276 | * dst_index at the end. |
| 2277 | * |
| 2278 | * [1] src_index->cache_tree is also used in unpack_callback() so if |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 2279 | * we invalidate o->internal.result, we need to update it to use |
| 2280 | * o->internal.result.cache_tree as well. |
Nguyễn Thái Ngọc Duy | 383480b | 2018-08-13 18:14:26 +0200 | [diff] [blame] | 2281 | */ |
René Scharfe | eb9ae4b | 2013-06-02 17:46:55 +0200 | [diff] [blame] | 2282 | static void invalidate_ce_path(const struct cache_entry *ce, |
| 2283 | struct unpack_trees_options *o) |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2284 | { |
Nguyễn Thái Ngọc Duy | e931371 | 2015-03-08 17:12:35 +0700 | [diff] [blame] | 2285 | if (!ce) |
| 2286 | return; |
| 2287 | cache_tree_invalidate_path(o->src_index, ce->name); |
Nguyễn Thái Ngọc Duy | 0cacebf | 2018-02-07 16:21:40 +0700 | [diff] [blame] | 2288 | untracked_cache_invalidate_path(o->src_index, ce->name, 1); |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2289 | } |
| 2290 | |
Sven Verdoolaege | 0cf7375 | 2007-07-17 20:28:28 +0200 | [diff] [blame] | 2291 | /* |
| 2292 | * Check that checking out ce->sha1 in subdir ce->name is not |
| 2293 | * going to overwrite any working files. |
Sven Verdoolaege | 0cf7375 | 2007-07-17 20:28:28 +0200 | [diff] [blame] | 2294 | */ |
Stefan Beller | d6b1230 | 2017-03-14 14:46:38 -0700 | [diff] [blame] | 2295 | static int verify_clean_submodule(const char *old_sha1, |
| 2296 | const struct cache_entry *ce, |
René Scharfe | eb9ae4b | 2013-06-02 17:46:55 +0200 | [diff] [blame] | 2297 | struct unpack_trees_options *o) |
Sven Verdoolaege | 0cf7375 | 2007-07-17 20:28:28 +0200 | [diff] [blame] | 2298 | { |
Stefan Beller | a7bc845 | 2017-03-14 14:46:39 -0700 | [diff] [blame] | 2299 | if (!submodule_from_ce(ce)) |
| 2300 | return 0; |
| 2301 | |
| 2302 | return check_submodule_move_head(ce, old_sha1, |
| 2303 | oid_to_hex(&ce->oid), o); |
Sven Verdoolaege | 0cf7375 | 2007-07-17 20:28:28 +0200 | [diff] [blame] | 2304 | } |
| 2305 | |
René Scharfe | eb9ae4b | 2013-06-02 17:46:55 +0200 | [diff] [blame] | 2306 | static int verify_clean_subdirectory(const struct cache_entry *ce, |
René Scharfe | eb9ae4b | 2013-06-02 17:46:55 +0200 | [diff] [blame] | 2307 | struct unpack_trees_options *o) |
Junio C Hamano | c819353 | 2007-03-15 23:25:22 -0700 | [diff] [blame] | 2308 | { |
| 2309 | /* |
Sven Verdoolaege | 0cf7375 | 2007-07-17 20:28:28 +0200 | [diff] [blame] | 2310 | * we are about to extract "ce->name"; we would not want to lose |
Junio C Hamano | c819353 | 2007-03-15 23:25:22 -0700 | [diff] [blame] | 2311 | * anything in the existing directory there. |
| 2312 | */ |
| 2313 | int namelen; |
Clemens Buchacher | 7b9e3ce | 2009-01-01 21:54:33 +0100 | [diff] [blame] | 2314 | int i; |
Junio C Hamano | c819353 | 2007-03-15 23:25:22 -0700 | [diff] [blame] | 2315 | struct dir_struct d; |
| 2316 | char *pathbuf; |
| 2317 | int cnt = 0; |
Sven Verdoolaege | 0cf7375 | 2007-07-17 20:28:28 +0200 | [diff] [blame] | 2318 | |
Stefan Beller | d6b1230 | 2017-03-14 14:46:38 -0700 | [diff] [blame] | 2319 | if (S_ISGITLINK(ce->ce_mode)) { |
brian m. carlson | 1053fe8 | 2017-10-15 22:07:06 +0000 | [diff] [blame] | 2320 | struct object_id oid; |
brian m. carlson | a98e610 | 2017-10-15 22:07:07 +0000 | [diff] [blame] | 2321 | int sub_head = resolve_gitlink_ref(ce->name, "HEAD", &oid); |
Stefan Beller | d6b1230 | 2017-03-14 14:46:38 -0700 | [diff] [blame] | 2322 | /* |
| 2323 | * If we are not going to update the submodule, then |
Sven Verdoolaege | 0cf7375 | 2007-07-17 20:28:28 +0200 | [diff] [blame] | 2324 | * we don't care. |
| 2325 | */ |
Jeff King | 4a7e27e | 2018-08-28 17:22:40 -0400 | [diff] [blame] | 2326 | if (!sub_head && oideq(&oid, &ce->oid)) |
Sven Verdoolaege | 0cf7375 | 2007-07-17 20:28:28 +0200 | [diff] [blame] | 2327 | return 0; |
brian m. carlson | 1053fe8 | 2017-10-15 22:07:06 +0000 | [diff] [blame] | 2328 | return verify_clean_submodule(sub_head ? NULL : oid_to_hex(&oid), |
Jeff King | df351c6 | 2019-03-20 04:15:27 -0400 | [diff] [blame] | 2329 | ce, o); |
Sven Verdoolaege | 0cf7375 | 2007-07-17 20:28:28 +0200 | [diff] [blame] | 2330 | } |
Junio C Hamano | c819353 | 2007-03-15 23:25:22 -0700 | [diff] [blame] | 2331 | |
| 2332 | /* |
| 2333 | * First let's make sure we do not have a local modification |
| 2334 | * in that directory. |
| 2335 | */ |
Thomas Gummerer | 68c4f6a | 2012-07-06 18:07:30 +0200 | [diff] [blame] | 2336 | namelen = ce_namelen(ce); |
Junio C Hamano | da165f4 | 2010-01-07 14:59:54 -0800 | [diff] [blame] | 2337 | for (i = locate_in_src_index(ce, o); |
| 2338 | i < o->src_index->cache_nr; |
| 2339 | i++) { |
Clemens Buchacher | 837e5fe | 2009-01-01 21:54:32 +0100 | [diff] [blame] | 2340 | struct cache_entry *ce2 = o->src_index->cache[i]; |
| 2341 | int len = ce_namelen(ce2); |
Junio C Hamano | c819353 | 2007-03-15 23:25:22 -0700 | [diff] [blame] | 2342 | if (len < namelen || |
Clemens Buchacher | 837e5fe | 2009-01-01 21:54:32 +0100 | [diff] [blame] | 2343 | strncmp(ce->name, ce2->name, namelen) || |
| 2344 | ce2->name[namelen] != '/') |
Junio C Hamano | c819353 | 2007-03-15 23:25:22 -0700 | [diff] [blame] | 2345 | break; |
| 2346 | /* |
Junio C Hamano | da165f4 | 2010-01-07 14:59:54 -0800 | [diff] [blame] | 2347 | * ce2->name is an entry in the subdirectory to be |
| 2348 | * removed. |
Junio C Hamano | c819353 | 2007-03-15 23:25:22 -0700 | [diff] [blame] | 2349 | */ |
Clemens Buchacher | 837e5fe | 2009-01-01 21:54:32 +0100 | [diff] [blame] | 2350 | if (!ce_stage(ce2)) { |
| 2351 | if (verify_uptodate(ce2, o)) |
Daniel Barkalow | 203a2fe | 2008-02-07 11:39:48 -0500 | [diff] [blame] | 2352 | return -1; |
Clemens Buchacher | 837e5fe | 2009-01-01 21:54:32 +0100 | [diff] [blame] | 2353 | add_entry(o, ce2, CE_REMOVE, 0); |
Nguyễn Thái Ngọc Duy | 5697ca9 | 2018-08-18 16:41:27 +0200 | [diff] [blame] | 2354 | invalidate_ce_path(ce, o); |
Junio C Hamano | da165f4 | 2010-01-07 14:59:54 -0800 | [diff] [blame] | 2355 | mark_ce_used(ce2, o); |
Junio C Hamano | c819353 | 2007-03-15 23:25:22 -0700 | [diff] [blame] | 2356 | } |
| 2357 | cnt++; |
| 2358 | } |
| 2359 | |
Elijah Newren | b817e54 | 2021-12-09 05:08:27 +0000 | [diff] [blame] | 2360 | /* Do not lose a locally present file that is not ignored. */ |
Jeff King | 75faa45 | 2015-09-24 17:07:03 -0400 | [diff] [blame] | 2361 | pathbuf = xstrfmt("%.*s/", namelen, ce->name); |
Junio C Hamano | c819353 | 2007-03-15 23:25:22 -0700 | [diff] [blame] | 2362 | |
| 2363 | memset(&d, 0, sizeof(d)); |
Elijah Newren | 576de3d | 2023-02-27 15:28:16 +0000 | [diff] [blame] | 2364 | if (o->internal.dir) |
Elijah Newren | b413a82 | 2023-02-27 15:28:09 +0000 | [diff] [blame] | 2365 | setup_standard_excludes(&d); |
Nguyễn Thái Ngọc Duy | c7f3259 | 2018-08-13 18:14:29 +0200 | [diff] [blame] | 2366 | i = read_directory(&d, o->src_index, pathbuf, namelen+1, NULL); |
Ævar Arnfjörð Bjarmason | e5a917f | 2021-10-07 11:46:09 +0200 | [diff] [blame] | 2367 | dir_clear(&d); |
| 2368 | free(pathbuf); |
Junio C Hamano | c819353 | 2007-03-15 23:25:22 -0700 | [diff] [blame] | 2369 | if (i) |
Nguyễn Thái Ngọc Duy | 191e9d2 | 2019-03-22 16:31:35 +0700 | [diff] [blame] | 2370 | return add_rejected_path(o, ERROR_NOT_UPTODATE_DIR, ce->name); |
Elijah Newren | b817e54 | 2021-12-09 05:08:27 +0000 | [diff] [blame] | 2371 | |
| 2372 | /* Do not lose startup_info->original_cwd */ |
| 2373 | if (startup_info->original_cwd && |
| 2374 | !strcmp(startup_info->original_cwd, ce->name)) |
| 2375 | return add_rejected_path(o, ERROR_CWD_IN_THE_WAY, ce->name); |
| 2376 | |
Junio C Hamano | c819353 | 2007-03-15 23:25:22 -0700 | [diff] [blame] | 2377 | return cnt; |
| 2378 | } |
| 2379 | |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2380 | /* |
Linus Torvalds | 32260ad | 2008-03-22 09:35:59 -0700 | [diff] [blame] | 2381 | * This gets called when there was no index entry for the tree entry 'dst', |
| 2382 | * but we found a file in the working tree that 'lstat()' said was fine, |
| 2383 | * and we're on a case-insensitive filesystem. |
| 2384 | * |
| 2385 | * See if we can find a case-insensitive match in the index that also |
| 2386 | * matches the stat information, and assume it's that other file! |
| 2387 | */ |
Clemens Buchacher | a9307f5 | 2010-10-09 15:52:58 +0200 | [diff] [blame] | 2388 | static int icase_exists(struct unpack_trees_options *o, const char *name, int len, struct stat *st) |
Linus Torvalds | 32260ad | 2008-03-22 09:35:59 -0700 | [diff] [blame] | 2389 | { |
Nguyễn Thái Ngọc Duy | 9c5e6c8 | 2013-07-09 22:29:00 +0700 | [diff] [blame] | 2390 | const struct cache_entry *src; |
Linus Torvalds | 32260ad | 2008-03-22 09:35:59 -0700 | [diff] [blame] | 2391 | |
Eric Sunshine | ebbd743 | 2013-09-17 03:06:15 -0400 | [diff] [blame] | 2392 | src = index_file_exists(o->src_index, name, len, 1); |
Nguyễn Thái Ngọc Duy | 56cac48 | 2009-12-14 18:43:58 +0700 | [diff] [blame] | 2393 | return src && !ie_match_stat(o->src_index, src, st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE); |
Linus Torvalds | 32260ad | 2008-03-22 09:35:59 -0700 | [diff] [blame] | 2394 | } |
| 2395 | |
Elijah Newren | 1fdd51a | 2021-09-27 16:33:45 +0000 | [diff] [blame] | 2396 | enum absent_checking_type { |
| 2397 | COMPLETELY_ABSENT, |
| 2398 | ABSENT_ANY_DIRECTORY |
| 2399 | }; |
| 2400 | |
Clemens Buchacher | a9307f5 | 2010-10-09 15:52:58 +0200 | [diff] [blame] | 2401 | static int check_ok_to_remove(const char *name, int len, int dtype, |
René Scharfe | eb9ae4b | 2013-06-02 17:46:55 +0200 | [diff] [blame] | 2402 | const struct cache_entry *ce, struct stat *st, |
Clemens Buchacher | a9307f5 | 2010-10-09 15:52:58 +0200 | [diff] [blame] | 2403 | enum unpack_trees_error_types error_type, |
Elijah Newren | 1fdd51a | 2021-09-27 16:33:45 +0000 | [diff] [blame] | 2404 | enum absent_checking_type absent_type, |
Clemens Buchacher | a9307f5 | 2010-10-09 15:52:58 +0200 | [diff] [blame] | 2405 | struct unpack_trees_options *o) |
| 2406 | { |
Nguyễn Thái Ngọc Duy | 9c5e6c8 | 2013-07-09 22:29:00 +0700 | [diff] [blame] | 2407 | const struct cache_entry *result; |
Clemens Buchacher | a9307f5 | 2010-10-09 15:52:58 +0200 | [diff] [blame] | 2408 | |
| 2409 | /* |
| 2410 | * It may be that the 'lstat()' succeeded even though |
| 2411 | * target 'ce' was absent, because there is an old |
| 2412 | * entry that is different only in case.. |
| 2413 | * |
| 2414 | * Ignore that lstat() if it matches. |
| 2415 | */ |
| 2416 | if (ignore_case && icase_exists(o, name, len, st)) |
| 2417 | return 0; |
| 2418 | |
Elijah Newren | 576de3d | 2023-02-27 15:28:16 +0000 | [diff] [blame] | 2419 | if (o->internal.dir && |
| 2420 | is_excluded(o->internal.dir, o->src_index, name, &dtype)) |
Clemens Buchacher | a9307f5 | 2010-10-09 15:52:58 +0200 | [diff] [blame] | 2421 | /* |
| 2422 | * ce->name is explicitly excluded, so it is Ok to |
| 2423 | * overwrite it. |
| 2424 | */ |
| 2425 | return 0; |
| 2426 | if (S_ISDIR(st->st_mode)) { |
| 2427 | /* |
| 2428 | * We are checking out path "foo" and |
| 2429 | * found "foo/." in the working tree. |
| 2430 | * This is tricky -- if we have modified |
| 2431 | * files that are in "foo/" we would lose |
| 2432 | * them. |
| 2433 | */ |
Jeff King | df351c6 | 2019-03-20 04:15:27 -0400 | [diff] [blame] | 2434 | if (verify_clean_subdirectory(ce, o) < 0) |
Clemens Buchacher | a9307f5 | 2010-10-09 15:52:58 +0200 | [diff] [blame] | 2435 | return -1; |
| 2436 | return 0; |
| 2437 | } |
| 2438 | |
Elijah Newren | 1fdd51a | 2021-09-27 16:33:45 +0000 | [diff] [blame] | 2439 | /* If we only care about directories, then we can remove */ |
| 2440 | if (absent_type == ABSENT_ANY_DIRECTORY) |
| 2441 | return 0; |
| 2442 | |
Clemens Buchacher | a9307f5 | 2010-10-09 15:52:58 +0200 | [diff] [blame] | 2443 | /* |
| 2444 | * The previous round may already have decided to |
| 2445 | * delete this path, which is in a subdirectory that |
| 2446 | * is being replaced with a blob. |
| 2447 | */ |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 2448 | result = index_file_exists(&o->internal.result, name, len, 0); |
Clemens Buchacher | a9307f5 | 2010-10-09 15:52:58 +0200 | [diff] [blame] | 2449 | if (result) { |
| 2450 | if (result->ce_flags & CE_REMOVE) |
| 2451 | return 0; |
| 2452 | } |
| 2453 | |
Nguyễn Thái Ngọc Duy | 191e9d2 | 2019-03-22 16:31:35 +0700 | [diff] [blame] | 2454 | return add_rejected_path(o, error_type, name); |
Clemens Buchacher | a9307f5 | 2010-10-09 15:52:58 +0200 | [diff] [blame] | 2455 | } |
| 2456 | |
Linus Torvalds | 32260ad | 2008-03-22 09:35:59 -0700 | [diff] [blame] | 2457 | /* |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2458 | * We do not want to remove or overwrite a working tree file that |
Junio C Hamano | f8a9d42 | 2006-12-04 16:00:46 -0800 | [diff] [blame] | 2459 | * is not tracked, unless it is ignored. |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2460 | */ |
René Scharfe | eb9ae4b | 2013-06-02 17:46:55 +0200 | [diff] [blame] | 2461 | static int verify_absent_1(const struct cache_entry *ce, |
| 2462 | enum unpack_trees_error_types error_type, |
Elijah Newren | 1fdd51a | 2021-09-27 16:33:45 +0000 | [diff] [blame] | 2463 | enum absent_checking_type absent_type, |
René Scharfe | eb9ae4b | 2013-06-02 17:46:55 +0200 | [diff] [blame] | 2464 | struct unpack_trees_options *o) |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2465 | { |
Clemens Buchacher | f66caaf | 2010-10-09 15:53:00 +0200 | [diff] [blame] | 2466 | int len; |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2467 | struct stat st; |
| 2468 | |
Elijah Newren | 0b0ee33 | 2021-12-09 05:08:28 +0000 | [diff] [blame] | 2469 | if (o->index_only || !o->update) |
Daniel Barkalow | 203a2fe | 2008-02-07 11:39:48 -0500 | [diff] [blame] | 2470 | return 0; |
Junio C Hamano | c819353 | 2007-03-15 23:25:22 -0700 | [diff] [blame] | 2471 | |
Elijah Newren | 0b0ee33 | 2021-12-09 05:08:28 +0000 | [diff] [blame] | 2472 | if (o->reset == UNPACK_RESET_OVERWRITE_UNTRACKED) { |
| 2473 | /* Avoid nuking startup_info->original_cwd... */ |
| 2474 | if (startup_info->original_cwd && |
| 2475 | !strcmp(startup_info->original_cwd, ce->name)) |
| 2476 | return add_rejected_path(o, ERROR_CWD_IN_THE_WAY, |
| 2477 | ce->name); |
| 2478 | /* ...but nuke anything else. */ |
| 2479 | return 0; |
| 2480 | } |
| 2481 | |
Matheus Tavares | fab78a0 | 2021-03-18 15:43:47 -0300 | [diff] [blame] | 2482 | len = check_leading_path(ce->name, ce_namelen(ce), 0); |
Clemens Buchacher | f66caaf | 2010-10-09 15:53:00 +0200 | [diff] [blame] | 2483 | if (!len) |
Daniel Barkalow | 203a2fe | 2008-02-07 11:39:48 -0500 | [diff] [blame] | 2484 | return 0; |
Clemens Buchacher | f66caaf | 2010-10-09 15:53:00 +0200 | [diff] [blame] | 2485 | else if (len > 0) { |
Jeff King | f514ef9 | 2015-08-19 14:12:37 -0400 | [diff] [blame] | 2486 | char *path; |
| 2487 | int ret; |
Junio C Hamano | ec0603e | 2007-07-12 01:04:16 -0700 | [diff] [blame] | 2488 | |
Jeff King | f514ef9 | 2015-08-19 14:12:37 -0400 | [diff] [blame] | 2489 | path = xmemdupz(ce->name, len); |
| 2490 | if (lstat(path, &st)) |
Nguyễn Thái Ngọc Duy | 43c728e | 2016-05-08 16:47:58 +0700 | [diff] [blame] | 2491 | ret = error_errno("cannot stat '%s'", path); |
Stefan Beller | a7bc845 | 2017-03-14 14:46:39 -0700 | [diff] [blame] | 2492 | else { |
| 2493 | if (submodule_from_ce(ce)) |
| 2494 | ret = check_submodule_move_head(ce, |
| 2495 | oid_to_hex(&ce->oid), |
| 2496 | NULL, o); |
| 2497 | else |
| 2498 | ret = check_ok_to_remove(path, len, DT_UNKNOWN, NULL, |
Elijah Newren | 1fdd51a | 2021-09-27 16:33:45 +0000 | [diff] [blame] | 2499 | &st, error_type, |
| 2500 | absent_type, o); |
Stefan Beller | a7bc845 | 2017-03-14 14:46:39 -0700 | [diff] [blame] | 2501 | } |
Jeff King | f514ef9 | 2015-08-19 14:12:37 -0400 | [diff] [blame] | 2502 | free(path); |
| 2503 | return ret; |
Jonathan Nieder | 92fda79 | 2011-01-12 20:26:36 -0600 | [diff] [blame] | 2504 | } else if (lstat(ce->name, &st)) { |
| 2505 | if (errno != ENOENT) |
Nguyễn Thái Ngọc Duy | 43c728e | 2016-05-08 16:47:58 +0700 | [diff] [blame] | 2506 | return error_errno("cannot stat '%s'", ce->name); |
Jonathan Nieder | 92fda79 | 2011-01-12 20:26:36 -0600 | [diff] [blame] | 2507 | return 0; |
| 2508 | } else { |
Stefan Beller | a7bc845 | 2017-03-14 14:46:39 -0700 | [diff] [blame] | 2509 | if (submodule_from_ce(ce)) |
| 2510 | return check_submodule_move_head(ce, oid_to_hex(&ce->oid), |
| 2511 | NULL, o); |
| 2512 | |
Clemens Buchacher | a9307f5 | 2010-10-09 15:52:58 +0200 | [diff] [blame] | 2513 | return check_ok_to_remove(ce->name, ce_namelen(ce), |
Jonathan Nieder | 92fda79 | 2011-01-12 20:26:36 -0600 | [diff] [blame] | 2514 | ce_to_dtype(ce), ce, &st, |
Elijah Newren | 1fdd51a | 2021-09-27 16:33:45 +0000 | [diff] [blame] | 2515 | error_type, absent_type, o); |
Jonathan Nieder | 92fda79 | 2011-01-12 20:26:36 -0600 | [diff] [blame] | 2516 | } |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2517 | } |
Clemens Buchacher | a9307f5 | 2010-10-09 15:52:58 +0200 | [diff] [blame] | 2518 | |
René Scharfe | eb9ae4b | 2013-06-02 17:46:55 +0200 | [diff] [blame] | 2519 | static int verify_absent(const struct cache_entry *ce, |
Matthieu Moy | 08402b0 | 2010-08-11 10:38:06 +0200 | [diff] [blame] | 2520 | enum unpack_trees_error_types error_type, |
Nguyễn Thái Ngọc Duy | 35a5aa7 | 2009-08-20 20:47:07 +0700 | [diff] [blame] | 2521 | struct unpack_trees_options *o) |
| 2522 | { |
Nguyễn Thái Ngọc Duy | 2431afb | 2010-11-27 13:24:04 +0700 | [diff] [blame] | 2523 | if (!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE)) |
Nguyễn Thái Ngọc Duy | f1f523e | 2009-08-20 20:47:10 +0700 | [diff] [blame] | 2524 | return 0; |
Elijah Newren | 1fdd51a | 2021-09-27 16:33:45 +0000 | [diff] [blame] | 2525 | return verify_absent_1(ce, error_type, COMPLETELY_ABSENT, o); |
| 2526 | } |
| 2527 | |
| 2528 | static int verify_absent_if_directory(const struct cache_entry *ce, |
| 2529 | enum unpack_trees_error_types error_type, |
| 2530 | struct unpack_trees_options *o) |
| 2531 | { |
| 2532 | if (!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE)) |
| 2533 | return 0; |
| 2534 | return verify_absent_1(ce, error_type, ABSENT_ANY_DIRECTORY, o); |
Nguyễn Thái Ngọc Duy | 35a5aa7 | 2009-08-20 20:47:07 +0700 | [diff] [blame] | 2535 | } |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2536 | |
René Scharfe | eb9ae4b | 2013-06-02 17:46:55 +0200 | [diff] [blame] | 2537 | static int verify_absent_sparse(const struct cache_entry *ce, |
| 2538 | enum unpack_trees_error_types error_type, |
| 2539 | struct unpack_trees_options *o) |
Nguyễn Thái Ngọc Duy | e800ec9 | 2009-08-20 20:47:09 +0700 | [diff] [blame] | 2540 | { |
Elijah Newren | 1fdd51a | 2021-09-27 16:33:45 +0000 | [diff] [blame] | 2541 | return verify_absent_1(ce, error_type, COMPLETELY_ABSENT, o); |
Nguyễn Thái Ngọc Duy | e800ec9 | 2009-08-20 20:47:09 +0700 | [diff] [blame] | 2542 | } |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2543 | |
René Scharfe | f2fa354 | 2013-06-02 17:46:54 +0200 | [diff] [blame] | 2544 | static int merged_entry(const struct cache_entry *ce, |
René Scharfe | eb9ae4b | 2013-06-02 17:46:55 +0200 | [diff] [blame] | 2545 | const struct cache_entry *old, |
René Scharfe | f2fa354 | 2013-06-02 17:46:54 +0200 | [diff] [blame] | 2546 | struct unpack_trees_options *o) |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2547 | { |
Linus Torvalds | 7f8ab8d | 2008-03-16 11:42:50 -0700 | [diff] [blame] | 2548 | int update = CE_UPDATE; |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 2549 | struct cache_entry *merge = dup_cache_entry(ce, &o->internal.result); |
Linus Torvalds | 7f8ab8d | 2008-03-16 11:42:50 -0700 | [diff] [blame] | 2550 | |
Junio C Hamano | e11d7b5 | 2009-12-31 23:04:04 -0800 | [diff] [blame] | 2551 | if (!old) { |
Nguyễn Thái Ngọc Duy | 2431afb | 2010-11-27 13:24:04 +0700 | [diff] [blame] | 2552 | /* |
| 2553 | * New index entries. In sparse checkout, the following |
| 2554 | * verify_absent() will be delayed until after |
| 2555 | * traverse_trees() finishes in unpack_trees(), then: |
| 2556 | * |
| 2557 | * - CE_NEW_SKIP_WORKTREE will be computed correctly |
| 2558 | * - verify_absent() be called again, this time with |
| 2559 | * correct CE_NEW_SKIP_WORKTREE |
| 2560 | * |
| 2561 | * verify_absent() call here does nothing in sparse |
| 2562 | * checkout (i.e. o->skip_sparse_checkout == 0) |
| 2563 | */ |
| 2564 | update |= CE_ADDED; |
| 2565 | merge->ce_flags |= CE_NEW_SKIP_WORKTREE; |
| 2566 | |
René Scharfe | f2fa354 | 2013-06-02 17:46:54 +0200 | [diff] [blame] | 2567 | if (verify_absent(merge, |
| 2568 | ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) { |
Jameson Miller | a849735 | 2018-07-02 19:49:31 +0000 | [diff] [blame] | 2569 | discard_cache_entry(merge); |
Junio C Hamano | e11d7b5 | 2009-12-31 23:04:04 -0800 | [diff] [blame] | 2570 | return -1; |
René Scharfe | f2fa354 | 2013-06-02 17:46:54 +0200 | [diff] [blame] | 2571 | } |
Junio C Hamano | e11d7b5 | 2009-12-31 23:04:04 -0800 | [diff] [blame] | 2572 | invalidate_ce_path(merge, o); |
Stefan Beller | a7bc845 | 2017-03-14 14:46:39 -0700 | [diff] [blame] | 2573 | |
Philippe Blain | e84704f | 2020-02-17 04:53:05 +0000 | [diff] [blame] | 2574 | if (submodule_from_ce(ce) && file_exists(ce->name)) { |
Stefan Beller | a7bc845 | 2017-03-14 14:46:39 -0700 | [diff] [blame] | 2575 | int ret = check_submodule_move_head(ce, NULL, |
| 2576 | oid_to_hex(&ce->oid), |
| 2577 | o); |
| 2578 | if (ret) |
| 2579 | return ret; |
| 2580 | } |
| 2581 | |
Junio C Hamano | e11d7b5 | 2009-12-31 23:04:04 -0800 | [diff] [blame] | 2582 | } else if (!(old->ce_flags & CE_CONFLICTED)) { |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2583 | /* |
| 2584 | * See if we can re-use the old CE directly? |
| 2585 | * That way we get the uptodate stat info. |
| 2586 | * |
Linus Torvalds | 7f8ab8d | 2008-03-16 11:42:50 -0700 | [diff] [blame] | 2587 | * This also removes the UPDATE flag on a match; otherwise |
| 2588 | * we will end up overwriting local changes in the work tree. |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2589 | */ |
| 2590 | if (same(old, merge)) { |
Linus Torvalds | eb7a2f1 | 2008-02-22 20:41:17 -0800 | [diff] [blame] | 2591 | copy_cache_entry(merge, old); |
Linus Torvalds | 7f8ab8d | 2008-03-16 11:42:50 -0700 | [diff] [blame] | 2592 | update = 0; |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2593 | } else { |
René Scharfe | f2fa354 | 2013-06-02 17:46:54 +0200 | [diff] [blame] | 2594 | if (verify_uptodate(old, o)) { |
Jameson Miller | a849735 | 2018-07-02 19:49:31 +0000 | [diff] [blame] | 2595 | discard_cache_entry(merge); |
Daniel Barkalow | 203a2fe | 2008-02-07 11:39:48 -0500 | [diff] [blame] | 2596 | return -1; |
René Scharfe | f2fa354 | 2013-06-02 17:46:54 +0200 | [diff] [blame] | 2597 | } |
Nguyễn Thái Ngọc Duy | 2431afb | 2010-11-27 13:24:04 +0700 | [diff] [blame] | 2598 | /* Migrate old flags over */ |
| 2599 | update |= old->ce_flags & (CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE); |
Linus Torvalds | bc052d7 | 2008-03-06 12:26:14 -0800 | [diff] [blame] | 2600 | invalidate_ce_path(old, o); |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2601 | } |
Stefan Beller | a7bc845 | 2017-03-14 14:46:39 -0700 | [diff] [blame] | 2602 | |
Philippe Blain | e84704f | 2020-02-17 04:53:05 +0000 | [diff] [blame] | 2603 | if (submodule_from_ce(ce) && file_exists(ce->name)) { |
Stefan Beller | a7bc845 | 2017-03-14 14:46:39 -0700 | [diff] [blame] | 2604 | int ret = check_submodule_move_head(ce, oid_to_hex(&old->oid), |
| 2605 | oid_to_hex(&ce->oid), |
| 2606 | o); |
| 2607 | if (ret) |
| 2608 | return ret; |
| 2609 | } |
Junio C Hamano | e11d7b5 | 2009-12-31 23:04:04 -0800 | [diff] [blame] | 2610 | } else { |
| 2611 | /* |
| 2612 | * Previously unmerged entry left as an existence |
| 2613 | * marker by read_index_unmerged(); |
| 2614 | */ |
Elijah Newren | 1fdd51a | 2021-09-27 16:33:45 +0000 | [diff] [blame] | 2615 | if (verify_absent_if_directory(merge, |
| 2616 | ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) { |
| 2617 | discard_cache_entry(merge); |
| 2618 | return -1; |
| 2619 | } |
| 2620 | |
Junio C Hamano | e11d7b5 | 2009-12-31 23:04:04 -0800 | [diff] [blame] | 2621 | invalidate_ce_path(old, o); |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2622 | } |
| 2623 | |
Johannes Schindelin | cc756ed | 2019-09-09 13:56:15 +0200 | [diff] [blame] | 2624 | if (do_add_entry(o, merge, update, CE_STAGEMASK) < 0) |
| 2625 | return -1; |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2626 | return 1; |
| 2627 | } |
| 2628 | |
Victoria Dye | ab81047 | 2022-03-01 20:24:30 +0000 | [diff] [blame] | 2629 | static int merged_sparse_dir(const struct cache_entry * const *src, int n, |
| 2630 | struct unpack_trees_options *o) |
| 2631 | { |
| 2632 | struct tree_desc t[MAX_UNPACK_TREES + 1]; |
| 2633 | void * tree_bufs[MAX_UNPACK_TREES + 1]; |
| 2634 | struct traverse_info info; |
| 2635 | int i, ret; |
| 2636 | |
| 2637 | /* |
| 2638 | * Create the tree traversal information for traversing into *only* the |
| 2639 | * sparse directory. |
| 2640 | */ |
| 2641 | setup_traverse_info(&info, src[0]->name); |
| 2642 | info.fn = unpack_sparse_callback; |
| 2643 | info.data = o; |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 2644 | info.show_all_errors = o->internal.show_all_errors; |
Victoria Dye | ab81047 | 2022-03-01 20:24:30 +0000 | [diff] [blame] | 2645 | info.pathspec = o->pathspec; |
| 2646 | |
| 2647 | /* Get the tree descriptors of the sparse directory in each of the merging trees */ |
| 2648 | for (i = 0; i < n; i++) |
| 2649 | tree_bufs[i] = fill_tree_descriptor(o->src_index->repo, &t[i], |
| 2650 | src[i] && !is_null_oid(&src[i]->oid) ? &src[i]->oid : NULL); |
| 2651 | |
| 2652 | ret = traverse_trees(o->src_index, n, t, &info); |
| 2653 | |
| 2654 | for (i = 0; i < n; i++) |
| 2655 | free(tree_bufs[i]); |
| 2656 | |
| 2657 | return ret; |
| 2658 | } |
| 2659 | |
René Scharfe | eb9ae4b | 2013-06-02 17:46:55 +0200 | [diff] [blame] | 2660 | static int deleted_entry(const struct cache_entry *ce, |
| 2661 | const struct cache_entry *old, |
| 2662 | struct unpack_trees_options *o) |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2663 | { |
Linus Torvalds | 34110cd | 2008-03-06 18:12:28 -0800 | [diff] [blame] | 2664 | /* Did it exist in the index? */ |
| 2665 | if (!old) { |
Matthieu Moy | 08402b0 | 2010-08-11 10:38:06 +0200 | [diff] [blame] | 2666 | if (verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o)) |
Daniel Barkalow | 203a2fe | 2008-02-07 11:39:48 -0500 | [diff] [blame] | 2667 | return -1; |
Linus Torvalds | 34110cd | 2008-03-06 18:12:28 -0800 | [diff] [blame] | 2668 | return 0; |
Elijah Newren | 56d06fe | 2021-09-27 16:33:46 +0000 | [diff] [blame] | 2669 | } else if (verify_absent_if_directory(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o)) { |
| 2670 | return -1; |
Linus Torvalds | 34110cd | 2008-03-06 18:12:28 -0800 | [diff] [blame] | 2671 | } |
Elijah Newren | 56d06fe | 2021-09-27 16:33:46 +0000 | [diff] [blame] | 2672 | |
Junio C Hamano | e11d7b5 | 2009-12-31 23:04:04 -0800 | [diff] [blame] | 2673 | if (!(old->ce_flags & CE_CONFLICTED) && verify_uptodate(old, o)) |
Linus Torvalds | 34110cd | 2008-03-06 18:12:28 -0800 | [diff] [blame] | 2674 | return -1; |
| 2675 | add_entry(o, ce, CE_REMOVE, 0); |
Linus Torvalds | bc052d7 | 2008-03-06 12:26:14 -0800 | [diff] [blame] | 2676 | invalidate_ce_path(ce, o); |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2677 | return 1; |
| 2678 | } |
| 2679 | |
René Scharfe | eb9ae4b | 2013-06-02 17:46:55 +0200 | [diff] [blame] | 2680 | static int keep_entry(const struct cache_entry *ce, |
| 2681 | struct unpack_trees_options *o) |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2682 | { |
Linus Torvalds | 34110cd | 2008-03-06 18:12:28 -0800 | [diff] [blame] | 2683 | add_entry(o, ce, 0, 0); |
Nguyễn Thái Ngọc Duy | 5697ca9 | 2018-08-18 16:41:27 +0200 | [diff] [blame] | 2684 | if (ce_stage(ce)) |
| 2685 | invalidate_ce_path(ce, o); |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2686 | return 1; |
| 2687 | } |
| 2688 | |
| 2689 | #if DBRT_DEBUG |
| 2690 | static void show_stage_entry(FILE *o, |
| 2691 | const char *label, const struct cache_entry *ce) |
| 2692 | { |
| 2693 | if (!ce) |
| 2694 | fprintf(o, "%s (missing)\n", label); |
| 2695 | else |
| 2696 | fprintf(o, "%s%06o %s %d\t%s\n", |
| 2697 | label, |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 2698 | ce->ce_mode, |
brian m. carlson | 99d1a98 | 2016-09-05 20:07:52 +0000 | [diff] [blame] | 2699 | oid_to_hex(&ce->oid), |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2700 | ce_stage(ce), |
| 2701 | ce->name); |
| 2702 | } |
| 2703 | #endif |
| 2704 | |
René Scharfe | 5828e83 | 2013-06-02 17:46:56 +0200 | [diff] [blame] | 2705 | int threeway_merge(const struct cache_entry * const *stages, |
| 2706 | struct unpack_trees_options *o) |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2707 | { |
René Scharfe | eb9ae4b | 2013-06-02 17:46:55 +0200 | [diff] [blame] | 2708 | const struct cache_entry *index; |
| 2709 | const struct cache_entry *head; |
| 2710 | const struct cache_entry *remote = stages[o->head_idx + 1]; |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2711 | int count; |
| 2712 | int head_match = 0; |
| 2713 | int remote_match = 0; |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2714 | |
| 2715 | int df_conflict_head = 0; |
| 2716 | int df_conflict_remote = 0; |
| 2717 | |
| 2718 | int any_anc_missing = 0; |
| 2719 | int no_anc_exists = 1; |
| 2720 | int i; |
| 2721 | |
| 2722 | for (i = 1; i < o->head_idx; i++) { |
Junio C Hamano | 4c4caaf | 2007-04-07 05:49:19 -0700 | [diff] [blame] | 2723 | if (!stages[i] || stages[i] == o->df_conflict_entry) |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2724 | any_anc_missing = 1; |
Junio C Hamano | 4c4caaf | 2007-04-07 05:49:19 -0700 | [diff] [blame] | 2725 | else |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2726 | no_anc_exists = 0; |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2727 | } |
| 2728 | |
| 2729 | index = stages[0]; |
| 2730 | head = stages[o->head_idx]; |
| 2731 | |
| 2732 | if (head == o->df_conflict_entry) { |
| 2733 | df_conflict_head = 1; |
| 2734 | head = NULL; |
| 2735 | } |
| 2736 | |
| 2737 | if (remote == o->df_conflict_entry) { |
| 2738 | df_conflict_remote = 1; |
| 2739 | remote = NULL; |
| 2740 | } |
| 2741 | |
Junio C Hamano | cee2d6a | 2009-10-11 13:38:11 -0700 | [diff] [blame] | 2742 | /* |
| 2743 | * First, if there's a #16 situation, note that to prevent #13 |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2744 | * and #14. |
| 2745 | */ |
| 2746 | if (!same(remote, head)) { |
| 2747 | for (i = 1; i < o->head_idx; i++) { |
| 2748 | if (same(stages[i], head)) { |
| 2749 | head_match = i; |
| 2750 | } |
| 2751 | if (same(stages[i], remote)) { |
| 2752 | remote_match = i; |
| 2753 | } |
| 2754 | } |
| 2755 | } |
| 2756 | |
Junio C Hamano | cee2d6a | 2009-10-11 13:38:11 -0700 | [diff] [blame] | 2757 | /* |
| 2758 | * We start with cases where the index is allowed to match |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2759 | * something other than the head: #14(ALT) and #2ALT, where it |
| 2760 | * is permitted to match the result instead. |
| 2761 | */ |
| 2762 | /* #14, #14ALT, #2ALT */ |
| 2763 | if (remote && !df_conflict_head && head_match && !remote_match) { |
Victoria Dye | f27c170 | 2022-03-01 20:24:31 +0000 | [diff] [blame] | 2764 | if (index && !same(index, remote) && !same(index, head)) { |
| 2765 | if (S_ISSPARSEDIR(index->ce_mode)) |
| 2766 | return merged_sparse_dir(stages, 4, o); |
| 2767 | else |
| 2768 | return reject_merge(index, o); |
| 2769 | } |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2770 | return merged_entry(remote, index, o); |
| 2771 | } |
| 2772 | /* |
| 2773 | * If we have an entry in the index cache, then we want to |
| 2774 | * make sure that it matches head. |
| 2775 | */ |
Victoria Dye | f27c170 | 2022-03-01 20:24:31 +0000 | [diff] [blame] | 2776 | if (index && !same(index, head)) { |
| 2777 | if (S_ISSPARSEDIR(index->ce_mode)) |
| 2778 | return merged_sparse_dir(stages, 4, o); |
| 2779 | else |
| 2780 | return reject_merge(index, o); |
| 2781 | } |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2782 | |
| 2783 | if (head) { |
| 2784 | /* #5ALT, #15 */ |
| 2785 | if (same(head, remote)) |
| 2786 | return merged_entry(head, index, o); |
| 2787 | /* #13, #3ALT */ |
| 2788 | if (!df_conflict_remote && remote_match && !head_match) |
| 2789 | return merged_entry(head, index, o); |
| 2790 | } |
| 2791 | |
| 2792 | /* #1 */ |
Linus Torvalds | 34110cd | 2008-03-06 18:12:28 -0800 | [diff] [blame] | 2793 | if (!head && !remote && any_anc_missing) |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2794 | return 0; |
| 2795 | |
Junio C Hamano | cee2d6a | 2009-10-11 13:38:11 -0700 | [diff] [blame] | 2796 | /* |
| 2797 | * Under the "aggressive" rule, we resolve mostly trivial |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2798 | * cases that we historically had git-merge-one-file resolve. |
| 2799 | */ |
| 2800 | if (o->aggressive) { |
Junio C Hamano | cee2d6a | 2009-10-11 13:38:11 -0700 | [diff] [blame] | 2801 | int head_deleted = !head; |
| 2802 | int remote_deleted = !remote; |
René Scharfe | eb9ae4b | 2013-06-02 17:46:55 +0200 | [diff] [blame] | 2803 | const struct cache_entry *ce = NULL; |
Junio C Hamano | 4c4caaf | 2007-04-07 05:49:19 -0700 | [diff] [blame] | 2804 | |
| 2805 | if (index) |
Sven Verdoolaege | 0cf7375 | 2007-07-17 20:28:28 +0200 | [diff] [blame] | 2806 | ce = index; |
Junio C Hamano | 4c4caaf | 2007-04-07 05:49:19 -0700 | [diff] [blame] | 2807 | else if (head) |
Sven Verdoolaege | 0cf7375 | 2007-07-17 20:28:28 +0200 | [diff] [blame] | 2808 | ce = head; |
Junio C Hamano | 4c4caaf | 2007-04-07 05:49:19 -0700 | [diff] [blame] | 2809 | else if (remote) |
Sven Verdoolaege | 0cf7375 | 2007-07-17 20:28:28 +0200 | [diff] [blame] | 2810 | ce = remote; |
Junio C Hamano | 4c4caaf | 2007-04-07 05:49:19 -0700 | [diff] [blame] | 2811 | else { |
| 2812 | for (i = 1; i < o->head_idx; i++) { |
| 2813 | if (stages[i] && stages[i] != o->df_conflict_entry) { |
Sven Verdoolaege | 0cf7375 | 2007-07-17 20:28:28 +0200 | [diff] [blame] | 2814 | ce = stages[i]; |
Junio C Hamano | 4c4caaf | 2007-04-07 05:49:19 -0700 | [diff] [blame] | 2815 | break; |
| 2816 | } |
| 2817 | } |
| 2818 | } |
| 2819 | |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2820 | /* |
| 2821 | * Deleted in both. |
| 2822 | * Deleted in one and unchanged in the other. |
| 2823 | */ |
| 2824 | if ((head_deleted && remote_deleted) || |
| 2825 | (head_deleted && remote && remote_match) || |
| 2826 | (remote_deleted && head && head_match)) { |
| 2827 | if (index) |
| 2828 | return deleted_entry(index, index, o); |
Linus Torvalds | 34110cd | 2008-03-06 18:12:28 -0800 | [diff] [blame] | 2829 | if (ce && !head_deleted) { |
Matthieu Moy | 08402b0 | 2010-08-11 10:38:06 +0200 | [diff] [blame] | 2830 | if (verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_REMOVED, o)) |
Daniel Barkalow | 203a2fe | 2008-02-07 11:39:48 -0500 | [diff] [blame] | 2831 | return -1; |
| 2832 | } |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2833 | return 0; |
| 2834 | } |
| 2835 | /* |
| 2836 | * Added in both, identically. |
| 2837 | */ |
| 2838 | if (no_anc_exists && head && remote && same(head, remote)) |
| 2839 | return merged_entry(head, index, o); |
| 2840 | |
| 2841 | } |
| 2842 | |
Victoria Dye | f27c170 | 2022-03-01 20:24:31 +0000 | [diff] [blame] | 2843 | /* Handle "no merge" cases (see t/t1000-read-tree-m-3way.sh) */ |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2844 | if (index) { |
Victoria Dye | f27c170 | 2022-03-01 20:24:31 +0000 | [diff] [blame] | 2845 | /* |
| 2846 | * If we've reached the "no merge" cases and we're merging |
| 2847 | * a sparse directory, we may have an "edit/edit" conflict that |
| 2848 | * can be resolved by individually merging directory contents. |
| 2849 | */ |
| 2850 | if (S_ISSPARSEDIR(index->ce_mode)) |
| 2851 | return merged_sparse_dir(stages, 4, o); |
| 2852 | |
| 2853 | /* |
| 2854 | * If we're not merging a sparse directory, ensure the index is |
| 2855 | * up-to-date to avoid files getting overwritten with conflict |
| 2856 | * resolution files |
| 2857 | */ |
Daniel Barkalow | 203a2fe | 2008-02-07 11:39:48 -0500 | [diff] [blame] | 2858 | if (verify_uptodate(index, o)) |
| 2859 | return -1; |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2860 | } |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2861 | |
Elijah Newren | 13e1fd6 | 2023-02-27 15:28:17 +0000 | [diff] [blame] | 2862 | o->internal.nontrivial_merge = 1; |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2863 | |
Junio C Hamano | ea4b52a | 2007-04-07 05:42:01 -0700 | [diff] [blame] | 2864 | /* #2, #3, #4, #6, #7, #9, #10, #11. */ |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2865 | count = 0; |
| 2866 | if (!head_match || !remote_match) { |
| 2867 | for (i = 1; i < o->head_idx; i++) { |
Junio C Hamano | 4c4caaf | 2007-04-07 05:49:19 -0700 | [diff] [blame] | 2868 | if (stages[i] && stages[i] != o->df_conflict_entry) { |
Junio C Hamano | 7f7932a | 2007-04-02 00:06:12 -0700 | [diff] [blame] | 2869 | keep_entry(stages[i], o); |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2870 | count++; |
| 2871 | break; |
| 2872 | } |
| 2873 | } |
| 2874 | } |
| 2875 | #if DBRT_DEBUG |
| 2876 | else { |
| 2877 | fprintf(stderr, "read-tree: warning #16 detected\n"); |
| 2878 | show_stage_entry(stderr, "head ", stages[head_match]); |
| 2879 | show_stage_entry(stderr, "remote ", stages[remote_match]); |
| 2880 | } |
| 2881 | #endif |
Junio C Hamano | 7f7932a | 2007-04-02 00:06:12 -0700 | [diff] [blame] | 2882 | if (head) { count += keep_entry(head, o); } |
| 2883 | if (remote) { count += keep_entry(remote, o); } |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2884 | return count; |
| 2885 | } |
| 2886 | |
| 2887 | /* |
| 2888 | * Two-way merge. |
| 2889 | * |
| 2890 | * The rule is to "carry forward" what is in the index without losing |
Felipe Contreras | a75d7b5 | 2009-10-24 11:31:32 +0300 | [diff] [blame] | 2891 | * information across a "fast-forward", favoring a successful merge |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2892 | * over a merge failure when it makes sense. For details of the |
| 2893 | * "carry forward" rule, please see <Documentation/git-read-tree.txt>. |
| 2894 | * |
| 2895 | */ |
René Scharfe | 5828e83 | 2013-06-02 17:46:56 +0200 | [diff] [blame] | 2896 | int twoway_merge(const struct cache_entry * const *src, |
| 2897 | struct unpack_trees_options *o) |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2898 | { |
René Scharfe | eb9ae4b | 2013-06-02 17:46:55 +0200 | [diff] [blame] | 2899 | const struct cache_entry *current = src[0]; |
| 2900 | const struct cache_entry *oldtree = src[1]; |
| 2901 | const struct cache_entry *newtree = src[2]; |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2902 | |
Elijah Newren | 1ca13dd | 2023-02-27 15:28:19 +0000 | [diff] [blame] | 2903 | if (o->internal.merge_size != 2) |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2904 | return error("Cannot do a twoway merge of %d trees", |
Elijah Newren | 1ca13dd | 2023-02-27 15:28:19 +0000 | [diff] [blame] | 2905 | o->internal.merge_size); |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2906 | |
Junio C Hamano | b8ba153 | 2007-04-02 16:29:56 -0700 | [diff] [blame] | 2907 | if (oldtree == o->df_conflict_entry) |
| 2908 | oldtree = NULL; |
| 2909 | if (newtree == o->df_conflict_entry) |
| 2910 | newtree = NULL; |
| 2911 | |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2912 | if (current) { |
Jeff King | b018ff6 | 2012-12-29 15:51:54 -0500 | [diff] [blame] | 2913 | if (current->ce_flags & CE_CONFLICTED) { |
| 2914 | if (same(oldtree, newtree) || o->reset) { |
| 2915 | if (!newtree) |
| 2916 | return deleted_entry(current, current, o); |
| 2917 | else |
| 2918 | return merged_entry(newtree, current, o); |
| 2919 | } |
Jonathan Nieder | 6a143aa | 2014-08-12 17:03:18 -0700 | [diff] [blame] | 2920 | return reject_merge(current, o); |
Jonathan Nieder | 6c1db1b | 2014-08-12 17:00:45 -0700 | [diff] [blame] | 2921 | } else if ((!oldtree && !newtree) || /* 4 and 5 */ |
Jeff King | b018ff6 | 2012-12-29 15:51:54 -0500 | [diff] [blame] | 2922 | (!oldtree && newtree && |
| 2923 | same(current, newtree)) || /* 6 and 7 */ |
| 2924 | (oldtree && newtree && |
| 2925 | same(oldtree, newtree)) || /* 14 and 15 */ |
| 2926 | (oldtree && newtree && |
| 2927 | !same(oldtree, newtree) && /* 18 and 19 */ |
| 2928 | same(current, newtree))) { |
Junio C Hamano | 7f7932a | 2007-04-02 00:06:12 -0700 | [diff] [blame] | 2929 | return keep_entry(current, o); |
Jonathan Nieder | 6c1db1b | 2014-08-12 17:00:45 -0700 | [diff] [blame] | 2930 | } else if (oldtree && !newtree && same(current, oldtree)) { |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2931 | /* 10 or 11 */ |
| 2932 | return deleted_entry(oldtree, current, o); |
Jonathan Nieder | 6c1db1b | 2014-08-12 17:00:45 -0700 | [diff] [blame] | 2933 | } else if (oldtree && newtree && |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2934 | same(current, oldtree) && !same(current, newtree)) { |
| 2935 | /* 20 or 21 */ |
| 2936 | return merged_entry(newtree, current, o); |
Derrick Stolee | e05cdb1 | 2021-07-20 20:14:41 +0000 | [diff] [blame] | 2937 | } else if (current && !oldtree && newtree && |
| 2938 | S_ISSPARSEDIR(current->ce_mode) != S_ISSPARSEDIR(newtree->ce_mode) && |
| 2939 | ce_stage(current) == 0) { |
| 2940 | /* |
| 2941 | * This case is a directory/file conflict across the sparse-index |
| 2942 | * boundary. When we are changing from one path to another via |
| 2943 | * 'git checkout', then we want to replace one entry with another |
| 2944 | * via merged_entry(). If there are staged changes, then we should |
| 2945 | * reject the merge instead. |
| 2946 | */ |
| 2947 | return merged_entry(newtree, current, o); |
Victoria Dye | ab81047 | 2022-03-01 20:24:30 +0000 | [diff] [blame] | 2948 | } else if (S_ISSPARSEDIR(current->ce_mode)) { |
| 2949 | /* |
| 2950 | * The sparse directories differ, but we don't know whether that's |
| 2951 | * because of two different files in the directory being modified |
| 2952 | * (can be trivially merged) or if there is a real file conflict. |
| 2953 | * Merge the sparse directory by OID to compare file-by-file. |
| 2954 | */ |
| 2955 | return merged_sparse_dir(src, 3, o); |
Jonathan Nieder | 6c1db1b | 2014-08-12 17:00:45 -0700 | [diff] [blame] | 2956 | } else |
Jonathan Nieder | 6a143aa | 2014-08-12 17:03:18 -0700 | [diff] [blame] | 2957 | return reject_merge(current, o); |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2958 | } |
Junio C Hamano | 5521883 | 2008-09-07 19:49:25 -0700 | [diff] [blame] | 2959 | else if (newtree) { |
| 2960 | if (oldtree && !o->initial_checkout) { |
| 2961 | /* |
| 2962 | * deletion of the path was staged; |
| 2963 | */ |
| 2964 | if (same(oldtree, newtree)) |
| 2965 | return 1; |
| 2966 | return reject_merge(oldtree, o); |
| 2967 | } |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2968 | return merged_entry(newtree, current, o); |
Junio C Hamano | 5521883 | 2008-09-07 19:49:25 -0700 | [diff] [blame] | 2969 | } |
Linus Torvalds | d699676 | 2007-08-10 12:31:20 -0700 | [diff] [blame] | 2970 | return deleted_entry(oldtree, current, o); |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2971 | } |
| 2972 | |
| 2973 | /* |
| 2974 | * Bind merge. |
| 2975 | * |
| 2976 | * Keep the index entries at stage0, collapse stage1 but make sure |
| 2977 | * stage0 does not have anything there. |
| 2978 | */ |
René Scharfe | 5828e83 | 2013-06-02 17:46:56 +0200 | [diff] [blame] | 2979 | int bind_merge(const struct cache_entry * const *src, |
| 2980 | struct unpack_trees_options *o) |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2981 | { |
René Scharfe | eb9ae4b | 2013-06-02 17:46:55 +0200 | [diff] [blame] | 2982 | const struct cache_entry *old = src[0]; |
| 2983 | const struct cache_entry *a = src[1]; |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2984 | |
Elijah Newren | 1ca13dd | 2023-02-27 15:28:19 +0000 | [diff] [blame] | 2985 | if (o->internal.merge_size != 1) |
Pete Wyckoff | 82247e9 | 2012-04-29 20:28:45 -0400 | [diff] [blame] | 2986 | return error("Cannot do a bind merge of %d trees", |
Elijah Newren | 1ca13dd | 2023-02-27 15:28:19 +0000 | [diff] [blame] | 2987 | o->internal.merge_size); |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2988 | if (a && old) |
Nguyễn Thái Ngọc Duy | b165fac | 2019-03-22 16:31:36 +0700 | [diff] [blame] | 2989 | return o->quiet ? -1 : |
Stefan Beller | 3d41542 | 2017-01-17 17:05:20 -0800 | [diff] [blame] | 2990 | error(ERRORMSG(o, ERROR_BIND_OVERLAP), |
Ævar Arnfjörð Bjarmason | 4002ec3 | 2022-12-20 13:39:56 +0100 | [diff] [blame] | 2991 | super_prefixed(a->name, o->super_prefix), |
| 2992 | super_prefixed(old->name, o->super_prefix)); |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2993 | if (!a) |
Junio C Hamano | 7f7932a | 2007-04-02 00:06:12 -0700 | [diff] [blame] | 2994 | return keep_entry(old, o); |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 2995 | else |
| 2996 | return merged_entry(a, NULL, o); |
| 2997 | } |
| 2998 | |
| 2999 | /* |
| 3000 | * One-way merge. |
| 3001 | * |
| 3002 | * The rule is: |
| 3003 | * - take the stat information from stage0, take the data from stage1 |
| 3004 | */ |
René Scharfe | 5828e83 | 2013-06-02 17:46:56 +0200 | [diff] [blame] | 3005 | int oneway_merge(const struct cache_entry * const *src, |
| 3006 | struct unpack_trees_options *o) |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 3007 | { |
René Scharfe | eb9ae4b | 2013-06-02 17:46:55 +0200 | [diff] [blame] | 3008 | const struct cache_entry *old = src[0]; |
| 3009 | const struct cache_entry *a = src[1]; |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 3010 | |
Elijah Newren | 1ca13dd | 2023-02-27 15:28:19 +0000 | [diff] [blame] | 3011 | if (o->internal.merge_size != 1) |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 3012 | return error("Cannot do a oneway merge of %d trees", |
Elijah Newren | 1ca13dd | 2023-02-27 15:28:19 +0000 | [diff] [blame] | 3013 | o->internal.merge_size); |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 3014 | |
Junio C Hamano | 78d3b06 | 2009-07-18 12:26:38 -0700 | [diff] [blame] | 3015 | if (!a || a == o->df_conflict_entry) |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 3016 | return deleted_entry(old, old, o); |
Linus Torvalds | 34110cd | 2008-03-06 18:12:28 -0800 | [diff] [blame] | 3017 | |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 3018 | if (old && same(old, a)) { |
Linus Torvalds | 34110cd | 2008-03-06 18:12:28 -0800 | [diff] [blame] | 3019 | int update = 0; |
Utsav Shah | 679f2f9 | 2019-11-20 08:32:17 +0000 | [diff] [blame] | 3020 | if (o->reset && o->update && !ce_uptodate(old) && !ce_skip_worktree(old) && |
| 3021 | !(old->ce_flags & CE_FSMONITOR_VALID)) { |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 3022 | struct stat st; |
| 3023 | if (lstat(old->name, &st) || |
Nguyễn Thái Ngọc Duy | 56cac48 | 2009-12-14 18:43:58 +0700 | [diff] [blame] | 3024 | ie_match_stat(o->src_index, old, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE)) |
Linus Torvalds | 34110cd | 2008-03-06 18:12:28 -0800 | [diff] [blame] | 3025 | update |= CE_UPDATE; |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 3026 | } |
Stefan Beller | ad17312 | 2018-01-05 12:03:03 -0800 | [diff] [blame] | 3027 | if (o->update && S_ISGITLINK(old->ce_mode) && |
| 3028 | should_update_submodules() && !verify_uptodate(old, o)) |
| 3029 | update |= CE_UPDATE; |
Nguyễn Thái Ngọc Duy | ab5af82 | 2019-03-18 18:38:22 +0700 | [diff] [blame] | 3030 | add_entry(o, old, update, CE_STAGEMASK); |
Linus Torvalds | 34110cd | 2008-03-06 18:12:28 -0800 | [diff] [blame] | 3031 | return 0; |
Johannes Schindelin | 076b0ad | 2006-07-30 20:26:15 +0200 | [diff] [blame] | 3032 | } |
| 3033 | return merged_entry(a, old, o); |
| 3034 | } |
Denton Liu | d3c7bf7 | 2021-03-03 03:16:42 -0800 | [diff] [blame] | 3035 | |
| 3036 | /* |
| 3037 | * Merge worktree and untracked entries in a stash entry. |
| 3038 | * |
| 3039 | * Ignore all index entries. Collapse remaining trees but make sure that they |
| 3040 | * don't have any conflicting files. |
| 3041 | */ |
| 3042 | int stash_worktree_untracked_merge(const struct cache_entry * const *src, |
| 3043 | struct unpack_trees_options *o) |
| 3044 | { |
| 3045 | const struct cache_entry *worktree = src[1]; |
| 3046 | const struct cache_entry *untracked = src[2]; |
| 3047 | |
Elijah Newren | 1ca13dd | 2023-02-27 15:28:19 +0000 | [diff] [blame] | 3048 | if (o->internal.merge_size != 2) |
| 3049 | BUG("invalid merge_size: %d", o->internal.merge_size); |
Denton Liu | d3c7bf7 | 2021-03-03 03:16:42 -0800 | [diff] [blame] | 3050 | |
| 3051 | if (worktree && untracked) |
| 3052 | return error(_("worktree and untracked commit have duplicate entries: %s"), |
Ævar Arnfjörð Bjarmason | 4002ec3 | 2022-12-20 13:39:56 +0100 | [diff] [blame] | 3053 | super_prefixed(worktree->name, o->super_prefix)); |
Denton Liu | d3c7bf7 | 2021-03-03 03:16:42 -0800 | [diff] [blame] | 3054 | |
| 3055 | return merged_entry(worktree ? worktree : untracked, NULL, o); |
| 3056 | } |