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