refs.c: move dwim_ref()/dwim_log() from sha1_name.c
[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 9
32574b68
NTND
10static int get_sha1_oneline(const char *, unsigned char *, struct commit_list *);
11
9938af6a
JH
12static 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
59static 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
74static 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
136static 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
160static 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
196const 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 219static 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
ae0ba8e2
JH
244static inline int upstream_mark(const char *string, int len)
245{
246 const char *suffix[] = { "@{upstream}", "@{u}" };
247 int i;
248
249 for (i = 0; i < ARRAY_SIZE(suffix); i++) {
250 int suffix_len = strlen(suffix[i]);
251 if (suffix_len <= len
252 && !memcmp(string, suffix[i], suffix_len))
253 return suffix_len;
254 }
255 return 0;
256}
257
d18ba221
TR
258static int get_sha1_1(const char *name, int len, unsigned char *sha1);
259
e86eb666
JH
260static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
261{
eedce784 262 static const char *warn_msg = "refname '%.*s' is ambiguous.";
ed378ec7 263 char *real_ref = NULL;
ab2a1a32
JH
264 int refs_found = 0;
265 int at, reflog_len;
9938af6a 266
3c3852e3 267 if (len == 40 && !get_sha1_hex(str, sha1))
9938af6a
JH
268 return 0;
269
d18ba221 270 /* basic@{time or number or -number} format to query ref-log */
694500ed 271 reflog_len = at = 0;
f265458f 272 if (len && str[len-1] == '}') {
aa9c55b6 273 for (at = len-2; at >= 0; at--) {
ab2a1a32 274 if (str[at] == '@' && str[at+1] == '{') {
ae0ba8e2 275 if (!upstream_mark(str + at, len - at)) {
28fb8438
JS
276 reflog_len = (len-1) - (at+2);
277 len = at;
278 }
ab2a1a32
JH
279 break;
280 }
d556fae2
SP
281 }
282 }
283
af13cdf2 284 /* Accept only unambiguous ref paths. */
11cf8801 285 if (len && ambiguous_path(str, len))
af13cdf2
LT
286 return -1;
287
11cf8801 288 if (!len && reflog_len) {
d18ba221
TR
289 struct strbuf buf = STRBUF_INIT;
290 int ret;
291 /* try the @{-N} syntax for n-th checkout */
431b1969 292 ret = interpret_branch_name(str+at, &buf);
d18ba221
TR
293 if (ret > 0) {
294 /* substitute this branch name and restart */
295 return get_sha1_1(buf.buf, buf.len, sha1);
296 } else if (ret == 0) {
297 return -1;
298 }
11cf8801
NP
299 /* allow "@{...}" to mean the current branch reflog */
300 refs_found = dwim_ref("HEAD", 4, sha1, &real_ref);
f2eba66d
NP
301 } else if (reflog_len)
302 refs_found = dwim_log(str, len, sha1, &real_ref);
303 else
11cf8801 304 refs_found = dwim_ref(str, len, sha1, &real_ref);
d556fae2
SP
305
306 if (!refs_found)
307 return -1;
308
309 if (warn_ambiguous_refs && refs_found > 1)
eedce784 310 warning(warn_msg, len, str);
d556fae2 311
ab2a1a32 312 if (reflog_len) {
ab2a1a32
JH
313 int nth, i;
314 unsigned long at_time;
16d7cc90
JH
315 unsigned long co_time;
316 int co_tz, co_cnt;
317
12a258c0
JK
318 /* a @{-N} placed anywhere except the start is an error */
319 if (str[at+2] == '-')
320 return -1;
321
fe558516 322 /* Is it asking for N-th entry, or approxidate? */
ab2a1a32
JH
323 for (i = nth = 0; 0 <= nth && i < reflog_len; i++) {
324 char ch = str[at+2+i];
325 if ('0' <= ch && ch <= '9')
326 nth = nth * 10 + ch - '0';
327 else
328 nth = -1;
329 }
ea360dd0
SP
330 if (100000000 <= nth) {
331 at_time = nth;
332 nth = -1;
333 } else if (0 <= nth)
ab2a1a32 334 at_time = 0;
861f00e3 335 else {
93cfa7c7 336 int errors = 0;
861f00e3 337 char *tmp = xstrndup(str + at + 2, reflog_len);
93cfa7c7 338 at_time = approxidate_careful(tmp, &errors);
861f00e3 339 free(tmp);
a5e10acb
JH
340 if (errors)
341 return -1;
861f00e3 342 }
16d7cc90
JH
343 if (read_ref_at(real_ref, at_time, nth, sha1, NULL,
344 &co_time, &co_tz, &co_cnt)) {
345 if (at_time)
eedce784
JS
346 warning("Log for '%.*s' only goes "
347 "back to %s.", len, str,
73013afd 348 show_date(co_time, co_tz, DATE_RFC2822));
e6eedc31
JS
349 else {
350 free(real_ref);
351 die("Log for '%.*s' only has %d entries.",
352 len, str, co_cnt);
353 }
16d7cc90 354 }
d556fae2
SP
355 }
356
ed378ec7 357 free(real_ref);
d556fae2 358 return 0;
9938af6a
JH
359}
360
9938af6a
JH
361static int get_parent(const char *name, int len,
362 unsigned char *result, int idx)
363{
364 unsigned char sha1[20];
365 int ret = get_sha1_1(name, len, sha1);
366 struct commit *commit;
367 struct commit_list *p;
368
369 if (ret)
370 return ret;
371 commit = lookup_commit_reference(sha1);
372 if (!commit)
373 return -1;
374 if (parse_commit(commit))
375 return -1;
376 if (!idx) {
e702496e 377 hashcpy(result, commit->object.sha1);
9938af6a
JH
378 return 0;
379 }
380 p = commit->parents;
381 while (p) {
382 if (!--idx) {
e702496e 383 hashcpy(result, p->item->object.sha1);
9938af6a
JH
384 return 0;
385 }
386 p = p->next;
387 }
388 return -1;
389}
390
4f7599ac
JH
391static int get_nth_ancestor(const char *name, int len,
392 unsigned char *result, int generation)
393{
394 unsigned char sha1[20];
621ff675
LT
395 struct commit *commit;
396 int ret;
397
398 ret = get_sha1_1(name, len, sha1);
4f7599ac
JH
399 if (ret)
400 return ret;
621ff675
LT
401 commit = lookup_commit_reference(sha1);
402 if (!commit)
403 return -1;
4f7599ac
JH
404
405 while (generation--) {
621ff675 406 if (parse_commit(commit) || !commit->parents)
4f7599ac 407 return -1;
621ff675 408 commit = commit->parents->item;
4f7599ac 409 }
621ff675 410 hashcpy(result, commit->object.sha1);
4f7599ac
JH
411 return 0;
412}
413
81776315
JH
414struct object *peel_to_type(const char *name, int namelen,
415 struct object *o, enum object_type expected_type)
416{
417 if (name && !namelen)
418 namelen = strlen(name);
419 if (!o) {
420 unsigned char sha1[20];
421 if (get_sha1_1(name, namelen, sha1))
422 return NULL;
423 o = parse_object(sha1);
424 }
425 while (1) {
426 if (!o || (!o->parsed && !parse_object(o->sha1)))
427 return NULL;
428 if (o->type == expected_type)
429 return o;
430 if (o->type == OBJ_TAG)
431 o = ((struct tag*) o)->tagged;
432 else if (o->type == OBJ_COMMIT)
433 o = &(((struct commit *) o)->tree->object);
434 else {
435 if (name)
436 error("%.*s: expected %s type, but the object "
437 "dereferences to %s type",
438 namelen, name, typename(expected_type),
439 typename(o->type));
440 return NULL;
441 }
442 }
443}
444
5385f52d
JH
445static int peel_onion(const char *name, int len, unsigned char *sha1)
446{
447 unsigned char outer[20];
448 const char *sp;
885a86ab 449 unsigned int expected_type = 0;
5385f52d
JH
450 struct object *o;
451
452 /*
453 * "ref^{type}" dereferences ref repeatedly until you cannot
454 * dereference anymore, or you get an object of given type,
455 * whichever comes first. "ref^{}" means just dereference
456 * tags until you get a non-tag. "ref^0" is a shorthand for
457 * "ref^{commit}". "commit^{tree}" could be used to find the
458 * top-level tree of the given commit.
459 */
460 if (len < 4 || name[len-1] != '}')
461 return -1;
462
463 for (sp = name + len - 1; name <= sp; sp--) {
464 int ch = *sp;
465 if (ch == '{' && name < sp && sp[-1] == '^')
466 break;
467 }
468 if (sp <= name)
469 return -1;
470
471 sp++; /* beginning of type name, or closing brace for empty */
472 if (!strncmp(commit_type, sp, 6) && sp[6] == '}')
1974632c 473 expected_type = OBJ_COMMIT;
5385f52d 474 else if (!strncmp(tree_type, sp, 4) && sp[4] == '}')
1974632c 475 expected_type = OBJ_TREE;
5385f52d 476 else if (!strncmp(blob_type, sp, 4) && sp[4] == '}')
1974632c 477 expected_type = OBJ_BLOB;
5385f52d 478 else if (sp[0] == '}')
1974632c 479 expected_type = OBJ_NONE;
32574b68
NTND
480 else if (sp[0] == '/')
481 expected_type = OBJ_COMMIT;
5385f52d
JH
482 else
483 return -1;
484
485 if (get_sha1_1(name, sp - name - 2, outer))
486 return -1;
487
488 o = parse_object(outer);
489 if (!o)
490 return -1;
885a86ab 491 if (!expected_type) {
9534f40b 492 o = deref_tag(o, name, sp - name - 2);
6e1c6c10
JH
493 if (!o || (!o->parsed && !parse_object(o->sha1)))
494 return -1;
e702496e 495 hashcpy(sha1, o->sha1);
32574b68 496 return 0;
5385f52d 497 }
32574b68
NTND
498
499 /*
500 * At this point, the syntax look correct, so
501 * if we do not get the needed object, we should
502 * barf.
503 */
504 o = peel_to_type(name, len, o, expected_type);
505 if (!o)
81776315 506 return -1;
32574b68
NTND
507
508 hashcpy(sha1, o->sha1);
509 if (sp[0] == '/') {
510 /* "$commit^{/foo}" */
511 char *prefix;
512 int ret;
513 struct commit_list *list = NULL;
514
81776315 515 /*
4322842a
NTND
516 * $commit^{/}. Some regex implementation may reject.
517 * We don't need regex anyway. '' pattern always matches.
5385f52d 518 */
4322842a 519 if (sp[1] == '}')
81776315 520 return 0;
4322842a 521
32574b68
NTND
522 prefix = xstrndup(sp + 1, name + len - 1 - (sp + 1));
523 commit_list_insert((struct commit *)o, &list);
524 ret = get_sha1_oneline(prefix, sha1, list);
525 free(prefix);
526 return ret;
5385f52d
JH
527 }
528 return 0;
529}
530
7dd45e15
JH
531static int get_describe_name(const char *name, int len, unsigned char *sha1)
532{
533 const char *cp;
534
535 for (cp = name + len - 1; name + 2 <= cp; cp--) {
536 char ch = *cp;
537 if (hexval(ch) & ~0377) {
538 /* We must be looking at g in "SOMETHING-g"
539 * for it to be describe output.
540 */
541 if (ch == 'g' && cp[-1] == '-') {
542 cp++;
543 len -= cp - name;
544 return get_short_sha1(cp, len, sha1, 1);
545 }
546 }
547 }
548 return -1;
549}
550
9938af6a
JH
551static int get_sha1_1(const char *name, int len, unsigned char *sha1)
552{
0601dbe1 553 int ret, has_suffix;
4f7599ac 554 const char *cp;
9938af6a 555
621ff675
LT
556 /*
557 * "name~3" is "name^^^", "name~" is "name~1", and "name^" is "name^1".
4f7599ac 558 */
0601dbe1 559 has_suffix = 0;
4f7599ac
JH
560 for (cp = name + len - 1; name <= cp; cp--) {
561 int ch = *cp;
562 if ('0' <= ch && ch <= '9')
563 continue;
0601dbe1
JH
564 if (ch == '~' || ch == '^')
565 has_suffix = ch;
4f7599ac
JH
566 break;
567 }
0601dbe1
JH
568
569 if (has_suffix) {
570 int num = 0;
4f7599ac
JH
571 int len1 = cp - name;
572 cp++;
573 while (cp < name + len)
0601dbe1 574 num = num * 10 + *cp++ - '0';
621ff675
LT
575 if (!num && len1 == len - 1)
576 num = 1;
577 if (has_suffix == '^')
0601dbe1 578 return get_parent(name, len1, sha1, num);
0601dbe1
JH
579 /* else if (has_suffix == '~') -- goes without saying */
580 return get_nth_ancestor(name, len1, sha1, num);
4f7599ac
JH
581 }
582
5385f52d
JH
583 ret = peel_onion(name, len, sha1);
584 if (!ret)
585 return 0;
586
9938af6a
JH
587 ret = get_sha1_basic(name, len, sha1);
588 if (!ret)
589 return 0;
7dd45e15
JH
590
591 /* It could be describe output that is "SOMETHING-gXXXX" */
592 ret = get_describe_name(name, len, sha1);
593 if (!ret)
594 return 0;
595
013f276e 596 return get_short_sha1(name, len, sha1, 0);
9938af6a
JH
597}
598
f7bff003
JH
599/*
600 * This interprets names like ':/Initial revision of "git"' by searching
601 * through history and returning the first commit whose message starts
3d045897 602 * the given regular expression.
f7bff003
JH
603 *
604 * For future extension, ':/!' is reserved. If you want to match a message
605 * beginning with a '!', you have to repeat the exclamation mark.
606 */
607#define ONELINE_SEEN (1u<<20)
608
28a4d940
JS
609static int handle_one_ref(const char *path,
610 const unsigned char *sha1, int flag, void *cb_data)
611{
612 struct commit_list **list = cb_data;
613 struct object *object = parse_object(sha1);
614 if (!object)
615 return 0;
affeef12 616 if (object->type == OBJ_TAG) {
28a4d940 617 object = deref_tag(object, path, strlen(path));
affeef12
MK
618 if (!object)
619 return 0;
620 }
28a4d940
JS
621 if (object->type != OBJ_COMMIT)
622 return 0;
47e44ed1 623 commit_list_insert_by_date((struct commit *)object, list);
28a4d940
JS
624 return 0;
625}
626
84baa31b
NTND
627static int get_sha1_oneline(const char *prefix, unsigned char *sha1,
628 struct commit_list *list)
28a4d940 629{
84baa31b 630 struct commit_list *backup = NULL, *l;
28042dbc 631 int found = 0;
57895105 632 regex_t regex;
28a4d940
JS
633
634 if (prefix[0] == '!') {
635 if (prefix[1] != '!')
636 die ("Invalid search pattern: %s", prefix);
637 prefix++;
638 }
57895105
LT
639
640 if (regcomp(&regex, prefix, REG_EXTENDED))
641 die("Invalid search pattern: %s", prefix);
642
84baa31b
NTND
643 for (l = list; l; l = l->next) {
644 l->item->object.flags |= ONELINE_SEEN;
28a4d940 645 commit_list_insert(l->item, &backup);
84baa31b 646 }
ed8ad7e2 647 while (list) {
28042dbc 648 char *p, *to_free = NULL;
1358e7d6 649 struct commit *commit;
364d3e65
JS
650 enum object_type type;
651 unsigned long size;
28042dbc 652 int matches;
ed8ad7e2
JM
653
654 commit = pop_most_recent_commit(&list, ONELINE_SEEN);
283cdbcf
MK
655 if (!parse_object(commit->object.sha1))
656 continue;
364d3e65
JS
657 if (commit->buffer)
658 p = commit->buffer;
659 else {
660 p = read_sha1_file(commit->object.sha1, &type, &size);
661 if (!p)
662 continue;
28042dbc 663 to_free = p;
364d3e65 664 }
28042dbc
JH
665
666 p = strstr(p, "\n\n");
667 matches = p && !regexec(&regex, p + 2, 0, NULL, 0);
668 free(to_free);
669
670 if (matches) {
28a4d940 671 hashcpy(sha1, commit->object.sha1);
28042dbc 672 found = 1;
28a4d940
JS
673 break;
674 }
675 }
57895105 676 regfree(&regex);
28a4d940
JS
677 free_commit_list(list);
678 for (l = backup; l; l = l->next)
679 clear_commit_marks(l->item, ONELINE_SEEN);
28042dbc
JH
680 free_commit_list(backup);
681 return found ? 0 : -1;
28a4d940
JS
682}
683
ae5a6c36 684struct grab_nth_branch_switch_cbdata {
c2883e62 685 long cnt, alloc;
ae5a6c36
JH
686 struct strbuf *buf;
687};
688
689static int grab_nth_branch_switch(unsigned char *osha1, unsigned char *nsha1,
690 const char *email, unsigned long timestamp, int tz,
691 const char *message, void *cb_data)
692{
693 struct grab_nth_branch_switch_cbdata *cb = cb_data;
a884d0cb
TR
694 const char *match = NULL, *target = NULL;
695 size_t len;
c2883e62 696 int nth;
a884d0cb
TR
697
698 if (!prefixcmp(message, "checkout: moving from ")) {
699 match = message + strlen("checkout: moving from ");
d7c03c1f 700 target = strstr(match, " to ");
ae5a6c36
JH
701 }
702
c829774c 703 if (!match || !target)
ae5a6c36
JH
704 return 0;
705
d7c03c1f 706 len = target - match;
c2883e62
JH
707 nth = cb->cnt++ % cb->alloc;
708 strbuf_reset(&cb->buf[nth]);
709 strbuf_add(&cb->buf[nth], match, len);
ae5a6c36
JH
710 return 0;
711}
712
713/*
ae0ba8e2
JH
714 * Parse @{-N} syntax, return the number of characters parsed
715 * if successful; otherwise signal an error with negative value.
ae5a6c36 716 */
ae0ba8e2 717static int interpret_nth_prior_checkout(const char *name, struct strbuf *buf)
ae5a6c36 718{
c2883e62 719 long nth;
39765e59 720 int i, retval;
ae5a6c36 721 struct grab_nth_branch_switch_cbdata cb;
a884d0cb
TR
722 const char *brace;
723 char *num_end;
ae5a6c36
JH
724
725 if (name[0] != '@' || name[1] != '{' || name[2] != '-')
726 return -1;
a884d0cb
TR
727 brace = strchr(name, '}');
728 if (!brace)
729 return -1;
730 nth = strtol(name+3, &num_end, 10);
731 if (num_end != brace)
ae5a6c36 732 return -1;
c2883e62
JH
733 if (nth <= 0)
734 return -1;
735 cb.alloc = nth;
736 cb.buf = xmalloc(nth * sizeof(struct strbuf));
737 for (i = 0; i < nth; i++)
738 strbuf_init(&cb.buf[i], 20);
739 cb.cnt = 0;
39765e59 740 retval = 0;
101d15e0
JH
741 for_each_recent_reflog_ent("HEAD", grab_nth_branch_switch, 40960, &cb);
742 if (cb.cnt < nth) {
743 cb.cnt = 0;
101d15e0
JH
744 for_each_reflog_ent("HEAD", grab_nth_branch_switch, &cb);
745 }
c2883e62 746 if (cb.cnt < nth)
39765e59 747 goto release_return;
c2883e62
JH
748 i = cb.cnt % nth;
749 strbuf_reset(buf);
750 strbuf_add(buf, cb.buf[i].buf, cb.buf[i].len);
39765e59
JH
751 retval = brace-name+1;
752
753release_return:
c2883e62
JH
754 for (i = 0; i < nth; i++)
755 strbuf_release(&cb.buf[i]);
756 free(cb.buf);
a884d0cb 757
39765e59 758 return retval;
ae5a6c36
JH
759}
760
619a644d
JH
761int get_sha1_mb(const char *name, unsigned char *sha1)
762{
763 struct commit *one, *two;
764 struct commit_list *mbs;
765 unsigned char sha1_tmp[20];
766 const char *dots;
767 int st;
768
769 dots = strstr(name, "...");
770 if (!dots)
771 return get_sha1(name, sha1);
772 if (dots == name)
773 st = get_sha1("HEAD", sha1_tmp);
774 else {
775 struct strbuf sb;
776 strbuf_init(&sb, dots - name);
777 strbuf_add(&sb, name, dots - name);
778 st = get_sha1(sb.buf, sha1_tmp);
779 strbuf_release(&sb);
780 }
781 if (st)
782 return st;
783 one = lookup_commit_reference_gently(sha1_tmp, 0);
784 if (!one)
785 return -1;
786
787 if (get_sha1(dots[3] ? (dots + 3) : "HEAD", sha1_tmp))
788 return -1;
789 two = lookup_commit_reference_gently(sha1_tmp, 0);
790 if (!two)
791 return -1;
792 mbs = get_merge_bases(one, two, 1);
793 if (!mbs || mbs->next)
794 st = -1;
795 else {
796 st = 0;
797 hashcpy(sha1, mbs->item->object.sha1);
798 }
799 free_commit_list(mbs);
800 return st;
801}
802
ae0ba8e2
JH
803/*
804 * This reads short-hand syntax that not only evaluates to a commit
805 * object name, but also can act as if the end user spelled the name
806 * of the branch from the command line.
807 *
808 * - "@{-N}" finds the name of the Nth previous branch we were on, and
809 * places the name of the branch in the given buf and returns the
810 * number of characters parsed if successful.
811 *
812 * - "<branch>@{upstream}" finds the name of the other ref that
813 * <branch> is configured to merge with (missing <branch> defaults
814 * to the current branch), and places the name of the branch in the
815 * given buf and returns the number of characters parsed if
816 * successful.
817 *
818 * If the input is not of the accepted format, it returns a negative
819 * number to signal an error.
820 *
821 * If the input was ok but there are not N branch switches in the
822 * reflog, it returns 0.
823 */
824int interpret_branch_name(const char *name, struct strbuf *buf)
825{
826 char *cp;
827 struct branch *upstream;
828 int namelen = strlen(name);
829 int len = interpret_nth_prior_checkout(name, buf);
830 int tmp_len;
831
832 if (!len)
833 return len; /* syntax Ok, not enough switches */
d46a8301
JK
834 if (0 < len && len == namelen)
835 return len; /* consumed all */
836 else if (0 < len) {
837 /* we have extra data, which might need further processing */
838 struct strbuf tmp = STRBUF_INIT;
839 int used = buf->len;
840 int ret;
841
842 strbuf_add(buf, name + len, namelen - len);
843 ret = interpret_branch_name(buf->buf, &tmp);
844 /* that data was not interpreted, remove our cruft */
845 if (ret < 0) {
846 strbuf_setlen(buf, used);
847 return len;
848 }
849 strbuf_reset(buf);
850 strbuf_addbuf(buf, &tmp);
851 strbuf_release(&tmp);
852 /* tweak for size of {-N} versus expanded ref name */
853 return ret - used + len;
854 }
855
ae0ba8e2
JH
856 cp = strchr(name, '@');
857 if (!cp)
858 return -1;
859 tmp_len = upstream_mark(cp, namelen - (cp - name));
860 if (!tmp_len)
861 return -1;
862 len = cp + tmp_len - name;
863 cp = xstrndup(name, cp - name);
864 upstream = branch_get(*cp ? cp : NULL);
865 if (!upstream
866 || !upstream->merge
867 || !upstream->merge[0]->dst)
868 return error("No upstream branch found for '%s'", cp);
869 free(cp);
870 cp = shorten_unambiguous_ref(upstream->merge[0]->dst, 0);
871 strbuf_reset(buf);
872 strbuf_addstr(buf, cp);
873 free(cp);
874 return len;
875}
876
6bab74e7
JN
877int strbuf_branchname(struct strbuf *sb, const char *name)
878{
879 int len = strlen(name);
880 if (interpret_branch_name(name, sb) == len)
881 return 0;
882 strbuf_add(sb, name, len);
883 return len;
884}
885
886int strbuf_check_branch_ref(struct strbuf *sb, const char *name)
887{
888 strbuf_branchname(sb, name);
889 if (name[0] == '-')
8d9c5010 890 return -1;
6bab74e7 891 strbuf_splice(sb, 0, 0, "refs/heads/", 11);
8d9c5010 892 return check_refname_format(sb->buf, 0);
6bab74e7
JN
893}
894
9938af6a
JH
895/*
896 * This is like "get_sha1_basic()", except it allows "sha1 expressions",
897 * notably "xyz^" for "parent of xyz"
898 */
899int get_sha1(const char *name, unsigned char *sha1)
900{
573285e5
CP
901 struct object_context unused;
902 return get_sha1_with_context(name, sha1, &unused);
a0cd87a5
MK
903}
904
009fee47
MM
905/* Must be called only when object_name:filename doesn't exist. */
906static void diagnose_invalid_sha1_path(const char *prefix,
907 const char *filename,
908 const unsigned char *tree_sha1,
909 const char *object_name)
910{
911 struct stat st;
912 unsigned char sha1[20];
913 unsigned mode;
914
915 if (!prefix)
916 prefix = "";
917
918 if (!lstat(filename, &st))
919 die("Path '%s' exists on disk, but not in '%s'.",
920 filename, object_name);
921 if (errno == ENOENT || errno == ENOTDIR) {
922 char *fullname = xmalloc(strlen(filename)
923 + strlen(prefix) + 1);
924 strcpy(fullname, prefix);
925 strcat(fullname, filename);
926
927 if (!get_tree_entry(tree_sha1, fullname,
928 sha1, &mode)) {
929 die("Path '%s' exists, but not '%s'.\n"
e41d718c 930 "Did you mean '%s:%s' aka '%s:./%s'?",
009fee47
MM
931 fullname,
932 filename,
933 object_name,
e41d718c
MG
934 fullname,
935 object_name,
936 filename);
009fee47
MM
937 }
938 die("Path '%s' does not exist in '%s'",
939 filename, object_name);
940 }
941}
942
943/* Must be called only when :stage:filename doesn't exist. */
944static void diagnose_invalid_index_path(int stage,
945 const char *prefix,
946 const char *filename)
947{
948 struct stat st;
949 struct cache_entry *ce;
950 int pos;
951 unsigned namelen = strlen(filename);
952 unsigned fullnamelen;
953 char *fullname;
954
955 if (!prefix)
956 prefix = "";
957
958 /* Wrong stage number? */
959 pos = cache_name_pos(filename, namelen);
960 if (pos < 0)
961 pos = -pos - 1;
77e8466f
MH
962 if (pos < active_nr) {
963 ce = active_cache[pos];
964 if (ce_namelen(ce) == namelen &&
965 !memcmp(ce->name, filename, namelen))
966 die("Path '%s' is in the index, but not at stage %d.\n"
967 "Did you mean ':%d:%s'?",
968 filename, stage,
969 ce_stage(ce), filename);
970 }
009fee47
MM
971
972 /* Confusion between relative and absolute filenames? */
973 fullnamelen = namelen + strlen(prefix);
974 fullname = xmalloc(fullnamelen + 1);
975 strcpy(fullname, prefix);
976 strcat(fullname, filename);
977 pos = cache_name_pos(fullname, fullnamelen);
978 if (pos < 0)
979 pos = -pos - 1;
77e8466f
MH
980 if (pos < active_nr) {
981 ce = active_cache[pos];
982 if (ce_namelen(ce) == fullnamelen &&
983 !memcmp(ce->name, fullname, fullnamelen))
984 die("Path '%s' is in the index, but not '%s'.\n"
e41d718c 985 "Did you mean ':%d:%s' aka ':%d:./%s'?",
77e8466f 986 fullname, filename,
e41d718c
MG
987 ce_stage(ce), fullname,
988 ce_stage(ce), filename);
77e8466f 989 }
009fee47
MM
990
991 if (!lstat(filename, &st))
992 die("Path '%s' exists on disk, but not in the index.", filename);
993 if (errno == ENOENT || errno == ENOTDIR)
994 die("Path '%s' does not exist (neither on disk nor in the index).",
995 filename);
996
997 free(fullname);
998}
999
1000
2e83b66c
JH
1001int get_sha1_with_mode_1(const char *name, unsigned char *sha1, unsigned *mode,
1002 int only_to_die, const char *prefix)
573285e5
CP
1003{
1004 struct object_context oc;
1005 int ret;
2e83b66c 1006 ret = get_sha1_with_context_1(name, sha1, &oc, only_to_die, prefix);
573285e5
CP
1007 *mode = oc.mode;
1008 return ret;
1009}
1010
979f7929
NTND
1011static char *resolve_relative_path(const char *rel)
1012{
1013 if (prefixcmp(rel, "./") && prefixcmp(rel, "../"))
1014 return NULL;
1015
1016 if (!startup_info)
1017 die("BUG: startup_info struct is not initialized.");
1018
1019 if (!is_inside_work_tree())
1020 die("relative path syntax can't be used outside working tree.");
1021
1022 /* die() inside prefix_path() if resolved path is outside worktree */
1023 return prefix_path(startup_info->prefix,
1024 startup_info->prefix ? strlen(startup_info->prefix) : 0,
1025 rel);
1026}
1027
573285e5
CP
1028int get_sha1_with_context_1(const char *name, unsigned char *sha1,
1029 struct object_context *oc,
2e83b66c 1030 int only_to_die, const char *prefix)
a0cd87a5
MK
1031{
1032 int ret, bracket_depth;
73b0e5af
JH
1033 int namelen = strlen(name);
1034 const char *cp;
5119602a 1035
573285e5
CP
1036 memset(oc, 0, sizeof(*oc));
1037 oc->mode = S_IFINVALID;
73b0e5af
JH
1038 ret = get_sha1_1(name, namelen, sha1);
1039 if (!ret)
1040 return ret;
1041 /* sha1:path --> object name of path in ent sha1
979f7929
NTND
1042 * :path -> object name of absolute path in index
1043 * :./path -> object name of path relative to cwd in index
73b0e5af 1044 * :[0-3]:path -> object name of path in index at stage
95ad6d2d 1045 * :/foo -> recent commit matching foo
73b0e5af
JH
1046 */
1047 if (name[0] == ':') {
1048 int stage = 0;
1049 struct cache_entry *ce;
979f7929 1050 char *new_path = NULL;
73b0e5af 1051 int pos;
2e83b66c 1052 if (!only_to_die && namelen > 2 && name[1] == '/') {
84baa31b
NTND
1053 struct commit_list *list = NULL;
1054 for_each_ref(handle_one_ref, &list);
1055 return get_sha1_oneline(name + 2, sha1, list);
1056 }
73b0e5af
JH
1057 if (namelen < 3 ||
1058 name[2] != ':' ||
1059 name[1] < '0' || '3' < name[1])
1060 cp = name + 1;
1061 else {
1062 stage = name[1] - '0';
1063 cp = name + 3;
5119602a 1064 }
3d6e0f74
JH
1065 new_path = resolve_relative_path(cp);
1066 if (!new_path) {
1067 namelen = namelen - (cp - name);
1068 } else {
1069 cp = new_path;
1070 namelen = strlen(cp);
1071 }
573285e5
CP
1072
1073 strncpy(oc->path, cp,
1074 sizeof(oc->path));
1075 oc->path[sizeof(oc->path)-1] = '\0';
1076
73b0e5af
JH
1077 if (!active_cache)
1078 read_cache();
73b0e5af
JH
1079 pos = cache_name_pos(cp, namelen);
1080 if (pos < 0)
1081 pos = -pos - 1;
1082 while (pos < active_nr) {
1083 ce = active_cache[pos];
1084 if (ce_namelen(ce) != namelen ||
1085 memcmp(ce->name, cp, namelen))
1086 break;
1087 if (ce_stage(ce) == stage) {
e702496e 1088 hashcpy(sha1, ce->sha1);
90064710 1089 oc->mode = ce->ce_mode;
979f7929 1090 free(new_path);
73b0e5af
JH
1091 return 0;
1092 }
e7cef45f 1093 pos++;
73b0e5af 1094 }
2e83b66c 1095 if (only_to_die && name[1] && name[1] != '/')
009fee47 1096 diagnose_invalid_index_path(stage, prefix, cp);
979f7929 1097 free(new_path);
73b0e5af
JH
1098 return -1;
1099 }
cce91a2c
SP
1100 for (cp = name, bracket_depth = 0; *cp; cp++) {
1101 if (*cp == '{')
1102 bracket_depth++;
1103 else if (bracket_depth && *cp == '}')
1104 bracket_depth--;
1105 else if (!bracket_depth && *cp == ':')
1106 break;
1107 }
1108 if (*cp == ':') {
73b0e5af 1109 unsigned char tree_sha1[20];
009fee47 1110 char *object_name = NULL;
2e83b66c 1111 if (only_to_die) {
009fee47
MM
1112 object_name = xmalloc(cp-name+1);
1113 strncpy(object_name, name, cp-name);
1114 object_name[cp-name] = '\0';
1115 }
1116 if (!get_sha1_1(name, cp-name, tree_sha1)) {
1117 const char *filename = cp+1;
979f7929
NTND
1118 char *new_filename = NULL;
1119
1120 new_filename = resolve_relative_path(filename);
1121 if (new_filename)
1122 filename = new_filename;
573285e5 1123 ret = get_tree_entry(tree_sha1, filename, sha1, &oc->mode);
2e83b66c 1124 if (only_to_die) {
009fee47
MM
1125 diagnose_invalid_sha1_path(prefix, filename,
1126 tree_sha1, object_name);
1127 free(object_name);
1128 }
573285e5
CP
1129 hashcpy(oc->tree, tree_sha1);
1130 strncpy(oc->path, filename,
1131 sizeof(oc->path));
1132 oc->path[sizeof(oc->path)-1] = '\0';
1133
979f7929 1134 free(new_filename);
009fee47
MM
1135 return ret;
1136 } else {
2e83b66c 1137 if (only_to_die)
009fee47
MM
1138 die("Invalid object name '%s'.", object_name);
1139 }
5119602a
LT
1140 }
1141 return ret;
9938af6a 1142}