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