Skip to content

Commit 18e71e6

Browse files
ethomsonethomson
committed
index: use new enum and structure names
Use the new-style index names throughout our own codebase.
1 parent 19faf7c commit 18e71e6

File tree

25 files changed

+152
-151
lines changed

25 files changed

+152
-151
lines changed

‎src/diff_generate.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ static int diff_delta__from_one(
138138
if (DIFF_FLAG_IS_SET(diff, GIT_DIFF_REVERSE))
139139
has_old = !has_old;
140140

141-
if ((entry->flags & GIT_IDXENTRY_VALID) != 0)
141+
if ((entry->flags & GIT_INDEX_ENTRY_VALID) != 0)
142142
return 0;
143143

144144
if (status == GIT_DELTA_IGNORED &&
@@ -764,11 +764,11 @@ static int maybe_modified(
764764
status = GIT_DELTA_CONFLICTED;
765765

766766
/* support "assume unchanged" (poorly, b/c we still stat everything) */
767-
} else if ((oitem->flags & GIT_IDXENTRY_VALID) != 0) {
767+
} else if ((oitem->flags & GIT_INDEX_ENTRY_VALID) != 0) {
768768
status = GIT_DELTA_UNMODIFIED;
769769

770770
/* support "skip worktree" index bit */
771-
} else if ((oitem->flags_extended & GIT_IDXENTRY_SKIP_WORKTREE) != 0) {
771+
} else if ((oitem->flags_extended & GIT_INDEX_ENTRY_SKIP_WORKTREE) != 0) {
772772
status = GIT_DELTA_UNMODIFIED;
773773

774774
/* if basic type of file changed, then split into delete and add */

‎src/idxmap.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ static kh_inline khint_t idxentry_hash(const git_index_entry *e)
2323
const char *s = e->path;
2424
khint_t h = (khint_t)git__tolower(*s);
2525
if (h) for (++s ; *s; ++s) h = (h << 5) - h + (khint_t)git__tolower(*s);
26-
return h + GIT_IDXENTRY_STAGE(e);
26+
return h + GIT_INDEX_ENTRY_STAGE(e);
2727
}
2828

29-
#define idxentry_equal(a, b) (GIT_IDXENTRY_STAGE(a) == GIT_IDXENTRY_STAGE(b) && strcmp(a->path, b->path) == 0)
30-
#define idxentry_icase_equal(a, b) (GIT_IDXENTRY_STAGE(a) == GIT_IDXENTRY_STAGE(b) && strcasecmp(a->path, b->path) == 0)
29+
#define idxentry_equal(a, b) (GIT_INDEX_ENTRY_STAGE(a) == GIT_INDEX_ENTRY_STAGE(b) && strcmp(a->path, b->path) == 0)
30+
#define idxentry_icase_equal(a, b) (GIT_INDEX_ENTRY_STAGE(a) == GIT_INDEX_ENTRY_STAGE(b) && strcasecmp(a->path, b->path) == 0)
3131

3232
__KHASH_IMPL(idx, static kh_inline, const git_index_entry *, git_index_entry *, 1, idxentry_hash, idxentry_equal)
3333
__KHASH_IMPL(idxicase, static kh_inline, const git_index_entry *, git_index_entry *, 1, idxentry_hash, idxentry_icase_equal)

‎src/index.c‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ int git_index_entry_srch(const void *key, const void *array_member)
168168
return 1;
169169

170170
if (srch_key->stage != GIT_INDEX_STAGE_ANY)
171-
return srch_key->stage - GIT_IDXENTRY_STAGE(&entry->entry);
171+
return srch_key->stage - GIT_INDEX_ENTRY_STAGE(&entry->entry);
172172

173173
return 0;
174174
}
@@ -194,7 +194,7 @@ int git_index_entry_isrch(const void *key, const void *array_member)
194194
return 1;
195195

196196
if (srch_key->stage != GIT_INDEX_STAGE_ANY)
197-
return srch_key->stage - GIT_IDXENTRY_STAGE(&entry->entry);
197+
return srch_key->stage - GIT_INDEX_ENTRY_STAGE(&entry->entry);
198198

199199
return 0;
200200
}
@@ -222,7 +222,7 @@ int git_index_entry_cmp(const void *a, const void *b)
222222
diff = strcmp(entry_a->path, entry_b->path);
223223

224224
if (diff == 0)
225-
diff = (GIT_IDXENTRY_STAGE(entry_a) - GIT_IDXENTRY_STAGE(entry_b));
225+
diff = (GIT_INDEX_ENTRY_STAGE(entry_a) - GIT_INDEX_ENTRY_STAGE(entry_b));
226226

227227
return diff;
228228
}
@@ -236,7 +236,7 @@ int git_index_entry_icmp(const void *a, const void *b)
236236
diff = strcasecmp(entry_a->path, entry_b->path);
237237

238238
if (diff == 0)
239-
diff = (GIT_IDXENTRY_STAGE(entry_a) - GIT_IDXENTRY_STAGE(entry_b));
239+
diff = (GIT_INDEX_ENTRY_STAGE(entry_a) - GIT_INDEX_ENTRY_STAGE(entry_b));
240240

241241
return diff;
242242
}
@@ -562,7 +562,7 @@ int git_index_set_caps(git_index *index, int caps)
562562

563563
old_ignore_case = index->ignore_case;
564564

565-
if (caps == GIT_INDEXCAP_FROM_OWNER) {
565+
if (caps == GIT_INDEX_CAPABILITY_FROM_OWNER) {
566566
git_repository *repo = INDEX_OWNER(index);
567567
int val;
568568

@@ -578,9 +578,9 @@ int git_index_set_caps(git_index *index, int caps)
578578
index->no_symlinks = (val == 0);
579579
}
580580
else {
581-
index->ignore_case = ((caps & GIT_INDEXCAP_IGNORE_CASE) != 0);
582-
index->distrust_filemode = ((caps & GIT_INDEXCAP_NO_FILEMODE) != 0);
583-
index->no_symlinks = ((caps & GIT_INDEXCAP_NO_SYMLINKS) != 0);
581+
index->ignore_case = ((caps & GIT_INDEX_CAPABILITY_IGNORE_CASE) != 0);
582+
index->distrust_filemode = ((caps & GIT_INDEX_CAPABILITY_NO_FILEMODE) != 0);
583+
index->no_symlinks = ((caps & GIT_INDEX_CAPABILITY_NO_SYMLINKS) != 0);
584584
}
585585

586586
if (old_ignore_case != index->ignore_case) {
@@ -592,9 +592,9 @@ int git_index_set_caps(git_index *index, int caps)
592592

593593
int git_index_caps(const git_index *index)
594594
{
595-
return ((index->ignore_case ? GIT_INDEXCAP_IGNORE_CASE : 0) |
596-
(index->distrust_filemode ? GIT_INDEXCAP_NO_FILEMODE : 0) |
597-
(index->no_symlinks ? GIT_INDEXCAP_NO_SYMLINKS : 0));
595+
return ((index->ignore_case ? GIT_INDEX_CAPABILITY_IGNORE_CASE : 0) |
596+
(index->distrust_filemode ? GIT_INDEX_CAPABILITY_NO_FILEMODE : 0) |
597+
(index->no_symlinks ? GIT_INDEX_CAPABILITY_NO_SYMLINKS : 0));
598598
}
599599

600600
const git_oid *git_index_checksum(git_index *index)
@@ -736,7 +736,7 @@ static int truncate_racily_clean(git_index *index)
736736

737737
diff_opts.flags |= GIT_DIFF_INCLUDE_TYPECHANGE | GIT_DIFF_IGNORE_SUBMODULES | GIT_DIFF_DISABLE_PATHSPEC_MATCH;
738738
git_vector_foreach(&index->entries, i, entry) {
739-
if ((entry->flags_extended & GIT_IDXENTRY_UPTODATE) == 0 &&
739+
if ((entry->flags_extended & GIT_INDEX_ENTRY_UPTODATE) == 0 &&
740740
is_racy_entry(index, entry))
741741
git_vector_insert(&paths, (char *)entry->path);
742742
}
@@ -857,7 +857,7 @@ const git_index_entry *git_index_get_bypath(
857857
assert(index);
858858

859859
key.path = path;
860-
GIT_IDXENTRY_STAGE_SET(&key, stage);
860+
GIT_INDEX_ENTRY_STAGE_SET(&key, stage);
861861

862862
LOOKUP_IN_MAP(pos, index, &key);
863863

@@ -890,12 +890,12 @@ static void index_entry_adjust_namemask(
890890
git_index_entry *entry,
891891
size_t path_length)
892892
{
893-
entry->flags &= ~GIT_IDXENTRY_NAMEMASK;
893+
entry->flags &= ~GIT_INDEX_ENTRY_NAMEMASK;
894894

895-
if (path_length < GIT_IDXENTRY_NAMEMASK)
896-
entry->flags |= path_length & GIT_IDXENTRY_NAMEMASK;
895+
if (path_length < GIT_INDEX_ENTRY_NAMEMASK)
896+
entry->flags |= path_length & GIT_INDEX_ENTRY_NAMEMASK;
897897
else
898-
entry->flags |= GIT_IDXENTRY_NAMEMASK;
898+
entry->flags |= GIT_INDEX_ENTRY_NAMEMASK;
899899
}
900900

901901
/* When `from_workdir` is true, we will validate the paths to avoid placing
@@ -1078,7 +1078,7 @@ static void index_entry_cpy_nocache(
10781078
git_oid_cpy(&tgt->id, &src->id);
10791079
tgt->mode = src->mode;
10801080
tgt->flags = src->flags;
1081-
tgt->flags_extended = (src->flags_extended & GIT_IDXENTRY_EXTENDED_FLAGS);
1081+
tgt->flags_extended = (src->flags_extended & GIT_INDEX_ENTRY_EXTENDED_FLAGS);
10821082
}
10831083

10841084
static int index_entry_dup_nocache(
@@ -1097,7 +1097,7 @@ static int has_file_name(git_index *index,
10971097
const git_index_entry *entry, size_t pos, int ok_to_replace)
10981098
{
10991099
size_t len = strlen(entry->path);
1100-
int stage = GIT_IDXENTRY_STAGE(entry);
1100+
int stage = GIT_INDEX_ENTRY_STAGE(entry);
11011101
const char *name = entry->path;
11021102

11031103
while (pos < index->entries.length) {
@@ -1107,7 +1107,7 @@ static int has_file_name(git_index *index,
11071107
break;
11081108
if (memcmp(name, p->path, len))
11091109
break;
1110-
if (GIT_IDXENTRY_STAGE(&p->entry) != stage)
1110+
if (GIT_INDEX_ENTRY_STAGE(&p->entry) != stage)
11111111
continue;
11121112
if (p->path[len] != '/')
11131113
continue;
@@ -1127,7 +1127,7 @@ static int has_file_name(git_index *index,
11271127
static int has_dir_name(git_index *index,
11281128
const git_index_entry *entry, int ok_to_replace)
11291129
{
1130-
int stage = GIT_IDXENTRY_STAGE(entry);
1130+
int stage = GIT_INDEX_ENTRY_STAGE(entry);
11311131
const char *name = entry->path;
11321132
const char *slash = name + strlen(name);
11331133

@@ -1164,7 +1164,7 @@ static int has_dir_name(git_index *index,
11641164
memcmp(p->path, name, len))
11651165
break; /* not our subdirectory */
11661166

1167-
if (GIT_IDXENTRY_STAGE(&p->entry) == stage)
1167+
if (GIT_INDEX_ENTRY_STAGE(&p->entry) == stage)
11681168
return 0;
11691169
}
11701170
}
@@ -1222,7 +1222,7 @@ static int canonicalize_directory_path(
12221222
&pos, &index->entries, index->entries_search_path, search);
12231223

12241224
while ((match = git_vector_get(&index->entries, pos))) {
1225-
if (GIT_IDXENTRY_STAGE(match) != 0) {
1225+
if (GIT_INDEX_ENTRY_STAGE(match) != 0) {
12261226
/* conflicts do not contribute to canonical paths */
12271227
} else if (strncmp(search, match->path, search_len) == 0) {
12281228
/* prefer an exact match to the input filename */
@@ -1260,7 +1260,7 @@ static int index_no_dups(void **old, void *new)
12601260
const git_index_entry *entry = new;
12611261
GIT_UNUSED(old);
12621262
giterr_set(GITERR_INDEX, "'%s' appears multiple times at stage %d",
1263-
entry->path, GIT_IDXENTRY_STAGE(entry));
1263+
entry->path, GIT_INDEX_ENTRY_STAGE(entry));
12641264
return GIT_EEXISTS;
12651265
}
12661266

@@ -1276,7 +1276,7 @@ static void index_existing_and_best(
12761276
int error;
12771277

12781278
error = index_find(&pos,
1279-
index, entry->path, 0, GIT_IDXENTRY_STAGE(entry));
1279+
index, entry->path, 0, GIT_INDEX_ENTRY_STAGE(entry));
12801280

12811281
if (error == 0) {
12821282
*existing = index->entries.contents[pos];
@@ -1289,7 +1289,7 @@ static void index_existing_and_best(
12891289
*existing_position = 0;
12901290
*best = NULL;
12911291

1292-
if (GIT_IDXENTRY_STAGE(entry) == 0) {
1292+
if (GIT_INDEX_ENTRY_STAGE(entry) == 0) {
12931293
for (; pos < index->entries.length; pos++) {
12941294
int (*strcomp)(const char *a, const char *b) =
12951295
index->ignore_case ? git__strcasecmp : git__strcmp;
@@ -1299,7 +1299,7 @@ static void index_existing_and_best(
12991299
if (strcomp(entry->path, e->path) != 0)
13001300
break;
13011301

1302-
if (GIT_IDXENTRY_STAGE(e) == GIT_INDEX_STAGE_ANCESTOR) {
1302+
if (GIT_INDEX_ENTRY_STAGE(e) == GIT_INDEX_STAGE_ANCESTOR) {
13031303
*best = e;
13041304
continue;
13051305
} else {
@@ -1344,7 +1344,7 @@ static int index_insert(
13441344
index_entry_adjust_namemask(entry, path_length);
13451345

13461346
/* This entry is now up-to-date and should not be checked for raciness */
1347-
entry->flags_extended |= GIT_IDXENTRY_UPTODATE;
1347+
entry->flags_extended |= GIT_INDEX_ENTRY_UPTODATE;
13481348

13491349
git_vector_sort(&index->entries);
13501350

@@ -1628,7 +1628,7 @@ int git_index__fill(git_index *index, const git_vector *source_entries)
16281628
break;
16291629

16301630
index_entry_adjust_namemask(entry, ((struct entry_internal *)entry)->pathlen);
1631-
entry->flags_extended |= GIT_IDXENTRY_UPTODATE;
1631+
entry->flags_extended |= GIT_INDEX_ENTRY_UPTODATE;
16321632
entry->mode = git_index__create_mode(entry->mode);
16331633

16341634
if ((ret = git_vector_insert(&index->entries, entry)) < 0)
@@ -1675,7 +1675,7 @@ int git_index_remove(git_index *index, const char *path, int stage)
16751675
git_index_entry remove_key = {{ 0 }};
16761676

16771677
remove_key.path = path;
1678-
GIT_IDXENTRY_STAGE_SET(&remove_key, stage);
1678+
GIT_INDEX_ENTRY_STAGE_SET(&remove_key, stage);
16791679

16801680
DELETE_IN_MAP(index, &remove_key);
16811681

@@ -1706,7 +1706,7 @@ int git_index_remove_directory(git_index *index, const char *dir, int stage)
17061706
if (!entry || git__prefixcmp(entry->path, pfx.ptr) != 0)
17071707
break;
17081708

1709-
if (GIT_IDXENTRY_STAGE(entry) != stage) {
1709+
if (GIT_INDEX_ENTRY_STAGE(entry) != stage) {
17101710
++pos;
17111711
continue;
17121712
}
@@ -1822,7 +1822,7 @@ int git_index_conflict_add(git_index *index,
18221822
continue;
18231823

18241824
/* Make sure stage is correct */
1825-
GIT_IDXENTRY_STAGE_SET(entries[i], i + 1);
1825+
GIT_INDEX_ENTRY_STAGE_SET(entries[i], i + 1);
18261826

18271827
if ((ret = index_insert(index, &entries[i], 1, true, true, false)) < 0)
18281828
goto on_error;
@@ -1865,7 +1865,7 @@ static int index_conflict__get_byindex(
18651865
if (path && index->entries_cmp_path(conflict_entry->path, path) != 0)
18661866
break;
18671867

1868-
stage = GIT_IDXENTRY_STAGE(conflict_entry);
1868+
stage = GIT_INDEX_ENTRY_STAGE(conflict_entry);
18691869
path = conflict_entry->path;
18701870

18711871
switch (stage) {
@@ -1932,7 +1932,7 @@ static int index_conflict_remove(git_index *index, const char *path)
19321932
index->entries_cmp_path(conflict_entry->path, path) != 0)
19331933
break;
19341934

1935-
if (GIT_IDXENTRY_STAGE(conflict_entry) == 0) {
1935+
if (GIT_INDEX_ENTRY_STAGE(conflict_entry) == 0) {
19361936
pos++;
19371937
continue;
19381938
}
@@ -1964,7 +1964,7 @@ int git_index_has_conflicts(const git_index *index)
19641964
assert(index);
19651965

19661966
git_vector_foreach(&index->entries, i, entry) {
1967-
if (GIT_IDXENTRY_STAGE(entry) > 0)
1967+
if (GIT_INDEX_ENTRY_STAGE(entry) > 0)
19681968
return 1;
19691969
}
19701970

@@ -2386,13 +2386,13 @@ static int read_conflict_names(git_index *index, const char *buffer, size_t size
23862386
static size_t index_entry_size(size_t path_len, size_t varint_len, uint32_t flags)
23872387
{
23882388
if (varint_len) {
2389-
if (flags & GIT_IDXENTRY_EXTENDED)
2389+
if (flags & GIT_INDEX_ENTRY_EXTENDED)
23902390
return offsetof(struct entry_long, path) + path_len + 1 + varint_len;
23912391
else
23922392
return offsetof(struct entry_short, path) + path_len + 1 + varint_len;
23932393
} else {
23942394
#define entry_size(type,len) ((offsetof(type, path) + (len) + 8) & ~7)
2395-
if (flags & GIT_IDXENTRY_EXTENDED)
2395+
if (flags & GIT_INDEX_ENTRY_EXTENDED)
23962396
return entry_size(struct entry_long, path_len);
23972397
else
23982398
return entry_size(struct entry_short, path_len);
@@ -2434,7 +2434,7 @@ static int read_entry(
24342434
git_oid_cpy(&entry.id, &source.oid);
24352435
entry.flags = ntohs(source.flags);
24362436

2437-
if (entry.flags & GIT_IDXENTRY_EXTENDED) {
2437+
if (entry.flags & GIT_INDEX_ENTRY_EXTENDED) {
24382438
uint16_t flags_raw;
24392439
size_t flags_offset;
24402440

@@ -2449,7 +2449,7 @@ static int read_entry(
24492449
path_ptr = (const char *) buffer + offsetof(struct entry_short, path);
24502450

24512451
if (!compressed) {
2452-
path_length = entry.flags & GIT_IDXENTRY_NAMEMASK;
2452+
path_length = entry.flags & GIT_INDEX_ENTRY_NAMEMASK;
24532453

24542454
/* if this is a very long string, we must find its
24552455
* real length without overflowing */
@@ -2694,10 +2694,10 @@ static bool is_index_extended(git_index *index)
26942694
extended = 0;
26952695

26962696
git_vector_foreach(&index->entries, i, entry) {
2697-
entry->flags &= ~GIT_IDXENTRY_EXTENDED;
2698-
if (entry->flags_extended & GIT_IDXENTRY_EXTENDED_FLAGS) {
2697+
entry->flags &= ~GIT_INDEX_ENTRY_EXTENDED;
2698+
if (entry->flags_extended & GIT_INDEX_ENTRY_EXTENDED_FLAGS) {
26992699
extended++;
2700-
entry->flags |= GIT_IDXENTRY_EXTENDED;
2700+
entry->flags |= GIT_INDEX_ENTRY_EXTENDED;
27012701
}
27022702
}
27032703

@@ -2762,11 +2762,11 @@ static int write_disk_entry(git_filebuf *file, git_index_entry *entry, const cha
27622762

27632763
ondisk.flags = htons(entry->flags);
27642764

2765-
if (entry->flags & GIT_IDXENTRY_EXTENDED) {
2765+
if (entry->flags & GIT_INDEX_ENTRY_EXTENDED) {
27662766
struct entry_long ondisk_ext;
27672767
memcpy(&ondisk_ext, &ondisk, sizeof(struct entry_short));
27682768
ondisk_ext.flags_extended = htons(entry->flags_extended &
2769-
GIT_IDXENTRY_EXTENDED_FLAGS);
2769+
GIT_INDEX_ENTRY_EXTENDED_FLAGS);
27702770
memcpy(mem, &ondisk_ext, offsetof(struct entry_long, path));
27712771
path = ((struct entry_long*)mem)->path;
27722772
disk_size -= offsetof(struct entry_long, path);
@@ -2980,7 +2980,7 @@ static void clear_uptodate(git_index *index)
29802980
size_t i;
29812981

29822982
git_vector_foreach(&index->entries, i, entry)
2983-
entry->flags_extended &= ~GIT_IDXENTRY_UPTODATE;
2983+
entry->flags_extended &= ~GIT_INDEX_ENTRY_UPTODATE;
29842984
}
29852985

29862986
static int write_index(git_oid *checksum, git_index *index, git_filebuf *file)
@@ -3037,12 +3037,12 @@ static int write_index(git_oid *checksum, git_index *index, git_filebuf *file)
30373037

30383038
int git_index_entry_stage(const git_index_entry *entry)
30393039
{
3040-
return GIT_IDXENTRY_STAGE(entry);
3040+
return GIT_INDEX_ENTRY_STAGE(entry);
30413041
}
30423042

30433043
int git_index_entry_is_conflict(const git_index_entry *entry)
30443044
{
3045-
return (GIT_IDXENTRY_STAGE(entry) > 0);
3045+
return (GIT_INDEX_ENTRY_STAGE(entry) > 0);
30463046
}
30473047

30483048
typedef struct read_tree_data {

0 commit comments

Comments
 (0)