refs API: post-migration API renaming [2/2]
Rename the transitory refs_werrres_ref_unsafe() function to refs_resolve_ref_unsafe(), now that all callers of the old function have learned to pass in a "failure_errno" parameter. The coccinelle semantic patch added in the preceding commit works, but I couldn't figure out how to get spatch(1) to re-flow these argument lists (and sometimes make lines way too long), so this rename was done with: perl -pi -e 's/refs_werrres_ref_unsafe/refs_resolve_ref_unsafe/g' \ $(git grep -l refs_werrres_ref_unsafe -- '*.c') But after that "make contrib/coccinelle/refs.cocci.patch" comes up empty, so the result would have been the same. Let's remove that transitory semantic patch file, we won't need to retain it for any other in-flight changes, refs_werrres_ref_unsafe() only existed within this patch series. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
Oct 16, 2021 at 11:39 UTC
f1da24ca5eeecf8931ffc08b4c8251c689c94a47
7 files changed
+22
-29
contrib/coccinelle/refs.pending.cocci
deleted
-5
@@ -1,5 +0,0 @@
1
-@@
2
-expression refs, refname, resolve_flags, oid, flags, failure_errno;
3
-@@
4
-- refs_werrres_ref_unsafe(refs, refname, resolve_flags, oid, flags, failure_errno)
5
-+ refs_resolve_ref_unsafe(refs, refname, resolve_flags, oid, flags, failure_errno)
refs.c
+8
-8
@@ -270,7 +270,7 @@ char *refs_resolve_refdup(struct ref_store *refs,
270
const char *result;
271
int ignore_errno;
272
273
- result = refs_werrres_ref_unsafe(refs, refname, resolve_flags,
273
+ result = refs_resolve_ref_unsafe(refs, refname, resolve_flags,
274
oid, flags, &ignore_errno);
275
return xstrdup_or_null(result);
276
}
@@ -296,7 +296,7 @@ int read_ref_full(const char *refname, int resolve_flags, struct object_id *oid,
296
int ignore_errno;
297
struct ref_store *refs = get_main_ref_store(the_repository);
298
299
- if (refs_werrres_ref_unsafe(refs, refname, resolve_flags,
299
+ if (refs_resolve_ref_unsafe(refs, refname, resolve_flags,
300
oid, flags, &ignore_errno))
301
return 0;
302
return -1;
@@ -310,7 +310,7 @@ int read_ref(const char *refname, struct object_id *oid)
310
int refs_ref_exists(struct ref_store *refs, const char *refname)
311
{
312
int ignore_errno;
313
- return !!refs_werrres_ref_unsafe(refs, refname, RESOLVE_REF_READING,
313
+ return !!refs_resolve_ref_unsafe(refs, refname, RESOLVE_REF_READING,
314
NULL, NULL, &ignore_errno);
315
}
316
@@ -660,7 +660,7 @@ int expand_ref(struct repository *repo, const char *str, int len,
660
this_result = refs_found ? &oid_from_ref : oid;
661
strbuf_reset(&fullref);
662
strbuf_addf(&fullref, *p, len, str);
663
- r = refs_werrres_ref_unsafe(refs, fullref.buf,
663
+ r = refs_resolve_ref_unsafe(refs, fullref.buf,
664
RESOLVE_REF_READING,
665
this_result, &flag,
666
&ignore_errno);
@@ -696,7 +696,7 @@ int repo_dwim_log(struct repository *r, const char *str, int len,
696
697
strbuf_reset(&path);
698
strbuf_addf(&path, *p, len, str);
699
- ref = refs_werrres_ref_unsafe(refs, path.buf,
699
+ ref = refs_resolve_ref_unsafe(refs, path.buf,
700
RESOLVE_REF_READING,
701
oid ? &hash : NULL, NULL,
702
&ignore_errno);
@@ -1383,7 +1383,7 @@ int refs_head_ref(struct ref_store *refs, each_ref_fn fn, void *cb_data)
1383
int flag;
1384
int ignore_errno;
1385
1386
- if (refs_werrres_ref_unsafe(refs, "HEAD", RESOLVE_REF_READING,
1386
+ if (refs_resolve_ref_unsafe(refs, "HEAD", RESOLVE_REF_READING,
1387
&oid, &flag, &ignore_errno))
1388
return fn("HEAD", &oid, flag, cb_data);
1389
@@ -1779,7 +1779,7 @@ const char *resolve_ref_unsafe(const char *refname, int resolve_flags,
1779
{
1780
int ignore_errno;
1781
1782
- return refs_werrres_ref_unsafe(get_main_ref_store(the_repository), refname,
1782
+ return refs_resolve_ref_unsafe(get_main_ref_store(the_repository), refname,
1783
resolve_flags, oid, flags, &ignore_errno);
1784
}
1785
@@ -1795,7 +1795,7 @@ int resolve_gitlink_ref(const char *submodule, const char *refname,
1795
if (!refs)
1796
return -1;
1797
1798
- if (!refs_werrres_ref_unsafe(refs, refname, 0, oid, &flags,
1798
+ if (!refs_resolve_ref_unsafe(refs, refname, 0, oid, &flags,
1799
&ignore_errno) || is_null_oid(oid))
1800
return -1;
1801
return 0;
refs.h
-2
@@ -68,8 +68,6 @@ struct worktree;
68
#define RESOLVE_REF_NO_RECURSE 0x02
69
#define RESOLVE_REF_ALLOW_BAD_NAME 0x04
70
71
-#define refs_werrres_ref_unsafe(refs, refname, resolve_flags, oid, flags, failure_errno) \
72
- refs_resolve_ref_unsafe(refs, refname, resolve_flags, oid, flags, failure_errno)
71
const char *refs_resolve_ref_unsafe(struct ref_store *refs,
72
const char *refname,
73
int resolve_flags,
refs/files-backend.c
+9
-9
@@ -281,7 +281,7 @@ static void loose_fill_ref_dir(struct ref_store *ref_store,
281
refname.len));
282
} else {
283
int ignore_errno;
284
- if (!refs_werrres_ref_unsafe(&refs->base,
284
+ if (!refs_resolve_ref_unsafe(&refs->base,
285
refname.buf,
286
RESOLVE_REF_READING,
287
&oid, &flag, &ignore_errno)) {
@@ -1034,7 +1034,7 @@ static struct ref_lock *lock_ref_oid_basic(struct files_ref_store *refs,
1034
goto error_return;
1035
}
1036
1037
- if (!refs_werrres_ref_unsafe(&refs->base, lock->ref_name, 0,
1037
+ if (!refs_resolve_ref_unsafe(&refs->base, lock->ref_name, 0,
1038
&lock->old_oid, NULL, &ignore_errno))
1039
oidclr(&lock->old_oid);
1040
goto out;
@@ -1410,7 +1410,7 @@ static int files_copy_or_rename_ref(struct ref_store *ref_store,
1410
goto out;
1411
}
1412
1413
- if (!refs_werrres_ref_unsafe(&refs->base, oldrefname,
1413
+ if (!refs_resolve_ref_unsafe(&refs->base, oldrefname,
1414
RESOLVE_REF_READING | RESOLVE_REF_NO_RECURSE,
1415
&orig_oid, &flag, &ignore_errno)) {
1416
ret = error("refname %s not found", oldrefname);
@@ -1456,7 +1456,7 @@ static int files_copy_or_rename_ref(struct ref_store *ref_store,
1456
* the safety anyway; we want to delete the reference whatever
1457
* its current value.
1458
*/
1459
- if (!copy && refs_werrres_ref_unsafe(&refs->base, newrefname,
1459
+ if (!copy && refs_resolve_ref_unsafe(&refs->base, newrefname,
1460
RESOLVE_REF_READING | RESOLVE_REF_NO_RECURSE,
1461
NULL, NULL, &ignore_errno) &&
1462
refs_delete_ref(&refs->base, NULL, newrefname,
@@ -1825,7 +1825,7 @@ static int commit_ref_update(struct files_ref_store *refs,
1825
const char *head_ref;
1826
int ignore_errno;
1827
1828
- head_ref = refs_werrres_ref_unsafe(&refs->base, "HEAD",
1828
+ head_ref = refs_resolve_ref_unsafe(&refs->base, "HEAD",
1829
RESOLVE_REF_READING,
1830
NULL, &head_flag,
1831
&ignore_errno);
@@ -1875,7 +1875,7 @@ static void update_symref_reflog(struct files_ref_store *refs,
1875
int ignore_errno;
1876
1877
if (logmsg &&
1878
- refs_werrres_ref_unsafe(&refs->base, target,
1878
+ refs_resolve_ref_unsafe(&refs->base, target,
1879
RESOLVE_REF_READING, &new_oid, NULL,
1880
&ignore_errno) &&
1881
files_log_ref_write(refs, refname, &lock->old_oid,
@@ -2163,7 +2163,7 @@ static int files_reflog_iterator_advance(struct ref_iterator *ref_iterator)
2163
if (ends_with(diter->basename, ".lock"))
2164
continue;
2165
2166
- if (!refs_werrres_ref_unsafe(iter->ref_store,
2166
+ if (!refs_resolve_ref_unsafe(iter->ref_store,
2167
diter->relative_path, 0,
2168
&iter->oid, &flags,
2169
&ignore_errno)) {
@@ -2511,7 +2511,7 @@ static int lock_ref_for_update(struct files_ref_store *refs,
2511
* to record and possibly check old_oid:
2512
*/
2513
int ignore_errno;
2514
- if (!refs_werrres_ref_unsafe(&refs->base,
2514
+ if (!refs_resolve_ref_unsafe(&refs->base,
2515
referent.buf, 0,
2516
&lock->old_oid, NULL,
2517
&ignore_errno)) {
@@ -3209,7 +3209,7 @@ static int files_reflog_expire(struct ref_store *ref_store,
3209
int type;
3210
const char *ref;
3211
3212
- ref = refs_werrres_ref_unsafe(&refs->base, refname,
3212
+ ref = refs_resolve_ref_unsafe(&refs->base, refname,
3213
RESOLVE_REF_NO_RECURSE,
3214
NULL, &type,
3215
&ignore_errno);
sequencer.c
+1
-1
@@ -1334,7 +1334,7 @@ void print_commit_summary(struct repository *r,
1334
diff_setup_done(&rev.diffopt);
1335
1336
refs = get_main_ref_store(the_repository);
1337
- head = refs_werrres_ref_unsafe(refs, "HEAD", 0, NULL, NULL,
1337
+ head = refs_resolve_ref_unsafe(refs, "HEAD", 0, NULL, NULL,
1338
&resolve_errno);
1339
if (!head) {
1340
errno = resolve_errno;
t/helper/test-ref-store.c
+1
-1
@@ -125,7 +125,7 @@ static int cmd_resolve_ref(struct ref_store *refs, const char **argv)
125
const char *ref;
126
int ignore_errno;
127
128
- ref = refs_werrres_ref_unsafe(refs, refname, resolve_flags,
128
+ ref = refs_resolve_ref_unsafe(refs, refname, resolve_flags,
129
&oid, &flags, &ignore_errno);
130
printf("%s %s 0x%x\n", oid_to_hex(&oid), ref ? ref : "(null)", flags);
131
return ref ? 0 : 1;
worktree.c
+3
-3
@@ -30,7 +30,7 @@ static void add_head_info(struct worktree *wt)
30
const char *target;
31
int ignore_errno;
32
33
- target = refs_werrres_ref_unsafe(get_worktree_ref_store(wt),
33
+ target = refs_resolve_ref_unsafe(get_worktree_ref_store(wt),
34
"HEAD",
35
0,
36
&wt->head_oid, &flags,
@@ -437,7 +437,7 @@ const struct worktree *find_shared_symref(const char *symref,
437
}
438
439
refs = get_worktree_ref_store(wt);
440
- symref_target = refs_werrres_ref_unsafe(refs, symref, 0,
440
+ symref_target = refs_resolve_ref_unsafe(refs, symref, 0,
441
NULL, &flags,
442
&ignore_errno);
443
if ((flags & REF_ISSYMREF) &&
@@ -574,7 +574,7 @@ int other_head_refs(each_ref_fn fn, void *cb_data)
574
575
strbuf_reset(&refname);
576
strbuf_worktree_ref(wt, &refname, "HEAD");
577
- if (refs_werrres_ref_unsafe(get_main_ref_store(the_repository),
577
+ if (refs_resolve_ref_unsafe(get_main_ref_store(the_repository),
578
refname.buf,
579
RESOLVE_REF_READING,
580
&oid, &flag, &ignore_errno))