global: introduce `USE_THE_REPOSITORY_VARIABLE` macro
Use of the `the_repository` variable is deprecated nowadays, and we
slowly but steadily convert the codebase to not use it anymore. Instead,
callers should be passing down the repository to work on via parameters.
It is hard though to prove that a given code unit does not use this
variable anymore. The most trivial case, merely demonstrating that there
is no direct use of `the_repository`, is already a bit of a pain during
code reviews as the reviewer needs to manually verify claims made by the
patch author. The bigger problem though is that we have many interfaces
that implicitly rely on `the_repository`.
Introduce a new `USE_THE_REPOSITORY_VARIABLE` macro that allows code
units to opt into usage of `the_repository`. The intent of this macro is
to demonstrate that a certain code unit does not use this variable
anymore, and to keep it from new dependencies on it in future changes,
be it explicit or implicit
For now, the macro only guards `the_repository` itself as well as
`the_hash_algo`. There are many more known interfaces where we have an
implicit dependency on `the_repository`, but those are not guarded at
the current point in time. Over time though, we should start to add
guards as required (or even better, just remove them).
Define the macro as required in our code units. As expected, most of our
code still relies on the global variable. Nearly all of our builtins
rely on the variable as there is no way yet to pass `the_repository` to
their entry point. For now, declare the macro in "biultin.h" to keep the
required changes at least a little bit more contained.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2024-06-14 14:50:23 +08:00
|
|
|
#define USE_THE_REPOSITORY_VARIABLE
|
|
|
|
|
2023-02-24 08:09:24 +08:00
|
|
|
#include "git-compat-util.h"
|
2017-06-15 02:07:36 +08:00
|
|
|
#include "config.h"
|
2006-04-22 01:27:34 +08:00
|
|
|
#include "builtin.h"
|
2018-04-11 05:26:18 +08:00
|
|
|
#include "exec-cmd.h"
|
2017-04-26 07:46:59 +08:00
|
|
|
#include "run-command.h"
|
2008-08-31 21:50:23 +08:00
|
|
|
#include "levenshtein.h"
|
2023-02-24 08:09:30 +08:00
|
|
|
#include "gettext.h"
|
2008-07-30 07:16:58 +08:00
|
|
|
#include "help.h"
|
2018-05-10 16:46:42 +08:00
|
|
|
#include "command-list.h"
|
2012-04-13 18:54:37 +08:00
|
|
|
#include "string-list.h"
|
|
|
|
#include "column.h"
|
2012-06-03 02:51:42 +08:00
|
|
|
#include "version.h"
|
2013-05-04 08:04:19 +08:00
|
|
|
#include "refs.h"
|
2017-05-30 13:17:42 +08:00
|
|
|
#include "parse-options.h"
|
2021-08-14 13:11:12 +08:00
|
|
|
#include "prompt.h"
|
2022-03-26 02:03:02 +08:00
|
|
|
#include "fsmonitor-ipc.h"
|
2024-09-14 05:16:14 +08:00
|
|
|
#include "repository.h"
|
2008-03-07 15:46:28 +08:00
|
|
|
|
2024-06-22 02:09:46 +08:00
|
|
|
#ifndef NO_CURL
|
|
|
|
#include "git-curl-compat.h" /* For LIBCURL_VERSION only */
|
|
|
|
#endif
|
|
|
|
|
2018-05-10 16:46:42 +08:00
|
|
|
struct category_description {
|
|
|
|
uint32_t category;
|
|
|
|
const char *desc;
|
|
|
|
};
|
|
|
|
static uint32_t common_mask =
|
|
|
|
CAT_init | CAT_worktree | CAT_info |
|
|
|
|
CAT_history | CAT_remote;
|
|
|
|
static struct category_description common_categories[] = {
|
|
|
|
{ CAT_init, N_("start a working area (see also: git help tutorial)") },
|
|
|
|
{ CAT_worktree, N_("work on the current change (see also: git help everyday)") },
|
|
|
|
{ CAT_info, N_("examine the history and state (see also: git help revisions)") },
|
|
|
|
{ CAT_history, N_("grow, mark and tweak your common history") },
|
|
|
|
{ CAT_remote, N_("collaborate (see also: git help workflows)") },
|
|
|
|
{ 0, NULL }
|
|
|
|
};
|
2018-05-21 02:40:01 +08:00
|
|
|
static struct category_description main_categories[] = {
|
|
|
|
{ CAT_mainporcelain, N_("Main Porcelain Commands") },
|
|
|
|
{ CAT_ancillarymanipulators, N_("Ancillary Commands / Manipulators") },
|
|
|
|
{ CAT_ancillaryinterrogators, N_("Ancillary Commands / Interrogators") },
|
|
|
|
{ CAT_foreignscminterface, N_("Interacting with Others") },
|
|
|
|
{ CAT_plumbingmanipulators, N_("Low-level Commands / Manipulators") },
|
|
|
|
{ CAT_plumbinginterrogators, N_("Low-level Commands / Interrogators") },
|
2019-11-06 01:07:26 +08:00
|
|
|
{ CAT_synchingrepositories, N_("Low-level Commands / Syncing Repositories") },
|
2018-05-21 02:40:01 +08:00
|
|
|
{ CAT_purehelpers, N_("Low-level Commands / Internal Helpers") },
|
2022-08-05 00:28:33 +08:00
|
|
|
{ CAT_userinterfaces, N_("User-facing repository, command and file interfaces") },
|
2022-09-16 21:05:29 +08:00
|
|
|
{ CAT_developerinterfaces, N_("Developer-facing file formats, protocols and other interfaces") },
|
2018-05-21 02:40:01 +08:00
|
|
|
{ 0, NULL }
|
|
|
|
};
|
2018-05-10 16:46:42 +08:00
|
|
|
|
2018-05-21 02:40:02 +08:00
|
|
|
static const char *drop_prefix(const char *name, uint32_t category)
|
2018-05-10 16:46:42 +08:00
|
|
|
{
|
|
|
|
const char *new_name;
|
2022-08-05 00:28:31 +08:00
|
|
|
const char *prefix;
|
2018-05-10 16:46:42 +08:00
|
|
|
|
2022-08-05 00:28:30 +08:00
|
|
|
switch (category) {
|
|
|
|
case CAT_guide:
|
2022-08-05 00:28:33 +08:00
|
|
|
case CAT_userinterfaces:
|
2022-08-05 00:28:34 +08:00
|
|
|
case CAT_developerinterfaces:
|
2022-08-05 00:28:30 +08:00
|
|
|
prefix = "git";
|
|
|
|
break;
|
2022-08-05 00:28:31 +08:00
|
|
|
default:
|
|
|
|
prefix = "git-";
|
|
|
|
break;
|
2022-08-05 00:28:30 +08:00
|
|
|
}
|
2022-08-05 00:28:31 +08:00
|
|
|
if (skip_prefix(name, prefix, &new_name))
|
2018-05-21 02:40:02 +08:00
|
|
|
return new_name;
|
2018-05-10 16:46:42 +08:00
|
|
|
|
2022-08-05 00:28:30 +08:00
|
|
|
return name;
|
2018-05-10 16:46:42 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void extract_cmds(struct cmdname_help **p_cmds, uint32_t mask)
|
|
|
|
{
|
|
|
|
int i, nr = 0;
|
|
|
|
struct cmdname_help *cmds;
|
|
|
|
|
|
|
|
if (ARRAY_SIZE(command_list) == 0)
|
|
|
|
BUG("empty command_list[] is a sign of broken generate-cmdlist.sh");
|
|
|
|
|
|
|
|
ALLOC_ARRAY(cmds, ARRAY_SIZE(command_list) + 1);
|
|
|
|
|
|
|
|
for (i = 0; i < ARRAY_SIZE(command_list); i++) {
|
|
|
|
const struct cmdname_help *cmd = command_list + i;
|
|
|
|
|
|
|
|
if (!(cmd->category & mask))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
cmds[nr] = *cmd;
|
2018-05-21 02:40:02 +08:00
|
|
|
cmds[nr].name = drop_prefix(cmd->name, cmd->category);
|
2018-05-10 16:46:42 +08:00
|
|
|
|
|
|
|
nr++;
|
|
|
|
}
|
|
|
|
cmds[nr].name = NULL;
|
|
|
|
*p_cmds = cmds;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void print_command_list(const struct cmdname_help *cmds,
|
|
|
|
uint32_t mask, int longest)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; cmds[i].name; i++) {
|
|
|
|
if (cmds[i].category & mask) {
|
2018-12-11 22:58:11 +08:00
|
|
|
size_t len = strlen(cmds[i].name);
|
2018-05-10 16:46:42 +08:00
|
|
|
printf(" %s ", cmds[i].name);
|
2019-01-31 17:23:49 +08:00
|
|
|
if (longest > len)
|
|
|
|
mput_char(' ', longest - len);
|
2018-05-10 16:46:42 +08:00
|
|
|
puts(_(cmds[i].help));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int cmd_name_cmp(const void *elem1, const void *elem2)
|
|
|
|
{
|
|
|
|
const struct cmdname_help *e1 = elem1;
|
|
|
|
const struct cmdname_help *e2 = elem2;
|
|
|
|
|
|
|
|
return strcmp(e1->name, e2->name);
|
|
|
|
}
|
|
|
|
|
2018-09-29 14:08:14 +08:00
|
|
|
static void print_cmd_by_category(const struct category_description *catdesc,
|
|
|
|
int *longest_p)
|
2018-05-10 16:46:42 +08:00
|
|
|
{
|
|
|
|
struct cmdname_help *cmds;
|
|
|
|
int longest = 0;
|
|
|
|
int i, nr = 0;
|
|
|
|
uint32_t mask = 0;
|
|
|
|
|
|
|
|
for (i = 0; catdesc[i].desc; i++)
|
|
|
|
mask |= catdesc[i].category;
|
|
|
|
|
|
|
|
extract_cmds(&cmds, mask);
|
|
|
|
|
|
|
|
for (i = 0; cmds[i].name; i++, nr++) {
|
|
|
|
if (longest < strlen(cmds[i].name))
|
|
|
|
longest = strlen(cmds[i].name);
|
|
|
|
}
|
|
|
|
QSORT(cmds, nr, cmd_name_cmp);
|
|
|
|
|
|
|
|
for (i = 0; catdesc[i].desc; i++) {
|
|
|
|
uint32_t mask = catdesc[i].category;
|
|
|
|
const char *desc = catdesc[i].desc;
|
|
|
|
|
2022-02-22 03:38:52 +08:00
|
|
|
if (i)
|
|
|
|
putchar('\n');
|
2022-02-22 03:38:45 +08:00
|
|
|
puts(_(desc));
|
2018-05-10 16:46:42 +08:00
|
|
|
print_command_list(cmds, mask, longest);
|
|
|
|
}
|
|
|
|
free(cmds);
|
2018-09-29 14:08:14 +08:00
|
|
|
if (longest_p)
|
|
|
|
*longest_p = longest;
|
2018-05-10 16:46:42 +08:00
|
|
|
}
|
|
|
|
|
2008-07-30 07:16:58 +08:00
|
|
|
void add_cmdname(struct cmdnames *cmds, const char *name, int len)
|
2006-04-22 01:27:34 +08:00
|
|
|
{
|
2016-02-23 06:44:32 +08:00
|
|
|
struct cmdname *ent;
|
|
|
|
FLEX_ALLOC_MEM(ent, name, name, len);
|
2006-04-22 01:27:34 +08:00
|
|
|
ent->len = len;
|
2007-10-29 11:30:52 +08:00
|
|
|
|
|
|
|
ALLOC_GROW(cmds->names, cmds->cnt + 1, cmds->alloc);
|
|
|
|
cmds->names[cmds->cnt++] = ent;
|
2006-04-22 01:27:34 +08:00
|
|
|
}
|
|
|
|
|
2024-06-11 17:21:06 +08:00
|
|
|
void cmdnames_release(struct cmdnames *cmds)
|
2008-08-31 21:50:23 +08:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
for (i = 0; i < cmds->cnt; ++i)
|
|
|
|
free(cmds->names[i]);
|
|
|
|
free(cmds->names);
|
|
|
|
cmds->cnt = 0;
|
|
|
|
cmds->alloc = 0;
|
|
|
|
}
|
|
|
|
|
2006-04-22 01:27:34 +08:00
|
|
|
static int cmdname_compare(const void *a_, const void *b_)
|
|
|
|
{
|
|
|
|
struct cmdname *a = *(struct cmdname **)a_;
|
|
|
|
struct cmdname *b = *(struct cmdname **)b_;
|
|
|
|
return strcmp(a->name, b->name);
|
|
|
|
}
|
|
|
|
|
2007-10-29 11:30:52 +08:00
|
|
|
static void uniq(struct cmdnames *cmds)
|
|
|
|
{
|
|
|
|
int i, j;
|
|
|
|
|
|
|
|
if (!cmds->cnt)
|
|
|
|
return;
|
|
|
|
|
2012-07-26 00:16:19 +08:00
|
|
|
for (i = j = 1; i < cmds->cnt; i++) {
|
|
|
|
if (!strcmp(cmds->names[i]->name, cmds->names[j-1]->name))
|
|
|
|
free(cmds->names[i]);
|
|
|
|
else
|
2007-10-29 11:30:52 +08:00
|
|
|
cmds->names[j++] = cmds->names[i];
|
2012-07-26 00:16:19 +08:00
|
|
|
}
|
2007-10-29 11:30:52 +08:00
|
|
|
|
|
|
|
cmds->cnt = j;
|
|
|
|
}
|
|
|
|
|
2008-07-30 07:16:58 +08:00
|
|
|
void exclude_cmds(struct cmdnames *cmds, struct cmdnames *excludes)
|
2007-11-09 07:35:32 +08:00
|
|
|
{
|
2007-10-29 11:30:52 +08:00
|
|
|
int ci, cj, ei;
|
|
|
|
int cmp;
|
|
|
|
|
|
|
|
ci = cj = ei = 0;
|
|
|
|
while (ci < cmds->cnt && ei < excludes->cnt) {
|
|
|
|
cmp = strcmp(cmds->names[ci]->name, excludes->names[ei]->name);
|
|
|
|
if (cmp < 0)
|
|
|
|
cmds->names[cj++] = cmds->names[ci++];
|
2012-07-26 02:01:12 +08:00
|
|
|
else if (cmp == 0) {
|
|
|
|
ei++;
|
|
|
|
free(cmds->names[ci++]);
|
|
|
|
} else if (cmp > 0)
|
2007-10-29 11:30:52 +08:00
|
|
|
ei++;
|
|
|
|
}
|
|
|
|
|
|
|
|
while (ci < cmds->cnt)
|
|
|
|
cmds->names[cj++] = cmds->names[ci++];
|
|
|
|
|
|
|
|
cmds->cnt = cj;
|
|
|
|
}
|
|
|
|
|
2014-03-01 03:27:29 +08:00
|
|
|
static void pretty_print_cmdnames(struct cmdnames *cmds, unsigned int colopts)
|
2006-04-22 01:27:34 +08:00
|
|
|
{
|
2012-04-13 18:54:37 +08:00
|
|
|
struct string_list list = STRING_LIST_INIT_NODUP;
|
|
|
|
struct column_options copts;
|
|
|
|
int i;
|
2006-04-22 01:27:34 +08:00
|
|
|
|
2012-04-13 18:54:37 +08:00
|
|
|
for (i = 0; i < cmds->cnt; i++)
|
|
|
|
string_list_append(&list, cmds->names[i]->name);
|
|
|
|
/*
|
|
|
|
* always enable column display, we only consult column.*
|
|
|
|
* about layout strategy and stuff
|
|
|
|
*/
|
|
|
|
colopts = (colopts & ~COL_ENABLE_MASK) | COL_ENABLED;
|
|
|
|
memset(&copts, 0, sizeof(copts));
|
|
|
|
copts.indent = " ";
|
|
|
|
copts.padding = 2;
|
|
|
|
print_columns(&list, colopts, &copts);
|
|
|
|
string_list_clear(&list, 0);
|
2006-04-22 01:27:34 +08:00
|
|
|
}
|
|
|
|
|
2008-08-29 01:15:33 +08:00
|
|
|
static void list_commands_in_dir(struct cmdnames *cmds,
|
2008-07-30 07:16:58 +08:00
|
|
|
const char *path,
|
|
|
|
const char *prefix)
|
2006-04-22 01:27:34 +08:00
|
|
|
{
|
2007-10-29 11:30:52 +08:00
|
|
|
DIR *dir = opendir(path);
|
2006-04-22 01:27:34 +08:00
|
|
|
struct dirent *de;
|
2008-07-28 04:34:14 +08:00
|
|
|
struct strbuf buf = STRBUF_INIT;
|
|
|
|
int len;
|
2006-04-22 01:27:34 +08:00
|
|
|
|
2008-07-28 04:34:14 +08:00
|
|
|
if (!dir)
|
2008-08-29 01:15:33 +08:00
|
|
|
return;
|
2008-07-30 07:16:58 +08:00
|
|
|
if (!prefix)
|
|
|
|
prefix = "git-";
|
2006-04-22 01:27:34 +08:00
|
|
|
|
2008-07-28 04:34:14 +08:00
|
|
|
strbuf_addf(&buf, "%s/", path);
|
|
|
|
len = buf.len;
|
|
|
|
|
2006-04-22 01:27:34 +08:00
|
|
|
while ((de = readdir(dir)) != NULL) {
|
2014-06-19 03:57:17 +08:00
|
|
|
const char *ent;
|
2014-07-01 00:58:51 +08:00
|
|
|
size_t entlen;
|
2006-04-22 01:27:34 +08:00
|
|
|
|
2014-06-19 03:57:17 +08:00
|
|
|
if (!skip_prefix(de->d_name, prefix, &ent))
|
2006-04-22 01:27:34 +08:00
|
|
|
continue;
|
2007-10-27 16:36:52 +08:00
|
|
|
|
2008-07-28 04:34:14 +08:00
|
|
|
strbuf_setlen(&buf, len);
|
|
|
|
strbuf_addstr(&buf, de->d_name);
|
|
|
|
if (!is_executable(buf.buf))
|
2006-04-22 01:27:34 +08:00
|
|
|
continue;
|
|
|
|
|
2014-06-19 03:57:17 +08:00
|
|
|
entlen = strlen(ent);
|
2014-07-17 02:25:59 +08:00
|
|
|
strip_suffix(ent, ".exe", &entlen);
|
2006-04-22 01:27:34 +08:00
|
|
|
|
2014-06-19 03:57:17 +08:00
|
|
|
add_cmdname(cmds, ent, entlen);
|
2006-04-22 01:27:34 +08:00
|
|
|
}
|
|
|
|
closedir(dir);
|
2008-07-28 04:34:14 +08:00
|
|
|
strbuf_release(&buf);
|
2007-10-29 11:30:52 +08:00
|
|
|
}
|
|
|
|
|
2008-08-29 01:15:33 +08:00
|
|
|
void load_command_list(const char *prefix,
|
2008-07-30 07:16:58 +08:00
|
|
|
struct cmdnames *main_cmds,
|
|
|
|
struct cmdnames *other_cmds)
|
2007-10-29 11:30:52 +08:00
|
|
|
{
|
|
|
|
const char *env_path = getenv("PATH");
|
|
|
|
const char *exec_path = git_exec_path();
|
|
|
|
|
2020-10-08 05:56:51 +08:00
|
|
|
load_builtin_commands(prefix, main_cmds);
|
|
|
|
|
2008-08-29 01:19:07 +08:00
|
|
|
if (exec_path) {
|
2008-08-29 01:15:33 +08:00
|
|
|
list_commands_in_dir(main_cmds, exec_path, prefix);
|
2016-09-29 23:27:31 +08:00
|
|
|
QSORT(main_cmds->names, main_cmds->cnt, cmdname_compare);
|
2008-08-29 01:19:07 +08:00
|
|
|
uniq(main_cmds);
|
2007-10-29 11:30:52 +08:00
|
|
|
}
|
|
|
|
|
2008-08-29 01:19:07 +08:00
|
|
|
if (env_path) {
|
|
|
|
char *paths, *path, *colon;
|
|
|
|
path = paths = xstrdup(env_path);
|
|
|
|
while (1) {
|
|
|
|
if ((colon = strchr(path, PATH_SEP)))
|
|
|
|
*colon = 0;
|
2008-09-10 23:54:28 +08:00
|
|
|
if (!exec_path || strcmp(path, exec_path))
|
|
|
|
list_commands_in_dir(other_cmds, path, prefix);
|
2007-10-29 11:30:52 +08:00
|
|
|
|
2008-08-29 01:19:07 +08:00
|
|
|
if (!colon)
|
|
|
|
break;
|
|
|
|
path = colon + 1;
|
|
|
|
}
|
|
|
|
free(paths);
|
2007-10-29 11:30:52 +08:00
|
|
|
|
2016-09-29 23:27:31 +08:00
|
|
|
QSORT(other_cmds->names, other_cmds->cnt, cmdname_compare);
|
2008-08-29 01:19:07 +08:00
|
|
|
uniq(other_cmds);
|
|
|
|
}
|
2008-07-30 07:16:58 +08:00
|
|
|
exclude_cmds(other_cmds, main_cmds);
|
2008-02-25 06:17:37 +08:00
|
|
|
}
|
|
|
|
|
config: add ctx arg to config_fn_t
Add a new "const struct config_context *ctx" arg to config_fn_t to hold
additional information about the config iteration operation.
config_context has a "struct key_value_info kvi" member that holds
metadata about the config source being read (e.g. what kind of config
source it is, the filename, etc). In this series, we're only interested
in .kvi, so we could have just used "struct key_value_info" as an arg,
but config_context makes it possible to add/adjust members in the future
without changing the config_fn_t signature. We could also consider other
ways of organizing the args (e.g. moving the config name and value into
config_context or key_value_info), but in my experiments, the
incremental benefit doesn't justify the added complexity (e.g. a
config_fn_t will sometimes invoke another config_fn_t but with a
different config value).
In subsequent commits, the .kvi member will replace the global "struct
config_reader" in config.c, making config iteration a global-free
operation. It requires much more work for the machinery to provide
meaningful values of .kvi, so for now, merely change the signature and
call sites, pass NULL as a placeholder value, and don't rely on the arg
in any meaningful way.
Most of the changes are performed by
contrib/coccinelle/config_fn_ctx.pending.cocci, which, for every
config_fn_t:
- Modifies the signature to accept "const struct config_context *ctx"
- Passes "ctx" to any inner config_fn_t, if needed
- Adds UNUSED attributes to "ctx", if needed
Most config_fn_t instances are easily identified by seeing if they are
called by the various config functions. Most of the remaining ones are
manually named in the .cocci patch. Manual cleanups are still needed,
but the majority of it is trivial; it's either adjusting config_fn_t
that the .cocci patch didn't catch, or adding forward declarations of
"struct config_context ctx" to make the signatures make sense.
The non-trivial changes are in cases where we are invoking a config_fn_t
outside of config machinery, and we now need to decide what value of
"ctx" to pass. These cases are:
- trace2/tr2_cfg.c:tr2_cfg_set_fl()
This is indirectly called by git_config_set() so that the trace2
machinery can notice the new config values and update its settings
using the tr2 config parsing function, i.e. tr2_cfg_cb().
- builtin/checkout.c:checkout_main()
This calls git_xmerge_config() as a shorthand for parsing a CLI arg.
This might be worth refactoring away in the future, since
git_xmerge_config() can call git_default_config(), which can do much
more than just parsing.
Handle them by creating a KVI_INIT macro that initializes "struct
key_value_info" to a reasonable default, and use that to construct the
"ctx" arg.
Signed-off-by: Glen Choo <chooglen@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-06-29 03:26:22 +08:00
|
|
|
static int get_colopts(const char *var, const char *value,
|
|
|
|
const struct config_context *ctx UNUSED, void *data)
|
2008-02-25 06:17:37 +08:00
|
|
|
{
|
2021-09-22 06:40:39 +08:00
|
|
|
unsigned int *colopts = data;
|
|
|
|
|
|
|
|
if (starts_with(var, "column."))
|
|
|
|
return git_column_config(var, value, "help", colopts);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
void list_commands(struct cmdnames *main_cmds, struct cmdnames *other_cmds)
|
|
|
|
{
|
|
|
|
unsigned int colopts = 0;
|
|
|
|
git_config(get_colopts, &colopts);
|
|
|
|
|
2008-07-30 07:16:58 +08:00
|
|
|
if (main_cmds->cnt) {
|
2008-08-29 01:19:42 +08:00
|
|
|
const char *exec_path = git_exec_path();
|
2012-04-25 19:21:53 +08:00
|
|
|
printf_ln(_("available git commands in '%s'"), exec_path);
|
2007-10-29 11:30:52 +08:00
|
|
|
putchar('\n');
|
2014-03-01 03:27:29 +08:00
|
|
|
pretty_print_cmdnames(main_cmds, colopts);
|
2007-10-29 11:30:52 +08:00
|
|
|
putchar('\n');
|
|
|
|
}
|
|
|
|
|
2008-07-30 07:16:58 +08:00
|
|
|
if (other_cmds->cnt) {
|
2022-02-22 03:38:45 +08:00
|
|
|
puts(_("git commands available from elsewhere on your $PATH"));
|
2008-07-30 07:16:58 +08:00
|
|
|
putchar('\n');
|
2014-03-01 03:27:29 +08:00
|
|
|
pretty_print_cmdnames(other_cmds, colopts);
|
2007-10-29 11:30:52 +08:00
|
|
|
putchar('\n');
|
|
|
|
}
|
2006-04-22 01:27:34 +08:00
|
|
|
}
|
|
|
|
|
2013-01-19 14:35:04 +08:00
|
|
|
void list_common_cmds_help(void)
|
2015-05-22 01:39:22 +08:00
|
|
|
{
|
|
|
|
puts(_("These are common Git commands used in various situations:"));
|
2022-02-22 03:38:52 +08:00
|
|
|
putchar('\n');
|
2018-09-29 14:08:14 +08:00
|
|
|
print_cmd_by_category(common_categories, NULL);
|
2013-01-19 14:35:04 +08:00
|
|
|
}
|
2015-05-22 01:39:22 +08:00
|
|
|
|
2018-05-21 02:39:59 +08:00
|
|
|
void list_all_main_cmds(struct string_list *list)
|
|
|
|
{
|
|
|
|
struct cmdnames main_cmds, other_cmds;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
memset(&main_cmds, 0, sizeof(main_cmds));
|
|
|
|
memset(&other_cmds, 0, sizeof(other_cmds));
|
|
|
|
load_command_list("git-", &main_cmds, &other_cmds);
|
|
|
|
|
|
|
|
for (i = 0; i < main_cmds.cnt; i++)
|
|
|
|
string_list_append(list, main_cmds.names[i]->name);
|
|
|
|
|
2024-06-11 17:21:06 +08:00
|
|
|
cmdnames_release(&main_cmds);
|
|
|
|
cmdnames_release(&other_cmds);
|
2015-05-22 01:39:22 +08:00
|
|
|
}
|
|
|
|
|
2018-05-21 02:39:59 +08:00
|
|
|
void list_all_other_cmds(struct string_list *list)
|
2013-01-19 14:35:04 +08:00
|
|
|
{
|
2018-05-21 02:39:59 +08:00
|
|
|
struct cmdnames main_cmds, other_cmds;
|
|
|
|
int i;
|
2013-01-19 14:35:04 +08:00
|
|
|
|
2018-05-21 02:39:59 +08:00
|
|
|
memset(&main_cmds, 0, sizeof(main_cmds));
|
|
|
|
memset(&other_cmds, 0, sizeof(other_cmds));
|
|
|
|
load_command_list("git-", &main_cmds, &other_cmds);
|
2013-01-19 14:35:04 +08:00
|
|
|
|
2018-05-21 02:39:59 +08:00
|
|
|
for (i = 0; i < other_cmds.cnt; i++)
|
|
|
|
string_list_append(list, other_cmds.names[i]->name);
|
2015-05-22 01:39:22 +08:00
|
|
|
|
2024-06-11 17:21:06 +08:00
|
|
|
cmdnames_release(&main_cmds);
|
|
|
|
cmdnames_release(&other_cmds);
|
2018-05-21 02:39:59 +08:00
|
|
|
}
|
|
|
|
|
2018-05-21 02:40:00 +08:00
|
|
|
void list_cmds_by_category(struct string_list *list,
|
|
|
|
const char *cat)
|
|
|
|
{
|
|
|
|
int i, n = ARRAY_SIZE(command_list);
|
|
|
|
uint32_t cat_id = 0;
|
2015-05-22 01:39:22 +08:00
|
|
|
|
2018-05-21 02:40:00 +08:00
|
|
|
for (i = 0; category_names[i]; i++) {
|
|
|
|
if (!strcmp(cat, category_names[i])) {
|
|
|
|
cat_id = 1UL << i;
|
|
|
|
break;
|
2015-05-22 01:39:22 +08:00
|
|
|
}
|
2018-05-21 02:40:00 +08:00
|
|
|
}
|
|
|
|
if (!cat_id)
|
|
|
|
die(_("unsupported command listing type '%s'"), cat);
|
|
|
|
|
|
|
|
for (i = 0; i < n; i++) {
|
|
|
|
struct cmdname_help *cmd = command_list + i;
|
|
|
|
|
2018-05-21 02:40:02 +08:00
|
|
|
if (!(cmd->category & cat_id))
|
|
|
|
continue;
|
|
|
|
string_list_append(list, drop_prefix(cmd->name, cmd->category));
|
2018-05-21 02:40:00 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-05-21 02:40:09 +08:00
|
|
|
void list_cmds_by_config(struct string_list *list)
|
|
|
|
{
|
|
|
|
const char *cmd_list;
|
|
|
|
|
2020-08-15 00:17:36 +08:00
|
|
|
if (git_config_get_string_tmp("completion.commands", &cmd_list))
|
2018-05-21 02:40:09 +08:00
|
|
|
return;
|
|
|
|
|
|
|
|
string_list_sort(list);
|
|
|
|
string_list_remove_duplicates(list, 0);
|
|
|
|
|
|
|
|
while (*cmd_list) {
|
|
|
|
struct strbuf sb = STRBUF_INIT;
|
|
|
|
const char *p = strchrnul(cmd_list, ' ');
|
2015-05-22 01:39:22 +08:00
|
|
|
|
2018-05-21 02:40:09 +08:00
|
|
|
strbuf_add(&sb, cmd_list, p - cmd_list);
|
2019-03-21 02:03:28 +08:00
|
|
|
if (sb.buf[0] == '-')
|
|
|
|
string_list_remove(list, sb.buf + 1, 0);
|
2018-05-21 02:40:09 +08:00
|
|
|
else
|
|
|
|
string_list_insert(list, sb.buf);
|
|
|
|
strbuf_release(&sb);
|
|
|
|
while (*p == ' ')
|
|
|
|
p++;
|
|
|
|
cmd_list = p;
|
2013-01-19 14:35:04 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-08-05 09:19:05 +08:00
|
|
|
void list_guides_help(void)
|
2018-05-21 02:40:02 +08:00
|
|
|
{
|
|
|
|
struct category_description catdesc[] = {
|
2020-08-05 09:19:05 +08:00
|
|
|
{ CAT_guide, N_("The Git concept guides are:") },
|
2022-08-05 00:28:33 +08:00
|
|
|
{ 0, NULL }
|
|
|
|
};
|
|
|
|
print_cmd_by_category(catdesc, NULL);
|
|
|
|
putchar('\n');
|
|
|
|
}
|
|
|
|
|
|
|
|
void list_user_interfaces_help(void)
|
|
|
|
{
|
|
|
|
struct category_description catdesc[] = {
|
|
|
|
{ CAT_userinterfaces, N_("User-facing repository, command and file interfaces:") },
|
2022-08-05 00:28:34 +08:00
|
|
|
{ 0, NULL }
|
|
|
|
};
|
|
|
|
print_cmd_by_category(catdesc, NULL);
|
|
|
|
putchar('\n');
|
|
|
|
}
|
|
|
|
|
|
|
|
void list_developer_interfaces_help(void)
|
|
|
|
{
|
|
|
|
struct category_description catdesc[] = {
|
|
|
|
{ CAT_developerinterfaces, N_("File formats, protocols and other developer interfaces:") },
|
2018-05-21 02:40:02 +08:00
|
|
|
{ 0, NULL }
|
|
|
|
};
|
2018-09-29 14:08:14 +08:00
|
|
|
print_cmd_by_category(catdesc, NULL);
|
2018-05-21 02:40:02 +08:00
|
|
|
putchar('\n');
|
|
|
|
}
|
|
|
|
|
config: add ctx arg to config_fn_t
Add a new "const struct config_context *ctx" arg to config_fn_t to hold
additional information about the config iteration operation.
config_context has a "struct key_value_info kvi" member that holds
metadata about the config source being read (e.g. what kind of config
source it is, the filename, etc). In this series, we're only interested
in .kvi, so we could have just used "struct key_value_info" as an arg,
but config_context makes it possible to add/adjust members in the future
without changing the config_fn_t signature. We could also consider other
ways of organizing the args (e.g. moving the config name and value into
config_context or key_value_info), but in my experiments, the
incremental benefit doesn't justify the added complexity (e.g. a
config_fn_t will sometimes invoke another config_fn_t but with a
different config value).
In subsequent commits, the .kvi member will replace the global "struct
config_reader" in config.c, making config iteration a global-free
operation. It requires much more work for the machinery to provide
meaningful values of .kvi, so for now, merely change the signature and
call sites, pass NULL as a placeholder value, and don't rely on the arg
in any meaningful way.
Most of the changes are performed by
contrib/coccinelle/config_fn_ctx.pending.cocci, which, for every
config_fn_t:
- Modifies the signature to accept "const struct config_context *ctx"
- Passes "ctx" to any inner config_fn_t, if needed
- Adds UNUSED attributes to "ctx", if needed
Most config_fn_t instances are easily identified by seeing if they are
called by the various config functions. Most of the remaining ones are
manually named in the .cocci patch. Manual cleanups are still needed,
but the majority of it is trivial; it's either adjusting config_fn_t
that the .cocci patch didn't catch, or adding forward declarations of
"struct config_context ctx" to make the signatures make sense.
The non-trivial changes are in cases where we are invoking a config_fn_t
outside of config machinery, and we now need to decide what value of
"ctx" to pass. These cases are:
- trace2/tr2_cfg.c:tr2_cfg_set_fl()
This is indirectly called by git_config_set() so that the trace2
machinery can notice the new config values and update its settings
using the tr2 config parsing function, i.e. tr2_cfg_cb().
- builtin/checkout.c:checkout_main()
This calls git_xmerge_config() as a shorthand for parsing a CLI arg.
This might be worth refactoring away in the future, since
git_xmerge_config() can call git_default_config(), which can do much
more than just parsing.
Handle them by creating a KVI_INIT macro that initializes "struct
key_value_info" to a reasonable default, and use that to construct the
"ctx" arg.
Signed-off-by: Glen Choo <chooglen@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-06-29 03:26:22 +08:00
|
|
|
static int get_alias(const char *var, const char *value,
|
|
|
|
const struct config_context *ctx UNUSED, void *data)
|
2018-09-29 14:08:14 +08:00
|
|
|
{
|
|
|
|
struct string_list *list = data;
|
|
|
|
|
2023-12-07 15:11:27 +08:00
|
|
|
if (skip_prefix(var, "alias.", &var)) {
|
|
|
|
if (!value)
|
|
|
|
return config_error_nonbool(var);
|
2018-09-29 14:08:14 +08:00
|
|
|
string_list_append(list, var)->util = xstrdup(value);
|
2023-12-07 15:11:27 +08:00
|
|
|
}
|
2018-09-29 14:08:14 +08:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2022-02-22 03:38:47 +08:00
|
|
|
static void list_all_cmds_help_external_commands(void)
|
2018-05-21 02:40:01 +08:00
|
|
|
{
|
2018-09-29 14:08:14 +08:00
|
|
|
struct string_list others = STRING_LIST_INIT_DUP;
|
2022-02-22 03:38:47 +08:00
|
|
|
int i;
|
2018-09-29 14:08:14 +08:00
|
|
|
|
|
|
|
list_all_other_cmds(&others);
|
|
|
|
if (others.nr)
|
|
|
|
printf("\n%s\n", _("External commands"));
|
|
|
|
for (i = 0; i < others.nr; i++)
|
|
|
|
printf(" %s\n", others.items[i].string);
|
|
|
|
string_list_clear(&others, 0);
|
2022-02-22 03:38:47 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void list_all_cmds_help_aliases(int longest)
|
|
|
|
{
|
|
|
|
struct string_list alias_list = STRING_LIST_INIT_DUP;
|
|
|
|
struct cmdname_help *aliases;
|
|
|
|
int i;
|
2018-09-29 14:08:14 +08:00
|
|
|
|
|
|
|
git_config(get_alias, &alias_list);
|
|
|
|
string_list_sort(&alias_list);
|
2018-12-11 22:58:11 +08:00
|
|
|
|
|
|
|
for (i = 0; i < alias_list.nr; i++) {
|
|
|
|
size_t len = strlen(alias_list.items[i].string);
|
|
|
|
if (longest < len)
|
|
|
|
longest = len;
|
|
|
|
}
|
|
|
|
|
2018-09-29 14:08:14 +08:00
|
|
|
if (alias_list.nr) {
|
|
|
|
printf("\n%s\n", _("Command aliases"));
|
|
|
|
ALLOC_ARRAY(aliases, alias_list.nr + 1);
|
|
|
|
for (i = 0; i < alias_list.nr; i++) {
|
|
|
|
aliases[i].name = alias_list.items[i].string;
|
|
|
|
aliases[i].help = alias_list.items[i].util;
|
|
|
|
aliases[i].category = 1;
|
|
|
|
}
|
|
|
|
aliases[alias_list.nr].name = NULL;
|
|
|
|
print_command_list(aliases, 1, longest);
|
|
|
|
free(aliases);
|
|
|
|
}
|
|
|
|
string_list_clear(&alias_list, 1);
|
2018-05-21 02:40:01 +08:00
|
|
|
}
|
|
|
|
|
2022-02-22 03:38:51 +08:00
|
|
|
void list_all_cmds_help(int show_external_commands, int show_aliases)
|
2022-02-22 03:38:47 +08:00
|
|
|
{
|
|
|
|
int longest;
|
|
|
|
|
|
|
|
puts(_("See 'git help <command>' to read about a specific subcommand"));
|
2022-02-22 03:38:52 +08:00
|
|
|
putchar('\n');
|
2022-02-22 03:38:47 +08:00
|
|
|
print_cmd_by_category(main_categories, &longest);
|
|
|
|
|
2022-02-22 03:38:51 +08:00
|
|
|
if (show_external_commands)
|
|
|
|
list_all_cmds_help_external_commands();
|
|
|
|
if (show_aliases)
|
|
|
|
list_all_cmds_help_aliases(longest);
|
2022-02-22 03:38:47 +08:00
|
|
|
}
|
|
|
|
|
2008-07-30 07:16:58 +08:00
|
|
|
int is_in_cmdlist(struct cmdnames *c, const char *s)
|
2008-02-25 06:17:37 +08:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
for (i = 0; i < c->cnt; i++)
|
|
|
|
if (!strcmp(s, c->names[i]->name))
|
|
|
|
return 1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-08-31 21:54:58 +08:00
|
|
|
static int autocorrect;
|
2008-09-10 23:54:28 +08:00
|
|
|
static struct cmdnames aliases;
|
2008-08-31 21:54:58 +08:00
|
|
|
|
2021-08-14 13:11:12 +08:00
|
|
|
#define AUTOCORRECT_PROMPT (-3)
|
2020-11-26 05:01:45 +08:00
|
|
|
#define AUTOCORRECT_NEVER (-2)
|
|
|
|
#define AUTOCORRECT_IMMEDIATELY (-1)
|
|
|
|
|
2023-02-24 14:39:48 +08:00
|
|
|
static int git_unknown_cmd_config(const char *var, const char *value,
|
config: pass kvi to die_bad_number()
Plumb "struct key_value_info" through all code paths that end in
die_bad_number(), which lets us remove the helper functions that read
analogous values from "struct config_reader". As a result, nothing reads
config_reader.config_kvi any more, so remove that too.
In config.c, this requires changing the signature of
git_configset_get_value() to 'return' "kvi" in an out parameter so that
git_configset_get_<type>() can pass it to git_config_<type>(). Only
numeric types will use "kvi", so for non-numeric types (e.g.
git_configset_get_string()), pass NULL to indicate that the out
parameter isn't needed.
Outside of config.c, config callbacks now need to pass "ctx->kvi" to any
of the git_config_<type>() functions that parse a config string into a
number type. Included is a .cocci patch to make that refactor.
The only exceptional case is builtin/config.c, where git_config_<type>()
is called outside of a config callback (namely, on user-provided input),
so config source information has never been available. In this case,
die_bad_number() defaults to a generic, but perfectly descriptive
message. Let's provide a safe, non-NULL for "kvi" anyway, but make sure
not to change the message.
Signed-off-by: Glen Choo <chooglen@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-06-29 03:26:27 +08:00
|
|
|
const struct config_context *ctx,
|
2023-02-24 14:39:48 +08:00
|
|
|
void *cb UNUSED)
|
2008-08-31 21:54:58 +08:00
|
|
|
{
|
use skip_prefix to avoid magic numbers
It's a common idiom to match a prefix and then skip past it
with a magic number, like:
if (starts_with(foo, "bar"))
foo += 3;
This is easy to get wrong, since you have to count the
prefix string yourself, and there's no compiler check if the
string changes. We can use skip_prefix to avoid the magic
numbers here.
Note that some of these conversions could be much shorter.
For example:
if (starts_with(arg, "--foo=")) {
bar = arg + 6;
continue;
}
could become:
if (skip_prefix(arg, "--foo=", &bar))
continue;
However, I have left it as:
if (skip_prefix(arg, "--foo=", &v)) {
bar = v;
continue;
}
to visually match nearby cases which need to actually
process the string. Like:
if (skip_prefix(arg, "--foo=", &v)) {
bar = atoi(v);
continue;
}
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-06-19 03:47:50 +08:00
|
|
|
const char *p;
|
|
|
|
|
2020-11-26 05:01:45 +08:00
|
|
|
if (!strcmp(var, "help.autocorrect")) {
|
|
|
|
if (!value)
|
|
|
|
return config_error_nonbool(var);
|
|
|
|
if (!strcmp(value, "never")) {
|
|
|
|
autocorrect = AUTOCORRECT_NEVER;
|
|
|
|
} else if (!strcmp(value, "immediate")) {
|
|
|
|
autocorrect = AUTOCORRECT_IMMEDIATELY;
|
2021-08-14 13:11:12 +08:00
|
|
|
} else if (!strcmp(value, "prompt")) {
|
|
|
|
autocorrect = AUTOCORRECT_PROMPT;
|
2020-11-26 05:01:45 +08:00
|
|
|
} else {
|
config: pass kvi to die_bad_number()
Plumb "struct key_value_info" through all code paths that end in
die_bad_number(), which lets us remove the helper functions that read
analogous values from "struct config_reader". As a result, nothing reads
config_reader.config_kvi any more, so remove that too.
In config.c, this requires changing the signature of
git_configset_get_value() to 'return' "kvi" in an out parameter so that
git_configset_get_<type>() can pass it to git_config_<type>(). Only
numeric types will use "kvi", so for non-numeric types (e.g.
git_configset_get_string()), pass NULL to indicate that the out
parameter isn't needed.
Outside of config.c, config callbacks now need to pass "ctx->kvi" to any
of the git_config_<type>() functions that parse a config string into a
number type. Included is a .cocci patch to make that refactor.
The only exceptional case is builtin/config.c, where git_config_<type>()
is called outside of a config callback (namely, on user-provided input),
so config source information has never been available. In this case,
die_bad_number() defaults to a generic, but perfectly descriptive
message. Let's provide a safe, non-NULL for "kvi" anyway, but make sure
not to change the message.
Signed-off-by: Glen Choo <chooglen@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-06-29 03:26:27 +08:00
|
|
|
int v = git_config_int(var, value, ctx->kvi);
|
2020-11-26 05:01:45 +08:00
|
|
|
autocorrect = (v < 0)
|
|
|
|
? AUTOCORRECT_IMMEDIATELY : v;
|
|
|
|
}
|
|
|
|
}
|
2008-09-10 23:54:28 +08:00
|
|
|
/* Also use aliases for command lookup */
|
use skip_prefix to avoid magic numbers
It's a common idiom to match a prefix and then skip past it
with a magic number, like:
if (starts_with(foo, "bar"))
foo += 3;
This is easy to get wrong, since you have to count the
prefix string yourself, and there's no compiler check if the
string changes. We can use skip_prefix to avoid the magic
numbers here.
Note that some of these conversions could be much shorter.
For example:
if (starts_with(arg, "--foo=")) {
bar = arg + 6;
continue;
}
could become:
if (skip_prefix(arg, "--foo=", &bar))
continue;
However, I have left it as:
if (skip_prefix(arg, "--foo=", &v)) {
bar = v;
continue;
}
to visually match nearby cases which need to actually
process the string. Like:
if (skip_prefix(arg, "--foo=", &v)) {
bar = atoi(v);
continue;
}
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-06-19 03:47:50 +08:00
|
|
|
if (skip_prefix(var, "alias.", &p))
|
|
|
|
add_cmdname(&aliases, p, strlen(p));
|
2008-08-31 21:54:58 +08:00
|
|
|
|
2022-10-30 03:56:14 +08:00
|
|
|
return 0;
|
2008-08-31 21:54:58 +08:00
|
|
|
}
|
|
|
|
|
2008-08-31 21:50:23 +08:00
|
|
|
static int levenshtein_compare(const void *p1, const void *p2)
|
2006-07-31 05:42:25 +08:00
|
|
|
{
|
2008-08-31 21:50:23 +08:00
|
|
|
const struct cmdname *const *c1 = p1, *const *c2 = p2;
|
|
|
|
const char *s1 = (*c1)->name, *s2 = (*c2)->name;
|
|
|
|
int l1 = (*c1)->len;
|
|
|
|
int l2 = (*c2)->len;
|
|
|
|
return l1 != l2 ? l1 - l2 : strcmp(s1, s2);
|
|
|
|
}
|
|
|
|
|
2008-09-10 23:54:28 +08:00
|
|
|
static void add_cmd_list(struct cmdnames *cmds, struct cmdnames *old)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
ALLOC_GROW(cmds->names, cmds->cnt + old->cnt, cmds->alloc);
|
|
|
|
|
|
|
|
for (i = 0; i < old->cnt; i++)
|
|
|
|
cmds->names[cmds->cnt++] = old->names[i];
|
2017-06-16 07:15:49 +08:00
|
|
|
FREE_AND_NULL(old->names);
|
2008-09-10 23:54:28 +08:00
|
|
|
old->cnt = 0;
|
|
|
|
}
|
|
|
|
|
2009-12-15 15:57:18 +08:00
|
|
|
/* An empirically derived magic number */
|
2010-11-27 00:00:39 +08:00
|
|
|
#define SIMILARITY_FLOOR 7
|
|
|
|
#define SIMILAR_ENOUGH(x) ((x) < SIMILARITY_FLOOR)
|
2009-12-15 15:57:18 +08:00
|
|
|
|
2011-07-08 18:08:49 +08:00
|
|
|
static const char bad_interpreter_advice[] =
|
|
|
|
N_("'%s' appears to be a git command, but we were not\n"
|
|
|
|
"able to execute it. Maybe git-%s is broken?");
|
|
|
|
|
2008-08-31 21:50:23 +08:00
|
|
|
const char *help_unknown_cmd(const char *cmd)
|
2006-07-31 05:42:25 +08:00
|
|
|
{
|
2008-08-31 21:50:23 +08:00
|
|
|
int i, n, best_similarity = 0;
|
|
|
|
struct cmdnames main_cmds, other_cmds;
|
2018-05-10 16:46:42 +08:00
|
|
|
struct cmdname_help *common_cmds;
|
2008-08-31 21:50:23 +08:00
|
|
|
|
|
|
|
memset(&main_cmds, 0, sizeof(main_cmds));
|
2009-08-11 18:10:21 +08:00
|
|
|
memset(&other_cmds, 0, sizeof(other_cmds));
|
2008-09-10 23:54:28 +08:00
|
|
|
memset(&aliases, 0, sizeof(aliases));
|
2008-08-31 21:50:23 +08:00
|
|
|
|
2024-09-12 19:29:45 +08:00
|
|
|
read_early_config(the_repository, git_unknown_cmd_config, NULL);
|
2008-08-31 21:54:58 +08:00
|
|
|
|
2021-08-14 13:11:12 +08:00
|
|
|
/*
|
|
|
|
* Disable autocorrection prompt in a non-interactive session
|
|
|
|
*/
|
|
|
|
if ((autocorrect == AUTOCORRECT_PROMPT) && (!isatty(0) || !isatty(2)))
|
|
|
|
autocorrect = AUTOCORRECT_NEVER;
|
|
|
|
|
2020-11-26 05:01:45 +08:00
|
|
|
if (autocorrect == AUTOCORRECT_NEVER) {
|
|
|
|
fprintf_ln(stderr, _("git: '%s' is not a git command. See 'git --help'."), cmd);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2008-08-31 21:50:23 +08:00
|
|
|
load_command_list("git-", &main_cmds, &other_cmds);
|
|
|
|
|
2008-09-10 23:54:28 +08:00
|
|
|
add_cmd_list(&main_cmds, &aliases);
|
|
|
|
add_cmd_list(&main_cmds, &other_cmds);
|
2016-09-29 23:27:31 +08:00
|
|
|
QSORT(main_cmds.names, main_cmds.cnt, cmdname_compare);
|
2008-09-10 23:54:28 +08:00
|
|
|
uniq(&main_cmds);
|
2008-08-31 21:50:23 +08:00
|
|
|
|
2018-05-10 16:46:42 +08:00
|
|
|
extract_cmds(&common_cmds, common_mask);
|
|
|
|
|
2010-11-27 00:00:39 +08:00
|
|
|
/* This abuses cmdname->len for levenshtein distance */
|
|
|
|
for (i = 0, n = 0; i < main_cmds.cnt; i++) {
|
|
|
|
int cmp = 0; /* avoid compiler stupidity */
|
|
|
|
const char *candidate = main_cmds.names[i]->name;
|
|
|
|
|
2011-07-08 18:08:49 +08:00
|
|
|
/*
|
|
|
|
* An exact match means we have the command, but
|
|
|
|
* for some reason exec'ing it gave us ENOENT; probably
|
|
|
|
* it's a bad interpreter in the #! line.
|
|
|
|
*/
|
|
|
|
if (!strcmp(candidate, cmd))
|
|
|
|
die(_(bad_interpreter_advice), cmd, cmd);
|
|
|
|
|
2010-11-27 00:00:39 +08:00
|
|
|
/* Does the candidate appear in common_cmds list? */
|
2018-05-10 16:46:42 +08:00
|
|
|
while (common_cmds[n].name &&
|
2010-11-27 00:00:39 +08:00
|
|
|
(cmp = strcmp(common_cmds[n].name, candidate)) < 0)
|
|
|
|
n++;
|
2018-05-10 16:46:42 +08:00
|
|
|
if (common_cmds[n].name && !cmp) {
|
2010-11-27 00:00:39 +08:00
|
|
|
/* Yes, this is one of the common commands */
|
|
|
|
n++; /* use the entry from common_cmds[] */
|
2013-12-01 04:55:40 +08:00
|
|
|
if (starts_with(candidate, cmd)) {
|
2010-11-27 00:00:39 +08:00
|
|
|
/* Give prefix match a very good score */
|
|
|
|
main_cmds.names[i]->len = 0;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-08-31 21:50:23 +08:00
|
|
|
main_cmds.names[i]->len =
|
2012-05-28 00:02:58 +08:00
|
|
|
levenshtein(cmd, candidate, 0, 2, 1, 3) + 1;
|
2010-11-27 00:00:39 +08:00
|
|
|
}
|
2018-05-10 16:46:42 +08:00
|
|
|
FREE_AND_NULL(common_cmds);
|
2008-08-31 21:50:23 +08:00
|
|
|
|
2016-09-29 23:27:31 +08:00
|
|
|
QSORT(main_cmds.names, main_cmds.cnt, levenshtein_compare);
|
2008-08-31 21:50:23 +08:00
|
|
|
|
|
|
|
if (!main_cmds.cnt)
|
2012-04-23 20:30:24 +08:00
|
|
|
die(_("Uh oh. Your system reports no Git commands at all."));
|
2008-08-31 21:50:23 +08:00
|
|
|
|
2010-11-27 00:00:39 +08:00
|
|
|
/* skip and count prefix matches */
|
|
|
|
for (n = 0; n < main_cmds.cnt && !main_cmds.names[n]->len; n++)
|
|
|
|
; /* still counting */
|
|
|
|
|
|
|
|
if (main_cmds.cnt <= n) {
|
|
|
|
/* prefix matches with everything? that is too ambiguous */
|
|
|
|
best_similarity = SIMILARITY_FLOOR + 1;
|
|
|
|
} else {
|
|
|
|
/* count all the most similar ones */
|
|
|
|
for (best_similarity = main_cmds.names[n++]->len;
|
|
|
|
(n < main_cmds.cnt &&
|
|
|
|
best_similarity == main_cmds.names[n]->len);
|
|
|
|
n++)
|
|
|
|
; /* still counting */
|
|
|
|
}
|
2009-12-15 15:57:18 +08:00
|
|
|
if (autocorrect && n == 1 && SIMILAR_ENOUGH(best_similarity)) {
|
2008-08-31 21:50:23 +08:00
|
|
|
const char *assumed = main_cmds.names[0]->name;
|
|
|
|
main_cmds.names[0] = NULL;
|
2024-06-11 17:21:06 +08:00
|
|
|
cmdnames_release(&main_cmds);
|
2012-04-23 20:30:24 +08:00
|
|
|
fprintf_ln(stderr,
|
|
|
|
_("WARNING: You called a Git command named '%s', "
|
2017-06-21 21:57:38 +08:00
|
|
|
"which does not exist."),
|
|
|
|
cmd);
|
2020-11-26 05:01:45 +08:00
|
|
|
if (autocorrect == AUTOCORRECT_IMMEDIATELY)
|
2017-06-21 21:57:38 +08:00
|
|
|
fprintf_ln(stderr,
|
|
|
|
_("Continuing under the assumption that "
|
|
|
|
"you meant '%s'."),
|
|
|
|
assumed);
|
2021-08-14 13:11:12 +08:00
|
|
|
else if (autocorrect == AUTOCORRECT_PROMPT) {
|
|
|
|
char *answer;
|
|
|
|
struct strbuf msg = STRBUF_INIT;
|
2021-12-16 06:58:58 +08:00
|
|
|
strbuf_addf(&msg, _("Run '%s' instead [y/N]? "), assumed);
|
2021-08-14 13:11:12 +08:00
|
|
|
answer = git_prompt(msg.buf, PROMPT_ECHO);
|
|
|
|
strbuf_release(&msg);
|
|
|
|
if (!(starts_with(answer, "y") ||
|
|
|
|
starts_with(answer, "Y")))
|
|
|
|
exit(1);
|
|
|
|
} else {
|
2017-06-21 21:57:38 +08:00
|
|
|
fprintf_ln(stderr,
|
|
|
|
_("Continuing in %0.1f seconds, "
|
|
|
|
"assuming that you meant '%s'."),
|
|
|
|
(float)autocorrect/10.0, assumed);
|
2015-06-06 03:45:05 +08:00
|
|
|
sleep_millisec(autocorrect * 100);
|
2008-08-31 21:54:58 +08:00
|
|
|
}
|
2008-08-31 21:50:23 +08:00
|
|
|
return assumed;
|
|
|
|
}
|
|
|
|
|
2012-04-23 20:30:24 +08:00
|
|
|
fprintf_ln(stderr, _("git: '%s' is not a git command. See 'git --help'."), cmd);
|
2008-08-31 21:50:23 +08:00
|
|
|
|
2009-12-15 15:57:18 +08:00
|
|
|
if (SIMILAR_ENOUGH(best_similarity)) {
|
2012-04-23 20:30:24 +08:00
|
|
|
fprintf_ln(stderr,
|
2017-05-11 20:06:32 +08:00
|
|
|
Q_("\nThe most similar command is",
|
|
|
|
"\nThe most similar commands are",
|
2012-04-23 20:30:24 +08:00
|
|
|
n));
|
2008-08-31 21:50:23 +08:00
|
|
|
|
|
|
|
for (i = 0; i < n; i++)
|
|
|
|
fprintf(stderr, "\t%s\n", main_cmds.names[i]->name);
|
|
|
|
}
|
|
|
|
|
2006-07-31 05:42:25 +08:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2020-04-17 05:18:05 +08:00
|
|
|
void get_version_info(struct strbuf *buf, int show_build_options)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* The format of this string should be kept stable for compatibility
|
|
|
|
* with external projects that rely on the output of "git version".
|
|
|
|
*
|
|
|
|
* Always show the version, even if other options are given.
|
|
|
|
*/
|
|
|
|
strbuf_addf(buf, "git version %s\n", git_version_string);
|
|
|
|
|
|
|
|
if (show_build_options) {
|
|
|
|
strbuf_addf(buf, "cpu: %s\n", GIT_HOST_CPU);
|
|
|
|
if (git_built_from_commit_string[0])
|
|
|
|
strbuf_addf(buf, "built from commit: %s\n",
|
|
|
|
git_built_from_commit_string);
|
|
|
|
else
|
|
|
|
strbuf_addstr(buf, "no commit associated with this build\n");
|
|
|
|
strbuf_addf(buf, "sizeof-long: %d\n", (int)sizeof(long));
|
|
|
|
strbuf_addf(buf, "sizeof-size_t: %d\n", (int)sizeof(size_t));
|
2020-05-13 07:42:12 +08:00
|
|
|
strbuf_addf(buf, "shell-path: %s\n", SHELL_PATH);
|
2020-04-17 05:18:05 +08:00
|
|
|
/* NEEDSWORK: also save and output GIT-BUILD_OPTIONS? */
|
2022-03-26 02:03:02 +08:00
|
|
|
|
|
|
|
if (fsmonitor_ipc__is_supported())
|
|
|
|
strbuf_addstr(buf, "feature: fsmonitor--daemon\n");
|
2024-06-22 02:09:46 +08:00
|
|
|
#if defined LIBCURL_VERSION
|
|
|
|
strbuf_addf(buf, "libcurl: %s\n", LIBCURL_VERSION);
|
|
|
|
#endif
|
2024-06-20 01:24:21 +08:00
|
|
|
#if defined OPENSSL_VERSION_TEXT
|
|
|
|
strbuf_addf(buf, "OpenSSL: %s\n", OPENSSL_VERSION_TEXT);
|
2024-06-22 02:09:47 +08:00
|
|
|
#endif
|
|
|
|
#if defined ZLIB_VERSION
|
|
|
|
strbuf_addf(buf, "zlib: %s\n", ZLIB_VERSION);
|
2024-06-20 01:24:21 +08:00
|
|
|
#endif
|
2020-04-17 05:18:05 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2024-09-14 05:16:14 +08:00
|
|
|
int cmd_version(int argc, const char **argv, const char *prefix, struct repository *repository UNUSED)
|
2006-04-22 01:27:34 +08:00
|
|
|
{
|
2020-04-17 05:18:05 +08:00
|
|
|
struct strbuf buf = STRBUF_INIT;
|
2017-05-30 13:17:42 +08:00
|
|
|
int build_options = 0;
|
|
|
|
const char * const usage[] = {
|
2022-10-13 23:39:13 +08:00
|
|
|
N_("git version [--build-options]"),
|
2017-05-30 13:17:42 +08:00
|
|
|
NULL
|
|
|
|
};
|
|
|
|
struct option options[] = {
|
|
|
|
OPT_BOOL(0, "build-options", &build_options,
|
|
|
|
"also print build options"),
|
|
|
|
OPT_END()
|
|
|
|
};
|
|
|
|
|
|
|
|
argc = parse_options(argc, argv, prefix, options, usage, 0);
|
|
|
|
|
2020-04-17 05:18:05 +08:00
|
|
|
get_version_info(&buf, build_options);
|
|
|
|
printf("%s", buf.buf);
|
|
|
|
|
|
|
|
strbuf_release(&buf);
|
2017-05-30 13:17:42 +08:00
|
|
|
|
2006-04-22 01:27:34 +08:00
|
|
|
return 0;
|
|
|
|
}
|
2013-05-04 08:04:19 +08:00
|
|
|
|
|
|
|
struct similar_ref_cb {
|
|
|
|
const char *base_ref;
|
|
|
|
struct string_list *similar_refs;
|
|
|
|
};
|
|
|
|
|
2024-08-09 23:37:50 +08:00
|
|
|
static int append_similar_ref(const char *refname, const char *referent UNUSED,
|
2022-08-26 01:09:48 +08:00
|
|
|
const struct object_id *oid UNUSED,
|
|
|
|
int flags UNUSED, void *cb_data)
|
2013-05-04 08:04:19 +08:00
|
|
|
{
|
|
|
|
struct similar_ref_cb *cb = (struct similar_ref_cb *)(cb_data);
|
|
|
|
char *branch = strrchr(refname, '/') + 1;
|
2014-06-19 03:48:29 +08:00
|
|
|
|
2013-05-04 08:04:19 +08:00
|
|
|
/* A remote branch of the same name is deemed similar */
|
2019-05-14 20:05:05 +08:00
|
|
|
if (starts_with(refname, "refs/remotes/") &&
|
2013-05-04 08:04:19 +08:00
|
|
|
!strcmp(branch, cb->base_ref))
|
2019-05-14 20:05:05 +08:00
|
|
|
string_list_append_nodup(cb->similar_refs,
|
2024-05-07 15:11:53 +08:00
|
|
|
refs_shorten_unambiguous_ref(get_main_ref_store(the_repository), refname, 1));
|
2013-05-04 08:04:19 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct string_list guess_refs(const char *ref)
|
|
|
|
{
|
|
|
|
struct similar_ref_cb ref_cb;
|
help_unknown_ref(): duplicate collected refnames
When "git merge" sees an unknown refname, we iterate through the refs to
try to suggest some possible alternates. We do so with for_each_ref(),
and in the callback we add some of the refnames we get to a
string_list that is declared with NODUP, directly adding a pointer into
the refname string our callback received.
But the for_each_ref() machinery does not promise that the refname
string will remain valid, and as a result we may print garbage memory.
The code in question dates back to its inception in e56181060e (help:
add help_unknown_ref(), 2013-05-04). But back then, the refname strings
generally did remain stable, at least immediately after the
for_each_ref() call. Later, in d1cf15516f (packed_ref_iterator_begin():
iterate using `mmapped_ref_iterator`, 2017-09-25), we started
consistently re-using a separate buffer for packed refs.
The fix is simple: duplicate the strings we intend to collect. We
already call string_list_clear(), so the memory is correctly freed.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-05-14 20:04:31 +08:00
|
|
|
struct string_list similar_refs = STRING_LIST_INIT_DUP;
|
2013-05-04 08:04:19 +08:00
|
|
|
|
|
|
|
ref_cb.base_ref = ref;
|
|
|
|
ref_cb.similar_refs = &similar_refs;
|
2024-05-07 15:11:53 +08:00
|
|
|
refs_for_each_ref(get_main_ref_store(the_repository),
|
|
|
|
append_similar_ref, &ref_cb);
|
2013-05-04 08:04:19 +08:00
|
|
|
return similar_refs;
|
|
|
|
}
|
|
|
|
|
2019-08-30 03:13:16 +08:00
|
|
|
NORETURN void help_unknown_ref(const char *ref, const char *cmd,
|
|
|
|
const char *error)
|
2013-05-04 08:04:19 +08:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
struct string_list suggested_refs = guess_refs(ref);
|
|
|
|
|
|
|
|
fprintf_ln(stderr, _("%s: %s - %s"), cmd, ref, error);
|
|
|
|
|
|
|
|
if (suggested_refs.nr > 0) {
|
|
|
|
fprintf_ln(stderr,
|
|
|
|
Q_("\nDid you mean this?",
|
|
|
|
"\nDid you mean one of these?",
|
|
|
|
suggested_refs.nr));
|
|
|
|
for (i = 0; i < suggested_refs.nr; i++)
|
|
|
|
fprintf(stderr, "\t%s\n", suggested_refs.items[i].string);
|
|
|
|
}
|
|
|
|
|
|
|
|
string_list_clear(&suggested_refs, 0);
|
|
|
|
exit(1);
|
|
|
|
}
|