]>
Commit | Line | Data |
---|---|---|
9938af6a | 1 | #include "cache.h" |
dabab1d6 | 2 | #include "object-name.h" |
6c6ddf92 | 3 | #include "advice.h" |
b2141fc1 | 4 | #include "config.h" |
32a8f510 | 5 | #include "environment.h" |
f394e093 | 6 | #include "gettext.h" |
41771fa4 | 7 | #include "hex.h" |
5385f52d | 8 | #include "tag.h" |
9938af6a | 9 | #include "commit.h" |
5385f52d JH |
10 | #include "tree.h" |
11 | #include "blob.h" | |
f3ab49db | 12 | #include "tree-walk.h" |
d556fae2 | 13 | #include "refs.h" |
28fb8438 | 14 | #include "remote.h" |
dbe44faa | 15 | #include "dir.h" |
fe299ec5 | 16 | #include "oid-array.h" |
0317f455 | 17 | #include "packfile.h" |
d4a4f929 | 18 | #include "pretty.h" |
0d4a1321 | 19 | #include "object-store.h" |
031dc927 | 20 | #include "repository.h" |
e38da487 | 21 | #include "setup.h" |
efe461b0 | 22 | #include "submodule.h" |
8aac67a1 | 23 | #include "midx.h" |
64043556 | 24 | #include "commit-reach.h" |
88c7b4c3 | 25 | #include "date.h" |
9938af6a | 26 | |
0bb41a19 | 27 | static int get_oid_oneline(struct repository *r, const char *, struct object_id *, struct commit_list *); |
32574b68 | 28 | |
ef9b0370 | 29 | typedef int (*disambiguate_hint_fn)(struct repository *, const struct object_id *, void *); |
a78fafe7 JH |
30 | |
31 | struct disambiguate_state { | |
0016043b | 32 | int len; /* length of prefix in hex chars */ |
dc01505f | 33 | char hex_pfx[GIT_MAX_HEXSZ + 1]; |
d2ee1185 | 34 | struct object_id bin_pfx; |
0016043b | 35 | |
ef9b0370 | 36 | struct repository *repo; |
a78fafe7 JH |
37 | disambiguate_hint_fn fn; |
38 | void *cb_data; | |
d2ee1185 | 39 | struct object_id candidate; |
a78fafe7 JH |
40 | unsigned candidate_exists:1; |
41 | unsigned candidate_checked:1; | |
42 | unsigned candidate_ok:1; | |
43 | unsigned disambiguate_fn_used:1; | |
44 | unsigned ambiguous:1; | |
957d7406 | 45 | unsigned always_call_fn:1; |
a78fafe7 JH |
46 | }; |
47 | ||
d2b7d9c7 | 48 | static void update_candidates(struct disambiguate_state *ds, const struct object_id *current) |
a78fafe7 | 49 | { |
957d7406 | 50 | if (ds->always_call_fn) { |
ef9b0370 | 51 | ds->ambiguous = ds->fn(ds->repo, current, ds->cb_data) ? 1 : 0; |
957d7406 JH |
52 | return; |
53 | } | |
a78fafe7 JH |
54 | if (!ds->candidate_exists) { |
55 | /* this is the first candidate */ | |
d2b7d9c7 | 56 | oidcpy(&ds->candidate, current); |
a78fafe7 JH |
57 | ds->candidate_exists = 1; |
58 | return; | |
4a7e27e9 | 59 | } else if (oideq(&ds->candidate, current)) { |
a78fafe7 JH |
60 | /* the same as what we already have seen */ |
61 | return; | |
62 | } | |
63 | ||
64 | if (!ds->fn) { | |
65 | /* cannot disambiguate between ds->candidate and current */ | |
66 | ds->ambiguous = 1; | |
67 | return; | |
68 | } | |
69 | ||
70 | if (!ds->candidate_checked) { | |
ef9b0370 | 71 | ds->candidate_ok = ds->fn(ds->repo, &ds->candidate, ds->cb_data); |
a78fafe7 JH |
72 | ds->disambiguate_fn_used = 1; |
73 | ds->candidate_checked = 1; | |
74 | } | |
75 | ||
76 | if (!ds->candidate_ok) { | |
749f763d | 77 | /* discard the candidate; we know it does not satisfy fn */ |
d2b7d9c7 | 78 | oidcpy(&ds->candidate, current); |
a78fafe7 JH |
79 | ds->candidate_checked = 0; |
80 | return; | |
81 | } | |
82 | ||
83 | /* if we reach this point, we know ds->candidate satisfies fn */ | |
ef9b0370 | 84 | if (ds->fn(ds->repo, current, ds->cb_data)) { |
a78fafe7 JH |
85 | /* |
86 | * if both current and candidate satisfy fn, we cannot | |
87 | * disambiguate. | |
88 | */ | |
89 | ds->candidate_ok = 0; | |
90 | ds->ambiguous = 1; | |
91 | } | |
92 | ||
93 | /* otherwise, current can be discarded and candidate is still good */ | |
94 | } | |
95 | ||
1e6771e5 | 96 | static int match_hash(unsigned, const unsigned char *, const unsigned char *); |
cc817ca3 | 97 | |
92d8ed8a EW |
98 | static enum cb_next match_prefix(const struct object_id *oid, void *arg) |
99 | { | |
100 | struct disambiguate_state *ds = arg; | |
101 | /* no need to call match_hash, oidtree_each did prefix match */ | |
102 | update_candidates(ds, oid); | |
103 | return ds->ambiguous ? CB_BREAK : CB_CONTINUE; | |
104 | } | |
105 | ||
0016043b | 106 | static void find_short_object_filename(struct disambiguate_state *ds) |
9938af6a | 107 | { |
263db403 | 108 | struct object_directory *odb; |
99a19b43 | 109 | |
92d8ed8a EW |
110 | for (odb = ds->repo->objects->odb; odb && !ds->ambiguous; odb = odb->next) |
111 | oidtree_each(odb_loose_cache(odb, &ds->bin_pfx), | |
112 | &ds->bin_pfx, ds->len, match_prefix, ds); | |
9938af6a JH |
113 | } |
114 | ||
1e6771e5 | 115 | static int match_hash(unsigned len, const unsigned char *a, const unsigned char *b) |
9938af6a JH |
116 | { |
117 | do { | |
118 | if (*a != *b) | |
119 | return 0; | |
120 | a++; | |
121 | b++; | |
122 | len -= 2; | |
123 | } while (len > 1); | |
124 | if (len) | |
125 | if ((*a ^ *b) & 0xf0) | |
126 | return 0; | |
127 | return 1; | |
128 | } | |
129 | ||
8aac67a1 DS |
130 | static void unique_in_midx(struct multi_pack_index *m, |
131 | struct disambiguate_state *ds) | |
132 | { | |
133 | uint32_t num, i, first = 0; | |
134 | const struct object_id *current = NULL; | |
135 | num = m->num_objects; | |
136 | ||
137 | if (!num) | |
138 | return; | |
139 | ||
140 | bsearch_midx(&ds->bin_pfx, m, &first); | |
141 | ||
142 | /* | |
143 | * At this point, "first" is the location of the lowest object | |
144 | * with an object name that could match "bin_pfx". See if we have | |
145 | * 0, 1 or more objects that actually match(es). | |
146 | */ | |
147 | for (i = first; i < num && !ds->ambiguous; i++) { | |
148 | struct object_id oid; | |
149 | current = nth_midxed_object_oid(&oid, m, i); | |
1e6771e5 | 150 | if (!match_hash(ds->len, ds->bin_pfx.hash, current->hash)) |
8aac67a1 DS |
151 | break; |
152 | update_candidates(ds, current); | |
153 | } | |
154 | } | |
155 | ||
0016043b | 156 | static void unique_in_pack(struct packed_git *p, |
a78fafe7 | 157 | struct disambiguate_state *ds) |
9938af6a | 158 | { |
902f5a21 | 159 | uint32_t num, i, first = 0; |
f703e6ea | 160 | |
af96fe33 DS |
161 | if (p->multi_pack_index) |
162 | return; | |
163 | ||
0e87b856 DS |
164 | if (open_pack_index(p) || !p->num_objects) |
165 | return; | |
166 | ||
f703e6ea | 167 | num = p->num_objects; |
902f5a21 | 168 | bsearch_pack(&ds->bin_pfx, p, &first); |
f703e6ea JH |
169 | |
170 | /* | |
171 | * At this point, "first" is the location of the lowest object | |
1703f9aa | 172 | * with an object name that could match "bin_pfx". See if we have |
f703e6ea JH |
173 | * 0, 1 or more objects that actually match(es). |
174 | */ | |
a78fafe7 | 175 | for (i = first; i < num && !ds->ambiguous; i++) { |
d2b7d9c7 | 176 | struct object_id oid; |
0763671b | 177 | nth_packed_object_id(&oid, p, i); |
1e6771e5 | 178 | if (!match_hash(ds->len, ds->bin_pfx.hash, oid.hash)) |
f703e6ea | 179 | break; |
0763671b | 180 | update_candidates(ds, &oid); |
9938af6a | 181 | } |
f703e6ea JH |
182 | } |
183 | ||
0016043b | 184 | static void find_short_packed_object(struct disambiguate_state *ds) |
9938af6a | 185 | { |
8aac67a1 | 186 | struct multi_pack_index *m; |
9938af6a JH |
187 | struct packed_git *p; |
188 | ||
ef9b0370 | 189 | for (m = get_multi_pack_index(ds->repo); m && !ds->ambiguous; |
8aac67a1 DS |
190 | m = m->next) |
191 | unique_in_midx(m, ds); | |
ef9b0370 | 192 | for (p = get_packed_git(ds->repo); p && !ds->ambiguous; |
a80d72db | 193 | p = p->next) |
0016043b | 194 | unique_in_pack(p, ds); |
99a19b43 JH |
195 | } |
196 | ||
a78fafe7 | 197 | static int finish_object_disambiguation(struct disambiguate_state *ds, |
e82caf38 | 198 | struct object_id *oid) |
99a19b43 | 199 | { |
a78fafe7 JH |
200 | if (ds->ambiguous) |
201 | return SHORT_NAME_AMBIGUOUS; | |
99a19b43 | 202 | |
a78fafe7 | 203 | if (!ds->candidate_exists) |
d1dd94b3 | 204 | return MISSING_OBJECT; |
a78fafe7 JH |
205 | |
206 | if (!ds->candidate_checked) | |
207 | /* | |
208 | * If this is the only candidate, there is no point | |
209 | * calling the disambiguation hint callback. | |
210 | * | |
211 | * On the other hand, if the current candidate | |
212 | * replaced an earlier candidate that did _not_ pass | |
213 | * the disambiguation hint callback, then we do have | |
214 | * more than one objects that match the short name | |
215 | * given, so we should make sure this one matches; | |
216 | * otherwise, if we discovered this one and the one | |
217 | * that we previously discarded in the reverse order, | |
218 | * we would end up showing different results in the | |
219 | * same repository! | |
220 | */ | |
221 | ds->candidate_ok = (!ds->disambiguate_fn_used || | |
ef9b0370 | 222 | ds->fn(ds->repo, &ds->candidate, ds->cb_data)); |
a78fafe7 JH |
223 | |
224 | if (!ds->candidate_ok) | |
013f276e | 225 | return SHORT_NAME_AMBIGUOUS; |
a78fafe7 | 226 | |
e82caf38 | 227 | oidcpy(oid, &ds->candidate); |
9938af6a JH |
228 | return 0; |
229 | } | |
230 | ||
ef9b0370 NTND |
231 | static int disambiguate_commit_only(struct repository *r, |
232 | const struct object_id *oid, | |
07ffb954 | 233 | void *cb_data UNUSED) |
aa1dec9e | 234 | { |
ef9b0370 | 235 | int kind = oid_object_info(r, oid, NULL); |
aa1dec9e JH |
236 | return kind == OBJ_COMMIT; |
237 | } | |
238 | ||
ef9b0370 NTND |
239 | static int disambiguate_committish_only(struct repository *r, |
240 | const struct object_id *oid, | |
07ffb954 | 241 | void *cb_data UNUSED) |
e2643617 JH |
242 | { |
243 | struct object *obj; | |
244 | int kind; | |
245 | ||
ef9b0370 | 246 | kind = oid_object_info(r, oid, NULL); |
e2643617 JH |
247 | if (kind == OBJ_COMMIT) |
248 | return 1; | |
249 | if (kind != OBJ_TAG) | |
99a19b43 | 250 | return 0; |
e2643617 JH |
251 | |
252 | /* We need to do this the hard way... */ | |
ef9b0370 | 253 | obj = deref_tag(r, parse_object(r, oid), NULL, 0); |
e2643617 JH |
254 | if (obj && obj->type == OBJ_COMMIT) |
255 | return 1; | |
9938af6a JH |
256 | return 0; |
257 | } | |
258 | ||
ef9b0370 NTND |
259 | static int disambiguate_tree_only(struct repository *r, |
260 | const struct object_id *oid, | |
07ffb954 | 261 | void *cb_data UNUSED) |
9938af6a | 262 | { |
ef9b0370 | 263 | int kind = oid_object_info(r, oid, NULL); |
daba53ae JH |
264 | return kind == OBJ_TREE; |
265 | } | |
9938af6a | 266 | |
ef9b0370 NTND |
267 | static int disambiguate_treeish_only(struct repository *r, |
268 | const struct object_id *oid, | |
07ffb954 | 269 | void *cb_data UNUSED) |
daba53ae JH |
270 | { |
271 | struct object *obj; | |
272 | int kind; | |
273 | ||
ef9b0370 | 274 | kind = oid_object_info(r, oid, NULL); |
daba53ae JH |
275 | if (kind == OBJ_TREE || kind == OBJ_COMMIT) |
276 | return 1; | |
277 | if (kind != OBJ_TAG) | |
278 | return 0; | |
279 | ||
280 | /* We need to do this the hard way... */ | |
ef9b0370 | 281 | obj = deref_tag(r, parse_object(r, oid), NULL, 0); |
daba53ae JH |
282 | if (obj && (obj->type == OBJ_TREE || obj->type == OBJ_COMMIT)) |
283 | return 1; | |
284 | return 0; | |
285 | } | |
286 | ||
ef9b0370 NTND |
287 | static int disambiguate_blob_only(struct repository *r, |
288 | const struct object_id *oid, | |
07ffb954 | 289 | void *cb_data UNUSED) |
daba53ae | 290 | { |
ef9b0370 | 291 | int kind = oid_object_info(r, oid, NULL); |
daba53ae JH |
292 | return kind == OBJ_BLOB; |
293 | } | |
294 | ||
5b33cb1f JK |
295 | static disambiguate_hint_fn default_disambiguate_hint; |
296 | ||
297 | int set_disambiguate_hint_config(const char *var, const char *value) | |
298 | { | |
299 | static const struct { | |
300 | const char *name; | |
301 | disambiguate_hint_fn fn; | |
302 | } hints[] = { | |
303 | { "none", NULL }, | |
304 | { "commit", disambiguate_commit_only }, | |
305 | { "committish", disambiguate_committish_only }, | |
306 | { "tree", disambiguate_tree_only }, | |
307 | { "treeish", disambiguate_treeish_only }, | |
308 | { "blob", disambiguate_blob_only } | |
309 | }; | |
310 | int i; | |
311 | ||
312 | if (!value) | |
313 | return config_error_nonbool(var); | |
314 | ||
315 | for (i = 0; i < ARRAY_SIZE(hints); i++) { | |
316 | if (!strcasecmp(value, hints[i].name)) { | |
317 | default_disambiguate_hint = hints[i].fn; | |
318 | return 0; | |
319 | } | |
320 | } | |
321 | ||
322 | return error("unknown hint type for '%s': %s", var, value); | |
323 | } | |
324 | ||
ef9b0370 NTND |
325 | static int init_object_disambiguation(struct repository *r, |
326 | const char *name, int len, | |
0016043b | 327 | struct disambiguate_state *ds) |
9938af6a | 328 | { |
957d7406 | 329 | int i; |
9938af6a | 330 | |
7b38efad | 331 | if (len < MINIMUM_ABBREV || len > the_hash_algo->hexsz) |
0016043b JK |
332 | return -1; |
333 | ||
334 | memset(ds, 0, sizeof(*ds)); | |
0016043b | 335 | |
af61c6e0 | 336 | for (i = 0; i < len ;i++) { |
9938af6a JH |
337 | unsigned char c = name[i]; |
338 | unsigned char val; | |
9938af6a JH |
339 | if (c >= '0' && c <= '9') |
340 | val = c - '0'; | |
341 | else if (c >= 'a' && c <= 'f') | |
342 | val = c - 'a' + 10; | |
343 | else if (c >= 'A' && c <='F') { | |
344 | val = c - 'A' + 10; | |
345 | c -= 'A' - 'a'; | |
346 | } | |
347 | else | |
348 | return -1; | |
0016043b | 349 | ds->hex_pfx[i] = c; |
9938af6a JH |
350 | if (!(i & 1)) |
351 | val <<= 4; | |
d2ee1185 | 352 | ds->bin_pfx.hash[i >> 1] |= val; |
9938af6a | 353 | } |
0016043b JK |
354 | |
355 | ds->len = len; | |
59e4e34f | 356 | ds->hex_pfx[len] = '\0'; |
ef9b0370 NTND |
357 | ds->repo = r; |
358 | prepare_alt_odb(r); | |
957d7406 JH |
359 | return 0; |
360 | } | |
361 | ||
d2ef3cb7 ÆAB |
362 | struct ambiguous_output { |
363 | const struct disambiguate_state *ds; | |
364 | struct strbuf advice; | |
3a73c1df | 365 | struct strbuf sb; |
d2ef3cb7 ÆAB |
366 | }; |
367 | ||
1b7ba794 | 368 | static int show_ambiguous_object(const struct object_id *oid, void *data) |
1ffa26c4 | 369 | { |
d2ef3cb7 ÆAB |
370 | struct ambiguous_output *state = data; |
371 | const struct disambiguate_state *ds = state->ds; | |
372 | struct strbuf *advice = &state->advice; | |
3a73c1df | 373 | struct strbuf *sb = &state->sb; |
1ffa26c4 | 374 | int type; |
ba5e8a0e | 375 | const char *hash; |
1ffa26c4 | 376 | |
ef9b0370 | 377 | if (ds->fn && !ds->fn(ds->repo, oid, ds->cb_data)) |
1ffa26c4 JK |
378 | return 0; |
379 | ||
ba5e8a0e | 380 | hash = repo_find_unique_abbrev(ds->repo, oid, DEFAULT_ABBREV); |
ef9b0370 | 381 | type = oid_object_info(ds->repo, oid, NULL); |
6780e680 ÆAB |
382 | |
383 | if (type < 0) { | |
ba5e8a0e ÆAB |
384 | /* |
385 | * TRANSLATORS: This is a line of ambiguous object | |
386 | * output shown when we cannot look up or parse the | |
387 | * object in question. E.g. "deadbeef [bad object]". | |
388 | */ | |
3a73c1df | 389 | strbuf_addf(sb, _("%s [bad object]"), hash); |
6780e680 ÆAB |
390 | goto out; |
391 | } | |
392 | ||
393 | assert(type == OBJ_TREE || type == OBJ_COMMIT || | |
394 | type == OBJ_BLOB || type == OBJ_TAG); | |
6780e680 | 395 | |
1ffa26c4 | 396 | if (type == OBJ_COMMIT) { |
ba5e8a0e ÆAB |
397 | struct strbuf date = STRBUF_INIT; |
398 | struct strbuf msg = STRBUF_INIT; | |
ef9b0370 | 399 | struct commit *commit = lookup_commit(ds->repo, oid); |
ba5e8a0e | 400 | |
1ffa26c4 JK |
401 | if (commit) { |
402 | struct pretty_print_context pp = {0}; | |
403 | pp.date_mode.type = DATE_SHORT; | |
bab82164 ÆAB |
404 | repo_format_commit_message(the_repository, commit, |
405 | "%ad", &date, &pp); | |
406 | repo_format_commit_message(the_repository, commit, | |
407 | "%s", &msg, &pp); | |
1ffa26c4 | 408 | } |
ba5e8a0e ÆAB |
409 | |
410 | /* | |
411 | * TRANSLATORS: This is a line of ambiguous commit | |
412 | * object output. E.g.: | |
413 | * | |
414 | * "deadbeef commit 2021-01-01 - Some Commit Message" | |
415 | */ | |
3a73c1df ÆAB |
416 | strbuf_addf(sb, _("%s commit %s - %s"), hash, date.buf, |
417 | msg.buf); | |
ba5e8a0e ÆAB |
418 | |
419 | strbuf_release(&date); | |
420 | strbuf_release(&msg); | |
1ffa26c4 | 421 | } else if (type == OBJ_TAG) { |
ef9b0370 | 422 | struct tag *tag = lookup_tag(ds->repo, oid); |
ba5e8a0e ÆAB |
423 | |
424 | if (!parse_tag(tag) && tag->tag) { | |
425 | /* | |
426 | * TRANSLATORS: This is a line of ambiguous | |
427 | * tag object output. E.g.: | |
428 | * | |
851b3d76 | 429 | * "deadbeef tag 2022-01-01 - Some Tag Message" |
ba5e8a0e | 430 | * |
851b3d76 ÆAB |
431 | * The second argument is the YYYY-MM-DD found |
432 | * in the tag. | |
433 | * | |
434 | * The third argument is the "tag" string | |
ba5e8a0e ÆAB |
435 | * from object.c. |
436 | */ | |
3a73c1df | 437 | strbuf_addf(sb, _("%s tag %s - %s"), hash, |
851b3d76 ÆAB |
438 | show_date(tag->date, 0, DATE_MODE(SHORT)), |
439 | tag->tag); | |
ba5e8a0e ÆAB |
440 | } else { |
441 | /* | |
442 | * TRANSLATORS: This is a line of ambiguous | |
443 | * tag object output where we couldn't parse | |
444 | * the tag itself. E.g.: | |
445 | * | |
851b3d76 | 446 | * "deadbeef [bad tag, could not parse it]" |
ba5e8a0e | 447 | */ |
3a73c1df | 448 | strbuf_addf(sb, _("%s [bad tag, could not parse it]"), |
ba5e8a0e ÆAB |
449 | hash); |
450 | } | |
451 | } else if (type == OBJ_TREE) { | |
452 | /* | |
453 | * TRANSLATORS: This is a line of ambiguous <type> | |
454 | * object output. E.g. "deadbeef tree". | |
455 | */ | |
3a73c1df | 456 | strbuf_addf(sb, _("%s tree"), hash); |
ba5e8a0e ÆAB |
457 | } else if (type == OBJ_BLOB) { |
458 | /* | |
459 | * TRANSLATORS: This is a line of ambiguous <type> | |
460 | * object output. E.g. "deadbeef blob". | |
461 | */ | |
3a73c1df | 462 | strbuf_addf(sb, _("%s blob"), hash); |
1ffa26c4 JK |
463 | } |
464 | ||
1ffa26c4 | 465 | |
6780e680 | 466 | out: |
ba5e8a0e ÆAB |
467 | /* |
468 | * TRANSLATORS: This is line item of ambiguous object output | |
469 | * from describe_ambiguous_object() above. For RTL languages | |
470 | * you'll probably want to swap the "%s" and leading " " space | |
471 | * around. | |
472 | */ | |
3a73c1df | 473 | strbuf_addf(advice, _(" %s\n"), sb->buf); |
1ffa26c4 | 474 | |
3a73c1df | 475 | strbuf_reset(sb); |
1ffa26c4 JK |
476 | return 0; |
477 | } | |
478 | ||
a885c93b ÆAB |
479 | static int collect_ambiguous(const struct object_id *oid, void *data) |
480 | { | |
481 | oid_array_append(data, oid); | |
482 | return 0; | |
483 | } | |
484 | ||
07ffb954 | 485 | static int repo_collect_ambiguous(struct repository *r UNUSED, |
ef9b0370 NTND |
486 | const struct object_id *oid, |
487 | void *data) | |
488 | { | |
489 | return collect_ambiguous(oid, data); | |
490 | } | |
491 | ||
7cfcb16b | 492 | static int sort_ambiguous(const void *a, const void *b, void *ctx) |
5cc044e0 | 493 | { |
7cfcb16b | 494 | struct repository *sort_ambiguous_repo = ctx; |
fae2ae45 NTND |
495 | int a_type = oid_object_info(sort_ambiguous_repo, a, NULL); |
496 | int b_type = oid_object_info(sort_ambiguous_repo, b, NULL); | |
5cc044e0 ÆAB |
497 | int a_type_sort; |
498 | int b_type_sort; | |
499 | ||
500 | /* | |
501 | * Sorts by hash within the same object type, just as | |
502 | * oid_array_for_each_unique() would do. | |
503 | */ | |
504 | if (a_type == b_type) | |
505 | return oidcmp(a, b); | |
506 | ||
507 | /* | |
508 | * Between object types show tags, then commits, and finally | |
509 | * trees and blobs. | |
510 | * | |
511 | * The object_type enum is commit, tree, blob, tag, but we | |
512 | * want tag, commit, tree blob. Cleverly (perhaps too | |
513 | * cleverly) do that with modulus, since the enum assigns 1 to | |
514 | * commit, so tag becomes 0. | |
515 | */ | |
516 | a_type_sort = a_type % 4; | |
517 | b_type_sort = b_type % 4; | |
518 | return a_type_sort > b_type_sort ? 1 : -1; | |
519 | } | |
520 | ||
fae2ae45 NTND |
521 | static void sort_ambiguous_oid_array(struct repository *r, struct oid_array *a) |
522 | { | |
7cfcb16b | 523 | QSORT_S(a->oid, a->nr, sort_ambiguous, r); |
fae2ae45 NTND |
524 | } |
525 | ||
c6c0235b NTND |
526 | static enum get_oid_result get_short_oid(struct repository *r, |
527 | const char *name, int len, | |
d1dd94b3 DT |
528 | struct object_id *oid, |
529 | unsigned flags) | |
957d7406 JH |
530 | { |
531 | int status; | |
957d7406 | 532 | struct disambiguate_state ds; |
321c89bf | 533 | int quietly = !!(flags & GET_OID_QUIETLY); |
957d7406 | 534 | |
c6c0235b | 535 | if (init_object_disambiguation(r, name, len, &ds) < 0) |
957d7406 | 536 | return -1; |
99a19b43 | 537 | |
321c89bf | 538 | if (HAS_MULTI_BITS(flags & GET_OID_DISAMBIGUATORS)) |
033abf97 | 539 | BUG("multiple get_short_oid disambiguator flags"); |
259942f5 | 540 | |
321c89bf | 541 | if (flags & GET_OID_COMMIT) |
aa1dec9e | 542 | ds.fn = disambiguate_commit_only; |
321c89bf | 543 | else if (flags & GET_OID_COMMITTISH) |
e2643617 | 544 | ds.fn = disambiguate_committish_only; |
321c89bf | 545 | else if (flags & GET_OID_TREE) |
daba53ae | 546 | ds.fn = disambiguate_tree_only; |
321c89bf | 547 | else if (flags & GET_OID_TREEISH) |
daba53ae | 548 | ds.fn = disambiguate_treeish_only; |
321c89bf | 549 | else if (flags & GET_OID_BLOB) |
daba53ae | 550 | ds.fn = disambiguate_blob_only; |
5b33cb1f JK |
551 | else |
552 | ds.fn = default_disambiguate_hint; | |
aa1dec9e | 553 | |
0016043b JK |
554 | find_short_object_filename(&ds); |
555 | find_short_packed_object(&ds); | |
e82caf38 | 556 | status = finish_object_disambiguation(&ds, oid); |
99a19b43 | 557 | |
6d67a993 JS |
558 | /* |
559 | * If we didn't find it, do the usual reprepare() slow-path, | |
560 | * since the object may have recently been added to the repository | |
561 | * or migrated from loose to packed. | |
562 | */ | |
563 | if (status == MISSING_OBJECT) { | |
34e7771b | 564 | reprepare_packed_git(r); |
6d67a993 JS |
565 | find_short_object_filename(&ds); |
566 | find_short_packed_object(&ds); | |
567 | status = finish_object_disambiguation(&ds, oid); | |
568 | } | |
569 | ||
1ffa26c4 | 570 | if (!quietly && (status == SHORT_NAME_AMBIGUOUS)) { |
5cc044e0 | 571 | struct oid_array collect = OID_ARRAY_INIT; |
d2ef3cb7 ÆAB |
572 | struct ambiguous_output out = { |
573 | .ds = &ds, | |
3a73c1df | 574 | .sb = STRBUF_INIT, |
d2ef3cb7 ÆAB |
575 | .advice = STRBUF_INIT, |
576 | }; | |
5cc044e0 | 577 | |
1e6771e5 | 578 | error(_("short object ID %s is ambiguous"), ds.hex_pfx); |
1ffa26c4 JK |
579 | |
580 | /* | |
581 | * We may still have ambiguity if we simply saw a series of | |
582 | * candidates that did not satisfy our hint function. In | |
583 | * that case, we still want to show them, so disable the hint | |
584 | * function entirely. | |
585 | */ | |
586 | if (!ds.ambiguous) | |
587 | ds.fn = NULL; | |
588 | ||
c6c0235b NTND |
589 | repo_for_each_abbrev(r, ds.hex_pfx, collect_ambiguous, &collect); |
590 | sort_ambiguous_oid_array(r, &collect); | |
5cc044e0 | 591 | |
d2ef3cb7 | 592 | if (oid_array_for_each(&collect, show_ambiguous_object, &out)) |
5cc044e0 | 593 | BUG("show_ambiguous_object shouldn't return non-zero"); |
d2ef3cb7 ÆAB |
594 | |
595 | /* | |
596 | * TRANSLATORS: The argument is the list of ambiguous | |
597 | * objects composed in show_ambiguous_object(). See | |
598 | * its "TRANSLATORS" comments for details. | |
599 | */ | |
600 | advise(_("The candidates are:\n%s"), out.advice.buf); | |
601 | ||
5cc044e0 | 602 | oid_array_clear(&collect); |
d2ef3cb7 | 603 | strbuf_release(&out.advice); |
3a73c1df | 604 | strbuf_release(&out.sb); |
1ffa26c4 JK |
605 | } |
606 | ||
013f276e JH |
607 | return status; |
608 | } | |
609 | ||
4e99f2db NTND |
610 | int repo_for_each_abbrev(struct repository *r, const char *prefix, |
611 | each_abbrev_fn fn, void *cb_data) | |
957d7406 | 612 | { |
910650d2 | 613 | struct oid_array collect = OID_ARRAY_INIT; |
957d7406 | 614 | struct disambiguate_state ds; |
fad6b9e5 | 615 | int ret; |
957d7406 | 616 | |
4e99f2db | 617 | if (init_object_disambiguation(r, prefix, strlen(prefix), &ds) < 0) |
957d7406 | 618 | return -1; |
957d7406 | 619 | |
957d7406 | 620 | ds.always_call_fn = 1; |
ef9b0370 | 621 | ds.fn = repo_collect_ambiguous; |
fad6b9e5 | 622 | ds.cb_data = &collect; |
0016043b JK |
623 | find_short_object_filename(&ds); |
624 | find_short_packed_object(&ds); | |
fad6b9e5 | 625 | |
910650d2 | 626 | ret = oid_array_for_each_unique(&collect, fn, cb_data); |
627 | oid_array_clear(&collect); | |
fad6b9e5 | 628 | return ret; |
957d7406 JH |
629 | } |
630 | ||
8e3f52d7 JK |
631 | /* |
632 | * Return the slot of the most-significant bit set in "val". There are various | |
633 | * ways to do this quickly with fls() or __builtin_clzl(), but speed is | |
634 | * probably not a big deal here. | |
635 | */ | |
636 | static unsigned msb(unsigned long val) | |
637 | { | |
638 | unsigned r = 0; | |
639 | while (val >>= 1) | |
640 | r++; | |
641 | return r; | |
642 | } | |
643 | ||
5b20ace6 DS |
644 | struct min_abbrev_data { |
645 | unsigned int init_len; | |
646 | unsigned int cur_len; | |
647 | char *hex; | |
7f07c033 | 648 | struct repository *repo; |
626fd982 | 649 | const struct object_id *oid; |
5b20ace6 DS |
650 | }; |
651 | ||
a42d6fd2 DS |
652 | static inline char get_hex_char_from_oid(const struct object_id *oid, |
653 | unsigned int pos) | |
654 | { | |
655 | static const char hex[] = "0123456789abcdef"; | |
656 | ||
657 | if ((pos & 1) == 0) | |
658 | return hex[oid->hash[pos >> 1] >> 4]; | |
659 | else | |
660 | return hex[oid->hash[pos >> 1] & 0xf]; | |
661 | } | |
662 | ||
5b20ace6 | 663 | static int extend_abbrev_len(const struct object_id *oid, void *cb_data) |
013f276e | 664 | { |
5b20ace6 | 665 | struct min_abbrev_data *mad = cb_data; |
47dd0d59 | 666 | |
5b20ace6 | 667 | unsigned int i = mad->init_len; |
a42d6fd2 | 668 | while (mad->hex[i] && mad->hex[i] == get_hex_char_from_oid(oid, i)) |
5b20ace6 DS |
669 | i++; |
670 | ||
671 | if (i < GIT_MAX_RAWSZ && i >= mad->cur_len) | |
672 | mad->cur_len = i + 1; | |
673 | ||
674 | return 0; | |
675 | } | |
676 | ||
07ffb954 | 677 | static int repo_extend_abbrev_len(struct repository *r UNUSED, |
ef9b0370 NTND |
678 | const struct object_id *oid, |
679 | void *cb_data) | |
680 | { | |
681 | return extend_abbrev_len(oid, cb_data); | |
682 | } | |
683 | ||
8aac67a1 DS |
684 | static void find_abbrev_len_for_midx(struct multi_pack_index *m, |
685 | struct min_abbrev_data *mad) | |
686 | { | |
687 | int match = 0; | |
688 | uint32_t num, first = 0; | |
689 | struct object_id oid; | |
690 | const struct object_id *mad_oid; | |
691 | ||
692 | if (!m->num_objects) | |
693 | return; | |
694 | ||
695 | num = m->num_objects; | |
696 | mad_oid = mad->oid; | |
697 | match = bsearch_midx(mad_oid, m, &first); | |
698 | ||
699 | /* | |
700 | * first is now the position in the packfile where we would insert | |
701 | * mad->hash if it does not exist (or the position of mad->hash if | |
702 | * it does exist). Hence, we consider a maximum of two objects | |
703 | * nearby for the abbreviation length. | |
704 | */ | |
705 | mad->init_len = 0; | |
706 | if (!match) { | |
707 | if (nth_midxed_object_oid(&oid, m, first)) | |
708 | extend_abbrev_len(&oid, mad); | |
709 | } else if (first < num - 1) { | |
710 | if (nth_midxed_object_oid(&oid, m, first + 1)) | |
711 | extend_abbrev_len(&oid, mad); | |
712 | } | |
713 | if (first > 0) { | |
714 | if (nth_midxed_object_oid(&oid, m, first - 1)) | |
715 | extend_abbrev_len(&oid, mad); | |
716 | } | |
717 | mad->init_len = mad->cur_len; | |
718 | } | |
719 | ||
0e87b856 DS |
720 | static void find_abbrev_len_for_pack(struct packed_git *p, |
721 | struct min_abbrev_data *mad) | |
013f276e | 722 | { |
0e87b856 | 723 | int match = 0; |
0aaf05b3 | 724 | uint32_t num, first = 0; |
0e87b856 | 725 | struct object_id oid; |
0aaf05b3 | 726 | const struct object_id *mad_oid; |
0e87b856 | 727 | |
af96fe33 DS |
728 | if (p->multi_pack_index) |
729 | return; | |
730 | ||
0e87b856 DS |
731 | if (open_pack_index(p) || !p->num_objects) |
732 | return; | |
733 | ||
734 | num = p->num_objects; | |
0aaf05b3 DS |
735 | mad_oid = mad->oid; |
736 | match = bsearch_pack(mad_oid, p, &first); | |
0e87b856 DS |
737 | |
738 | /* | |
739 | * first is now the position in the packfile where we would insert | |
740 | * mad->hash if it does not exist (or the position of mad->hash if | |
21abed50 | 741 | * it does exist). Hence, we consider a maximum of two objects |
0e87b856 DS |
742 | * nearby for the abbreviation length. |
743 | */ | |
744 | mad->init_len = 0; | |
745 | if (!match) { | |
0763671b | 746 | if (!nth_packed_object_id(&oid, p, first)) |
21abed50 | 747 | extend_abbrev_len(&oid, mad); |
0e87b856 | 748 | } else if (first < num - 1) { |
0763671b | 749 | if (!nth_packed_object_id(&oid, p, first + 1)) |
21abed50 | 750 | extend_abbrev_len(&oid, mad); |
0e87b856 DS |
751 | } |
752 | if (first > 0) { | |
0763671b | 753 | if (!nth_packed_object_id(&oid, p, first - 1)) |
21abed50 | 754 | extend_abbrev_len(&oid, mad); |
0e87b856 DS |
755 | } |
756 | mad->init_len = mad->cur_len; | |
757 | } | |
758 | ||
759 | static void find_abbrev_len_packed(struct min_abbrev_data *mad) | |
760 | { | |
8aac67a1 | 761 | struct multi_pack_index *m; |
0e87b856 DS |
762 | struct packed_git *p; |
763 | ||
7f07c033 | 764 | for (m = get_multi_pack_index(mad->repo); m; m = m->next) |
8aac67a1 | 765 | find_abbrev_len_for_midx(m, mad); |
7f07c033 | 766 | for (p = get_packed_git(mad->repo); p; p = p->next) |
0e87b856 DS |
767 | find_abbrev_len_for_pack(p, mad); |
768 | } | |
769 | ||
8bb95572 NTND |
770 | int repo_find_unique_abbrev_r(struct repository *r, char *hex, |
771 | const struct object_id *oid, int len) | |
5b20ace6 DS |
772 | { |
773 | struct disambiguate_state ds; | |
774 | struct min_abbrev_data mad; | |
775 | struct object_id oid_ret; | |
8bb95572 | 776 | const unsigned hexsz = r->hash_algo->hexsz; |
7b38efad | 777 | |
e6c587c7 | 778 | if (len < 0) { |
8bb95572 | 779 | unsigned long count = repo_approximate_object_count(r); |
8e3f52d7 JK |
780 | /* |
781 | * Add one because the MSB only tells us the highest bit set, | |
782 | * not including the value of all the _other_ bits (so "15" | |
783 | * is only one off of 2^4, but the MSB is the 3rd bit. | |
784 | */ | |
785 | len = msb(count) + 1; | |
786 | /* | |
787 | * We now know we have on the order of 2^len objects, which | |
788 | * expects a collision at 2^(len/2). But we also care about hex | |
789 | * chars, not bits, and there are 4 bits per hex. So all | |
42c78a21 | 790 | * together we need to divide by 2 and round up. |
8e3f52d7 | 791 | */ |
42c78a21 | 792 | len = DIV_ROUND_UP(len, 2); |
8e3f52d7 JK |
793 | /* |
794 | * For very small repos, we stick with our regular fallback. | |
795 | */ | |
796 | if (len < FALLBACK_DEFAULT_ABBREV) | |
797 | len = FALLBACK_DEFAULT_ABBREV; | |
e6c587c7 | 798 | } |
8e3f52d7 | 799 | |
aab9583f | 800 | oid_to_hex_r(hex, oid); |
7b38efad | 801 | if (len == hexsz || !len) |
802 | return hexsz; | |
5b20ace6 | 803 | |
8bb95572 | 804 | mad.repo = r; |
5b20ace6 DS |
805 | mad.init_len = len; |
806 | mad.cur_len = len; | |
807 | mad.hex = hex; | |
626fd982 | 808 | mad.oid = oid; |
0e87b856 DS |
809 | |
810 | find_abbrev_len_packed(&mad); | |
811 | ||
ef9b0370 | 812 | if (init_object_disambiguation(r, hex, mad.cur_len, &ds) < 0) |
0e87b856 | 813 | return -1; |
5b20ace6 | 814 | |
ef9b0370 | 815 | ds.fn = repo_extend_abbrev_len; |
5b20ace6 DS |
816 | ds.always_call_fn = 1; |
817 | ds.cb_data = (void *)&mad; | |
818 | ||
819 | find_short_object_filename(&ds); | |
5b20ace6 DS |
820 | (void)finish_object_disambiguation(&ds, &oid_ret); |
821 | ||
822 | hex[mad.cur_len] = 0; | |
823 | return mad.cur_len; | |
af49c6d0 JK |
824 | } |
825 | ||
8bb95572 NTND |
826 | const char *repo_find_unique_abbrev(struct repository *r, |
827 | const struct object_id *oid, | |
828 | int len) | |
af49c6d0 | 829 | { |
ef2ed501 | 830 | static int bufno; |
dc01505f | 831 | static char hexbuffer[4][GIT_MAX_HEXSZ + 1]; |
3e98919a RS |
832 | char *hex = hexbuffer[bufno]; |
833 | bufno = (bufno + 1) % ARRAY_SIZE(hexbuffer); | |
8bb95572 | 834 | repo_find_unique_abbrev_r(r, hex, oid, len); |
b66fde9a | 835 | return hex; |
9938af6a JH |
836 | } |
837 | ||
6677c466 | 838 | static int ambiguous_path(const char *path, int len) |
af13cdf2 LT |
839 | { |
840 | int slash = 1; | |
6677c466 | 841 | int cnt; |
af13cdf2 | 842 | |
6677c466 | 843 | for (cnt = 0; cnt < len; cnt++) { |
af13cdf2 LT |
844 | switch (*path++) { |
845 | case '\0': | |
846 | break; | |
847 | case '/': | |
848 | if (slash) | |
849 | break; | |
850 | slash = 1; | |
851 | continue; | |
852 | case '.': | |
853 | continue; | |
854 | default: | |
855 | slash = 0; | |
856 | continue; | |
857 | } | |
c054d64e | 858 | break; |
af13cdf2 | 859 | } |
6677c466 | 860 | return slash; |
af13cdf2 LT |
861 | } |
862 | ||
a1ad0eb0 JK |
863 | static inline int at_mark(const char *string, int len, |
864 | const char **suffix, int nr) | |
ae0ba8e2 | 865 | { |
ae0ba8e2 JH |
866 | int i; |
867 | ||
a1ad0eb0 | 868 | for (i = 0; i < nr; i++) { |
ae0ba8e2 JH |
869 | int suffix_len = strlen(suffix[i]); |
870 | if (suffix_len <= len | |
244ea1b5 | 871 | && !strncasecmp(string, suffix[i], suffix_len)) |
ae0ba8e2 JH |
872 | return suffix_len; |
873 | } | |
874 | return 0; | |
875 | } | |
876 | ||
a1ad0eb0 JK |
877 | static inline int upstream_mark(const char *string, int len) |
878 | { | |
879 | const char *suffix[] = { "@{upstream}", "@{u}" }; | |
880 | return at_mark(string, len, suffix, ARRAY_SIZE(suffix)); | |
881 | } | |
882 | ||
adfe5d04 JK |
883 | static inline int push_mark(const char *string, int len) |
884 | { | |
885 | const char *suffix[] = { "@{push}" }; | |
886 | return at_mark(string, len, suffix, ARRAY_SIZE(suffix)); | |
887 | } | |
888 | ||
2b1790f5 | 889 | static enum get_oid_result get_oid_1(struct repository *r, const char *name, int len, struct object_id *oid, unsigned lookup_flags); |
23a57129 | 890 | static int interpret_nth_prior_checkout(struct repository *r, const char *name, int namelen, struct strbuf *buf); |
d18ba221 | 891 | |
49281cf5 NTND |
892 | static int get_oid_basic(struct repository *r, const char *str, int len, |
893 | struct object_id *oid, unsigned int flags) | |
e86eb666 | 894 | { |
eedce784 | 895 | static const char *warn_msg = "refname '%.*s' is ambiguous."; |
798c35fc NTND |
896 | static const char *object_name_msg = N_( |
897 | "Git normally never creates a ref that ends with 40 hex characters\n" | |
898 | "because it will be ignored when you just specify 40-hex. These refs\n" | |
899 | "may be created by mistake. For example,\n" | |
900 | "\n" | |
328c6cb8 | 901 | " git switch -c $br $(git rev-parse ...)\n" |
798c35fc NTND |
902 | "\n" |
903 | "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" | |
904 | "examine these refs and maybe delete them. Turn this message off by\n" | |
8dc84fdc | 905 | "running \"git config advice.objectNameWarning false\""); |
e82caf38 | 906 | struct object_id tmp_oid; |
ed378ec7 | 907 | char *real_ref = NULL; |
ab2a1a32 | 908 | int refs_found = 0; |
128fd54d | 909 | int at, reflog_len, nth_prior = 0; |
9938af6a | 910 | |
49281cf5 | 911 | if (len == r->hash_algo->hexsz && !get_oid_hex(str, oid)) { |
832cf74c | 912 | if (warn_ambiguous_refs && warn_on_object_refname_ambiguity) { |
f24c30e0 | 913 | refs_found = repo_dwim_ref(r, str, len, &tmp_oid, &real_ref, 0); |
832cf74c | 914 | if (refs_found > 0) { |
25fba78d | 915 | warning(warn_msg, len, str); |
ed9bff08 | 916 | if (advice_enabled(ADVICE_OBJECT_NAME_WARNING)) |
25fba78d JK |
917 | fprintf(stderr, "%s\n", _(object_name_msg)); |
918 | } | |
919 | free(real_ref); | |
798c35fc | 920 | } |
9938af6a | 921 | return 0; |
798c35fc | 922 | } |
9938af6a | 923 | |
d18ba221 | 924 | /* basic@{time or number or -number} format to query ref-log */ |
694500ed | 925 | reflog_len = at = 0; |
f265458f | 926 | if (len && str[len-1] == '}') { |
e883a057 | 927 | for (at = len-4; at >= 0; at--) { |
ab2a1a32 | 928 | if (str[at] == '@' && str[at+1] == '{') { |
83d16bc7 RR |
929 | if (str[at+2] == '-') { |
930 | if (at != 0) | |
931 | /* @{-N} not at start */ | |
932 | return -1; | |
128fd54d FC |
933 | nth_prior = 1; |
934 | continue; | |
935 | } | |
adfe5d04 JK |
936 | if (!upstream_mark(str + at, len - at) && |
937 | !push_mark(str + at, len - at)) { | |
28fb8438 JS |
938 | reflog_len = (len-1) - (at+2); |
939 | len = at; | |
940 | } | |
ab2a1a32 JH |
941 | break; |
942 | } | |
d556fae2 SP |
943 | } |
944 | } | |
945 | ||
af13cdf2 | 946 | /* Accept only unambiguous ref paths. */ |
11cf8801 | 947 | if (len && ambiguous_path(str, len)) |
af13cdf2 LT |
948 | return -1; |
949 | ||
128fd54d | 950 | if (nth_prior) { |
d18ba221 | 951 | struct strbuf buf = STRBUF_INIT; |
128fd54d FC |
952 | int detached; |
953 | ||
49281cf5 NTND |
954 | if (interpret_nth_prior_checkout(r, str, len, &buf) > 0) { |
955 | detached = (buf.len == r->hash_algo->hexsz && !get_oid_hex(buf.buf, oid)); | |
128fd54d FC |
956 | strbuf_release(&buf); |
957 | if (detached) | |
958 | return 0; | |
d18ba221 | 959 | } |
128fd54d FC |
960 | } |
961 | ||
962 | if (!len && reflog_len) | |
11cf8801 | 963 | /* allow "@{...}" to mean the current branch reflog */ |
f24c30e0 | 964 | refs_found = repo_dwim_ref(r, "HEAD", 4, oid, &real_ref, 0); |
128fd54d | 965 | else if (reflog_len) |
49281cf5 | 966 | refs_found = repo_dwim_log(r, str, len, oid, &real_ref); |
f2eba66d | 967 | else |
f24c30e0 | 968 | refs_found = repo_dwim_ref(r, str, len, oid, &real_ref, 0); |
d556fae2 SP |
969 | |
970 | if (!refs_found) | |
971 | return -1; | |
972 | ||
321c89bf | 973 | if (warn_ambiguous_refs && !(flags & GET_OID_QUIETLY) && |
798c35fc | 974 | (refs_found > 1 || |
49281cf5 | 975 | !get_short_oid(r, str, len, &tmp_oid, GET_OID_QUIETLY))) |
eedce784 | 976 | warning(warn_msg, len, str); |
d556fae2 | 977 | |
ab2a1a32 | 978 | if (reflog_len) { |
ab2a1a32 | 979 | int nth, i; |
dddbad72 JS |
980 | timestamp_t at_time; |
981 | timestamp_t co_time; | |
16d7cc90 JH |
982 | int co_tz, co_cnt; |
983 | ||
fe558516 | 984 | /* Is it asking for N-th entry, or approxidate? */ |
ab2a1a32 JH |
985 | for (i = nth = 0; 0 <= nth && i < reflog_len; i++) { |
986 | char ch = str[at+2+i]; | |
987 | if ('0' <= ch && ch <= '9') | |
988 | nth = nth * 10 + ch - '0'; | |
989 | else | |
990 | nth = -1; | |
991 | } | |
ea360dd0 SP |
992 | if (100000000 <= nth) { |
993 | at_time = nth; | |
994 | nth = -1; | |
995 | } else if (0 <= nth) | |
ab2a1a32 | 996 | at_time = 0; |
861f00e3 | 997 | else { |
93cfa7c7 | 998 | int errors = 0; |
861f00e3 | 999 | char *tmp = xstrndup(str + at + 2, reflog_len); |
93cfa7c7 | 1000 | at_time = approxidate_careful(tmp, &errors); |
861f00e3 | 1001 | free(tmp); |
28b35632 JK |
1002 | if (errors) { |
1003 | free(real_ref); | |
a5e10acb | 1004 | return -1; |
28b35632 | 1005 | } |
861f00e3 | 1006 | } |
49281cf5 | 1007 | if (read_ref_at(get_main_ref_store(r), |
7fdff474 | 1008 | real_ref, flags, at_time, nth, oid, NULL, |
16d7cc90 | 1009 | &co_time, &co_tz, &co_cnt)) { |
305ebea0 | 1010 | if (!len) { |
145136a9 | 1011 | if (!skip_prefix(real_ref, "refs/heads/", &str)) |
305ebea0 | 1012 | str = "HEAD"; |
145136a9 | 1013 | len = strlen(str); |
305ebea0 | 1014 | } |
c41a87dd | 1015 | if (at_time) { |
321c89bf | 1016 | if (!(flags & GET_OID_QUIETLY)) { |
b0418303 JK |
1017 | warning(_("log for '%.*s' only goes back to %s"), |
1018 | len, str, | |
a5481a6c | 1019 | show_date(co_time, co_tz, DATE_MODE(RFC2822))); |
c41a87dd DA |
1020 | } |
1021 | } else { | |
321c89bf | 1022 | if (flags & GET_OID_QUIETLY) { |
c41a87dd DA |
1023 | exit(128); |
1024 | } | |
b0418303 | 1025 | die(_("log for '%.*s' only has %d entries"), |
e6eedc31 JS |
1026 | len, str, co_cnt); |
1027 | } | |
16d7cc90 | 1028 | } |
d556fae2 SP |
1029 | } |
1030 | ||
ed378ec7 | 1031 | free(real_ref); |
d556fae2 | 1032 | return 0; |
9938af6a JH |
1033 | } |
1034 | ||
2b1790f5 NTND |
1035 | static enum get_oid_result get_parent(struct repository *r, |
1036 | const char *name, int len, | |
d1dd94b3 | 1037 | struct object_id *result, int idx) |
9938af6a | 1038 | { |
1e43ed98 | 1039 | struct object_id oid; |
2b1790f5 | 1040 | enum get_oid_result ret = get_oid_1(r, name, len, &oid, |
d1dd94b3 | 1041 | GET_OID_COMMITTISH); |
9938af6a JH |
1042 | struct commit *commit; |
1043 | struct commit_list *p; | |
1044 | ||
1045 | if (ret) | |
1046 | return ret; | |
2b1790f5 | 1047 | commit = lookup_commit_reference(r, &oid); |
4a93b899 | 1048 | if (repo_parse_commit(r, commit)) |
d1dd94b3 | 1049 | return MISSING_OBJECT; |
9938af6a | 1050 | if (!idx) { |
e82caf38 | 1051 | oidcpy(result, &commit->object.oid); |
d1dd94b3 | 1052 | return FOUND; |
9938af6a JH |
1053 | } |
1054 | p = commit->parents; | |
1055 | while (p) { | |
1056 | if (!--idx) { | |
e82caf38 | 1057 | oidcpy(result, &p->item->object.oid); |
d1dd94b3 | 1058 | return FOUND; |
9938af6a JH |
1059 | } |
1060 | p = p->next; | |
1061 | } | |
d1dd94b3 | 1062 | return MISSING_OBJECT; |
9938af6a JH |
1063 | } |
1064 | ||
2b1790f5 NTND |
1065 | static enum get_oid_result get_nth_ancestor(struct repository *r, |
1066 | const char *name, int len, | |
d1dd94b3 DT |
1067 | struct object_id *result, |
1068 | int generation) | |
4f7599ac | 1069 | { |
1e43ed98 | 1070 | struct object_id oid; |
621ff675 LT |
1071 | struct commit *commit; |
1072 | int ret; | |
1073 | ||
2b1790f5 | 1074 | ret = get_oid_1(r, name, len, &oid, GET_OID_COMMITTISH); |
4f7599ac JH |
1075 | if (ret) |
1076 | return ret; | |
2b1790f5 | 1077 | commit = lookup_commit_reference(r, &oid); |
621ff675 | 1078 | if (!commit) |
d1dd94b3 | 1079 | return MISSING_OBJECT; |
4f7599ac JH |
1080 | |
1081 | while (generation--) { | |
4a93b899 | 1082 | if (repo_parse_commit(r, commit) || !commit->parents) |
d1dd94b3 | 1083 | return MISSING_OBJECT; |
621ff675 | 1084 | commit = commit->parents->item; |
4f7599ac | 1085 | } |
e82caf38 | 1086 | oidcpy(result, &commit->object.oid); |
d1dd94b3 | 1087 | return FOUND; |
4f7599ac JH |
1088 | } |
1089 | ||
2b1790f5 NTND |
1090 | struct object *repo_peel_to_type(struct repository *r, const char *name, int namelen, |
1091 | struct object *o, enum object_type expected_type) | |
81776315 JH |
1092 | { |
1093 | if (name && !namelen) | |
1094 | namelen = strlen(name); | |
81776315 | 1095 | while (1) { |
2b1790f5 | 1096 | if (!o || (!o->parsed && !parse_object(r, &o->oid))) |
81776315 | 1097 | return NULL; |
a6a3f2cc | 1098 | if (expected_type == OBJ_ANY || o->type == expected_type) |
81776315 JH |
1099 | return o; |
1100 | if (o->type == OBJ_TAG) | |
1101 | o = ((struct tag*) o)->tagged; | |
1102 | else if (o->type == OBJ_COMMIT) | |
2b1790f5 | 1103 | o = &(repo_get_commit_tree(r, ((struct commit *)o))->object); |
81776315 JH |
1104 | else { |
1105 | if (name) | |
1106 | error("%.*s: expected %s type, but the object " | |
1107 | "dereferences to %s type", | |
debca9d2 BW |
1108 | namelen, name, type_name(expected_type), |
1109 | type_name(o->type)); | |
81776315 JH |
1110 | return NULL; |
1111 | } | |
1112 | } | |
1113 | } | |
1114 | ||
2b1790f5 NTND |
1115 | static int peel_onion(struct repository *r, const char *name, int len, |
1116 | struct object_id *oid, unsigned lookup_flags) | |
5385f52d | 1117 | { |
de37d50d | 1118 | struct object_id outer; |
5385f52d | 1119 | const char *sp; |
885a86ab | 1120 | unsigned int expected_type = 0; |
5385f52d JH |
1121 | struct object *o; |
1122 | ||
1123 | /* | |
1124 | * "ref^{type}" dereferences ref repeatedly until you cannot | |
1125 | * dereference anymore, or you get an object of given type, | |
1126 | * whichever comes first. "ref^{}" means just dereference | |
1127 | * tags until you get a non-tag. "ref^0" is a shorthand for | |
1128 | * "ref^{commit}". "commit^{tree}" could be used to find the | |
1129 | * top-level tree of the given commit. | |
1130 | */ | |
1131 | if (len < 4 || name[len-1] != '}') | |
1132 | return -1; | |
1133 | ||
1134 | for (sp = name + len - 1; name <= sp; sp--) { | |
1135 | int ch = *sp; | |
1136 | if (ch == '{' && name < sp && sp[-1] == '^') | |
1137 | break; | |
1138 | } | |
1139 | if (sp <= name) | |
1140 | return -1; | |
1141 | ||
1142 | sp++; /* beginning of type name, or closing brace for empty */ | |
59556548 | 1143 | if (starts_with(sp, "commit}")) |
1974632c | 1144 | expected_type = OBJ_COMMIT; |
59556548 | 1145 | else if (starts_with(sp, "tag}")) |
75aa26d3 | 1146 | expected_type = OBJ_TAG; |
59556548 | 1147 | else if (starts_with(sp, "tree}")) |
1974632c | 1148 | expected_type = OBJ_TREE; |
59556548 | 1149 | else if (starts_with(sp, "blob}")) |
1974632c | 1150 | expected_type = OBJ_BLOB; |
59556548 | 1151 | else if (starts_with(sp, "object}")) |
a6a3f2cc | 1152 | expected_type = OBJ_ANY; |
5385f52d | 1153 | else if (sp[0] == '}') |
1974632c | 1154 | expected_type = OBJ_NONE; |
32574b68 NTND |
1155 | else if (sp[0] == '/') |
1156 | expected_type = OBJ_COMMIT; | |
5385f52d JH |
1157 | else |
1158 | return -1; | |
1159 | ||
321c89bf | 1160 | lookup_flags &= ~GET_OID_DISAMBIGUATORS; |
e2643617 | 1161 | if (expected_type == OBJ_COMMIT) |
321c89bf | 1162 | lookup_flags |= GET_OID_COMMITTISH; |
ed1ca602 | 1163 | else if (expected_type == OBJ_TREE) |
321c89bf | 1164 | lookup_flags |= GET_OID_TREEISH; |
e2643617 | 1165 | |
2b1790f5 | 1166 | if (get_oid_1(r, name, sp - name - 2, &outer, lookup_flags)) |
5385f52d JH |
1167 | return -1; |
1168 | ||
2b1790f5 | 1169 | o = parse_object(r, &outer); |
5385f52d JH |
1170 | if (!o) |
1171 | return -1; | |
885a86ab | 1172 | if (!expected_type) { |
2b1790f5 NTND |
1173 | o = deref_tag(r, o, name, sp - name - 2); |
1174 | if (!o || (!o->parsed && !parse_object(r, &o->oid))) | |
6e1c6c10 | 1175 | return -1; |
e82caf38 | 1176 | oidcpy(oid, &o->oid); |
32574b68 | 1177 | return 0; |
5385f52d | 1178 | } |
32574b68 NTND |
1179 | |
1180 | /* | |
1181 | * At this point, the syntax look correct, so | |
1182 | * if we do not get the needed object, we should | |
1183 | * barf. | |
1184 | */ | |
2b1790f5 | 1185 | o = repo_peel_to_type(r, name, len, o, expected_type); |
32574b68 | 1186 | if (!o) |
81776315 | 1187 | return -1; |
32574b68 | 1188 | |
e82caf38 | 1189 | oidcpy(oid, &o->oid); |
32574b68 NTND |
1190 | if (sp[0] == '/') { |
1191 | /* "$commit^{/foo}" */ | |
1192 | char *prefix; | |
1193 | int ret; | |
1194 | struct commit_list *list = NULL; | |
1195 | ||
81776315 | 1196 | /* |
4322842a NTND |
1197 | * $commit^{/}. Some regex implementation may reject. |
1198 | * We don't need regex anyway. '' pattern always matches. | |
5385f52d | 1199 | */ |
4322842a | 1200 | if (sp[1] == '}') |
81776315 | 1201 | return 0; |
4322842a | 1202 | |
32574b68 NTND |
1203 | prefix = xstrndup(sp + 1, name + len - 1 - (sp + 1)); |
1204 | commit_list_insert((struct commit *)o, &list); | |
2b1790f5 | 1205 | ret = get_oid_oneline(r, prefix, oid, list); |
32574b68 NTND |
1206 | free(prefix); |
1207 | return ret; | |
5385f52d JH |
1208 | } |
1209 | return 0; | |
1210 | } | |
1211 | ||
0c6b5ba1 NTND |
1212 | static int get_describe_name(struct repository *r, |
1213 | const char *name, int len, | |
1214 | struct object_id *oid) | |
7dd45e15 JH |
1215 | { |
1216 | const char *cp; | |
321c89bf | 1217 | unsigned flags = GET_OID_QUIETLY | GET_OID_COMMIT; |
7dd45e15 JH |
1218 | |
1219 | for (cp = name + len - 1; name + 2 <= cp; cp--) { | |
1220 | char ch = *cp; | |
6f75d45b | 1221 | if (!isxdigit(ch)) { |
7dd45e15 JH |
1222 | /* We must be looking at g in "SOMETHING-g" |
1223 | * for it to be describe output. | |
1224 | */ | |
1225 | if (ch == 'g' && cp[-1] == '-') { | |
1226 | cp++; | |
1227 | len -= cp - name; | |
0c6b5ba1 | 1228 | return get_short_oid(r, |
c6c0235b | 1229 | cp, len, oid, flags); |
7dd45e15 JH |
1230 | } |
1231 | } | |
1232 | } | |
1233 | return -1; | |
1234 | } | |
1235 | ||
2b1790f5 NTND |
1236 | static enum get_oid_result get_oid_1(struct repository *r, |
1237 | const char *name, int len, | |
d1dd94b3 DT |
1238 | struct object_id *oid, |
1239 | unsigned lookup_flags) | |
9938af6a | 1240 | { |
0601dbe1 | 1241 | int ret, has_suffix; |
4f7599ac | 1242 | const char *cp; |
9938af6a | 1243 | |
621ff675 LT |
1244 | /* |
1245 | * "name~3" is "name^^^", "name~" is "name~1", and "name^" is "name^1". | |
4f7599ac | 1246 | */ |
0601dbe1 | 1247 | has_suffix = 0; |
4f7599ac JH |
1248 | for (cp = name + len - 1; name <= cp; cp--) { |
1249 | int ch = *cp; | |
1250 | if ('0' <= ch && ch <= '9') | |
1251 | continue; | |
0601dbe1 JH |
1252 | if (ch == '~' || ch == '^') |
1253 | has_suffix = ch; | |
4f7599ac JH |
1254 | break; |
1255 | } | |
0601dbe1 JH |
1256 | |
1257 | if (has_suffix) { | |
59fa5f5a | 1258 | unsigned int num = 0; |
4f7599ac JH |
1259 | int len1 = cp - name; |
1260 | cp++; | |
59fa5f5a RS |
1261 | while (cp < name + len) { |
1262 | unsigned int digit = *cp++ - '0'; | |
1263 | if (unsigned_mult_overflows(num, 10)) | |
1264 | return MISSING_OBJECT; | |
1265 | num *= 10; | |
1266 | if (unsigned_add_overflows(num, digit)) | |
1267 | return MISSING_OBJECT; | |
1268 | num += digit; | |
1269 | } | |
621ff675 LT |
1270 | if (!num && len1 == len - 1) |
1271 | num = 1; | |
59fa5f5a RS |
1272 | else if (num > INT_MAX) |
1273 | return MISSING_OBJECT; | |
621ff675 | 1274 | if (has_suffix == '^') |
2b1790f5 | 1275 | return get_parent(r, name, len1, oid, num); |
0601dbe1 | 1276 | /* else if (has_suffix == '~') -- goes without saying */ |
2b1790f5 | 1277 | return get_nth_ancestor(r, name, len1, oid, num); |
4f7599ac JH |
1278 | } |
1279 | ||
2b1790f5 | 1280 | ret = peel_onion(r, name, len, oid, lookup_flags); |
5385f52d | 1281 | if (!ret) |
d1dd94b3 | 1282 | return FOUND; |
5385f52d | 1283 | |
2b1790f5 | 1284 | ret = get_oid_basic(r, name, len, oid, lookup_flags); |
9938af6a | 1285 | if (!ret) |
d1dd94b3 | 1286 | return FOUND; |
7dd45e15 JH |
1287 | |
1288 | /* It could be describe output that is "SOMETHING-gXXXX" */ | |
2b1790f5 | 1289 | ret = get_describe_name(r, name, len, oid); |
7dd45e15 | 1290 | if (!ret) |
d1dd94b3 | 1291 | return FOUND; |
7dd45e15 | 1292 | |
2b1790f5 | 1293 | return get_short_oid(r, name, len, oid, lookup_flags); |
9938af6a JH |
1294 | } |
1295 | ||
f7bff003 JH |
1296 | /* |
1297 | * This interprets names like ':/Initial revision of "git"' by searching | |
1298 | * through history and returning the first commit whose message starts | |
3d045897 | 1299 | * the given regular expression. |
f7bff003 | 1300 | * |
0769854f WP |
1301 | * For negative-matching, prefix the pattern-part with '!-', like: ':/!-WIP'. |
1302 | * | |
1303 | * For a literal '!' character at the beginning of a pattern, you have to repeat | |
1304 | * that, like: ':/!!foo' | |
1305 | * | |
1306 | * For future extension, all other sequences beginning with ':/!' are reserved. | |
f7bff003 | 1307 | */ |
208acbfb NTND |
1308 | |
1309 | /* Remember to update object flag allocation in object.h */ | |
f7bff003 JH |
1310 | #define ONELINE_SEEN (1u<<20) |
1311 | ||
c931ba4e NTND |
1312 | struct handle_one_ref_cb { |
1313 | struct repository *repo; | |
1314 | struct commit_list **list; | |
1315 | }; | |
1316 | ||
9c5fe0b8 | 1317 | static int handle_one_ref(const char *path, const struct object_id *oid, |
5cf88fd8 | 1318 | int flag UNUSED, |
63e14ee2 | 1319 | void *cb_data) |
28a4d940 | 1320 | { |
c931ba4e NTND |
1321 | struct handle_one_ref_cb *cb = cb_data; |
1322 | struct commit_list **list = cb->list; | |
1323 | struct object *object = parse_object(cb->repo, oid); | |
28a4d940 JS |
1324 | if (!object) |
1325 | return 0; | |
affeef12 | 1326 | if (object->type == OBJ_TAG) { |
c931ba4e | 1327 | object = deref_tag(cb->repo, object, path, |
a74093da | 1328 | strlen(path)); |
affeef12 MK |
1329 | if (!object) |
1330 | return 0; | |
1331 | } | |
28a4d940 JS |
1332 | if (object->type != OBJ_COMMIT) |
1333 | return 0; | |
e8d1dfe6 | 1334 | commit_list_insert((struct commit *)object, list); |
28a4d940 JS |
1335 | return 0; |
1336 | } | |
1337 | ||
0bb41a19 NTND |
1338 | static int get_oid_oneline(struct repository *r, |
1339 | const char *prefix, struct object_id *oid, | |
1340 | struct commit_list *list) | |
28a4d940 | 1341 | { |
84baa31b | 1342 | struct commit_list *backup = NULL, *l; |
28042dbc | 1343 | int found = 0; |
0769854f | 1344 | int negative = 0; |
57895105 | 1345 | regex_t regex; |
28a4d940 JS |
1346 | |
1347 | if (prefix[0] == '!') { | |
28a4d940 | 1348 | prefix++; |
0769854f WP |
1349 | |
1350 | if (prefix[0] == '-') { | |
1351 | prefix++; | |
1352 | negative = 1; | |
1353 | } else if (prefix[0] != '!') { | |
e6a6a768 | 1354 | return -1; |
0769854f | 1355 | } |
28a4d940 | 1356 | } |
57895105 LT |
1357 | |
1358 | if (regcomp(®ex, prefix, REG_EXTENDED)) | |
aac4fac1 | 1359 | return -1; |
57895105 | 1360 | |
84baa31b NTND |
1361 | for (l = list; l; l = l->next) { |
1362 | l->item->object.flags |= ONELINE_SEEN; | |
28a4d940 | 1363 | commit_list_insert(l->item, &backup); |
84baa31b | 1364 | } |
ed8ad7e2 | 1365 | while (list) { |
ba41c1c9 | 1366 | const char *p, *buf; |
1358e7d6 | 1367 | struct commit *commit; |
28042dbc | 1368 | int matches; |
ed8ad7e2 JM |
1369 | |
1370 | commit = pop_most_recent_commit(&list, ONELINE_SEEN); | |
0bb41a19 | 1371 | if (!parse_object(r, &commit->object.oid)) |
283cdbcf | 1372 | continue; |
4a93b899 | 1373 | buf = repo_get_commit_buffer(r, commit, NULL); |
ba41c1c9 | 1374 | p = strstr(buf, "\n\n"); |
0769854f | 1375 | matches = negative ^ (p && !regexec(®ex, p + 2, 0, NULL, 0)); |
4a93b899 | 1376 | repo_unuse_commit_buffer(r, commit, buf); |
28042dbc JH |
1377 | |
1378 | if (matches) { | |
e82caf38 | 1379 | oidcpy(oid, &commit->object.oid); |
28042dbc | 1380 | found = 1; |
28a4d940 JS |
1381 | break; |
1382 | } | |
1383 | } | |
57895105 | 1384 | regfree(®ex); |
28a4d940 JS |
1385 | free_commit_list(list); |
1386 | for (l = backup; l; l = l->next) | |
1387 | clear_commit_marks(l->item, ONELINE_SEEN); | |
28042dbc JH |
1388 | free_commit_list(backup); |
1389 | return found ? 0 : -1; | |
28a4d940 JS |
1390 | } |
1391 | ||
ae5a6c36 | 1392 | struct grab_nth_branch_switch_cbdata { |
98f85ff4 | 1393 | int remaining; |
4b3aa170 | 1394 | struct strbuf *sb; |
ae5a6c36 JH |
1395 | }; |
1396 | ||
5cf88fd8 ÆAB |
1397 | static int grab_nth_branch_switch(struct object_id *ooid UNUSED, |
1398 | struct object_id *noid UNUSED, | |
1399 | const char *email UNUSED, | |
1400 | timestamp_t timestamp UNUSED, | |
1401 | int tz UNUSED, | |
ae5a6c36 JH |
1402 | const char *message, void *cb_data) |
1403 | { | |
1404 | struct grab_nth_branch_switch_cbdata *cb = cb_data; | |
a884d0cb TR |
1405 | const char *match = NULL, *target = NULL; |
1406 | size_t len; | |
1407 | ||
95b567c7 | 1408 | if (skip_prefix(message, "checkout: moving from ", &match)) |
d7c03c1f | 1409 | target = strstr(match, " to "); |
ae5a6c36 | 1410 | |
c829774c | 1411 | if (!match || !target) |
ae5a6c36 | 1412 | return 0; |
98f85ff4 JH |
1413 | if (--(cb->remaining) == 0) { |
1414 | len = target - match; | |
4b3aa170 RS |
1415 | strbuf_reset(cb->sb); |
1416 | strbuf_add(cb->sb, match, len); | |
98f85ff4 JH |
1417 | return 1; /* we are done */ |
1418 | } | |
ae5a6c36 JH |
1419 | return 0; |
1420 | } | |
1421 | ||
1422 | /* | |
ae0ba8e2 JH |
1423 | * Parse @{-N} syntax, return the number of characters parsed |
1424 | * if successful; otherwise signal an error with negative value. | |
ae5a6c36 | 1425 | */ |
23a57129 NTND |
1426 | static int interpret_nth_prior_checkout(struct repository *r, |
1427 | const char *name, int namelen, | |
8cd4249c | 1428 | struct strbuf *buf) |
ae5a6c36 | 1429 | { |
c2883e62 | 1430 | long nth; |
98f85ff4 | 1431 | int retval; |
ae5a6c36 | 1432 | struct grab_nth_branch_switch_cbdata cb; |
a884d0cb TR |
1433 | const char *brace; |
1434 | char *num_end; | |
ae5a6c36 | 1435 | |
8cd4249c JK |
1436 | if (namelen < 4) |
1437 | return -1; | |
ae5a6c36 JH |
1438 | if (name[0] != '@' || name[1] != '{' || name[2] != '-') |
1439 | return -1; | |
8cd4249c | 1440 | brace = memchr(name, '}', namelen); |
a884d0cb TR |
1441 | if (!brace) |
1442 | return -1; | |
98f85ff4 | 1443 | nth = strtol(name + 3, &num_end, 10); |
a884d0cb | 1444 | if (num_end != brace) |
ae5a6c36 | 1445 | return -1; |
c2883e62 JH |
1446 | if (nth <= 0) |
1447 | return -1; | |
98f85ff4 | 1448 | cb.remaining = nth; |
4b3aa170 | 1449 | cb.sb = buf; |
98f85ff4 | 1450 | |
23a57129 NTND |
1451 | retval = refs_for_each_reflog_ent_reverse(get_main_ref_store(r), |
1452 | "HEAD", grab_nth_branch_switch, &cb); | |
1453 | if (0 < retval) { | |
98f85ff4 | 1454 | retval = brace - name + 1; |
23a57129 NTND |
1455 | } else |
1456 | retval = 0; | |
a884d0cb | 1457 | |
39765e59 | 1458 | return retval; |
ae5a6c36 JH |
1459 | } |
1460 | ||
0daf7ff6 NTND |
1461 | int repo_get_oid_mb(struct repository *r, |
1462 | const char *name, | |
1463 | struct object_id *oid) | |
619a644d JH |
1464 | { |
1465 | struct commit *one, *two; | |
1466 | struct commit_list *mbs; | |
151b2911 | 1467 | struct object_id oid_tmp; |
619a644d JH |
1468 | const char *dots; |
1469 | int st; | |
1470 | ||
1471 | dots = strstr(name, "..."); | |
1472 | if (!dots) | |
0daf7ff6 | 1473 | return repo_get_oid(r, name, oid); |
619a644d | 1474 | if (dots == name) |
0daf7ff6 | 1475 | st = repo_get_oid(r, "HEAD", &oid_tmp); |
619a644d JH |
1476 | else { |
1477 | struct strbuf sb; | |
1478 | strbuf_init(&sb, dots - name); | |
1479 | strbuf_add(&sb, name, dots - name); | |
0daf7ff6 | 1480 | st = repo_get_oid_committish(r, sb.buf, &oid_tmp); |
619a644d JH |
1481 | strbuf_release(&sb); |
1482 | } | |
1483 | if (st) | |
1484 | return st; | |
0daf7ff6 | 1485 | one = lookup_commit_reference_gently(r, &oid_tmp, 0); |
619a644d JH |
1486 | if (!one) |
1487 | return -1; | |
1488 | ||
0daf7ff6 | 1489 | if (repo_get_oid_committish(r, dots[3] ? (dots + 3) : "HEAD", &oid_tmp)) |
619a644d | 1490 | return -1; |
0daf7ff6 | 1491 | two = lookup_commit_reference_gently(r, &oid_tmp, 0); |
619a644d JH |
1492 | if (!two) |
1493 | return -1; | |
34e7771b | 1494 | mbs = repo_get_merge_bases(r, one, two); |
619a644d JH |
1495 | if (!mbs || mbs->next) |
1496 | st = -1; | |
1497 | else { | |
1498 | st = 0; | |
151b2911 | 1499 | oidcpy(oid, &mbs->item->object.oid); |
619a644d JH |
1500 | } |
1501 | free_commit_list(mbs); | |
1502 | return st; | |
1503 | } | |
1504 | ||
9ba89f48 FC |
1505 | /* parse @something syntax, when 'something' is not {.*} */ |
1506 | static int interpret_empty_at(const char *name, int namelen, int len, struct strbuf *buf) | |
1507 | { | |
1508 | const char *next; | |
1509 | ||
1510 | if (len || name[1] == '{') | |
1511 | return -1; | |
1512 | ||
1513 | /* make sure it's a single @, or @@{.*}, not @foo */ | |
8cd4249c | 1514 | next = memchr(name + len + 1, '@', namelen - len - 1); |
9ba89f48 FC |
1515 | if (next && next[1] != '{') |
1516 | return -1; | |
1517 | if (!next) | |
1518 | next = name + namelen; | |
1519 | if (next != name + 1) | |
1520 | return -1; | |
1521 | ||
1522 | strbuf_reset(buf); | |
1523 | strbuf_add(buf, "HEAD", 4); | |
1524 | return 1; | |
1525 | } | |
1526 | ||
71588ed2 NTND |
1527 | static int reinterpret(struct repository *r, |
1528 | const char *name, int namelen, int len, | |
0e9f62da | 1529 | struct strbuf *buf, unsigned allowed) |
7a0a49a7 FC |
1530 | { |
1531 | /* we have extra data, which might need further processing */ | |
1532 | struct strbuf tmp = STRBUF_INIT; | |
1533 | int used = buf->len; | |
1534 | int ret; | |
a4f66a78 JT |
1535 | struct interpret_branch_name_options options = { |
1536 | .allowed = allowed | |
1537 | }; | |
7a0a49a7 FC |
1538 | |
1539 | strbuf_add(buf, name + len, namelen - len); | |
a4f66a78 | 1540 | ret = repo_interpret_branch_name(r, buf->buf, buf->len, &tmp, &options); |
7a0a49a7 FC |
1541 | /* that data was not interpreted, remove our cruft */ |
1542 | if (ret < 0) { | |
1543 | strbuf_setlen(buf, used); | |
1544 | return len; | |
1545 | } | |
1546 | strbuf_reset(buf); | |
1547 | strbuf_addbuf(buf, &tmp); | |
1548 | strbuf_release(&tmp); | |
1549 | /* tweak for size of {-N} versus expanded ref name */ | |
1550 | return ret - used + len; | |
1551 | } | |
1552 | ||
ea1c873c | 1553 | static void set_shortened_ref(struct repository *r, struct strbuf *buf, const char *ref) |
a39c14af | 1554 | { |
ea1c873c | 1555 | char *s = refs_shorten_unambiguous_ref(get_main_ref_store(r), ref, 0); |
a39c14af JK |
1556 | strbuf_reset(buf); |
1557 | strbuf_addstr(buf, s); | |
1558 | free(s); | |
1559 | } | |
1560 | ||
0e9f62da JK |
1561 | static int branch_interpret_allowed(const char *refname, unsigned allowed) |
1562 | { | |
1563 | if (!allowed) | |
1564 | return 1; | |
1565 | ||
1566 | if ((allowed & INTERPRET_BRANCH_LOCAL) && | |
1567 | starts_with(refname, "refs/heads/")) | |
1568 | return 1; | |
1569 | if ((allowed & INTERPRET_BRANCH_REMOTE) && | |
1570 | starts_with(refname, "refs/remotes/")) | |
1571 | return 1; | |
1572 | ||
1573 | return 0; | |
1574 | } | |
1575 | ||
ea1c873c NTND |
1576 | static int interpret_branch_mark(struct repository *r, |
1577 | const char *name, int namelen, | |
48c58471 JK |
1578 | int at, struct strbuf *buf, |
1579 | int (*get_mark)(const char *, int), | |
1580 | const char *(*get_data)(struct branch *, | |
0e9f62da | 1581 | struct strbuf *), |
a4f66a78 | 1582 | const struct interpret_branch_name_options *options) |
a39c14af JK |
1583 | { |
1584 | int len; | |
48c58471 JK |
1585 | struct branch *branch; |
1586 | struct strbuf err = STRBUF_INIT; | |
1587 | const char *value; | |
a39c14af | 1588 | |
48c58471 | 1589 | len = get_mark(name + at, namelen - at); |
a39c14af JK |
1590 | if (!len) |
1591 | return -1; | |
1592 | ||
3f6eb30f JK |
1593 | if (memchr(name, ':', at)) |
1594 | return -1; | |
1595 | ||
48c58471 JK |
1596 | if (at) { |
1597 | char *name_str = xmemdupz(name, at); | |
1598 | branch = branch_get(name_str); | |
1599 | free(name_str); | |
1600 | } else | |
1601 | branch = branch_get(NULL); | |
1602 | ||
1603 | value = get_data(branch, &err); | |
f24c30e0 JT |
1604 | if (!value) { |
1605 | if (options->nonfatal_dangling_mark) { | |
1606 | strbuf_release(&err); | |
1607 | return -1; | |
1608 | } else { | |
1609 | die("%s", err.buf); | |
1610 | } | |
1611 | } | |
48c58471 | 1612 | |
a4f66a78 | 1613 | if (!branch_interpret_allowed(value, options->allowed)) |
0e9f62da JK |
1614 | return -1; |
1615 | ||
ea1c873c | 1616 | set_shortened_ref(r, buf, value); |
a39c14af JK |
1617 | return len + at; |
1618 | } | |
1619 | ||
8f56e9d4 NTND |
1620 | int repo_interpret_branch_name(struct repository *r, |
1621 | const char *name, int namelen, | |
1622 | struct strbuf *buf, | |
a4f66a78 | 1623 | const struct interpret_branch_name_options *options) |
ae0ba8e2 | 1624 | { |
f278f40f | 1625 | char *at; |
9892d5d4 | 1626 | const char *start; |
13228c30 | 1627 | int len; |
ae0ba8e2 | 1628 | |
cf99a761 FC |
1629 | if (!namelen) |
1630 | namelen = strlen(name); | |
1631 | ||
a4f66a78 | 1632 | if (!options->allowed || (options->allowed & INTERPRET_BRANCH_LOCAL)) { |
71588ed2 | 1633 | len = interpret_nth_prior_checkout(r, name, namelen, buf); |
0e9f62da JK |
1634 | if (!len) { |
1635 | return len; /* syntax Ok, not enough switches */ | |
1636 | } else if (len > 0) { | |
1637 | if (len == namelen) | |
1638 | return len; /* consumed all */ | |
1639 | else | |
a4f66a78 JT |
1640 | return reinterpret(r, name, namelen, len, buf, |
1641 | options->allowed); | |
0e9f62da | 1642 | } |
d46a8301 JK |
1643 | } |
1644 | ||
9892d5d4 JK |
1645 | for (start = name; |
1646 | (at = memchr(start, '@', namelen - (start - name))); | |
1647 | start = at + 1) { | |
9ba89f48 | 1648 | |
a4f66a78 | 1649 | if (!options->allowed || (options->allowed & INTERPRET_BRANCH_HEAD)) { |
0e9f62da JK |
1650 | len = interpret_empty_at(name, namelen, at - name, buf); |
1651 | if (len > 0) | |
71588ed2 | 1652 | return reinterpret(r, name, namelen, len, buf, |
a4f66a78 | 1653 | options->allowed); |
0e9f62da | 1654 | } |
9ba89f48 | 1655 | |
71588ed2 | 1656 | len = interpret_branch_mark(r, name, namelen, at - name, buf, |
0e9f62da | 1657 | upstream_mark, branch_get_upstream, |
a4f66a78 | 1658 | options); |
9892d5d4 JK |
1659 | if (len > 0) |
1660 | return len; | |
adfe5d04 | 1661 | |
71588ed2 | 1662 | len = interpret_branch_mark(r, name, namelen, at - name, buf, |
0e9f62da | 1663 | push_mark, branch_get_push, |
a4f66a78 | 1664 | options); |
9892d5d4 JK |
1665 | if (len > 0) |
1666 | return len; | |
bb0dab5d | 1667 | } |
9ba89f48 | 1668 | |
a39c14af | 1669 | return -1; |
ae0ba8e2 JH |
1670 | } |
1671 | ||
0e9f62da | 1672 | void strbuf_branchname(struct strbuf *sb, const char *name, unsigned allowed) |
6bab74e7 JN |
1673 | { |
1674 | int len = strlen(name); | |
a4f66a78 JT |
1675 | struct interpret_branch_name_options options = { |
1676 | .allowed = allowed | |
1677 | }; | |
d850b7a5 ÆAB |
1678 | int used = repo_interpret_branch_name(the_repository, name, len, sb, |
1679 | &options); | |
84cf2466 | 1680 | |
84cf2466 JH |
1681 | if (used < 0) |
1682 | used = 0; | |
1683 | strbuf_add(sb, name + used, len - used); | |
6bab74e7 JN |
1684 | } |
1685 | ||
1686 | int strbuf_check_branch_ref(struct strbuf *sb, const char *name) | |
1687 | { | |
7c3f847a JH |
1688 | if (startup_info->have_repository) |
1689 | strbuf_branchname(sb, name, INTERPRET_BRANCH_LOCAL); | |
1690 | else | |
1691 | strbuf_addstr(sb, name); | |
a625b092 JH |
1692 | |
1693 | /* | |
1694 | * This splice must be done even if we end up rejecting the | |
1695 | * name; builtin/branch.c::copy_or_rename_branch() still wants | |
1696 | * to see what the name expanded to so that "branch -m" can be | |
1697 | * used as a tool to correct earlier mistakes. | |
1698 | */ | |
6bab74e7 | 1699 | strbuf_splice(sb, 0, 0, "refs/heads/", 11); |
a625b092 JH |
1700 | |
1701 | if (*name == '-' || | |
1702 | !strcmp(sb->buf, "refs/heads/HEAD")) | |
1703 | return -1; | |
1704 | ||
8d9c5010 | 1705 | return check_refname_format(sb->buf, 0); |
6bab74e7 JN |
1706 | } |
1707 | ||
9938af6a | 1708 | /* |
e82caf38 | 1709 | * This is like "get_oid_basic()", except it allows "object ID expressions", |
9938af6a JH |
1710 | * notably "xyz^" for "parent of xyz" |
1711 | */ | |
ec580eaa | 1712 | int repo_get_oid(struct repository *r, const char *name, struct object_id *oid) |
2764fd93 | 1713 | { |
e82caf38 | 1714 | struct object_context unused; |
ec580eaa | 1715 | return get_oid_with_context(r, name, 0, oid, &unused); |
2764fd93 | 1716 | } |
1717 | ||
f5116f43 PSU |
1718 | /* |
1719 | * This returns a non-zero value if the string (built using printf | |
1720 | * format and the given arguments) is not a valid object. | |
1721 | */ | |
1722 | int get_oidf(struct object_id *oid, const char *fmt, ...) | |
1723 | { | |
1724 | va_list ap; | |
1725 | int ret; | |
1726 | struct strbuf sb = STRBUF_INIT; | |
1727 | ||
1728 | va_start(ap, fmt); | |
1729 | strbuf_vaddf(&sb, fmt, ap); | |
1730 | va_end(ap); | |
1731 | ||
d850b7a5 | 1732 | ret = repo_get_oid(the_repository, sb.buf, oid); |
f5116f43 PSU |
1733 | strbuf_release(&sb); |
1734 | ||
1735 | return ret; | |
1736 | } | |
2764fd93 | 1737 | |
cd74e473 | 1738 | /* |
a8a5406a | 1739 | * Many callers know that the user meant to name a commit-ish by |
cd74e473 JH |
1740 | * syntactical positions where the object name appears. Calling this |
1741 | * function allows the machinery to disambiguate shorter-than-unique | |
a8a5406a | 1742 | * abbreviated object names between commit-ish and others. |
cd74e473 JH |
1743 | * |
1744 | * Note that this does NOT error out when the named object is not a | |
a8a5406a | 1745 | * commit-ish. It is merely to give a hint to the disambiguation |
cd74e473 JH |
1746 | * machinery. |
1747 | */ | |
65e50464 NTND |
1748 | int repo_get_oid_committish(struct repository *r, |
1749 | const char *name, | |
1750 | struct object_id *oid) | |
cd74e473 JH |
1751 | { |
1752 | struct object_context unused; | |
65e50464 | 1753 | return get_oid_with_context(r, name, GET_OID_COMMITTISH, |
e82caf38 | 1754 | oid, &unused); |
cd74e473 JH |
1755 | } |
1756 | ||
65e50464 NTND |
1757 | int repo_get_oid_treeish(struct repository *r, |
1758 | const char *name, | |
1759 | struct object_id *oid) | |
daba53ae JH |
1760 | { |
1761 | struct object_context unused; | |
65e50464 | 1762 | return get_oid_with_context(r, name, GET_OID_TREEISH, |
e82caf38 | 1763 | oid, &unused); |
daba53ae JH |
1764 | } |
1765 | ||
65e50464 NTND |
1766 | int repo_get_oid_commit(struct repository *r, |
1767 | const char *name, | |
1768 | struct object_id *oid) | |
daba53ae JH |
1769 | { |
1770 | struct object_context unused; | |
65e50464 | 1771 | return get_oid_with_context(r, name, GET_OID_COMMIT, |
e82caf38 | 1772 | oid, &unused); |
daba53ae JH |
1773 | } |
1774 | ||
65e50464 NTND |
1775 | int repo_get_oid_tree(struct repository *r, |
1776 | const char *name, | |
1777 | struct object_id *oid) | |
daba53ae JH |
1778 | { |
1779 | struct object_context unused; | |
65e50464 | 1780 | return get_oid_with_context(r, name, GET_OID_TREE, |
e82caf38 | 1781 | oid, &unused); |
daba53ae JH |
1782 | } |
1783 | ||
65e50464 NTND |
1784 | int repo_get_oid_blob(struct repository *r, |
1785 | const char *name, | |
1786 | struct object_id *oid) | |
daba53ae JH |
1787 | { |
1788 | struct object_context unused; | |
65e50464 | 1789 | return get_oid_with_context(r, name, GET_OID_BLOB, |
e82caf38 | 1790 | oid, &unused); |
a0cd87a5 MK |
1791 | } |
1792 | ||
009fee47 | 1793 | /* Must be called only when object_name:filename doesn't exist. */ |
50ddb089 NTND |
1794 | static void diagnose_invalid_oid_path(struct repository *r, |
1795 | const char *prefix, | |
e82caf38 | 1796 | const char *filename, |
1797 | const struct object_id *tree_oid, | |
1798 | const char *object_name, | |
1799 | int object_name_len) | |
009fee47 | 1800 | { |
e82caf38 | 1801 | struct object_id oid; |
5ec1e728 | 1802 | unsigned short mode; |
009fee47 MM |
1803 | |
1804 | if (!prefix) | |
1805 | prefix = ""; | |
1806 | ||
dbe44faa | 1807 | if (file_exists(filename)) |
b0418303 | 1808 | die(_("path '%s' exists on disk, but not in '%.*s'"), |
b2981d06 | 1809 | filename, object_name_len, object_name); |
c7054209 | 1810 | if (is_missing_file_error(errno)) { |
b2724c87 | 1811 | char *fullname = xstrfmt("%s%s", prefix, filename); |
009fee47 | 1812 | |
50ddb089 | 1813 | if (!get_tree_entry(r, tree_oid, fullname, &oid, &mode)) { |
b0418303 JK |
1814 | die(_("path '%s' exists, but not '%s'\n" |
1815 | "hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"), | |
009fee47 MM |
1816 | fullname, |
1817 | filename, | |
b2981d06 | 1818 | object_name_len, object_name, |
e41d718c | 1819 | fullname, |
b2981d06 | 1820 | object_name_len, object_name, |
e41d718c | 1821 | filename); |
009fee47 | 1822 | } |
b0418303 | 1823 | die(_("path '%s' does not exist in '%.*s'"), |
b2981d06 | 1824 | filename, object_name_len, object_name); |
009fee47 MM |
1825 | } |
1826 | } | |
1827 | ||
1828 | /* Must be called only when :stage:filename doesn't exist. */ | |
0488481e | 1829 | static void diagnose_invalid_index_path(struct repository *r, |
3a7a698e | 1830 | int stage, |
009fee47 MM |
1831 | const char *prefix, |
1832 | const char *filename) | |
1833 | { | |
0488481e | 1834 | struct index_state *istate = r->index; |
9c5e6c80 | 1835 | const struct cache_entry *ce; |
009fee47 MM |
1836 | int pos; |
1837 | unsigned namelen = strlen(filename); | |
43bb66ae | 1838 | struct strbuf fullname = STRBUF_INIT; |
009fee47 MM |
1839 | |
1840 | if (!prefix) | |
1841 | prefix = ""; | |
1842 | ||
1843 | /* Wrong stage number? */ | |
3a7a698e | 1844 | pos = index_name_pos(istate, filename, namelen); |
009fee47 MM |
1845 | if (pos < 0) |
1846 | pos = -pos - 1; | |
3a7a698e NTND |
1847 | if (pos < istate->cache_nr) { |
1848 | ce = istate->cache[pos]; | |
4925adb4 DS |
1849 | if (!S_ISSPARSEDIR(ce->ce_mode) && |
1850 | ce_namelen(ce) == namelen && | |
77e8466f | 1851 | !memcmp(ce->name, filename, namelen)) |
b0418303 JK |
1852 | die(_("path '%s' is in the index, but not at stage %d\n" |
1853 | "hint: Did you mean ':%d:%s'?"), | |
77e8466f MH |
1854 | filename, stage, |
1855 | ce_stage(ce), filename); | |
1856 | } | |
009fee47 MM |
1857 | |
1858 | /* Confusion between relative and absolute filenames? */ | |
43bb66ae JK |
1859 | strbuf_addstr(&fullname, prefix); |
1860 | strbuf_addstr(&fullname, filename); | |
3a7a698e | 1861 | pos = index_name_pos(istate, fullname.buf, fullname.len); |
009fee47 MM |
1862 | if (pos < 0) |
1863 | pos = -pos - 1; | |
3a7a698e NTND |
1864 | if (pos < istate->cache_nr) { |
1865 | ce = istate->cache[pos]; | |
4925adb4 DS |
1866 | if (!S_ISSPARSEDIR(ce->ce_mode) && |
1867 | ce_namelen(ce) == fullname.len && | |
43bb66ae | 1868 | !memcmp(ce->name, fullname.buf, fullname.len)) |
b0418303 JK |
1869 | die(_("path '%s' is in the index, but not '%s'\n" |
1870 | "hint: Did you mean ':%d:%s' aka ':%d:./%s'?"), | |
43bb66ae JK |
1871 | fullname.buf, filename, |
1872 | ce_stage(ce), fullname.buf, | |
e41d718c | 1873 | ce_stage(ce), filename); |
77e8466f | 1874 | } |
009fee47 | 1875 | |
0488481e | 1876 | if (repo_file_exists(r, filename)) |
b0418303 | 1877 | die(_("path '%s' exists on disk, but not in the index"), filename); |
c7054209 | 1878 | if (is_missing_file_error(errno)) |
b0418303 | 1879 | die(_("path '%s' does not exist (neither on disk nor in the index)"), |
009fee47 MM |
1880 | filename); |
1881 | ||
43bb66ae | 1882 | strbuf_release(&fullname); |
009fee47 MM |
1883 | } |
1884 | ||
1885 | ||
0381f7f3 | 1886 | static char *resolve_relative_path(struct repository *r, const char *rel) |
979f7929 | 1887 | { |
59556548 | 1888 | if (!starts_with(rel, "./") && !starts_with(rel, "../")) |
979f7929 NTND |
1889 | return NULL; |
1890 | ||
0381f7f3 | 1891 | if (r != the_repository || !is_inside_work_tree()) |
b0418303 | 1892 | die(_("relative path syntax can't be used outside working tree")); |
979f7929 NTND |
1893 | |
1894 | /* die() inside prefix_path() if resolved path is outside worktree */ | |
1895 | return prefix_path(startup_info->prefix, | |
1896 | startup_info->prefix ? strlen(startup_info->prefix) : 0, | |
1897 | rel); | |
1898 | } | |
1899 | ||
561287d3 DS |
1900 | static int reject_tree_in_index(struct repository *repo, |
1901 | int only_to_die, | |
1902 | const struct cache_entry *ce, | |
1903 | int stage, | |
1904 | const char *prefix, | |
1905 | const char *cp) | |
1906 | { | |
1907 | if (!S_ISSPARSEDIR(ce->ce_mode)) | |
1908 | return 0; | |
1909 | if (only_to_die) | |
1910 | diagnose_invalid_index_path(repo, stage, prefix, cp); | |
1911 | return -1; | |
1912 | } | |
1913 | ||
7589e636 | 1914 | static enum get_oid_result get_oid_with_context_1(struct repository *repo, |
3a7a698e | 1915 | const char *name, |
e82caf38 | 1916 | unsigned flags, |
1917 | const char *prefix, | |
1918 | struct object_id *oid, | |
1919 | struct object_context *oc) | |
a0cd87a5 MK |
1920 | { |
1921 | int ret, bracket_depth; | |
73b0e5af JH |
1922 | int namelen = strlen(name); |
1923 | const char *cp; | |
321c89bf | 1924 | int only_to_die = flags & GET_OID_ONLY_TO_DIE; |
5119602a | 1925 | |
573285e5 CP |
1926 | memset(oc, 0, sizeof(*oc)); |
1927 | oc->mode = S_IFINVALID; | |
d72cae12 | 1928 | strbuf_init(&oc->symlink_path, 0); |
2b1790f5 | 1929 | ret = get_oid_1(repo, name, namelen, oid, flags); |
245b9488 ÆAB |
1930 | if (!ret && flags & GET_OID_REQUIRE_PATH) |
1931 | die(_("<object>:<path> required, only <object> '%s' given"), | |
1932 | name); | |
73b0e5af JH |
1933 | if (!ret) |
1934 | return ret; | |
33bd598c | 1935 | /* |
1e6771e5 | 1936 | * tree:path --> object name of path in tree |
979f7929 NTND |
1937 | * :path -> object name of absolute path in index |
1938 | * :./path -> object name of path relative to cwd in index | |
73b0e5af | 1939 | * :[0-3]:path -> object name of path in index at stage |
95ad6d2d | 1940 | * :/foo -> recent commit matching foo |
73b0e5af JH |
1941 | */ |
1942 | if (name[0] == ':') { | |
1943 | int stage = 0; | |
9c5e6c80 | 1944 | const struct cache_entry *ce; |
979f7929 | 1945 | char *new_path = NULL; |
73b0e5af | 1946 | int pos; |
2e83b66c | 1947 | if (!only_to_die && namelen > 2 && name[1] == '/') { |
c931ba4e | 1948 | struct handle_one_ref_cb cb; |
84baa31b | 1949 | struct commit_list *list = NULL; |
2b2a5be3 | 1950 | |
c931ba4e NTND |
1951 | cb.repo = repo; |
1952 | cb.list = &list; | |
5ff4b920 | 1953 | refs_for_each_ref(get_main_ref_store(repo), handle_one_ref, &cb); |
02204610 | 1954 | refs_head_ref(get_main_ref_store(repo), handle_one_ref, &cb); |
e8d1dfe6 | 1955 | commit_list_sort_by_date(&list); |
0bb41a19 | 1956 | return get_oid_oneline(repo, name + 2, oid, list); |
84baa31b | 1957 | } |
73b0e5af JH |
1958 | if (namelen < 3 || |
1959 | name[2] != ':' || | |
1960 | name[1] < '0' || '3' < name[1]) | |
1961 | cp = name + 1; | |
1962 | else { | |
1963 | stage = name[1] - '0'; | |
1964 | cp = name + 3; | |
5119602a | 1965 | } |
0381f7f3 | 1966 | new_path = resolve_relative_path(repo, cp); |
3d6e0f74 JH |
1967 | if (!new_path) { |
1968 | namelen = namelen - (cp - name); | |
1969 | } else { | |
1970 | cp = new_path; | |
1971 | namelen = strlen(cp); | |
1972 | } | |
573285e5 | 1973 | |
321c89bf | 1974 | if (flags & GET_OID_RECORD_PATH) |
dc944b65 | 1975 | oc->path = xstrdup(cp); |
573285e5 | 1976 | |
581d2fd9 | 1977 | if (!repo->index || !repo->index->cache) |
efe461b0 | 1978 | repo_read_index(repo); |
3a7a698e | 1979 | pos = index_name_pos(repo->index, cp, namelen); |
73b0e5af JH |
1980 | if (pos < 0) |
1981 | pos = -pos - 1; | |
3a7a698e NTND |
1982 | while (pos < repo->index->cache_nr) { |
1983 | ce = repo->index->cache[pos]; | |
73b0e5af JH |
1984 | if (ce_namelen(ce) != namelen || |
1985 | memcmp(ce->name, cp, namelen)) | |
1986 | break; | |
1987 | if (ce_stage(ce) == stage) { | |
561287d3 DS |
1988 | free(new_path); |
1989 | if (reject_tree_in_index(repo, only_to_die, ce, | |
1990 | stage, prefix, cp)) | |
1991 | return -1; | |
e82caf38 | 1992 | oidcpy(oid, &ce->oid); |
90064710 | 1993 | oc->mode = ce->ce_mode; |
73b0e5af JH |
1994 | return 0; |
1995 | } | |
e7cef45f | 1996 | pos++; |
73b0e5af | 1997 | } |
2e83b66c | 1998 | if (only_to_die && name[1] && name[1] != '/') |
0488481e | 1999 | diagnose_invalid_index_path(repo, stage, prefix, cp); |
979f7929 | 2000 | free(new_path); |
73b0e5af JH |
2001 | return -1; |
2002 | } | |
cce91a2c SP |
2003 | for (cp = name, bracket_depth = 0; *cp; cp++) { |
2004 | if (*cp == '{') | |
2005 | bracket_depth++; | |
2006 | else if (bracket_depth && *cp == '}') | |
2007 | bracket_depth--; | |
2008 | else if (!bracket_depth && *cp == ':') | |
2009 | break; | |
2010 | } | |
2011 | if (*cp == ':') { | |
e82caf38 | 2012 | struct object_id tree_oid; |
b2981d06 | 2013 | int len = cp - name; |
8a10fea4 JK |
2014 | unsigned sub_flags = flags; |
2015 | ||
321c89bf | 2016 | sub_flags &= ~GET_OID_DISAMBIGUATORS; |
2017 | sub_flags |= GET_OID_TREEISH; | |
8a10fea4 | 2018 | |
2b1790f5 | 2019 | if (!get_oid_1(repo, name, len, &tree_oid, sub_flags)) { |
009fee47 | 2020 | const char *filename = cp+1; |
979f7929 NTND |
2021 | char *new_filename = NULL; |
2022 | ||
0381f7f3 | 2023 | new_filename = resolve_relative_path(repo, filename); |
979f7929 NTND |
2024 | if (new_filename) |
2025 | filename = new_filename; | |
321c89bf | 2026 | if (flags & GET_OID_FOLLOW_SYMLINKS) { |
0dd1f0c3 | 2027 | ret = get_tree_entry_follow_symlinks(repo, &tree_oid, |
3b683bcf | 2028 | filename, oid, &oc->symlink_path, |
c4ec9677 DT |
2029 | &oc->mode); |
2030 | } else { | |
50ddb089 | 2031 | ret = get_tree_entry(repo, &tree_oid, filename, oid, |
916bc35b | 2032 | &oc->mode); |
c4ec9677 | 2033 | if (ret && only_to_die) { |
50ddb089 | 2034 | diagnose_invalid_oid_path(repo, prefix, |
c4ec9677 | 2035 | filename, |
e82caf38 | 2036 | &tree_oid, |
c4ec9677 DT |
2037 | name, len); |
2038 | } | |
009fee47 | 2039 | } |
321c89bf | 2040 | if (flags & GET_OID_RECORD_PATH) |
dc944b65 | 2041 | oc->path = xstrdup(filename); |
573285e5 | 2042 | |
979f7929 | 2043 | free(new_filename); |
009fee47 MM |
2044 | return ret; |
2045 | } else { | |
2e83b66c | 2046 | if (only_to_die) |
b0418303 | 2047 | die(_("invalid object name '%.*s'."), len, name); |
009fee47 | 2048 | } |
5119602a LT |
2049 | } |
2050 | return ret; | |
9938af6a | 2051 | } |
f01cc14c | 2052 | |
8c135ea2 JH |
2053 | /* |
2054 | * Call this function when you know "name" given by the end user must | |
2055 | * name an object but it doesn't; the function _may_ die with a better | |
2056 | * diagnostic message than "no such object 'name'", e.g. "Path 'doc' does not | |
2057 | * exist in 'HEAD'" when given "HEAD:doc", or it may return in which case | |
2058 | * you have a chance to diagnose the error further. | |
2059 | */ | |
e270f42c NTND |
2060 | void maybe_die_on_misspelt_object_name(struct repository *r, |
2061 | const char *name, | |
2062 | const char *prefix) | |
f01cc14c JH |
2063 | { |
2064 | struct object_context oc; | |
e82caf38 | 2065 | struct object_id oid; |
9ce6000c | 2066 | get_oid_with_context_1(r, name, GET_OID_ONLY_TO_DIE | GET_OID_QUIETLY, |
3a7a698e | 2067 | prefix, &oid, &oc); |
8c135ea2 JH |
2068 | } |
2069 | ||
127b48f9 NTND |
2070 | enum get_oid_result get_oid_with_context(struct repository *repo, |
2071 | const char *str, | |
2072 | unsigned flags, | |
2073 | struct object_id *oid, | |
2074 | struct object_context *oc) | |
f01cc14c | 2075 | { |
321c89bf | 2076 | if (flags & GET_OID_FOLLOW_SYMLINKS && flags & GET_OID_ONLY_TO_DIE) |
1e6771e5 | 2077 | BUG("incompatible flags for get_oid_with_context"); |
3a7a698e | 2078 | return get_oid_with_context_1(repo, str, flags, NULL, oid, oc); |
f01cc14c | 2079 | } |