Line | Count | Source (jump to first uncovered line) |
1 | | #include "git-compat-util.h" |
2 | | #include "advice.h" |
3 | | #include "config.h" |
4 | | #include "color.h" |
5 | | #include "gettext.h" |
6 | | #include "help.h" |
7 | | #include "string-list.h" |
8 | | |
9 | | static int advice_use_color = -1; |
10 | | static char advice_colors[][COLOR_MAXLEN] = { |
11 | | GIT_COLOR_RESET, |
12 | | GIT_COLOR_YELLOW, /* HINT */ |
13 | | }; |
14 | | |
15 | | enum color_advice { |
16 | | ADVICE_COLOR_RESET = 0, |
17 | | ADVICE_COLOR_HINT = 1, |
18 | | }; |
19 | | |
20 | | static int parse_advise_color_slot(const char *slot) |
21 | 0 | { |
22 | 0 | if (!strcasecmp(slot, "reset")) |
23 | 0 | return ADVICE_COLOR_RESET; |
24 | 0 | if (!strcasecmp(slot, "hint")) |
25 | 0 | return ADVICE_COLOR_HINT; |
26 | 0 | return -1; |
27 | 0 | } |
28 | | |
29 | | static const char *advise_get_color(enum color_advice ix) |
30 | 20 | { |
31 | 20 | if (want_color_stderr(advice_use_color)) |
32 | 0 | return advice_colors[ix]; |
33 | 20 | return ""; |
34 | 20 | } |
35 | | |
36 | | static struct { |
37 | | const char *key; |
38 | | int enabled; |
39 | | } advice_setting[] = { |
40 | | [ADVICE_ADD_EMBEDDED_REPO] = { "addEmbeddedRepo", 1 }, |
41 | | [ADVICE_ADD_EMPTY_PATHSPEC] = { "addEmptyPathspec", 1 }, |
42 | | [ADVICE_ADD_IGNORED_FILE] = { "addIgnoredFile", 1 }, |
43 | | [ADVICE_AM_WORK_DIR] = { "amWorkDir", 1 }, |
44 | | [ADVICE_AMBIGUOUS_FETCH_REFSPEC] = { "ambiguousFetchRefspec", 1 }, |
45 | | [ADVICE_CHECKOUT_AMBIGUOUS_REMOTE_BRANCH_NAME] = { "checkoutAmbiguousRemoteBranchName", 1 }, |
46 | | [ADVICE_COMMIT_BEFORE_MERGE] = { "commitBeforeMerge", 1 }, |
47 | | [ADVICE_DETACHED_HEAD] = { "detachedHead", 1 }, |
48 | | [ADVICE_SUGGEST_DETACHING_HEAD] = { "suggestDetachingHead", 1 }, |
49 | | [ADVICE_DIVERGING] = { "diverging", 1 }, |
50 | | [ADVICE_FETCH_SHOW_FORCED_UPDATES] = { "fetchShowForcedUpdates", 1 }, |
51 | | [ADVICE_GRAFT_FILE_DEPRECATED] = { "graftFileDeprecated", 1 }, |
52 | | [ADVICE_IGNORED_HOOK] = { "ignoredHook", 1 }, |
53 | | [ADVICE_IMPLICIT_IDENTITY] = { "implicitIdentity", 1 }, |
54 | | [ADVICE_NESTED_TAG] = { "nestedTag", 1 }, |
55 | | [ADVICE_OBJECT_NAME_WARNING] = { "objectNameWarning", 1 }, |
56 | | [ADVICE_PUSH_ALREADY_EXISTS] = { "pushAlreadyExists", 1 }, |
57 | | [ADVICE_PUSH_FETCH_FIRST] = { "pushFetchFirst", 1 }, |
58 | | [ADVICE_PUSH_NEEDS_FORCE] = { "pushNeedsForce", 1 }, |
59 | | [ADVICE_PUSH_REF_NEEDS_UPDATE] = { "pushRefNeedsUpdate", 1 }, |
60 | | |
61 | | /* make this an alias for backward compatibility */ |
62 | | [ADVICE_PUSH_UPDATE_REJECTED_ALIAS] = { "pushNonFastForward", 1 }, |
63 | | |
64 | | [ADVICE_PUSH_NON_FF_CURRENT] = { "pushNonFFCurrent", 1 }, |
65 | | [ADVICE_PUSH_NON_FF_MATCHING] = { "pushNonFFMatching", 1 }, |
66 | | [ADVICE_PUSH_UNQUALIFIED_REF_NAME] = { "pushUnqualifiedRefName", 1 }, |
67 | | [ADVICE_PUSH_UPDATE_REJECTED] = { "pushUpdateRejected", 1 }, |
68 | | [ADVICE_RESET_NO_REFRESH_WARNING] = { "resetNoRefresh", 1 }, |
69 | | [ADVICE_RESOLVE_CONFLICT] = { "resolveConflict", 1 }, |
70 | | [ADVICE_RM_HINTS] = { "rmHints", 1 }, |
71 | | [ADVICE_SEQUENCER_IN_USE] = { "sequencerInUse", 1 }, |
72 | | [ADVICE_SET_UPSTREAM_FAILURE] = { "setUpstreamFailure", 1 }, |
73 | | [ADVICE_SKIPPED_CHERRY_PICKS] = { "skippedCherryPicks", 1 }, |
74 | | [ADVICE_STATUS_AHEAD_BEHIND_WARNING] = { "statusAheadBehindWarning", 1 }, |
75 | | [ADVICE_STATUS_HINTS] = { "statusHints", 1 }, |
76 | | [ADVICE_STATUS_U_OPTION] = { "statusUoption", 1 }, |
77 | | [ADVICE_SUBMODULE_ALTERNATE_ERROR_STRATEGY_DIE] = { "submoduleAlternateErrorStrategyDie", 1 }, |
78 | | [ADVICE_SUBMODULES_NOT_UPDATED] = { "submodulesNotUpdated", 1 }, |
79 | | [ADVICE_UPDATE_SPARSE_PATH] = { "updateSparsePath", 1 }, |
80 | | [ADVICE_WAITING_FOR_EDITOR] = { "waitingForEditor", 1 }, |
81 | | [ADVICE_WORKTREE_ADD_ORPHAN] = { "worktreeAddOrphan", 1 }, |
82 | | }; |
83 | | |
84 | | static const char turn_off_instructions[] = |
85 | | N_("\n" |
86 | | "Disable this message with \"git config advice.%s false\""); |
87 | | |
88 | | static void vadvise(const char *advice, int display_instructions, |
89 | | const char *key, va_list params) |
90 | 1 | { |
91 | 1 | struct strbuf buf = STRBUF_INIT; |
92 | 1 | const char *cp, *np; |
93 | | |
94 | 1 | strbuf_vaddf(&buf, advice, params); |
95 | | |
96 | 1 | if (display_instructions) |
97 | 0 | strbuf_addf(&buf, turn_off_instructions, key); |
98 | | |
99 | 11 | for (cp = buf.buf; *cp; cp = np) { |
100 | 10 | np = strchrnul(cp, '\n'); |
101 | 10 | fprintf(stderr, _("%shint: %.*s%s\n"), |
102 | 10 | advise_get_color(ADVICE_COLOR_HINT), |
103 | 10 | (int)(np - cp), cp, |
104 | 10 | advise_get_color(ADVICE_COLOR_RESET)); |
105 | 10 | if (*np) |
106 | 10 | np++; |
107 | 10 | } |
108 | 1 | strbuf_release(&buf); |
109 | 1 | } |
110 | | |
111 | | void advise(const char *advice, ...) |
112 | 1 | { |
113 | 1 | va_list params; |
114 | 1 | va_start(params, advice); |
115 | 1 | vadvise(advice, 0, "", params); |
116 | 1 | va_end(params); |
117 | 1 | } |
118 | | |
119 | | int advice_enabled(enum advice_type type) |
120 | 7.62k | { |
121 | 7.62k | switch(type) { |
122 | 0 | case ADVICE_PUSH_UPDATE_REJECTED: |
123 | 0 | return advice_setting[ADVICE_PUSH_UPDATE_REJECTED].enabled && |
124 | 0 | advice_setting[ADVICE_PUSH_UPDATE_REJECTED_ALIAS].enabled; |
125 | 7.62k | default: |
126 | 7.62k | return advice_setting[type].enabled; |
127 | 7.62k | } |
128 | 7.62k | } |
129 | | |
130 | | void advise_if_enabled(enum advice_type type, const char *advice, ...) |
131 | 0 | { |
132 | 0 | va_list params; |
133 | |
|
134 | 0 | if (!advice_enabled(type)) |
135 | 0 | return; |
136 | | |
137 | 0 | va_start(params, advice); |
138 | 0 | vadvise(advice, 1, advice_setting[type].key, params); |
139 | 0 | va_end(params); |
140 | 0 | } |
141 | | |
142 | | int git_default_advice_config(const char *var, const char *value) |
143 | 0 | { |
144 | 0 | const char *k, *slot_name; |
145 | 0 | int i; |
146 | |
|
147 | 0 | if (!strcmp(var, "color.advice")) { |
148 | 0 | advice_use_color = git_config_colorbool(var, value); |
149 | 0 | return 0; |
150 | 0 | } |
151 | | |
152 | 0 | if (skip_prefix(var, "color.advice.", &slot_name)) { |
153 | 0 | int slot = parse_advise_color_slot(slot_name); |
154 | 0 | if (slot < 0) |
155 | 0 | return 0; |
156 | 0 | if (!value) |
157 | 0 | return config_error_nonbool(var); |
158 | 0 | return color_parse(value, advice_colors[slot]); |
159 | 0 | } |
160 | | |
161 | 0 | if (!skip_prefix(var, "advice.", &k)) |
162 | 0 | return 0; |
163 | | |
164 | 0 | for (i = 0; i < ARRAY_SIZE(advice_setting); i++) { |
165 | 0 | if (strcasecmp(k, advice_setting[i].key)) |
166 | 0 | continue; |
167 | 0 | advice_setting[i].enabled = git_config_bool(var, value); |
168 | 0 | return 0; |
169 | 0 | } |
170 | | |
171 | 0 | return 0; |
172 | 0 | } |
173 | | |
174 | | void list_config_advices(struct string_list *list, const char *prefix) |
175 | 0 | { |
176 | 0 | int i; |
177 | |
|
178 | 0 | for (i = 0; i < ARRAY_SIZE(advice_setting); i++) |
179 | 0 | list_config_item(list, prefix, advice_setting[i].key); |
180 | 0 | } |
181 | | |
182 | | int error_resolve_conflict(const char *me) |
183 | 0 | { |
184 | 0 | if (!strcmp(me, "cherry-pick")) |
185 | 0 | error(_("Cherry-picking is not possible because you have unmerged files.")); |
186 | 0 | else if (!strcmp(me, "commit")) |
187 | 0 | error(_("Committing is not possible because you have unmerged files.")); |
188 | 0 | else if (!strcmp(me, "merge")) |
189 | 0 | error(_("Merging is not possible because you have unmerged files.")); |
190 | 0 | else if (!strcmp(me, "pull")) |
191 | 0 | error(_("Pulling is not possible because you have unmerged files.")); |
192 | 0 | else if (!strcmp(me, "revert")) |
193 | 0 | error(_("Reverting is not possible because you have unmerged files.")); |
194 | 0 | else if (!strcmp(me, "rebase")) |
195 | 0 | error(_("Rebasing is not possible because you have unmerged files.")); |
196 | 0 | else |
197 | 0 | BUG("Unhandled conflict reason '%s'", me); |
198 | | |
199 | 0 | if (advice_enabled(ADVICE_RESOLVE_CONFLICT)) |
200 | | /* |
201 | | * Message used both when 'git commit' fails and when |
202 | | * other commands doing a merge do. |
203 | | */ |
204 | 0 | advise(_("Fix them up in the work tree, and then use 'git add/rm <file>'\n" |
205 | 0 | "as appropriate to mark resolution and make a commit.")); |
206 | 0 | return -1; |
207 | 0 | } |
208 | | |
209 | | void NORETURN die_resolve_conflict(const char *me) |
210 | 0 | { |
211 | 0 | error_resolve_conflict(me); |
212 | 0 | die(_("Exiting because of an unresolved conflict.")); |
213 | 0 | } |
214 | | |
215 | | void NORETURN die_conclude_merge(void) |
216 | 0 | { |
217 | 0 | error(_("You have not concluded your merge (MERGE_HEAD exists).")); |
218 | 0 | if (advice_enabled(ADVICE_RESOLVE_CONFLICT)) |
219 | 0 | advise(_("Please, commit your changes before merging.")); |
220 | 0 | die(_("Exiting because of unfinished merge.")); |
221 | 0 | } |
222 | | |
223 | | void NORETURN die_ff_impossible(void) |
224 | 0 | { |
225 | 0 | advise_if_enabled(ADVICE_DIVERGING, |
226 | 0 | _("Diverging branches can't be fast-forwarded, you need to either:\n" |
227 | 0 | "\n" |
228 | 0 | "\tgit merge --no-ff\n" |
229 | 0 | "\n" |
230 | 0 | "or:\n" |
231 | 0 | "\n" |
232 | 0 | "\tgit rebase\n")); |
233 | 0 | die(_("Not possible to fast-forward, aborting.")); |
234 | 0 | } |
235 | | |
236 | | void advise_on_updating_sparse_paths(struct string_list *pathspec_list) |
237 | 0 | { |
238 | 0 | struct string_list_item *item; |
239 | |
|
240 | 0 | if (!pathspec_list->nr) |
241 | 0 | return; |
242 | | |
243 | 0 | fprintf(stderr, _("The following paths and/or pathspecs matched paths that exist\n" |
244 | 0 | "outside of your sparse-checkout definition, so will not be\n" |
245 | 0 | "updated in the index:\n")); |
246 | 0 | for_each_string_list_item(item, pathspec_list) |
247 | 0 | fprintf(stderr, "%s\n", item->string); |
248 | |
|
249 | 0 | advise_if_enabled(ADVICE_UPDATE_SPARSE_PATH, |
250 | 0 | _("If you intend to update such entries, try one of the following:\n" |
251 | 0 | "* Use the --sparse option.\n" |
252 | 0 | "* Disable or modify the sparsity rules.")); |
253 | 0 | } |
254 | | |
255 | | void detach_advice(const char *new_name) |
256 | 0 | { |
257 | 0 | const char *fmt = |
258 | 0 | _("Note: switching to '%s'.\n" |
259 | 0 | "\n" |
260 | 0 | "You are in 'detached HEAD' state. You can look around, make experimental\n" |
261 | 0 | "changes and commit them, and you can discard any commits you make in this\n" |
262 | 0 | "state without impacting any branches by switching back to a branch.\n" |
263 | 0 | "\n" |
264 | 0 | "If you want to create a new branch to retain commits you create, you may\n" |
265 | 0 | "do so (now or later) by using -c with the switch command. Example:\n" |
266 | 0 | "\n" |
267 | 0 | " git switch -c <new-branch-name>\n" |
268 | 0 | "\n" |
269 | 0 | "Or undo this operation with:\n" |
270 | 0 | "\n" |
271 | 0 | " git switch -\n" |
272 | 0 | "\n" |
273 | 0 | "Turn off this advice by setting config variable advice.detachedHead to false\n\n"); |
274 | |
|
275 | 0 | fprintf(stderr, fmt, new_name); |
276 | 0 | } |
277 | | |
278 | | void advise_on_moving_dirty_path(struct string_list *pathspec_list) |
279 | 0 | { |
280 | 0 | struct string_list_item *item; |
281 | |
|
282 | 0 | if (!pathspec_list->nr) |
283 | 0 | return; |
284 | | |
285 | 0 | fprintf(stderr, _("The following paths have been moved outside the\n" |
286 | 0 | "sparse-checkout definition but are not sparse due to local\n" |
287 | 0 | "modifications.\n")); |
288 | 0 | for_each_string_list_item(item, pathspec_list) |
289 | 0 | fprintf(stderr, "%s\n", item->string); |
290 | |
|
291 | 0 | advise_if_enabled(ADVICE_UPDATE_SPARSE_PATH, |
292 | 0 | _("To correct the sparsity of these paths, do the following:\n" |
293 | 0 | "* Use \"git add --sparse <paths>\" to update the index\n" |
294 | 0 | "* Use \"git sparse-checkout reapply\" to apply the sparsity rules")); |
295 | 0 | } |