]> git.ipfire.org Git - thirdparty/git.git/blame - advice.c
t5318: avoid unnecessary command substitutions
[thirdparty/git.git] / advice.c
CommitLineData
75194438 1#include "cache.h"
b2141fc1 2#include "config.h"
960786e7 3#include "color.h"
3ac68a93 4#include "help.h"
75194438 5
1184564e 6int advice_push_update_rejected = 1;
f25950f3 7int advice_push_non_ff_current = 1;
f25950f3 8int advice_push_non_ff_matching = 1;
b4505682 9int advice_push_already_exists = 1;
75e5c0dc
JH
10int advice_push_fetch_first = 1;
11int advice_push_needs_force = 1;
edf563fb 12int advice_status_hints = 1;
6a38ef2c 13int advice_status_u_option = 1;
4c371f91 14int advice_commit_before_merge = 1;
d38a30df 15int advice_resolve_conflict = 1;
b706fcfe 16int advice_implicit_identity = 1;
13be3e31 17int advice_detached_head = 1;
caa2036b 18int advice_set_upstream_failure = 1;
798c35fc 19int advice_object_name_warning = 1;
431bb23a 20int advice_amworkdir = 1;
7e309446 21int advice_rm_hints = 1;
53213994 22int advice_add_embedded_repo = 1;
f805a00a 23int advice_ignored_hook = 1;
abfb04d0 24int advice_waiting_for_editor = 1;
f9f99b3f 25int advice_graft_file_deprecated = 1;
75194438 26
960786e7
RD
27static int advice_use_color = -1;
28static char advice_colors[][COLOR_MAXLEN] = {
29 GIT_COLOR_RESET,
30 GIT_COLOR_YELLOW, /* HINT */
31};
32
33enum color_advice {
34 ADVICE_COLOR_RESET = 0,
35 ADVICE_COLOR_HINT = 1,
36};
37
38static int parse_advise_color_slot(const char *slot)
39{
40 if (!strcasecmp(slot, "reset"))
41 return ADVICE_COLOR_RESET;
42 if (!strcasecmp(slot, "hint"))
43 return ADVICE_COLOR_HINT;
44 return -1;
45}
46
47static const char *advise_get_color(enum color_advice ix)
48{
49 if (want_color_stderr(advice_use_color))
50 return advice_colors[ix];
51 return "";
52}
53
75194438
JK
54static struct {
55 const char *name;
56 int *preference;
57} advice_config[] = {
fb6fbffb
NTND
58 { "pushUpdateRejected", &advice_push_update_rejected },
59 { "pushNonFFCurrent", &advice_push_non_ff_current },
60 { "pushNonFFMatching", &advice_push_non_ff_matching },
61 { "pushAlreadyExists", &advice_push_already_exists },
62 { "pushFetchFirst", &advice_push_fetch_first },
63 { "pushNeedsForce", &advice_push_needs_force },
64 { "statusHints", &advice_status_hints },
65 { "statusUoption", &advice_status_u_option },
66 { "commitBeforeMerge", &advice_commit_before_merge },
67 { "resolveConflict", &advice_resolve_conflict },
68 { "implicitIdentity", &advice_implicit_identity },
69 { "detachedHead", &advice_detached_head },
70 { "setupStreamFailure", &advice_set_upstream_failure },
71 { "objectNameWarning", &advice_object_name_warning },
431bb23a 72 { "amWorkDir", &advice_amworkdir },
fb6fbffb
NTND
73 { "rmHints", &advice_rm_hints },
74 { "addEmbeddedRepo", &advice_add_embedded_repo },
75 { "ignoredHook", &advice_ignored_hook },
76 { "waitingForEditor", &advice_waiting_for_editor },
77 { "graftFileDeprecated", &advice_graft_file_deprecated },
1184564e
CR
78
79 /* make this an alias for backward compatibility */
fb6fbffb 80 { "pushNonFastForward", &advice_push_update_rejected }
75194438
JK
81};
82
38ef61cf
RR
83void advise(const char *advice, ...)
84{
23cb5bf3 85 struct strbuf buf = STRBUF_INIT;
38ef61cf 86 va_list params;
23cb5bf3 87 const char *cp, *np;
38ef61cf
RR
88
89 va_start(params, advice);
447b99c8 90 strbuf_vaddf(&buf, advice, params);
38ef61cf 91 va_end(params);
23cb5bf3
JH
92
93 for (cp = buf.buf; *cp; cp = np) {
94 np = strchrnul(cp, '\n');
960786e7
RD
95 fprintf(stderr, _("%shint: %.*s%s\n"),
96 advise_get_color(ADVICE_COLOR_HINT),
97 (int)(np - cp), cp,
98 advise_get_color(ADVICE_COLOR_RESET));
23cb5bf3
JH
99 if (*np)
100 np++;
101 }
102 strbuf_release(&buf);
38ef61cf
RR
103}
104
75194438
JK
105int git_default_advice_config(const char *var, const char *value)
106{
960786e7 107 const char *k, *slot_name;
75194438
JK
108 int i;
109
960786e7
RD
110 if (!strcmp(var, "color.advice")) {
111 advice_use_color = git_config_colorbool(var, value);
112 return 0;
113 }
114
115 if (skip_prefix(var, "color.advice.", &slot_name)) {
116 int slot = parse_advise_color_slot(slot_name);
117 if (slot < 0)
118 return 0;
119 if (!value)
120 return config_error_nonbool(var);
121 return color_parse(value, advice_colors[slot]);
122 }
123
cf4fff57
JK
124 if (!skip_prefix(var, "advice.", &k))
125 return 0;
126
75194438 127 for (i = 0; i < ARRAY_SIZE(advice_config); i++) {
fb6fbffb 128 if (strcasecmp(k, advice_config[i].name))
75194438
JK
129 continue;
130 *advice_config[i].preference = git_config_bool(var, value);
131 return 0;
132 }
133
134 return 0;
135}
d38a30df 136
3ac68a93
NTND
137void list_config_advices(struct string_list *list, const char *prefix)
138{
139 int i;
140
141 for (i = 0; i < ARRAY_SIZE(advice_config); i++)
142 list_config_item(list, prefix, advice_config[i].name);
143}
144
38ef61cf 145int error_resolve_conflict(const char *me)
d38a30df 146{
8785c425
VA
147 if (!strcmp(me, "cherry-pick"))
148 error(_("Cherry-picking is not possible because you have unmerged files."));
149 else if (!strcmp(me, "commit"))
150 error(_("Committing is not possible because you have unmerged files."));
151 else if (!strcmp(me, "merge"))
152 error(_("Merging is not possible because you have unmerged files."));
153 else if (!strcmp(me, "pull"))
154 error(_("Pulling is not possible because you have unmerged files."));
155 else if (!strcmp(me, "revert"))
156 error(_("Reverting is not possible because you have unmerged files."));
157 else
158 error(_("It is not possible to %s because you have unmerged files."),
159 me);
160
23cb5bf3 161 if (advice_resolve_conflict)
d38a30df
MM
162 /*
163 * Message used both when 'git commit' fails and when
164 * other commands doing a merge do.
165 */
c057b242 166 advise(_("Fix them up in the work tree, and then use 'git add/rm <file>'\n"
91e70e00 167 "as appropriate to mark resolution and make a commit."));
38ef61cf
RR
168 return -1;
169}
170
171void NORETURN die_resolve_conflict(const char *me)
172{
173 error_resolve_conflict(me);
8785c425 174 die(_("Exiting because of an unresolved conflict."));
d38a30df 175}
2857093b 176
4a4cf9e8
PT
177void NORETURN die_conclude_merge(void)
178{
179 error(_("You have not concluded your merge (MERGE_HEAD exists)."));
180 if (advice_resolve_conflict)
b7447679 181 advise(_("Please, commit your changes before merging."));
4a4cf9e8
PT
182 die(_("Exiting because of unfinished merge."));
183}
184
2857093b
NTND
185void detach_advice(const char *new_name)
186{
e9f3cec4
VA
187 const char *fmt =
188 _("Note: checking out '%s'.\n\n"
2857093b
NTND
189 "You are in 'detached HEAD' state. You can look around, make experimental\n"
190 "changes and commit them, and you can discard any commits you make in this\n"
191 "state without impacting any branches by performing another checkout.\n\n"
192 "If you want to create a new branch to retain commits you create, you may\n"
193 "do so (now or later) by using -b with the checkout command again. Example:\n\n"
e9f3cec4 194 " git checkout -b <new-branch-name>\n\n");
2857093b
NTND
195
196 fprintf(stderr, fmt, new_name);
197}