microsoft
/
git
зеркало из https://github.com/microsoft/git.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

dir: expose cmp_name() and check_contains() 

We want to use cmp_name() and check_contains() (which both compare
`struct dir_entry`s, the former in terms of the sort order, the latter
in terms of whether one lexically contains another) outside of dir.c,
so we have to (1) change their linkage and (2) rename them as
appropriate for the global namespace. The second is achieved by
renaming cmp_name() to cmp_dir_entry() and check_contains() to
check_dir_entry_contains().

Signed-off-by: Samuel Lijin <sxlijin@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Samuel Lijin 2017-05-18 04:21:53 -04:00 коммит произвёл Junio C Hamano
Родитель fb89888849
Коммит bbf504a995
2 изменённых файлов: 9 добавлений и 5 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

11
dir.c
Просмотреть файл

@ -1805,7 +1805,7 @@ static enum path_treatment read_directory_recursive(struct dir_struct *dir,
return dir_state; return dir_state;
} }
static int cmp_name(const void *p1, const void *p2) int cmp_dir_entry(const void *p1, const void *p2)
{ {
const struct dir_entry *e1 = *(const struct dir_entry **)p1; const struct dir_entry *e1 = *(const struct dir_entry **)p1;
const struct dir_entry *e2 = *(const struct dir_entry **)p2; const struct dir_entry *e2 = *(const struct dir_entry **)p2;
@ -1814,7 +1814,7 @@ static int cmp_name(const void *p1, const void *p2)
} }
/* check if *out lexically strictly contains *in */ /* check if *out lexically strictly contains *in */
static int check_contains(const struct dir_entry *out, const struct dir_entry *in) int check_dir_entry_contains(const struct dir_entry *out, const struct dir_entry *in)
{ {
return (out->len < in->len) && return (out->len < in->len) &&
(out->name[out->len - 1] == '/') && (out->name[out->len - 1] == '/') &&
@ -2034,8 +2034,8 @@ int read_directory(struct dir_struct *dir, const char *path,
dir->untracked = NULL; dir->untracked = NULL;
if (!len || treat_leading_path(dir, path, len, pathspec)) if (!len || treat_leading_path(dir, path, len, pathspec))
read_directory_recursive(dir, path, len, untracked, 0, pathspec); read_directory_recursive(dir, path, len, untracked, 0, pathspec);
QSORT(dir->entries, dir->nr, cmp_name); QSORT(dir->entries, dir->nr, cmp_dir_entry);
QSORT(dir->ignored, dir->ignored_nr, cmp_name); QSORT(dir->ignored, dir->ignored_nr, cmp_dir_entry);
/* /*
* If DIR_SHOW_IGNORED_TOO is set, read_directory_recursive() will * If DIR_SHOW_IGNORED_TOO is set, read_directory_recursive() will
@ -2048,7 +2048,8 @@ int read_directory(struct dir_struct *dir, const char *path,
/* remove from dir->entries untracked contents of untracked dirs */ /* remove from dir->entries untracked contents of untracked dirs */
for (i = j = 0; j < dir->nr; j++) { for (i = j = 0; j < dir->nr; j++) {
if (i && check_contains(dir->entries[i - 1], dir->entries[j])) { if (i &&
check_dir_entry_contains(dir->entries[i - 1], dir->entries[j])) {
free(dir->entries[j]); free(dir->entries[j]);
dir->entries[j] = NULL; dir->entries[j] = NULL;
} else { } else {

3
dir.h
Просмотреть файл

@ -327,6 +327,9 @@ static inline int dir_path_match(const struct dir_entry *ent,
has_trailing_dir); has_trailing_dir);
} }
int cmp_dir_entry(const void *p1, const void *p2);
int check_dir_entry_contains(const struct dir_entry *out, const struct dir_entry *in);
void untracked_cache_invalidate_path(struct index_state *, const char *); void untracked_cache_invalidate_path(struct index_state *, const char *);
void untracked_cache_remove_from_index(struct index_state *, const char *); void untracked_cache_remove_from_index(struct index_state *, const char *);
void untracked_cache_add_to_index(struct index_state *, const char *); void untracked_cache_add_to_index(struct index_state *, const char *);