Skip to content
Newer
Older
100644 476 lines (397 sloc) 11.5 KB
70827b1 Split up builtin commands into separate files from git.c
Linus Torvalds authored
1 #include "cache.h"
2 #include "builtin.h"
3 #include "exec_cmd.h"
8af84da @dscho git wrapper: DWIM mistyped commands
dscho authored
4 #include "levenshtein.h"
940208a builtin-help: make some internal functions available to other builtins
Miklos Vajna authored
5 #include "help.h"
6612b9e @kusma help: always suggest common-cmds if prefix of cmd
kusma authored
6 #include "common-cmds.h"
dbfae68 @pclouds help: reuse print_columns() for help -a
pclouds authored
7 #include "string-list.h"
8 #include "column.h"
816fb46 @peff move git_version_string into version.c
peff authored
9 #include "version.h"
e561810 @amrav help: add help_unknown_ref()
amrav authored
10 #include "refs.h"
6494998 @chriscool help: add "man.viewer" config var to use "woman" or "konqueror"
chriscool authored
11
940208a builtin-help: make some internal functions available to other builtins
Miklos Vajna authored
12 void add_cmdname(struct cmdnames *cmds, const char *name, int len)
70827b1 Split up builtin commands into separate files from git.c
Linus Torvalds authored
13 {
940208a builtin-help: make some internal functions available to other builtins
Miklos Vajna authored
14 struct cmdname *ent = xmalloc(sizeof(*ent) + len + 1);
1eb0569 @srp include $PATH in generating list of commands for "help -a"
srp authored
15
70827b1 Split up builtin commands into separate files from git.c
Linus Torvalds authored
16 ent->len = len;
17 memcpy(ent->name, name, len);
18 ent->name[len] = 0;
1eb0569 @srp include $PATH in generating list of commands for "help -a"
srp authored
19
20 ALLOC_GROW(cmds->names, cmds->cnt + 1, cmds->alloc);
21 cmds->names[cmds->cnt++] = ent;
70827b1 Split up builtin commands into separate files from git.c
Linus Torvalds authored
22 }
23
8af84da @dscho git wrapper: DWIM mistyped commands
dscho authored
24 static void clean_cmdnames(struct cmdnames *cmds)
25 {
26 int i;
27 for (i = 0; i < cmds->cnt; ++i)
28 free(cmds->names[i]);
29 free(cmds->names);
30 cmds->cnt = 0;
31 cmds->alloc = 0;
32 }
33
70827b1 Split up builtin commands into separate files from git.c
Linus Torvalds authored
34 static int cmdname_compare(const void *a_, const void *b_)
35 {
36 struct cmdname *a = *(struct cmdname **)a_;
37 struct cmdname *b = *(struct cmdname **)b_;
38 return strcmp(a->name, b->name);
39 }
40
1eb0569 @srp include $PATH in generating list of commands for "help -a"
srp authored
41 static void uniq(struct cmdnames *cmds)
42 {
43 int i, j;
44
45 if (!cmds->cnt)
46 return;
47
4a15758 @peff help.c::uniq: plug a leak
peff authored
48 for (i = j = 1; i < cmds->cnt; i++) {
49 if (!strcmp(cmds->names[i]->name, cmds->names[j-1]->name))
50 free(cmds->names[i]);
51 else
1eb0569 @srp include $PATH in generating list of commands for "help -a"
srp authored
52 cmds->names[j++] = cmds->names[i];
4a15758 @peff help.c::uniq: plug a leak
peff authored
53 }
1eb0569 @srp include $PATH in generating list of commands for "help -a"
srp authored
54
55 cmds->cnt = j;
56 }
57
940208a builtin-help: make some internal functions available to other builtins
Miklos Vajna authored
58 void exclude_cmds(struct cmdnames *cmds, struct cmdnames *excludes)
f3fa183 @gitster Style: place opening brace of a function definition at column 1
gitster authored
59 {
1eb0569 @srp include $PATH in generating list of commands for "help -a"
srp authored
60 int ci, cj, ei;
61 int cmp;
62
63 ci = cj = ei = 0;
64 while (ci < cmds->cnt && ei < excludes->cnt) {
65 cmp = strcmp(cmds->names[ci]->name, excludes->names[ei]->name);
66 if (cmp < 0)
67 cmds->names[cj++] = cmds->names[ci++];
6a17f58 @gitster help.c::exclude_cmds(): plug a leak
gitster authored
68 else if (cmp == 0) {
69 ei++;
70 free(cmds->names[ci++]);
71 } else if (cmp > 0)
1eb0569 @srp include $PATH in generating list of commands for "help -a"
srp authored
72 ei++;
73 }
74
75 while (ci < cmds->cnt)
76 cmds->names[cj++] = cmds->names[ci++];
77
78 cmds->cnt = cj;
79 }
80
d10cb3d @ralfth help.c: rename function "pretty_print_string_list"
ralfth authored
81 static void pretty_print_cmdnames(struct cmdnames *cmds, unsigned int colopts)
70827b1 Split up builtin commands into separate files from git.c
Linus Torvalds authored
82 {
dbfae68 @pclouds help: reuse print_columns() for help -a
pclouds authored
83 struct string_list list = STRING_LIST_INIT_NODUP;
84 struct column_options copts;
85 int i;
70827b1 Split up builtin commands into separate files from git.c
Linus Torvalds authored
86
dbfae68 @pclouds help: reuse print_columns() for help -a
pclouds authored
87 for (i = 0; i < cmds->cnt; i++)
88 string_list_append(&list, cmds->names[i]->name);
89 /*
90 * always enable column display, we only consult column.*
91 * about layout strategy and stuff
92 */
93 colopts = (colopts & ~COL_ENABLE_MASK) | COL_ENABLED;
94 memset(&copts, 0, sizeof(copts));
95 copts.indent = " ";
96 copts.padding = 2;
97 print_columns(&list, colopts, &copts);
98 string_list_clear(&list, 0);
70827b1 Split up builtin commands into separate files from git.c
Linus Torvalds authored
99 }
100
cc3b7a9 Windows: Make 'git help -a' work.
Johannes Sixt authored
101 static int is_executable(const char *name)
102 {
103 struct stat st;
104
105 if (stat(name, &st) || /* stat, not lstat */
106 !S_ISREG(st.st_mode))
107 return 0;
108
f66450a cygwin: Remove the Win32 l/stat() implementation
Ramsay Jones authored
109 #if defined(GIT_WINDOWS_NATIVE)
0d30ad7 @lznuaa Avoid declaration after statement
lznuaa authored
110 { /* cannot trust the executable bit, peek into the file instead */
cc3b7a9 Windows: Make 'git help -a' work.
Johannes Sixt authored
111 char buf[3] = { 0 };
112 int n;
113 int fd = open(name, O_RDONLY);
114 st.st_mode &= ~S_IXUSR;
115 if (fd >= 0) {
116 n = read(fd, buf, 2);
117 if (n == 2)
118 /* DOS executables start with "MZ" */
119 if (!strcmp(buf, "#!") || !strcmp(buf, "MZ"))
120 st.st_mode |= S_IXUSR;
121 close(fd);
122 }
0d30ad7 @lznuaa Avoid declaration after statement
lznuaa authored
123 }
cc3b7a9 Windows: Make 'git help -a' work.
Johannes Sixt authored
124 #endif
125 return st.st_mode & S_IXUSR;
126 }
127
e321180 @raalkml Remove calculation of the longest command name from where it is not used
raalkml authored
128 static void list_commands_in_dir(struct cmdnames *cmds,
940208a builtin-help: make some internal functions available to other builtins
Miklos Vajna authored
129 const char *path,
130 const char *prefix)
70827b1 Split up builtin commands into separate files from git.c
Linus Torvalds authored
131 {
1eb0569 @srp include $PATH in generating list of commands for "help -a"
srp authored
132 DIR *dir = opendir(path);
70827b1 Split up builtin commands into separate files from git.c
Linus Torvalds authored
133 struct dirent *de;
f5d600e @dscho Avoid chdir() in list_commands_in_dir()
dscho authored
134 struct strbuf buf = STRBUF_INIT;
135 int len;
70827b1 Split up builtin commands into separate files from git.c
Linus Torvalds authored
136
f5d600e @dscho Avoid chdir() in list_commands_in_dir()
dscho authored
137 if (!dir)
e321180 @raalkml Remove calculation of the longest command name from where it is not used
raalkml authored
138 return;
940208a builtin-help: make some internal functions available to other builtins
Miklos Vajna authored
139 if (!prefix)
140 prefix = "git-";
70827b1 Split up builtin commands into separate files from git.c
Linus Torvalds authored
141
f5d600e @dscho Avoid chdir() in list_commands_in_dir()
dscho authored
142 strbuf_addf(&buf, "%s/", path);
143 len = buf.len;
144
70827b1 Split up builtin commands into separate files from git.c
Linus Torvalds authored
145 while ((de = readdir(dir)) != NULL) {
de8118e @peff use skip_prefix to avoid repeated calculations
peff authored
146 const char *ent;
26936bf @peff use strip_suffix instead of ends_with in simple cases
peff authored
147 size_t entlen;
70827b1 Split up builtin commands into separate files from git.c
Linus Torvalds authored
148
de8118e @peff use skip_prefix to avoid repeated calculations
peff authored
149 if (!skip_prefix(de->d_name, prefix, &ent))
70827b1 Split up builtin commands into separate files from git.c
Linus Torvalds authored
150 continue;
0966003 @srp list_commands(): simplify code by using chdir()
srp authored
151
f5d600e @dscho Avoid chdir() in list_commands_in_dir()
dscho authored
152 strbuf_setlen(&buf, len);
153 strbuf_addstr(&buf, de->d_name);
154 if (!is_executable(buf.buf))
70827b1 Split up builtin commands into separate files from git.c
Linus Torvalds authored
155 continue;
156
de8118e @peff use skip_prefix to avoid repeated calculations
peff authored
157 entlen = strlen(ent);
6e40947 @gitster Merge branch 'jk/strip-suffix'
gitster authored
158 strip_suffix(ent, ".exe", &entlen);
70827b1 Split up builtin commands into separate files from git.c
Linus Torvalds authored
159
de8118e @peff use skip_prefix to avoid repeated calculations
peff authored
160 add_cmdname(cmds, ent, entlen);
70827b1 Split up builtin commands into separate files from git.c
Linus Torvalds authored
161 }
162 closedir(dir);
f5d600e @dscho Avoid chdir() in list_commands_in_dir()
dscho authored
163 strbuf_release(&buf);
1eb0569 @srp include $PATH in generating list of commands for "help -a"
srp authored
164 }
165
e321180 @raalkml Remove calculation of the longest command name from where it is not used
raalkml authored
166 void load_command_list(const char *prefix,
940208a builtin-help: make some internal functions available to other builtins
Miklos Vajna authored
167 struct cmdnames *main_cmds,
168 struct cmdnames *other_cmds)
1eb0569 @srp include $PATH in generating list of commands for "help -a"
srp authored
169 {
170 const char *env_path = getenv("PATH");
171 const char *exec_path = git_exec_path();
172
1f08e5c @raalkml Allow git help work without PATH set
raalkml authored
173 if (exec_path) {
e321180 @raalkml Remove calculation of the longest command name from where it is not used
raalkml authored
174 list_commands_in_dir(main_cmds, exec_path, prefix);
1f08e5c @raalkml Allow git help work without PATH set
raalkml authored
175 qsort(main_cmds->names, main_cmds->cnt,
176 sizeof(*main_cmds->names), cmdname_compare);
177 uniq(main_cmds);
1eb0569 @srp include $PATH in generating list of commands for "help -a"
srp authored
178 }
179
1f08e5c @raalkml Allow git help work without PATH set
raalkml authored
180 if (env_path) {
181 char *paths, *path, *colon;
182 path = paths = xstrdup(env_path);
183 while (1) {
184 if ((colon = strchr(path, PATH_SEP)))
185 *colon = 0;
746c221 @pieter git wrapper: also use aliases to correct mistyped commands
pieter authored
186 if (!exec_path || strcmp(path, exec_path))
187 list_commands_in_dir(other_cmds, path, prefix);
1eb0569 @srp include $PATH in generating list of commands for "help -a"
srp authored
188
1f08e5c @raalkml Allow git help work without PATH set
raalkml authored
189 if (!colon)
190 break;
191 path = colon + 1;
192 }
193 free(paths);
1eb0569 @srp include $PATH in generating list of commands for "help -a"
srp authored
194
1f08e5c @raalkml Allow git help work without PATH set
raalkml authored
195 qsort(other_cmds->names, other_cmds->cnt,
196 sizeof(*other_cmds->names), cmdname_compare);
197 uniq(other_cmds);
198 }
940208a builtin-help: make some internal functions available to other builtins
Miklos Vajna authored
199 exclude_cmds(other_cmds, main_cmds);
2156435 @peff help: respect aliases
peff authored
200 }
201
f4ed0af @gitster Merge branch 'nd/columns'
gitster authored
202 void list_commands(unsigned int colopts,
dbfae68 @pclouds help: reuse print_columns() for help -a
pclouds authored
203 struct cmdnames *main_cmds, struct cmdnames *other_cmds)
2156435 @peff help: respect aliases
peff authored
204 {
940208a builtin-help: make some internal functions available to other builtins
Miklos Vajna authored
205 if (main_cmds->cnt) {
61c5d43 @raalkml list_commands: only call git_exec_path if it is needed
raalkml authored
206 const char *exec_path = git_exec_path();
4470ef9 @pclouds help: replace underlining "help -a" headers using hyphens with a blan…
pclouds authored
207 printf_ln(_("available git commands in '%s'"), exec_path);
1eb0569 @srp include $PATH in generating list of commands for "help -a"
srp authored
208 putchar('\n');
d10cb3d @ralfth help.c: rename function "pretty_print_string_list"
ralfth authored
209 pretty_print_cmdnames(main_cmds, colopts);
1eb0569 @srp include $PATH in generating list of commands for "help -a"
srp authored
210 putchar('\n');
211 }
212
940208a builtin-help: make some internal functions available to other builtins
Miklos Vajna authored
213 if (other_cmds->cnt) {
4470ef9 @pclouds help: replace underlining "help -a" headers using hyphens with a blan…
pclouds authored
214 printf_ln(_("git commands available from elsewhere on your $PATH"));
940208a builtin-help: make some internal functions available to other builtins
Miklos Vajna authored
215 putchar('\n');
d10cb3d @ralfth help.c: rename function "pretty_print_string_list"
ralfth authored
216 pretty_print_cmdnames(other_cmds, colopts);
1eb0569 @srp include $PATH in generating list of commands for "help -a"
srp authored
217 putchar('\n');
218 }
70827b1 Split up builtin commands into separate files from git.c
Linus Torvalds authored
219 }
220
2241477 @Groutcho help: respect new common command grouping
Groutcho authored
221 static int cmd_group_cmp(const void *elem1, const void *elem2)
222 {
223 const struct cmdname_help *e1 = elem1;
224 const struct cmdname_help *e2 = elem2;
225
226 if (e1->group < e2->group)
227 return -1;
228 if (e1->group > e2->group)
229 return 1;
230 return strcmp(e1->name, e2->name);
231 }
232
1542d4c @gitster help: include <common-cmds.h> only in one file
gitster authored
233 void list_common_cmds_help(void)
234 {
235 int i, longest = 0;
2241477 @Groutcho help: respect new common command grouping
Groutcho authored
236 int current_grp = -1;
1542d4c @gitster help: include <common-cmds.h> only in one file
gitster authored
237
238 for (i = 0; i < ARRAY_SIZE(common_cmds); i++) {
239 if (longest < strlen(common_cmds[i].name))
240 longest = strlen(common_cmds[i].name);
241 }
242
2241477 @Groutcho help: respect new common command grouping
Groutcho authored
243 qsort(common_cmds, ARRAY_SIZE(common_cmds),
244 sizeof(common_cmds[0]), cmd_group_cmp);
245
246 puts(_("These are common Git commands used in various situations:"));
247
1542d4c @gitster help: include <common-cmds.h> only in one file
gitster authored
248 for (i = 0; i < ARRAY_SIZE(common_cmds); i++) {
2241477 @Groutcho help: respect new common command grouping
Groutcho authored
249 if (common_cmds[i].group != current_grp) {
250 printf("\n%s\n", _(common_cmd_groups[common_cmds[i].group]));
251 current_grp = common_cmds[i].group;
252 }
253
1542d4c @gitster help: include <common-cmds.h> only in one file
gitster authored
254 printf(" %s ", common_cmds[i].name);
255 mput_char(' ', longest - strlen(common_cmds[i].name));
256 puts(_(common_cmds[i].help));
257 }
258 }
259
940208a builtin-help: make some internal functions available to other builtins
Miklos Vajna authored
260 int is_in_cmdlist(struct cmdnames *c, const char *s)
2156435 @peff help: respect aliases
peff authored
261 {
262 int i;
263 for (i = 0; i < c->cnt; i++)
264 if (!strcmp(s, c->names[i]->name))
265 return 1;
266 return 0;
267 }
268
f0e9071 @raalkml Add help.autocorrect to enable/disable autocorrecting
raalkml authored
269 static int autocorrect;
746c221 @pieter git wrapper: also use aliases to correct mistyped commands
pieter authored
270 static struct cmdnames aliases;
f0e9071 @raalkml Add help.autocorrect to enable/disable autocorrecting
raalkml authored
271
272 static int git_unknown_cmd_config(const char *var, const char *value, void *cb)
273 {
ae021d8 @peff use skip_prefix to avoid magic numbers
peff authored
274 const char *p;
275
f0e9071 @raalkml Add help.autocorrect to enable/disable autocorrecting
raalkml authored
276 if (!strcmp(var, "help.autocorrect"))
277 autocorrect = git_config_int(var,value);
746c221 @pieter git wrapper: also use aliases to correct mistyped commands
pieter authored
278 /* Also use aliases for command lookup */
ae021d8 @peff use skip_prefix to avoid magic numbers
peff authored
279 if (skip_prefix(var, "alias.", &p))
280 add_cmdname(&aliases, p, strlen(p));
f0e9071 @raalkml Add help.autocorrect to enable/disable autocorrecting
raalkml authored
281
282 return git_default_config(var, value, cb);
283 }
284
8af84da @dscho git wrapper: DWIM mistyped commands
dscho authored
285 static int levenshtein_compare(const void *p1, const void *p2)
822a7d5 Remove cmd_usage() routine and re-organize the help/usage code.
Ramsay Allan Jones authored
286 {
8af84da @dscho git wrapper: DWIM mistyped commands
dscho authored
287 const struct cmdname *const *c1 = p1, *const *c2 = p2;
288 const char *s1 = (*c1)->name, *s2 = (*c2)->name;
289 int l1 = (*c1)->len;
290 int l2 = (*c2)->len;
291 return l1 != l2 ? l1 - l2 : strcmp(s1, s2);
292 }
293
746c221 @pieter git wrapper: also use aliases to correct mistyped commands
pieter authored
294 static void add_cmd_list(struct cmdnames *cmds, struct cmdnames *old)
295 {
296 int i;
297 ALLOC_GROW(cmds->names, cmds->cnt + old->cnt, cmds->alloc);
298
299 for (i = 0; i < old->cnt; i++)
300 cmds->names[cmds->cnt++] = old->names[i];
301 free(old->names);
302 old->cnt = 0;
303 old->names = NULL;
304 }
305
06500a0 @j6t help.autocorrect: do not run a command if the command given is junk
j6t authored
306 /* An empirically derived magic number */
6612b9e @kusma help: always suggest common-cmds if prefix of cmd
kusma authored
307 #define SIMILARITY_FLOOR 7
308 #define SIMILAR_ENOUGH(x) ((x) < SIMILARITY_FLOOR)
06500a0 @j6t help.autocorrect: do not run a command if the command given is junk
j6t authored
309
823e0de help_unknown_cmd: do not propose an "unknown" cmd
Michael Schubert authored
310 static const char bad_interpreter_advice[] =
311 N_("'%s' appears to be a git command, but we were not\n"
312 "able to execute it. Maybe git-%s is broken?");
313
8af84da @dscho git wrapper: DWIM mistyped commands
dscho authored
314 const char *help_unknown_cmd(const char *cmd)
822a7d5 Remove cmd_usage() routine and re-organize the help/usage code.
Ramsay Allan Jones authored
315 {
8af84da @dscho git wrapper: DWIM mistyped commands
dscho authored
316 int i, n, best_similarity = 0;
317 struct cmdnames main_cmds, other_cmds;
318
319 memset(&main_cmds, 0, sizeof(main_cmds));
0b74f5d @jherland help.c: give correct structure's size to memset()
jherland authored
320 memset(&other_cmds, 0, sizeof(other_cmds));
746c221 @pieter git wrapper: also use aliases to correct mistyped commands
pieter authored
321 memset(&aliases, 0, sizeof(aliases));
8af84da @dscho git wrapper: DWIM mistyped commands
dscho authored
322
f0e9071 @raalkml Add help.autocorrect to enable/disable autocorrecting
raalkml authored
323 git_config(git_unknown_cmd_config, NULL);
324
8af84da @dscho git wrapper: DWIM mistyped commands
dscho authored
325 load_command_list("git-", &main_cmds, &other_cmds);
326
746c221 @pieter git wrapper: also use aliases to correct mistyped commands
pieter authored
327 add_cmd_list(&main_cmds, &aliases);
328 add_cmd_list(&main_cmds, &other_cmds);
329 qsort(main_cmds.names, main_cmds.cnt,
d333ac1 @stefanbeller help: fix the size passed to qsort
stefanbeller authored
330 sizeof(*main_cmds.names), cmdname_compare);
746c221 @pieter git wrapper: also use aliases to correct mistyped commands
pieter authored
331 uniq(&main_cmds);
8af84da @dscho git wrapper: DWIM mistyped commands
dscho authored
332
6612b9e @kusma help: always suggest common-cmds if prefix of cmd
kusma authored
333 /* This abuses cmdname->len for levenshtein distance */
334 for (i = 0, n = 0; i < main_cmds.cnt; i++) {
335 int cmp = 0; /* avoid compiler stupidity */
336 const char *candidate = main_cmds.names[i]->name;
337
823e0de help_unknown_cmd: do not propose an "unknown" cmd
Michael Schubert authored
338 /*
339 * An exact match means we have the command, but
340 * for some reason exec'ing it gave us ENOENT; probably
341 * it's a bad interpreter in the #! line.
342 */
343 if (!strcmp(candidate, cmd))
344 die(_(bad_interpreter_advice), cmd, cmd);
345
6612b9e @kusma help: always suggest common-cmds if prefix of cmd
kusma authored
346 /* Does the candidate appear in common_cmds list? */
347 while (n < ARRAY_SIZE(common_cmds) &&
348 (cmp = strcmp(common_cmds[n].name, candidate)) < 0)
349 n++;
350 if ((n < ARRAY_SIZE(common_cmds)) && !cmp) {
351 /* Yes, this is one of the common commands */
352 n++; /* use the entry from common_cmds[] */
5955654 @chriscool replace {pre,suf}fixcmp() with {starts,ends}_with()
chriscool authored
353 if (starts_with(candidate, cmd)) {
6612b9e @kusma help: always suggest common-cmds if prefix of cmd
kusma authored
354 /* Give prefix match a very good score */
355 main_cmds.names[i]->len = 0;
356 continue;
357 }
358 }
359
8af84da @dscho git wrapper: DWIM mistyped commands
dscho authored
360 main_cmds.names[i]->len =
c41494f @moy Reduce cost of deletion in levenstein distance (4 -> 3)
moy authored
361 levenshtein(cmd, candidate, 0, 2, 1, 3) + 1;
6612b9e @kusma help: always suggest common-cmds if prefix of cmd
kusma authored
362 }
8af84da @dscho git wrapper: DWIM mistyped commands
dscho authored
363
364 qsort(main_cmds.names, main_cmds.cnt,
365 sizeof(*main_cmds.names), levenshtein_compare);
366
367 if (!main_cmds.cnt)
9665627 @pclouds i18n: help: mark strings for translation
pclouds authored
368 die(_("Uh oh. Your system reports no Git commands at all."));
8af84da @dscho git wrapper: DWIM mistyped commands
dscho authored
369
6612b9e @kusma help: always suggest common-cmds if prefix of cmd
kusma authored
370 /* skip and count prefix matches */
371 for (n = 0; n < main_cmds.cnt && !main_cmds.names[n]->len; n++)
372 ; /* still counting */
373
374 if (main_cmds.cnt <= n) {
375 /* prefix matches with everything? that is too ambiguous */
376 best_similarity = SIMILARITY_FLOOR + 1;
377 } else {
378 /* count all the most similar ones */
379 for (best_similarity = main_cmds.names[n++]->len;
380 (n < main_cmds.cnt &&
381 best_similarity == main_cmds.names[n]->len);
382 n++)
383 ; /* still counting */
384 }
06500a0 @j6t help.autocorrect: do not run a command if the command given is junk
j6t authored
385 if (autocorrect && n == 1 && SIMILAR_ENOUGH(best_similarity)) {
8af84da @dscho git wrapper: DWIM mistyped commands
dscho authored
386 const char *assumed = main_cmds.names[0]->name;
387 main_cmds.names[0] = NULL;
388 clean_cmdnames(&main_cmds);
9665627 @pclouds i18n: help: mark strings for translation
pclouds authored
389 fprintf_ln(stderr,
390 _("WARNING: You called a Git command named '%s', "
391 "which does not exist.\n"
392 "Continuing under the assumption that you meant '%s'"),
8af84da @dscho git wrapper: DWIM mistyped commands
dscho authored
393 cmd, assumed);
f0e9071 @raalkml Add help.autocorrect to enable/disable autocorrecting
raalkml authored
394 if (autocorrect > 0) {
9665627 @pclouds i18n: help: mark strings for translation
pclouds authored
395 fprintf_ln(stderr, _("in %0.1f seconds automatically..."),
f0e9071 @raalkml Add help.autocorrect to enable/disable autocorrecting
raalkml authored
396 (float)autocorrect/10.0);
2024d31 @j6t help.c: wrap wait-only poll() invocation in sleep_millisec()
j6t authored
397 sleep_millisec(autocorrect * 100);
f0e9071 @raalkml Add help.autocorrect to enable/disable autocorrecting
raalkml authored
398 }
8af84da @dscho git wrapper: DWIM mistyped commands
dscho authored
399 return assumed;
400 }
401
9665627 @pclouds i18n: help: mark strings for translation
pclouds authored
402 fprintf_ln(stderr, _("git: '%s' is not a git command. See 'git --help'."), cmd);
8af84da @dscho git wrapper: DWIM mistyped commands
dscho authored
403
06500a0 @j6t help.autocorrect: do not run a command if the command given is junk
j6t authored
404 if (SIMILAR_ENOUGH(best_similarity)) {
9665627 @pclouds i18n: help: mark strings for translation
pclouds authored
405 fprintf_ln(stderr,
406 Q_("\nDid you mean this?",
407 "\nDid you mean one of these?",
408 n));
8af84da @dscho git wrapper: DWIM mistyped commands
dscho authored
409
410 for (i = 0; i < n; i++)
411 fprintf(stderr, "\t%s\n", main_cmds.names[i]->name);
412 }
413
822a7d5 Remove cmd_usage() routine and re-organize the help/usage code.
Ramsay Allan Jones authored
414 exit(1);
415 }
416
a633fca Call setup_git_directory() much earlier
Linus Torvalds authored
417 int cmd_version(int argc, const char **argv, const char *prefix)
70827b1 Split up builtin commands into separate files from git.c
Linus Torvalds authored
418 {
f2de0b9 @davvid help.c: add a compatibility comment to cmd_version()
davvid authored
419 /*
420 * The format of this string should be kept stable for compatibility
421 * with external projects that rely on the output of "git version".
422 */
70827b1 Split up builtin commands into separate files from git.c
Linus Torvalds authored
423 printf("git version %s\n", git_version_string);
424 return 0;
425 }
e561810 @amrav help: add help_unknown_ref()
amrav authored
426
427 struct similar_ref_cb {
428 const char *base_ref;
429 struct string_list *similar_refs;
430 };
431
91d6e94 @mhagger append_similar_ref(): rewrite to take an object_id argument
mhagger authored
432 static int append_similar_ref(const char *refname, const struct object_id *oid,
e561810 @amrav help: add help_unknown_ref()
amrav authored
433 int flags, void *cb_data)
434 {
435 struct similar_ref_cb *cb = (struct similar_ref_cb *)(cb_data);
436 char *branch = strrchr(refname, '/') + 1;
95b567c @peff use skip_prefix to avoid repeating strings
peff authored
437 const char *remote;
438
e561810 @amrav help: add help_unknown_ref()
amrav authored
439 /* A remote branch of the same name is deemed similar */
95b567c @peff use skip_prefix to avoid repeating strings
peff authored
440 if (skip_prefix(refname, "refs/remotes/", &remote) &&
e561810 @amrav help: add help_unknown_ref()
amrav authored
441 !strcmp(branch, cb->base_ref))
95b567c @peff use skip_prefix to avoid repeating strings
peff authored
442 string_list_append(cb->similar_refs, remote);
e561810 @amrav help: add help_unknown_ref()
amrav authored
443 return 0;
444 }
445
446 static struct string_list guess_refs(const char *ref)
447 {
448 struct similar_ref_cb ref_cb;
449 struct string_list similar_refs = STRING_LIST_INIT_NODUP;
450
451 ref_cb.base_ref = ref;
452 ref_cb.similar_refs = &similar_refs;
453 for_each_ref(append_similar_ref, &ref_cb);
454 return similar_refs;
455 }
456
457 void help_unknown_ref(const char *ref, const char *cmd, const char *error)
458 {
459 int i;
460 struct string_list suggested_refs = guess_refs(ref);
461
462 fprintf_ln(stderr, _("%s: %s - %s"), cmd, ref, error);
463
464 if (suggested_refs.nr > 0) {
465 fprintf_ln(stderr,
466 Q_("\nDid you mean this?",
467 "\nDid you mean one of these?",
468 suggested_refs.nr));
469 for (i = 0; i < suggested_refs.nr; i++)
470 fprintf(stderr, "\t%s\n", suggested_refs.items[i].string);
471 }
472
473 string_list_clear(&suggested_refs, 0);
474 exit(1);
475 }
Something went wrong with that request. Please try again.