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