]>
Commit | Line | Data |
---|---|---|
9938af6a | 1 | #include "cache.h" |
5385f52d | 2 | #include "tag.h" |
9938af6a | 3 | #include "commit.h" |
5385f52d JH |
4 | #include "tree.h" |
5 | #include "blob.h" | |
f3ab49db | 6 | #include "tree-walk.h" |
d556fae2 | 7 | #include "refs.h" |
28fb8438 | 8 | #include "remote.h" |
9938af6a | 9 | |
32574b68 NTND |
10 | static int get_sha1_oneline(const char *, unsigned char *, struct commit_list *); |
11 | ||
a78fafe7 JH |
12 | typedef int (*disambiguate_hint_fn)(const unsigned char *, void *); |
13 | ||
14 | struct disambiguate_state { | |
15 | disambiguate_hint_fn fn; | |
16 | void *cb_data; | |
17 | unsigned char candidate[20]; | |
18 | unsigned candidate_exists:1; | |
19 | unsigned candidate_checked:1; | |
20 | unsigned candidate_ok:1; | |
21 | unsigned disambiguate_fn_used:1; | |
22 | unsigned ambiguous:1; | |
23 | }; | |
24 | ||
25 | static void update_candidates(struct disambiguate_state *ds, const unsigned char *current) | |
26 | { | |
27 | if (!ds->candidate_exists) { | |
28 | /* this is the first candidate */ | |
29 | hashcpy(ds->candidate, current); | |
30 | ds->candidate_exists = 1; | |
31 | return; | |
32 | } else if (!hashcmp(ds->candidate, current)) { | |
33 | /* the same as what we already have seen */ | |
34 | return; | |
35 | } | |
36 | ||
37 | if (!ds->fn) { | |
38 | /* cannot disambiguate between ds->candidate and current */ | |
39 | ds->ambiguous = 1; | |
40 | return; | |
41 | } | |
42 | ||
43 | if (!ds->candidate_checked) { | |
44 | ds->candidate_ok = ds->fn(ds->candidate, ds->cb_data); | |
45 | ds->disambiguate_fn_used = 1; | |
46 | ds->candidate_checked = 1; | |
47 | } | |
48 | ||
49 | if (!ds->candidate_ok) { | |
50 | /* discard the candidate; we know it does not satisify fn */ | |
51 | hashcpy(ds->candidate, current); | |
52 | ds->candidate_checked = 0; | |
53 | return; | |
54 | } | |
55 | ||
56 | /* if we reach this point, we know ds->candidate satisfies fn */ | |
57 | if (ds->fn(current, ds->cb_data)) { | |
58 | /* | |
59 | * if both current and candidate satisfy fn, we cannot | |
60 | * disambiguate. | |
61 | */ | |
62 | ds->candidate_ok = 0; | |
63 | ds->ambiguous = 1; | |
64 | } | |
65 | ||
66 | /* otherwise, current can be discarded and candidate is still good */ | |
67 | } | |
68 | ||
69 | static void find_short_object_filename(int len, const char *hex_pfx, struct disambiguate_state *ds) | |
9938af6a | 70 | { |
99a19b43 | 71 | struct alternate_object_database *alt; |
9938af6a | 72 | char hex[40]; |
99a19b43 JH |
73 | static struct alternate_object_database *fakeent; |
74 | ||
75 | if (!fakeent) { | |
274ac009 JH |
76 | /* |
77 | * Create a "fake" alternate object database that | |
78 | * points to our own object database, to make it | |
79 | * easier to get a temporary working space in | |
80 | * alt->name/alt->base while iterating over the | |
81 | * object databases including our own. | |
82 | */ | |
99a19b43 JH |
83 | const char *objdir = get_object_directory(); |
84 | int objdir_len = strlen(objdir); | |
85 | int entlen = objdir_len + 43; | |
86 | fakeent = xmalloc(sizeof(*fakeent) + entlen); | |
87 | memcpy(fakeent->base, objdir, objdir_len); | |
88 | fakeent->name = fakeent->base + objdir_len + 1; | |
89 | fakeent->name[-1] = '/'; | |
90 | } | |
91 | fakeent->next = alt_odb_list; | |
9938af6a | 92 | |
1703f9aa | 93 | sprintf(hex, "%.2s", hex_pfx); |
a78fafe7 | 94 | for (alt = fakeent; alt && !ds->ambiguous; alt = alt->next) { |
9938af6a | 95 | struct dirent *de; |
99a19b43 | 96 | DIR *dir; |
1703f9aa | 97 | sprintf(alt->name, "%.2s/", hex_pfx); |
99a19b43 JH |
98 | dir = opendir(alt->base); |
99 | if (!dir) | |
100 | continue; | |
a78fafe7 JH |
101 | |
102 | while (!ds->ambiguous && (de = readdir(dir)) != NULL) { | |
103 | unsigned char sha1[20]; | |
104 | ||
9938af6a JH |
105 | if (strlen(de->d_name) != 38) |
106 | continue; | |
1703f9aa | 107 | if (memcmp(de->d_name, hex_pfx + 2, len - 2)) |
9938af6a | 108 | continue; |
a78fafe7 JH |
109 | memcpy(hex + 2, de->d_name, 38); |
110 | if (!get_sha1_hex(hex, sha1)) | |
111 | update_candidates(ds, sha1); | |
9938af6a JH |
112 | } |
113 | closedir(dir); | |
114 | } | |
9938af6a JH |
115 | } |
116 | ||
117 | static int match_sha(unsigned len, const unsigned char *a, const unsigned char *b) | |
118 | { | |
119 | do { | |
120 | if (*a != *b) | |
121 | return 0; | |
122 | a++; | |
123 | b++; | |
124 | len -= 2; | |
125 | } while (len > 1); | |
126 | if (len) | |
127 | if ((*a ^ *b) & 0xf0) | |
128 | return 0; | |
129 | return 1; | |
130 | } | |
131 | ||
a78fafe7 | 132 | static void unique_in_pack(int len, |
1703f9aa | 133 | const unsigned char *bin_pfx, |
a78fafe7 JH |
134 | struct packed_git *p, |
135 | struct disambiguate_state *ds) | |
f703e6ea JH |
136 | { |
137 | uint32_t num, last, i, first = 0; | |
138 | const unsigned char *current = NULL; | |
139 | ||
140 | open_pack_index(p); | |
141 | num = p->num_objects; | |
142 | last = num; | |
143 | while (first < last) { | |
144 | uint32_t mid = (first + last) / 2; | |
145 | const unsigned char *current; | |
146 | int cmp; | |
147 | ||
148 | current = nth_packed_object_sha1(p, mid); | |
1703f9aa | 149 | cmp = hashcmp(bin_pfx, current); |
f703e6ea JH |
150 | if (!cmp) { |
151 | first = mid; | |
152 | break; | |
153 | } | |
154 | if (cmp > 0) { | |
155 | first = mid+1; | |
156 | continue; | |
157 | } | |
158 | last = mid; | |
159 | } | |
160 | ||
161 | /* | |
162 | * At this point, "first" is the location of the lowest object | |
1703f9aa | 163 | * with an object name that could match "bin_pfx". See if we have |
f703e6ea JH |
164 | * 0, 1 or more objects that actually match(es). |
165 | */ | |
a78fafe7 JH |
166 | for (i = first; i < num && !ds->ambiguous; i++) { |
167 | current = nth_packed_object_sha1(p, i); | |
1703f9aa | 168 | if (!match_sha(len, bin_pfx, current)) |
f703e6ea | 169 | break; |
a78fafe7 | 170 | update_candidates(ds, current); |
f703e6ea | 171 | } |
f703e6ea JH |
172 | } |
173 | ||
a78fafe7 JH |
174 | static void find_short_packed_object(int len, const unsigned char *bin_pfx, |
175 | struct disambiguate_state *ds) | |
9938af6a JH |
176 | { |
177 | struct packed_git *p; | |
178 | ||
179 | prepare_packed_git(); | |
a78fafe7 JH |
180 | for (p = packed_git; p && !ds->ambiguous; p = p->next) |
181 | unique_in_pack(len, bin_pfx, p, ds); | |
99a19b43 JH |
182 | } |
183 | ||
013f276e JH |
184 | #define SHORT_NAME_NOT_FOUND (-1) |
185 | #define SHORT_NAME_AMBIGUOUS (-2) | |
186 | ||
a78fafe7 JH |
187 | static int finish_object_disambiguation(struct disambiguate_state *ds, |
188 | unsigned char *sha1) | |
99a19b43 | 189 | { |
a78fafe7 JH |
190 | if (ds->ambiguous) |
191 | return SHORT_NAME_AMBIGUOUS; | |
99a19b43 | 192 | |
a78fafe7 | 193 | if (!ds->candidate_exists) |
013f276e | 194 | return SHORT_NAME_NOT_FOUND; |
a78fafe7 JH |
195 | |
196 | if (!ds->candidate_checked) | |
197 | /* | |
198 | * If this is the only candidate, there is no point | |
199 | * calling the disambiguation hint callback. | |
200 | * | |
201 | * On the other hand, if the current candidate | |
202 | * replaced an earlier candidate that did _not_ pass | |
203 | * the disambiguation hint callback, then we do have | |
204 | * more than one objects that match the short name | |
205 | * given, so we should make sure this one matches; | |
206 | * otherwise, if we discovered this one and the one | |
207 | * that we previously discarded in the reverse order, | |
208 | * we would end up showing different results in the | |
209 | * same repository! | |
210 | */ | |
211 | ds->candidate_ok = (!ds->disambiguate_fn_used || | |
212 | ds->fn(ds->candidate, ds->cb_data)); | |
213 | ||
214 | if (!ds->candidate_ok) | |
c005e986 | 215 | return SHORT_NAME_AMBIGUOUS; |
a78fafe7 JH |
216 | |
217 | hashcpy(sha1, ds->candidate); | |
9938af6a JH |
218 | return 0; |
219 | } | |
220 | ||
aa1dec9e JH |
221 | static int disambiguate_commit_only(const unsigned char *sha1, void *cb_data_unused) |
222 | { | |
223 | int kind = sha1_object_info(sha1, NULL); | |
224 | return kind == OBJ_COMMIT; | |
225 | } | |
226 | ||
013f276e | 227 | static int get_short_sha1(const char *name, int len, unsigned char *sha1, |
37c00e55 | 228 | unsigned flags) |
9938af6a | 229 | { |
013f276e | 230 | int i, status; |
1703f9aa JH |
231 | char hex_pfx[40]; |
232 | unsigned char bin_pfx[20]; | |
a78fafe7 | 233 | struct disambiguate_state ds; |
37c00e55 | 234 | int quietly = !!(flags & GET_SHA1_QUIETLY); |
9938af6a | 235 | |
8a83157e | 236 | if (len < MINIMUM_ABBREV || len > 40) |
af61c6e0 | 237 | return -1; |
1703f9aa JH |
238 | hashclr(bin_pfx); |
239 | memset(hex_pfx, 'x', 40); | |
af61c6e0 | 240 | for (i = 0; i < len ;i++) { |
9938af6a JH |
241 | unsigned char c = name[i]; |
242 | unsigned char val; | |
9938af6a JH |
243 | if (c >= '0' && c <= '9') |
244 | val = c - '0'; | |
245 | else if (c >= 'a' && c <= 'f') | |
246 | val = c - 'a' + 10; | |
247 | else if (c >= 'A' && c <='F') { | |
248 | val = c - 'A' + 10; | |
249 | c -= 'A' - 'a'; | |
250 | } | |
251 | else | |
252 | return -1; | |
1703f9aa | 253 | hex_pfx[i] = c; |
9938af6a JH |
254 | if (!(i & 1)) |
255 | val <<= 4; | |
1703f9aa | 256 | bin_pfx[i >> 1] |= val; |
9938af6a | 257 | } |
99a19b43 | 258 | |
a78fafe7 JH |
259 | prepare_alt_odb(); |
260 | ||
261 | memset(&ds, 0, sizeof(ds)); | |
aa1dec9e JH |
262 | if (flags & GET_SHA1_COMMIT) |
263 | ds.fn = disambiguate_commit_only; | |
264 | ||
a78fafe7 JH |
265 | find_short_object_filename(len, hex_pfx, &ds); |
266 | find_short_packed_object(len, bin_pfx, &ds); | |
267 | status = finish_object_disambiguation(&ds, sha1); | |
268 | ||
013f276e | 269 | if (!quietly && (status == SHORT_NAME_AMBIGUOUS)) |
1703f9aa | 270 | return error("short SHA1 %.*s is ambiguous.", len, hex_pfx); |
013f276e JH |
271 | return status; |
272 | } | |
273 | ||
274 | const char *find_unique_abbrev(const unsigned char *sha1, int len) | |
275 | { | |
b66fde9a | 276 | int status, exists; |
013f276e | 277 | static char hex[41]; |
47dd0d59 | 278 | |
b66fde9a | 279 | exists = has_sha1_file(sha1); |
013f276e | 280 | memcpy(hex, sha1_to_hex(sha1), 40); |
02c5cba2 | 281 | if (len == 40 || !len) |
47dd0d59 | 282 | return hex; |
013f276e JH |
283 | while (len < 40) { |
284 | unsigned char sha1_ret[20]; | |
37c00e55 | 285 | status = get_short_sha1(hex, len, sha1_ret, GET_SHA1_QUIETLY); |
b66fde9a JH |
286 | if (exists |
287 | ? !status | |
288 | : status == SHORT_NAME_NOT_FOUND) { | |
ea2c69ed | 289 | hex[len] = 0; |
013f276e JH |
290 | return hex; |
291 | } | |
013f276e JH |
292 | len++; |
293 | } | |
b66fde9a | 294 | return hex; |
9938af6a JH |
295 | } |
296 | ||
6677c466 | 297 | static int ambiguous_path(const char *path, int len) |
af13cdf2 LT |
298 | { |
299 | int slash = 1; | |
6677c466 | 300 | int cnt; |
af13cdf2 | 301 | |
6677c466 | 302 | for (cnt = 0; cnt < len; cnt++) { |
af13cdf2 LT |
303 | switch (*path++) { |
304 | case '\0': | |
305 | break; | |
306 | case '/': | |
307 | if (slash) | |
308 | break; | |
309 | slash = 1; | |
310 | continue; | |
311 | case '.': | |
312 | continue; | |
313 | default: | |
314 | slash = 0; | |
315 | continue; | |
316 | } | |
c054d64e | 317 | break; |
af13cdf2 | 318 | } |
6677c466 | 319 | return slash; |
af13cdf2 LT |
320 | } |
321 | ||
ae0ba8e2 JH |
322 | static inline int upstream_mark(const char *string, int len) |
323 | { | |
324 | const char *suffix[] = { "@{upstream}", "@{u}" }; | |
325 | int i; | |
326 | ||
327 | for (i = 0; i < ARRAY_SIZE(suffix); i++) { | |
328 | int suffix_len = strlen(suffix[i]); | |
329 | if (suffix_len <= len | |
330 | && !memcmp(string, suffix[i], suffix_len)) | |
331 | return suffix_len; | |
332 | } | |
333 | return 0; | |
334 | } | |
335 | ||
d18ba221 TR |
336 | static int get_sha1_1(const char *name, int len, unsigned char *sha1); |
337 | ||
e86eb666 JH |
338 | static int get_sha1_basic(const char *str, int len, unsigned char *sha1) |
339 | { | |
eedce784 | 340 | static const char *warn_msg = "refname '%.*s' is ambiguous."; |
ed378ec7 | 341 | char *real_ref = NULL; |
ab2a1a32 JH |
342 | int refs_found = 0; |
343 | int at, reflog_len; | |
9938af6a | 344 | |
3c3852e3 | 345 | if (len == 40 && !get_sha1_hex(str, sha1)) |
9938af6a JH |
346 | return 0; |
347 | ||
d18ba221 | 348 | /* basic@{time or number or -number} format to query ref-log */ |
694500ed | 349 | reflog_len = at = 0; |
f265458f | 350 | if (len && str[len-1] == '}') { |
aa9c55b6 | 351 | for (at = len-2; at >= 0; at--) { |
ab2a1a32 | 352 | if (str[at] == '@' && str[at+1] == '{') { |
ae0ba8e2 | 353 | if (!upstream_mark(str + at, len - at)) { |
28fb8438 JS |
354 | reflog_len = (len-1) - (at+2); |
355 | len = at; | |
356 | } | |
ab2a1a32 JH |
357 | break; |
358 | } | |
d556fae2 SP |
359 | } |
360 | } | |
361 | ||
af13cdf2 | 362 | /* Accept only unambiguous ref paths. */ |
11cf8801 | 363 | if (len && ambiguous_path(str, len)) |
af13cdf2 LT |
364 | return -1; |
365 | ||
11cf8801 | 366 | if (!len && reflog_len) { |
d18ba221 TR |
367 | struct strbuf buf = STRBUF_INIT; |
368 | int ret; | |
369 | /* try the @{-N} syntax for n-th checkout */ | |
431b1969 | 370 | ret = interpret_branch_name(str+at, &buf); |
d18ba221 TR |
371 | if (ret > 0) { |
372 | /* substitute this branch name and restart */ | |
373 | return get_sha1_1(buf.buf, buf.len, sha1); | |
374 | } else if (ret == 0) { | |
375 | return -1; | |
376 | } | |
11cf8801 NP |
377 | /* allow "@{...}" to mean the current branch reflog */ |
378 | refs_found = dwim_ref("HEAD", 4, sha1, &real_ref); | |
f2eba66d NP |
379 | } else if (reflog_len) |
380 | refs_found = dwim_log(str, len, sha1, &real_ref); | |
381 | else | |
11cf8801 | 382 | refs_found = dwim_ref(str, len, sha1, &real_ref); |
d556fae2 SP |
383 | |
384 | if (!refs_found) | |
385 | return -1; | |
386 | ||
387 | if (warn_ambiguous_refs && refs_found > 1) | |
eedce784 | 388 | warning(warn_msg, len, str); |
d556fae2 | 389 | |
ab2a1a32 | 390 | if (reflog_len) { |
ab2a1a32 JH |
391 | int nth, i; |
392 | unsigned long at_time; | |
16d7cc90 JH |
393 | unsigned long co_time; |
394 | int co_tz, co_cnt; | |
395 | ||
12a258c0 JK |
396 | /* a @{-N} placed anywhere except the start is an error */ |
397 | if (str[at+2] == '-') | |
398 | return -1; | |
399 | ||
fe558516 | 400 | /* Is it asking for N-th entry, or approxidate? */ |
ab2a1a32 JH |
401 | for (i = nth = 0; 0 <= nth && i < reflog_len; i++) { |
402 | char ch = str[at+2+i]; | |
403 | if ('0' <= ch && ch <= '9') | |
404 | nth = nth * 10 + ch - '0'; | |
405 | else | |
406 | nth = -1; | |
407 | } | |
ea360dd0 SP |
408 | if (100000000 <= nth) { |
409 | at_time = nth; | |
410 | nth = -1; | |
411 | } else if (0 <= nth) | |
ab2a1a32 | 412 | at_time = 0; |
861f00e3 | 413 | else { |
93cfa7c7 | 414 | int errors = 0; |
861f00e3 | 415 | char *tmp = xstrndup(str + at + 2, reflog_len); |
93cfa7c7 | 416 | at_time = approxidate_careful(tmp, &errors); |
861f00e3 | 417 | free(tmp); |
a5e10acb JH |
418 | if (errors) |
419 | return -1; | |
861f00e3 | 420 | } |
16d7cc90 JH |
421 | if (read_ref_at(real_ref, at_time, nth, sha1, NULL, |
422 | &co_time, &co_tz, &co_cnt)) { | |
423 | if (at_time) | |
eedce784 JS |
424 | warning("Log for '%.*s' only goes " |
425 | "back to %s.", len, str, | |
73013afd | 426 | show_date(co_time, co_tz, DATE_RFC2822)); |
e6eedc31 JS |
427 | else { |
428 | free(real_ref); | |
429 | die("Log for '%.*s' only has %d entries.", | |
430 | len, str, co_cnt); | |
431 | } | |
16d7cc90 | 432 | } |
d556fae2 SP |
433 | } |
434 | ||
ed378ec7 | 435 | free(real_ref); |
d556fae2 | 436 | return 0; |
9938af6a JH |
437 | } |
438 | ||
9938af6a JH |
439 | static int get_parent(const char *name, int len, |
440 | unsigned char *result, int idx) | |
441 | { | |
442 | unsigned char sha1[20]; | |
443 | int ret = get_sha1_1(name, len, sha1); | |
444 | struct commit *commit; | |
445 | struct commit_list *p; | |
446 | ||
447 | if (ret) | |
448 | return ret; | |
449 | commit = lookup_commit_reference(sha1); | |
450 | if (!commit) | |
451 | return -1; | |
452 | if (parse_commit(commit)) | |
453 | return -1; | |
454 | if (!idx) { | |
e702496e | 455 | hashcpy(result, commit->object.sha1); |
9938af6a JH |
456 | return 0; |
457 | } | |
458 | p = commit->parents; | |
459 | while (p) { | |
460 | if (!--idx) { | |
e702496e | 461 | hashcpy(result, p->item->object.sha1); |
9938af6a JH |
462 | return 0; |
463 | } | |
464 | p = p->next; | |
465 | } | |
466 | return -1; | |
467 | } | |
468 | ||
4f7599ac JH |
469 | static int get_nth_ancestor(const char *name, int len, |
470 | unsigned char *result, int generation) | |
471 | { | |
472 | unsigned char sha1[20]; | |
621ff675 LT |
473 | struct commit *commit; |
474 | int ret; | |
475 | ||
476 | ret = get_sha1_1(name, len, sha1); | |
4f7599ac JH |
477 | if (ret) |
478 | return ret; | |
621ff675 LT |
479 | commit = lookup_commit_reference(sha1); |
480 | if (!commit) | |
481 | return -1; | |
4f7599ac JH |
482 | |
483 | while (generation--) { | |
621ff675 | 484 | if (parse_commit(commit) || !commit->parents) |
4f7599ac | 485 | return -1; |
621ff675 | 486 | commit = commit->parents->item; |
4f7599ac | 487 | } |
621ff675 | 488 | hashcpy(result, commit->object.sha1); |
4f7599ac JH |
489 | return 0; |
490 | } | |
491 | ||
81776315 JH |
492 | struct object *peel_to_type(const char *name, int namelen, |
493 | struct object *o, enum object_type expected_type) | |
494 | { | |
495 | if (name && !namelen) | |
496 | namelen = strlen(name); | |
81776315 JH |
497 | while (1) { |
498 | if (!o || (!o->parsed && !parse_object(o->sha1))) | |
499 | return NULL; | |
500 | if (o->type == expected_type) | |
501 | return o; | |
502 | if (o->type == OBJ_TAG) | |
503 | o = ((struct tag*) o)->tagged; | |
504 | else if (o->type == OBJ_COMMIT) | |
505 | o = &(((struct commit *) o)->tree->object); | |
506 | else { | |
507 | if (name) | |
508 | error("%.*s: expected %s type, but the object " | |
509 | "dereferences to %s type", | |
510 | namelen, name, typename(expected_type), | |
511 | typename(o->type)); | |
512 | return NULL; | |
513 | } | |
514 | } | |
515 | } | |
516 | ||
5385f52d JH |
517 | static int peel_onion(const char *name, int len, unsigned char *sha1) |
518 | { | |
519 | unsigned char outer[20]; | |
520 | const char *sp; | |
885a86ab | 521 | unsigned int expected_type = 0; |
5385f52d JH |
522 | struct object *o; |
523 | ||
524 | /* | |
525 | * "ref^{type}" dereferences ref repeatedly until you cannot | |
526 | * dereference anymore, or you get an object of given type, | |
527 | * whichever comes first. "ref^{}" means just dereference | |
528 | * tags until you get a non-tag. "ref^0" is a shorthand for | |
529 | * "ref^{commit}". "commit^{tree}" could be used to find the | |
530 | * top-level tree of the given commit. | |
531 | */ | |
532 | if (len < 4 || name[len-1] != '}') | |
533 | return -1; | |
534 | ||
535 | for (sp = name + len - 1; name <= sp; sp--) { | |
536 | int ch = *sp; | |
537 | if (ch == '{' && name < sp && sp[-1] == '^') | |
538 | break; | |
539 | } | |
540 | if (sp <= name) | |
541 | return -1; | |
542 | ||
543 | sp++; /* beginning of type name, or closing brace for empty */ | |
544 | if (!strncmp(commit_type, sp, 6) && sp[6] == '}') | |
1974632c | 545 | expected_type = OBJ_COMMIT; |
5385f52d | 546 | else if (!strncmp(tree_type, sp, 4) && sp[4] == '}') |
1974632c | 547 | expected_type = OBJ_TREE; |
5385f52d | 548 | else if (!strncmp(blob_type, sp, 4) && sp[4] == '}') |
1974632c | 549 | expected_type = OBJ_BLOB; |
5385f52d | 550 | else if (sp[0] == '}') |
1974632c | 551 | expected_type = OBJ_NONE; |
32574b68 NTND |
552 | else if (sp[0] == '/') |
553 | expected_type = OBJ_COMMIT; | |
5385f52d JH |
554 | else |
555 | return -1; | |
556 | ||
557 | if (get_sha1_1(name, sp - name - 2, outer)) | |
558 | return -1; | |
559 | ||
560 | o = parse_object(outer); | |
561 | if (!o) | |
562 | return -1; | |
885a86ab | 563 | if (!expected_type) { |
9534f40b | 564 | o = deref_tag(o, name, sp - name - 2); |
6e1c6c10 JH |
565 | if (!o || (!o->parsed && !parse_object(o->sha1))) |
566 | return -1; | |
e702496e | 567 | hashcpy(sha1, o->sha1); |
32574b68 | 568 | return 0; |
5385f52d | 569 | } |
32574b68 NTND |
570 | |
571 | /* | |
572 | * At this point, the syntax look correct, so | |
573 | * if we do not get the needed object, we should | |
574 | * barf. | |
575 | */ | |
576 | o = peel_to_type(name, len, o, expected_type); | |
577 | if (!o) | |
81776315 | 578 | return -1; |
32574b68 NTND |
579 | |
580 | hashcpy(sha1, o->sha1); | |
581 | if (sp[0] == '/') { | |
582 | /* "$commit^{/foo}" */ | |
583 | char *prefix; | |
584 | int ret; | |
585 | struct commit_list *list = NULL; | |
586 | ||
81776315 | 587 | /* |
4322842a NTND |
588 | * $commit^{/}. Some regex implementation may reject. |
589 | * We don't need regex anyway. '' pattern always matches. | |
5385f52d | 590 | */ |
4322842a | 591 | if (sp[1] == '}') |
81776315 | 592 | return 0; |
4322842a | 593 | |
32574b68 NTND |
594 | prefix = xstrndup(sp + 1, name + len - 1 - (sp + 1)); |
595 | commit_list_insert((struct commit *)o, &list); | |
596 | ret = get_sha1_oneline(prefix, sha1, list); | |
597 | free(prefix); | |
598 | return ret; | |
5385f52d JH |
599 | } |
600 | return 0; | |
601 | } | |
602 | ||
7dd45e15 JH |
603 | static int get_describe_name(const char *name, int len, unsigned char *sha1) |
604 | { | |
605 | const char *cp; | |
606 | ||
607 | for (cp = name + len - 1; name + 2 <= cp; cp--) { | |
608 | char ch = *cp; | |
609 | if (hexval(ch) & ~0377) { | |
610 | /* We must be looking at g in "SOMETHING-g" | |
611 | * for it to be describe output. | |
612 | */ | |
613 | if (ch == 'g' && cp[-1] == '-') { | |
614 | cp++; | |
615 | len -= cp - name; | |
37c00e55 | 616 | return get_short_sha1(cp, len, sha1, GET_SHA1_QUIETLY); |
7dd45e15 JH |
617 | } |
618 | } | |
619 | } | |
620 | return -1; | |
621 | } | |
622 | ||
9938af6a JH |
623 | static int get_sha1_1(const char *name, int len, unsigned char *sha1) |
624 | { | |
0601dbe1 | 625 | int ret, has_suffix; |
4f7599ac | 626 | const char *cp; |
9938af6a | 627 | |
621ff675 LT |
628 | /* |
629 | * "name~3" is "name^^^", "name~" is "name~1", and "name^" is "name^1". | |
4f7599ac | 630 | */ |
0601dbe1 | 631 | has_suffix = 0; |
4f7599ac JH |
632 | for (cp = name + len - 1; name <= cp; cp--) { |
633 | int ch = *cp; | |
634 | if ('0' <= ch && ch <= '9') | |
635 | continue; | |
0601dbe1 JH |
636 | if (ch == '~' || ch == '^') |
637 | has_suffix = ch; | |
4f7599ac JH |
638 | break; |
639 | } | |
0601dbe1 JH |
640 | |
641 | if (has_suffix) { | |
642 | int num = 0; | |
4f7599ac JH |
643 | int len1 = cp - name; |
644 | cp++; | |
645 | while (cp < name + len) | |
0601dbe1 | 646 | num = num * 10 + *cp++ - '0'; |
621ff675 LT |
647 | if (!num && len1 == len - 1) |
648 | num = 1; | |
649 | if (has_suffix == '^') | |
0601dbe1 | 650 | return get_parent(name, len1, sha1, num); |
0601dbe1 JH |
651 | /* else if (has_suffix == '~') -- goes without saying */ |
652 | return get_nth_ancestor(name, len1, sha1, num); | |
4f7599ac JH |
653 | } |
654 | ||
5385f52d JH |
655 | ret = peel_onion(name, len, sha1); |
656 | if (!ret) | |
657 | return 0; | |
658 | ||
9938af6a JH |
659 | ret = get_sha1_basic(name, len, sha1); |
660 | if (!ret) | |
661 | return 0; | |
7dd45e15 JH |
662 | |
663 | /* It could be describe output that is "SOMETHING-gXXXX" */ | |
664 | ret = get_describe_name(name, len, sha1); | |
665 | if (!ret) | |
666 | return 0; | |
667 | ||
013f276e | 668 | return get_short_sha1(name, len, sha1, 0); |
9938af6a JH |
669 | } |
670 | ||
f7bff003 JH |
671 | /* |
672 | * This interprets names like ':/Initial revision of "git"' by searching | |
673 | * through history and returning the first commit whose message starts | |
3d045897 | 674 | * the given regular expression. |
f7bff003 JH |
675 | * |
676 | * For future extension, ':/!' is reserved. If you want to match a message | |
677 | * beginning with a '!', you have to repeat the exclamation mark. | |
678 | */ | |
679 | #define ONELINE_SEEN (1u<<20) | |
680 | ||
28a4d940 JS |
681 | static int handle_one_ref(const char *path, |
682 | const unsigned char *sha1, int flag, void *cb_data) | |
683 | { | |
684 | struct commit_list **list = cb_data; | |
685 | struct object *object = parse_object(sha1); | |
686 | if (!object) | |
687 | return 0; | |
affeef12 | 688 | if (object->type == OBJ_TAG) { |
28a4d940 | 689 | object = deref_tag(object, path, strlen(path)); |
affeef12 MK |
690 | if (!object) |
691 | return 0; | |
692 | } | |
28a4d940 JS |
693 | if (object->type != OBJ_COMMIT) |
694 | return 0; | |
47e44ed1 | 695 | commit_list_insert_by_date((struct commit *)object, list); |
28a4d940 JS |
696 | return 0; |
697 | } | |
698 | ||
84baa31b NTND |
699 | static int get_sha1_oneline(const char *prefix, unsigned char *sha1, |
700 | struct commit_list *list) | |
28a4d940 | 701 | { |
84baa31b | 702 | struct commit_list *backup = NULL, *l; |
28042dbc | 703 | int found = 0; |
57895105 | 704 | regex_t regex; |
28a4d940 JS |
705 | |
706 | if (prefix[0] == '!') { | |
707 | if (prefix[1] != '!') | |
708 | die ("Invalid search pattern: %s", prefix); | |
709 | prefix++; | |
710 | } | |
57895105 LT |
711 | |
712 | if (regcomp(®ex, prefix, REG_EXTENDED)) | |
713 | die("Invalid search pattern: %s", prefix); | |
714 | ||
84baa31b NTND |
715 | for (l = list; l; l = l->next) { |
716 | l->item->object.flags |= ONELINE_SEEN; | |
28a4d940 | 717 | commit_list_insert(l->item, &backup); |
84baa31b | 718 | } |
ed8ad7e2 | 719 | while (list) { |
28042dbc | 720 | char *p, *to_free = NULL; |
1358e7d6 | 721 | struct commit *commit; |
364d3e65 JS |
722 | enum object_type type; |
723 | unsigned long size; | |
28042dbc | 724 | int matches; |
ed8ad7e2 JM |
725 | |
726 | commit = pop_most_recent_commit(&list, ONELINE_SEEN); | |
283cdbcf MK |
727 | if (!parse_object(commit->object.sha1)) |
728 | continue; | |
364d3e65 JS |
729 | if (commit->buffer) |
730 | p = commit->buffer; | |
731 | else { | |
732 | p = read_sha1_file(commit->object.sha1, &type, &size); | |
733 | if (!p) | |
734 | continue; | |
28042dbc | 735 | to_free = p; |
364d3e65 | 736 | } |
28042dbc JH |
737 | |
738 | p = strstr(p, "\n\n"); | |
739 | matches = p && !regexec(®ex, p + 2, 0, NULL, 0); | |
740 | free(to_free); | |
741 | ||
742 | if (matches) { | |
28a4d940 | 743 | hashcpy(sha1, commit->object.sha1); |
28042dbc | 744 | found = 1; |
28a4d940 JS |
745 | break; |
746 | } | |
747 | } | |
57895105 | 748 | regfree(®ex); |
28a4d940 JS |
749 | free_commit_list(list); |
750 | for (l = backup; l; l = l->next) | |
751 | clear_commit_marks(l->item, ONELINE_SEEN); | |
28042dbc JH |
752 | free_commit_list(backup); |
753 | return found ? 0 : -1; | |
28a4d940 JS |
754 | } |
755 | ||
ae5a6c36 | 756 | struct grab_nth_branch_switch_cbdata { |
c2883e62 | 757 | long cnt, alloc; |
ae5a6c36 JH |
758 | struct strbuf *buf; |
759 | }; | |
760 | ||
761 | static int grab_nth_branch_switch(unsigned char *osha1, unsigned char *nsha1, | |
762 | const char *email, unsigned long timestamp, int tz, | |
763 | const char *message, void *cb_data) | |
764 | { | |
765 | struct grab_nth_branch_switch_cbdata *cb = cb_data; | |
a884d0cb TR |
766 | const char *match = NULL, *target = NULL; |
767 | size_t len; | |
c2883e62 | 768 | int nth; |
a884d0cb TR |
769 | |
770 | if (!prefixcmp(message, "checkout: moving from ")) { | |
771 | match = message + strlen("checkout: moving from "); | |
d7c03c1f | 772 | target = strstr(match, " to "); |
ae5a6c36 JH |
773 | } |
774 | ||
c829774c | 775 | if (!match || !target) |
ae5a6c36 JH |
776 | return 0; |
777 | ||
d7c03c1f | 778 | len = target - match; |
c2883e62 JH |
779 | nth = cb->cnt++ % cb->alloc; |
780 | strbuf_reset(&cb->buf[nth]); | |
781 | strbuf_add(&cb->buf[nth], match, len); | |
ae5a6c36 JH |
782 | return 0; |
783 | } | |
784 | ||
785 | /* | |
ae0ba8e2 JH |
786 | * Parse @{-N} syntax, return the number of characters parsed |
787 | * if successful; otherwise signal an error with negative value. | |
ae5a6c36 | 788 | */ |
ae0ba8e2 | 789 | static int interpret_nth_prior_checkout(const char *name, struct strbuf *buf) |
ae5a6c36 | 790 | { |
c2883e62 | 791 | long nth; |
39765e59 | 792 | int i, retval; |
ae5a6c36 | 793 | struct grab_nth_branch_switch_cbdata cb; |
a884d0cb TR |
794 | const char *brace; |
795 | char *num_end; | |
ae5a6c36 JH |
796 | |
797 | if (name[0] != '@' || name[1] != '{' || name[2] != '-') | |
798 | return -1; | |
a884d0cb TR |
799 | brace = strchr(name, '}'); |
800 | if (!brace) | |
801 | return -1; | |
802 | nth = strtol(name+3, &num_end, 10); | |
803 | if (num_end != brace) | |
ae5a6c36 | 804 | return -1; |
c2883e62 JH |
805 | if (nth <= 0) |
806 | return -1; | |
807 | cb.alloc = nth; | |
808 | cb.buf = xmalloc(nth * sizeof(struct strbuf)); | |
809 | for (i = 0; i < nth; i++) | |
810 | strbuf_init(&cb.buf[i], 20); | |
811 | cb.cnt = 0; | |
39765e59 | 812 | retval = 0; |
101d15e0 JH |
813 | for_each_recent_reflog_ent("HEAD", grab_nth_branch_switch, 40960, &cb); |
814 | if (cb.cnt < nth) { | |
815 | cb.cnt = 0; | |
101d15e0 JH |
816 | for_each_reflog_ent("HEAD", grab_nth_branch_switch, &cb); |
817 | } | |
c2883e62 | 818 | if (cb.cnt < nth) |
39765e59 | 819 | goto release_return; |
c2883e62 JH |
820 | i = cb.cnt % nth; |
821 | strbuf_reset(buf); | |
822 | strbuf_add(buf, cb.buf[i].buf, cb.buf[i].len); | |
39765e59 JH |
823 | retval = brace-name+1; |
824 | ||
825 | release_return: | |
c2883e62 JH |
826 | for (i = 0; i < nth; i++) |
827 | strbuf_release(&cb.buf[i]); | |
828 | free(cb.buf); | |
a884d0cb | 829 | |
39765e59 | 830 | return retval; |
ae5a6c36 JH |
831 | } |
832 | ||
619a644d JH |
833 | int get_sha1_mb(const char *name, unsigned char *sha1) |
834 | { | |
835 | struct commit *one, *two; | |
836 | struct commit_list *mbs; | |
837 | unsigned char sha1_tmp[20]; | |
838 | const char *dots; | |
839 | int st; | |
840 | ||
841 | dots = strstr(name, "..."); | |
842 | if (!dots) | |
843 | return get_sha1(name, sha1); | |
844 | if (dots == name) | |
845 | st = get_sha1("HEAD", sha1_tmp); | |
846 | else { | |
847 | struct strbuf sb; | |
848 | strbuf_init(&sb, dots - name); | |
849 | strbuf_add(&sb, name, dots - name); | |
850 | st = get_sha1(sb.buf, sha1_tmp); | |
851 | strbuf_release(&sb); | |
852 | } | |
853 | if (st) | |
854 | return st; | |
855 | one = lookup_commit_reference_gently(sha1_tmp, 0); | |
856 | if (!one) | |
857 | return -1; | |
858 | ||
859 | if (get_sha1(dots[3] ? (dots + 3) : "HEAD", sha1_tmp)) | |
860 | return -1; | |
861 | two = lookup_commit_reference_gently(sha1_tmp, 0); | |
862 | if (!two) | |
863 | return -1; | |
864 | mbs = get_merge_bases(one, two, 1); | |
865 | if (!mbs || mbs->next) | |
866 | st = -1; | |
867 | else { | |
868 | st = 0; | |
869 | hashcpy(sha1, mbs->item->object.sha1); | |
870 | } | |
871 | free_commit_list(mbs); | |
872 | return st; | |
873 | } | |
874 | ||
ae0ba8e2 JH |
875 | /* |
876 | * This reads short-hand syntax that not only evaluates to a commit | |
877 | * object name, but also can act as if the end user spelled the name | |
878 | * of the branch from the command line. | |
879 | * | |
880 | * - "@{-N}" finds the name of the Nth previous branch we were on, and | |
881 | * places the name of the branch in the given buf and returns the | |
882 | * number of characters parsed if successful. | |
883 | * | |
884 | * - "<branch>@{upstream}" finds the name of the other ref that | |
885 | * <branch> is configured to merge with (missing <branch> defaults | |
886 | * to the current branch), and places the name of the branch in the | |
887 | * given buf and returns the number of characters parsed if | |
888 | * successful. | |
889 | * | |
890 | * If the input is not of the accepted format, it returns a negative | |
891 | * number to signal an error. | |
892 | * | |
893 | * If the input was ok but there are not N branch switches in the | |
894 | * reflog, it returns 0. | |
895 | */ | |
896 | int interpret_branch_name(const char *name, struct strbuf *buf) | |
897 | { | |
898 | char *cp; | |
899 | struct branch *upstream; | |
900 | int namelen = strlen(name); | |
901 | int len = interpret_nth_prior_checkout(name, buf); | |
902 | int tmp_len; | |
903 | ||
904 | if (!len) | |
905 | return len; /* syntax Ok, not enough switches */ | |
d46a8301 JK |
906 | if (0 < len && len == namelen) |
907 | return len; /* consumed all */ | |
908 | else if (0 < len) { | |
909 | /* we have extra data, which might need further processing */ | |
910 | struct strbuf tmp = STRBUF_INIT; | |
911 | int used = buf->len; | |
912 | int ret; | |
913 | ||
914 | strbuf_add(buf, name + len, namelen - len); | |
915 | ret = interpret_branch_name(buf->buf, &tmp); | |
916 | /* that data was not interpreted, remove our cruft */ | |
917 | if (ret < 0) { | |
918 | strbuf_setlen(buf, used); | |
919 | return len; | |
920 | } | |
921 | strbuf_reset(buf); | |
922 | strbuf_addbuf(buf, &tmp); | |
923 | strbuf_release(&tmp); | |
924 | /* tweak for size of {-N} versus expanded ref name */ | |
925 | return ret - used + len; | |
926 | } | |
927 | ||
ae0ba8e2 JH |
928 | cp = strchr(name, '@'); |
929 | if (!cp) | |
930 | return -1; | |
931 | tmp_len = upstream_mark(cp, namelen - (cp - name)); | |
932 | if (!tmp_len) | |
933 | return -1; | |
934 | len = cp + tmp_len - name; | |
935 | cp = xstrndup(name, cp - name); | |
936 | upstream = branch_get(*cp ? cp : NULL); | |
937 | if (!upstream | |
938 | || !upstream->merge | |
939 | || !upstream->merge[0]->dst) | |
940 | return error("No upstream branch found for '%s'", cp); | |
941 | free(cp); | |
942 | cp = shorten_unambiguous_ref(upstream->merge[0]->dst, 0); | |
943 | strbuf_reset(buf); | |
944 | strbuf_addstr(buf, cp); | |
945 | free(cp); | |
946 | return len; | |
947 | } | |
948 | ||
6bab74e7 JN |
949 | int strbuf_branchname(struct strbuf *sb, const char *name) |
950 | { | |
951 | int len = strlen(name); | |
952 | if (interpret_branch_name(name, sb) == len) | |
953 | return 0; | |
954 | strbuf_add(sb, name, len); | |
955 | return len; | |
956 | } | |
957 | ||
958 | int strbuf_check_branch_ref(struct strbuf *sb, const char *name) | |
959 | { | |
960 | strbuf_branchname(sb, name); | |
961 | if (name[0] == '-') | |
8d9c5010 | 962 | return -1; |
6bab74e7 | 963 | strbuf_splice(sb, 0, 0, "refs/heads/", 11); |
8d9c5010 | 964 | return check_refname_format(sb->buf, 0); |
6bab74e7 JN |
965 | } |
966 | ||
9938af6a JH |
967 | /* |
968 | * This is like "get_sha1_basic()", except it allows "sha1 expressions", | |
969 | * notably "xyz^" for "parent of xyz" | |
970 | */ | |
971 | int get_sha1(const char *name, unsigned char *sha1) | |
972 | { | |
573285e5 CP |
973 | struct object_context unused; |
974 | return get_sha1_with_context(name, sha1, &unused); | |
a0cd87a5 MK |
975 | } |
976 | ||
009fee47 MM |
977 | /* Must be called only when object_name:filename doesn't exist. */ |
978 | static void diagnose_invalid_sha1_path(const char *prefix, | |
979 | const char *filename, | |
980 | const unsigned char *tree_sha1, | |
981 | const char *object_name) | |
982 | { | |
983 | struct stat st; | |
984 | unsigned char sha1[20]; | |
985 | unsigned mode; | |
986 | ||
987 | if (!prefix) | |
988 | prefix = ""; | |
989 | ||
990 | if (!lstat(filename, &st)) | |
991 | die("Path '%s' exists on disk, but not in '%s'.", | |
992 | filename, object_name); | |
993 | if (errno == ENOENT || errno == ENOTDIR) { | |
994 | char *fullname = xmalloc(strlen(filename) | |
995 | + strlen(prefix) + 1); | |
996 | strcpy(fullname, prefix); | |
997 | strcat(fullname, filename); | |
998 | ||
999 | if (!get_tree_entry(tree_sha1, fullname, | |
1000 | sha1, &mode)) { | |
1001 | die("Path '%s' exists, but not '%s'.\n" | |
e41d718c | 1002 | "Did you mean '%s:%s' aka '%s:./%s'?", |
009fee47 MM |
1003 | fullname, |
1004 | filename, | |
1005 | object_name, | |
e41d718c MG |
1006 | fullname, |
1007 | object_name, | |
1008 | filename); | |
009fee47 MM |
1009 | } |
1010 | die("Path '%s' does not exist in '%s'", | |
1011 | filename, object_name); | |
1012 | } | |
1013 | } | |
1014 | ||
1015 | /* Must be called only when :stage:filename doesn't exist. */ | |
1016 | static void diagnose_invalid_index_path(int stage, | |
1017 | const char *prefix, | |
1018 | const char *filename) | |
1019 | { | |
1020 | struct stat st; | |
1021 | struct cache_entry *ce; | |
1022 | int pos; | |
1023 | unsigned namelen = strlen(filename); | |
1024 | unsigned fullnamelen; | |
1025 | char *fullname; | |
1026 | ||
1027 | if (!prefix) | |
1028 | prefix = ""; | |
1029 | ||
1030 | /* Wrong stage number? */ | |
1031 | pos = cache_name_pos(filename, namelen); | |
1032 | if (pos < 0) | |
1033 | pos = -pos - 1; | |
77e8466f MH |
1034 | if (pos < active_nr) { |
1035 | ce = active_cache[pos]; | |
1036 | if (ce_namelen(ce) == namelen && | |
1037 | !memcmp(ce->name, filename, namelen)) | |
1038 | die("Path '%s' is in the index, but not at stage %d.\n" | |
1039 | "Did you mean ':%d:%s'?", | |
1040 | filename, stage, | |
1041 | ce_stage(ce), filename); | |
1042 | } | |
009fee47 MM |
1043 | |
1044 | /* Confusion between relative and absolute filenames? */ | |
1045 | fullnamelen = namelen + strlen(prefix); | |
1046 | fullname = xmalloc(fullnamelen + 1); | |
1047 | strcpy(fullname, prefix); | |
1048 | strcat(fullname, filename); | |
1049 | pos = cache_name_pos(fullname, fullnamelen); | |
1050 | if (pos < 0) | |
1051 | pos = -pos - 1; | |
77e8466f MH |
1052 | if (pos < active_nr) { |
1053 | ce = active_cache[pos]; | |
1054 | if (ce_namelen(ce) == fullnamelen && | |
1055 | !memcmp(ce->name, fullname, fullnamelen)) | |
1056 | die("Path '%s' is in the index, but not '%s'.\n" | |
e41d718c | 1057 | "Did you mean ':%d:%s' aka ':%d:./%s'?", |
77e8466f | 1058 | fullname, filename, |
e41d718c MG |
1059 | ce_stage(ce), fullname, |
1060 | ce_stage(ce), filename); | |
77e8466f | 1061 | } |
009fee47 MM |
1062 | |
1063 | if (!lstat(filename, &st)) | |
1064 | die("Path '%s' exists on disk, but not in the index.", filename); | |
1065 | if (errno == ENOENT || errno == ENOTDIR) | |
1066 | die("Path '%s' does not exist (neither on disk nor in the index).", | |
1067 | filename); | |
1068 | ||
1069 | free(fullname); | |
1070 | } | |
1071 | ||
1072 | ||
979f7929 NTND |
1073 | static char *resolve_relative_path(const char *rel) |
1074 | { | |
1075 | if (prefixcmp(rel, "./") && prefixcmp(rel, "../")) | |
1076 | return NULL; | |
1077 | ||
1078 | if (!startup_info) | |
1079 | die("BUG: startup_info struct is not initialized."); | |
1080 | ||
1081 | if (!is_inside_work_tree()) | |
1082 | die("relative path syntax can't be used outside working tree."); | |
1083 | ||
1084 | /* die() inside prefix_path() if resolved path is outside worktree */ | |
1085 | return prefix_path(startup_info->prefix, | |
1086 | startup_info->prefix ? strlen(startup_info->prefix) : 0, | |
1087 | rel); | |
1088 | } | |
1089 | ||
f01cc14c JH |
1090 | static int get_sha1_with_context_1(const char *name, unsigned char *sha1, |
1091 | struct object_context *oc, | |
1092 | int only_to_die, const char *prefix) | |
a0cd87a5 MK |
1093 | { |
1094 | int ret, bracket_depth; | |
73b0e5af JH |
1095 | int namelen = strlen(name); |
1096 | const char *cp; | |
5119602a | 1097 | |
573285e5 CP |
1098 | memset(oc, 0, sizeof(*oc)); |
1099 | oc->mode = S_IFINVALID; | |
73b0e5af JH |
1100 | ret = get_sha1_1(name, namelen, sha1); |
1101 | if (!ret) | |
1102 | return ret; | |
1103 | /* sha1:path --> object name of path in ent sha1 | |
979f7929 NTND |
1104 | * :path -> object name of absolute path in index |
1105 | * :./path -> object name of path relative to cwd in index | |
73b0e5af | 1106 | * :[0-3]:path -> object name of path in index at stage |
95ad6d2d | 1107 | * :/foo -> recent commit matching foo |
73b0e5af JH |
1108 | */ |
1109 | if (name[0] == ':') { | |
1110 | int stage = 0; | |
1111 | struct cache_entry *ce; | |
979f7929 | 1112 | char *new_path = NULL; |
73b0e5af | 1113 | int pos; |
2e83b66c | 1114 | if (!only_to_die && namelen > 2 && name[1] == '/') { |
84baa31b NTND |
1115 | struct commit_list *list = NULL; |
1116 | for_each_ref(handle_one_ref, &list); | |
1117 | return get_sha1_oneline(name + 2, sha1, list); | |
1118 | } | |
73b0e5af JH |
1119 | if (namelen < 3 || |
1120 | name[2] != ':' || | |
1121 | name[1] < '0' || '3' < name[1]) | |
1122 | cp = name + 1; | |
1123 | else { | |
1124 | stage = name[1] - '0'; | |
1125 | cp = name + 3; | |
5119602a | 1126 | } |
3d6e0f74 JH |
1127 | new_path = resolve_relative_path(cp); |
1128 | if (!new_path) { | |
1129 | namelen = namelen - (cp - name); | |
1130 | } else { | |
1131 | cp = new_path; | |
1132 | namelen = strlen(cp); | |
1133 | } | |
573285e5 CP |
1134 | |
1135 | strncpy(oc->path, cp, | |
1136 | sizeof(oc->path)); | |
1137 | oc->path[sizeof(oc->path)-1] = '\0'; | |
1138 | ||
73b0e5af JH |
1139 | if (!active_cache) |
1140 | read_cache(); | |
73b0e5af JH |
1141 | pos = cache_name_pos(cp, namelen); |
1142 | if (pos < 0) | |
1143 | pos = -pos - 1; | |
1144 | while (pos < active_nr) { | |
1145 | ce = active_cache[pos]; | |
1146 | if (ce_namelen(ce) != namelen || | |
1147 | memcmp(ce->name, cp, namelen)) | |
1148 | break; | |
1149 | if (ce_stage(ce) == stage) { | |
e702496e | 1150 | hashcpy(sha1, ce->sha1); |
90064710 | 1151 | oc->mode = ce->ce_mode; |
979f7929 | 1152 | free(new_path); |
73b0e5af JH |
1153 | return 0; |
1154 | } | |
e7cef45f | 1155 | pos++; |
73b0e5af | 1156 | } |
2e83b66c | 1157 | if (only_to_die && name[1] && name[1] != '/') |
009fee47 | 1158 | diagnose_invalid_index_path(stage, prefix, cp); |
979f7929 | 1159 | free(new_path); |
73b0e5af JH |
1160 | return -1; |
1161 | } | |
cce91a2c SP |
1162 | for (cp = name, bracket_depth = 0; *cp; cp++) { |
1163 | if (*cp == '{') | |
1164 | bracket_depth++; | |
1165 | else if (bracket_depth && *cp == '}') | |
1166 | bracket_depth--; | |
1167 | else if (!bracket_depth && *cp == ':') | |
1168 | break; | |
1169 | } | |
1170 | if (*cp == ':') { | |
73b0e5af | 1171 | unsigned char tree_sha1[20]; |
009fee47 | 1172 | char *object_name = NULL; |
2e83b66c | 1173 | if (only_to_die) { |
009fee47 MM |
1174 | object_name = xmalloc(cp-name+1); |
1175 | strncpy(object_name, name, cp-name); | |
1176 | object_name[cp-name] = '\0'; | |
1177 | } | |
1178 | if (!get_sha1_1(name, cp-name, tree_sha1)) { | |
1179 | const char *filename = cp+1; | |
979f7929 NTND |
1180 | char *new_filename = NULL; |
1181 | ||
1182 | new_filename = resolve_relative_path(filename); | |
1183 | if (new_filename) | |
1184 | filename = new_filename; | |
573285e5 | 1185 | ret = get_tree_entry(tree_sha1, filename, sha1, &oc->mode); |
2e83b66c | 1186 | if (only_to_die) { |
009fee47 MM |
1187 | diagnose_invalid_sha1_path(prefix, filename, |
1188 | tree_sha1, object_name); | |
1189 | free(object_name); | |
1190 | } | |
573285e5 CP |
1191 | hashcpy(oc->tree, tree_sha1); |
1192 | strncpy(oc->path, filename, | |
1193 | sizeof(oc->path)); | |
1194 | oc->path[sizeof(oc->path)-1] = '\0'; | |
1195 | ||
979f7929 | 1196 | free(new_filename); |
009fee47 MM |
1197 | return ret; |
1198 | } else { | |
2e83b66c | 1199 | if (only_to_die) |
009fee47 MM |
1200 | die("Invalid object name '%s'.", object_name); |
1201 | } | |
5119602a LT |
1202 | } |
1203 | return ret; | |
9938af6a | 1204 | } |
f01cc14c | 1205 | |
8c135ea2 JH |
1206 | /* |
1207 | * Call this function when you know "name" given by the end user must | |
1208 | * name an object but it doesn't; the function _may_ die with a better | |
1209 | * diagnostic message than "no such object 'name'", e.g. "Path 'doc' does not | |
1210 | * exist in 'HEAD'" when given "HEAD:doc", or it may return in which case | |
1211 | * you have a chance to diagnose the error further. | |
1212 | */ | |
1213 | void maybe_die_on_misspelt_object_name(const char *name, const char *prefix) | |
f01cc14c JH |
1214 | { |
1215 | struct object_context oc; | |
8c135ea2 JH |
1216 | unsigned char sha1[20]; |
1217 | get_sha1_with_context_1(name, sha1, &oc, 1, prefix); | |
1218 | } | |
1219 | ||
f01cc14c JH |
1220 | int get_sha1_with_context(const char *str, unsigned char *sha1, struct object_context *orc) |
1221 | { | |
1222 | return get_sha1_with_context_1(str, sha1, orc, 0, NULL); | |
1223 | } |