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