diff options
author | Derrick Stolee <dstolee@microsoft.com> | 2019-09-03 11:04:56 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-09-05 14:05:11 -0700 |
commit | caa3d5544474a6ef8e8d7db5c073c1564b76d8bb (patch) | |
tree | 76203b7747cbc9665cf97700947ed52ddd075e4d /builtin | |
parent | treewide: rename 'struct exclude' to 'struct path_pattern' (diff) | |
download | tgif-caa3d5544474a6ef8e8d7db5c073c1564b76d8bb.tar.xz |
treewide: rename 'struct exclude_list' to 'struct pattern_list'
The first consumer of pattern-matching filenames was the
.gitignore feature. In that context, storing a list of patterns
as a 'struct exclude_list' makes sense. However, the
sparse-checkout feature then adopted these structures and methods,
but with the opposite meaning: these patterns match the files
that should be included!
It would be clearer to rename this entire library as a "pattern
matching" library, and the callers apply exclusion/inclusion
logic accordingly based on their needs.
This commit renames 'struct exclude_list' to 'struct pattern_list'
and renames several variables called 'el' to 'pl'.
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r-- | builtin/check-ignore.c | 4 | ||||
-rw-r--r-- | builtin/clean.c | 12 | ||||
-rw-r--r-- | builtin/ls-files.c | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/builtin/check-ignore.c b/builtin/check-ignore.c index 9a0f234514..97108ccb9c 100644 --- a/builtin/check-ignore.c +++ b/builtin/check-ignore.c @@ -41,7 +41,7 @@ static void output_pattern(const char *path, struct path_pattern *pattern) write_name_quoted(path, stdout, '\n'); } else { if (pattern) { - quote_c_style(pattern->el->src, NULL, stdout, 0); + quote_c_style(pattern->pl->src, NULL, stdout, 0); printf(":%d:%s%s%s\t", pattern->srcpos, bang, pattern->pattern, slash); @@ -58,7 +58,7 @@ static void output_pattern(const char *path, struct path_pattern *pattern) } else { if (pattern) printf("%s%c%d%c%s%s%s%c%s%c", - pattern->el->src, '\0', + pattern->pl->src, '\0', pattern->srcpos, '\0', bang, pattern->pattern, slash, '\0', path, '\0'); diff --git a/builtin/clean.c b/builtin/clean.c index aaba4af3c2..d8c847d9fd 100644 --- a/builtin/clean.c +++ b/builtin/clean.c @@ -647,7 +647,7 @@ static int filter_by_patterns_cmd(void) struct strbuf confirm = STRBUF_INIT; struct strbuf **ignore_list; struct string_list_item *item; - struct exclude_list *el; + struct pattern_list *pl; int changed = -1, i; for (;;) { @@ -670,7 +670,7 @@ static int filter_by_patterns_cmd(void) break; memset(&dir, 0, sizeof(dir)); - el = add_exclude_list(&dir, EXC_CMDL, "manual exclude"); + pl = add_exclude_list(&dir, EXC_CMDL, "manual exclude"); ignore_list = strbuf_split_max(&confirm, ' ', 0); for (i = 0; ignore_list[i]; i++) { @@ -678,7 +678,7 @@ static int filter_by_patterns_cmd(void) if (!ignore_list[i]->len) continue; - add_exclude(ignore_list[i]->buf, "", 0, el, -(i+1)); + add_exclude(ignore_list[i]->buf, "", 0, pl, -(i+1)); } changed = 0; @@ -900,7 +900,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix) struct pathspec pathspec; struct strbuf buf = STRBUF_INIT; struct string_list exclude_list = STRING_LIST_INIT_NODUP; - struct exclude_list *el; + struct pattern_list *pl; struct string_list_item *item; const char *qname; struct option options[] = { @@ -957,9 +957,9 @@ int cmd_clean(int argc, const char **argv, const char *prefix) if (!ignored) setup_standard_excludes(&dir); - el = add_exclude_list(&dir, EXC_CMDL, "--exclude option"); + pl = add_exclude_list(&dir, EXC_CMDL, "--exclude option"); for (i = 0; i < exclude_list.nr; i++) - add_exclude(exclude_list.items[i].string, "", 0, el, -(i+1)); + add_exclude(exclude_list.items[i].string, "", 0, pl, -(i+1)); parse_pathspec(&pathspec, 0, PATHSPEC_PREFER_CWD, diff --git a/builtin/ls-files.c b/builtin/ls-files.c index 7f83c9a6f2..df8918a128 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -516,7 +516,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) int require_work_tree = 0, show_tag = 0, i; const char *max_prefix; struct dir_struct dir; - struct exclude_list *el; + struct pattern_list *pl; struct string_list exclude_list = STRING_LIST_INIT_NODUP; struct option builtin_ls_files_options[] = { /* Think twice before adding "--nul" synonym to this */ @@ -594,9 +594,9 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) argc = parse_options(argc, argv, prefix, builtin_ls_files_options, ls_files_usage, 0); - el = add_exclude_list(&dir, EXC_CMDL, "--exclude option"); + pl = add_exclude_list(&dir, EXC_CMDL, "--exclude option"); for (i = 0; i < exclude_list.nr; i++) { - add_exclude(exclude_list.items[i].string, "", 0, el, --exclude_args); + add_exclude(exclude_list.items[i].string, "", 0, pl, --exclude_args); } if (show_tag || show_valid_bit || show_fsmonitor_bit) { tag_cached = "H "; |