cherry-pick/revert: make direct internal call to merge_tree()
[git/spearce.git] / sha1_name.c
blob41b680915d7348bf622397da8b1465d3769a361a
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"
9 static int find_short_object_filename(int len, const char *name, unsigned char *sha1)
11 struct alternate_object_database *alt;
12 char hex[40];
13 int found = 0;
14 static struct alternate_object_database *fakeent;
16 if (!fakeent) {
17 const char *objdir = get_object_directory();
18 int objdir_len = strlen(objdir);
19 int entlen = objdir_len + 43;
20 fakeent = xmalloc(sizeof(*fakeent) + entlen);
21 memcpy(fakeent->base, objdir, objdir_len);
22 fakeent->name = fakeent->base + objdir_len + 1;
23 fakeent->name[-1] = '/';
25 fakeent->next = alt_odb_list;
27 sprintf(hex, "%.2s", name);
28 for (alt = fakeent; alt && found < 2; alt = alt->next) {
29 struct dirent *de;
30 DIR *dir;
31 sprintf(alt->name, "%.2s/", name);
32 dir = opendir(alt->base);
33 if (!dir)
34 continue;
35 while ((de = readdir(dir)) != NULL) {
36 if (strlen(de->d_name) != 38)
37 continue;
38 if (memcmp(de->d_name, name + 2, len - 2))
39 continue;
40 if (!found) {
41 memcpy(hex + 2, de->d_name, 38);
42 found++;
44 else if (memcmp(hex + 2, de->d_name, 38)) {
45 found = 2;
46 break;
49 closedir(dir);
51 if (found == 1)
52 return get_sha1_hex(hex, sha1) == 0;
53 return found;
56 static int match_sha(unsigned len, const unsigned char *a, const unsigned char *b)
58 do {
59 if (*a != *b)
60 return 0;
61 a++;
62 b++;
63 len -= 2;
64 } while (len > 1);
65 if (len)
66 if ((*a ^ *b) & 0xf0)
67 return 0;
68 return 1;
71 static int find_short_packed_object(int len, const unsigned char *match, unsigned char *sha1)
73 struct packed_git *p;
74 const unsigned char *found_sha1 = NULL;
75 int found = 0;
77 prepare_packed_git();
78 for (p = packed_git; p && found < 2; p = p->next) {
79 uint32_t num, last;
80 uint32_t first = 0;
81 open_pack_index(p);
82 num = p->num_objects;
83 last = num;
84 while (first < last) {
85 uint32_t mid = (first + last) / 2;
86 const unsigned char *now;
87 int cmp;
89 now = nth_packed_object_sha1(p, mid);
90 cmp = hashcmp(match, now);
91 if (!cmp) {
92 first = mid;
93 break;
95 if (cmp > 0) {
96 first = mid+1;
97 continue;
99 last = mid;
101 if (first < num) {
102 const unsigned char *now, *next;
103 now = nth_packed_object_sha1(p, first);
104 if (match_sha(len, match, now)) {
105 next = nth_packed_object_sha1(p, first+1);
106 if (!next|| !match_sha(len, match, next)) {
107 /* unique within this pack */
108 if (!found) {
109 found_sha1 = now;
110 found++;
112 else if (hashcmp(found_sha1, now)) {
113 found = 2;
114 break;
117 else {
118 /* not even unique within this pack */
119 found = 2;
120 break;
125 if (found == 1)
126 hashcpy(sha1, found_sha1);
127 return found;
130 #define SHORT_NAME_NOT_FOUND (-1)
131 #define SHORT_NAME_AMBIGUOUS (-2)
133 static int find_unique_short_object(int len, char *canonical,
134 unsigned char *res, unsigned char *sha1)
136 int has_unpacked, has_packed;
137 unsigned char unpacked_sha1[20], packed_sha1[20];
139 prepare_alt_odb();
140 has_unpacked = find_short_object_filename(len, canonical, unpacked_sha1);
141 has_packed = find_short_packed_object(len, res, packed_sha1);
142 if (!has_unpacked && !has_packed)
143 return SHORT_NAME_NOT_FOUND;
144 if (1 < has_unpacked || 1 < has_packed)
145 return SHORT_NAME_AMBIGUOUS;
146 if (has_unpacked != has_packed) {
147 hashcpy(sha1, (has_packed ? packed_sha1 : unpacked_sha1));
148 return 0;
150 /* Both have unique ones -- do they match? */
151 if (hashcmp(packed_sha1, unpacked_sha1))
152 return SHORT_NAME_AMBIGUOUS;
153 hashcpy(sha1, packed_sha1);
154 return 0;
157 static int get_short_sha1(const char *name, int len, unsigned char *sha1,
158 int quietly)
160 int i, status;
161 char canonical[40];
162 unsigned char res[20];
164 if (len < MINIMUM_ABBREV || len > 40)
165 return -1;
166 hashclr(res);
167 memset(canonical, 'x', 40);
168 for (i = 0; i < len ;i++) {
169 unsigned char c = name[i];
170 unsigned char val;
171 if (c >= '0' && c <= '9')
172 val = c - '0';
173 else if (c >= 'a' && c <= 'f')
174 val = c - 'a' + 10;
175 else if (c >= 'A' && c <='F') {
176 val = c - 'A' + 10;
177 c -= 'A' - 'a';
179 else
180 return -1;
181 canonical[i] = c;
182 if (!(i & 1))
183 val <<= 4;
184 res[i >> 1] |= val;
187 status = find_unique_short_object(i, canonical, res, sha1);
188 if (!quietly && (status == SHORT_NAME_AMBIGUOUS))
189 return error("short SHA1 %.*s is ambiguous.", len, canonical);
190 return status;
193 const char *find_unique_abbrev(const unsigned char *sha1, int len)
195 int status, exists;
196 static char hex[41];
198 exists = has_sha1_file(sha1);
199 memcpy(hex, sha1_to_hex(sha1), 40);
200 if (len == 40 || !len)
201 return hex;
202 while (len < 40) {
203 unsigned char sha1_ret[20];
204 status = get_short_sha1(hex, len, sha1_ret, 1);
205 if (exists
206 ? !status
207 : status == SHORT_NAME_NOT_FOUND) {
208 hex[len] = 0;
209 return hex;
211 len++;
213 return hex;
216 static int ambiguous_path(const char *path, int len)
218 int slash = 1;
219 int cnt;
221 for (cnt = 0; cnt < len; cnt++) {
222 switch (*path++) {
223 case '\0':
224 break;
225 case '/':
226 if (slash)
227 break;
228 slash = 1;
229 continue;
230 case '.':
231 continue;
232 default:
233 slash = 0;
234 continue;
236 break;
238 return slash;
241 int dwim_ref(const char *str, int len, unsigned char *sha1, char **ref)
243 const char **p, *r;
244 int refs_found = 0;
246 *ref = NULL;
247 for (p = ref_rev_parse_rules; *p; p++) {
248 unsigned char sha1_from_ref[20];
249 unsigned char *this_result;
251 this_result = refs_found ? sha1_from_ref : sha1;
252 r = resolve_ref(mkpath(*p, len, str), this_result, 1, NULL);
253 if (r) {
254 if (!refs_found++)
255 *ref = xstrdup(r);
256 if (!warn_ambiguous_refs)
257 break;
260 return refs_found;
263 int dwim_log(const char *str, int len, unsigned char *sha1, char **log)
265 const char **p;
266 int logs_found = 0;
268 *log = NULL;
269 for (p = ref_rev_parse_rules; *p; p++) {
270 struct stat st;
271 unsigned char hash[20];
272 char path[PATH_MAX];
273 const char *ref, *it;
275 strcpy(path, mkpath(*p, len, str));
276 ref = resolve_ref(path, hash, 1, NULL);
277 if (!ref)
278 continue;
279 if (!stat(git_path("logs/%s", path), &st) &&
280 S_ISREG(st.st_mode))
281 it = path;
282 else if (strcmp(ref, path) &&
283 !stat(git_path("logs/%s", ref), &st) &&
284 S_ISREG(st.st_mode))
285 it = ref;
286 else
287 continue;
288 if (!logs_found++) {
289 *log = xstrdup(it);
290 hashcpy(sha1, hash);
292 if (!warn_ambiguous_refs)
293 break;
295 return logs_found;
298 static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
300 static const char *warning = "warning: refname '%.*s' is ambiguous.\n";
301 char *real_ref = NULL;
302 int refs_found = 0;
303 int at, reflog_len;
305 if (len == 40 && !get_sha1_hex(str, sha1))
306 return 0;
308 /* basic@{time or number} format to query ref-log */
309 reflog_len = at = 0;
310 if (str[len-1] == '}') {
311 for (at = 0; at < len - 1; at++) {
312 if (str[at] == '@' && str[at+1] == '{') {
313 reflog_len = (len-1) - (at+2);
314 len = at;
315 break;
320 /* Accept only unambiguous ref paths. */
321 if (len && ambiguous_path(str, len))
322 return -1;
324 if (!len && reflog_len) {
325 /* allow "@{...}" to mean the current branch reflog */
326 refs_found = dwim_ref("HEAD", 4, sha1, &real_ref);
327 } else if (reflog_len)
328 refs_found = dwim_log(str, len, sha1, &real_ref);
329 else
330 refs_found = dwim_ref(str, len, sha1, &real_ref);
332 if (!refs_found)
333 return -1;
335 if (warn_ambiguous_refs && refs_found > 1)
336 fprintf(stderr, warning, len, str);
338 if (reflog_len) {
339 int nth, i;
340 unsigned long at_time;
341 unsigned long co_time;
342 int co_tz, co_cnt;
344 /* Is it asking for N-th entry, or approxidate? */
345 for (i = nth = 0; 0 <= nth && i < reflog_len; i++) {
346 char ch = str[at+2+i];
347 if ('0' <= ch && ch <= '9')
348 nth = nth * 10 + ch - '0';
349 else
350 nth = -1;
352 if (100000000 <= nth) {
353 at_time = nth;
354 nth = -1;
355 } else if (0 <= nth)
356 at_time = 0;
357 else {
358 char *tmp = xstrndup(str + at + 2, reflog_len);
359 at_time = approxidate(tmp);
360 free(tmp);
362 if (read_ref_at(real_ref, at_time, nth, sha1, NULL,
363 &co_time, &co_tz, &co_cnt)) {
364 if (at_time)
365 fprintf(stderr,
366 "warning: Log for '%.*s' only goes "
367 "back to %s.\n", len, str,
368 show_date(co_time, co_tz, DATE_RFC2822));
369 else
370 fprintf(stderr,
371 "warning: Log for '%.*s' only has "
372 "%d entries.\n", len, str, co_cnt);
376 free(real_ref);
377 return 0;
380 static int get_sha1_1(const char *name, int len, unsigned char *sha1);
382 static int get_parent(const char *name, int len,
383 unsigned char *result, int idx)
385 unsigned char sha1[20];
386 int ret = get_sha1_1(name, len, sha1);
387 struct commit *commit;
388 struct commit_list *p;
390 if (ret)
391 return ret;
392 commit = lookup_commit_reference(sha1);
393 if (!commit)
394 return -1;
395 if (parse_commit(commit))
396 return -1;
397 if (!idx) {
398 hashcpy(result, commit->object.sha1);
399 return 0;
401 p = commit->parents;
402 while (p) {
403 if (!--idx) {
404 hashcpy(result, p->item->object.sha1);
405 return 0;
407 p = p->next;
409 return -1;
412 static int get_nth_ancestor(const char *name, int len,
413 unsigned char *result, int generation)
415 unsigned char sha1[20];
416 struct commit *commit;
417 int ret;
419 ret = get_sha1_1(name, len, sha1);
420 if (ret)
421 return ret;
422 commit = lookup_commit_reference(sha1);
423 if (!commit)
424 return -1;
426 while (generation--) {
427 if (parse_commit(commit) || !commit->parents)
428 return -1;
429 commit = commit->parents->item;
431 hashcpy(result, commit->object.sha1);
432 return 0;
435 struct object *peel_to_type(const char *name, int namelen,
436 struct object *o, enum object_type expected_type)
438 if (name && !namelen)
439 namelen = strlen(name);
440 if (!o) {
441 unsigned char sha1[20];
442 if (get_sha1_1(name, namelen, sha1))
443 return NULL;
444 o = parse_object(sha1);
446 while (1) {
447 if (!o || (!o->parsed && !parse_object(o->sha1)))
448 return NULL;
449 if (o->type == expected_type)
450 return o;
451 if (o->type == OBJ_TAG)
452 o = ((struct tag*) o)->tagged;
453 else if (o->type == OBJ_COMMIT)
454 o = &(((struct commit *) o)->tree->object);
455 else {
456 if (name)
457 error("%.*s: expected %s type, but the object "
458 "dereferences to %s type",
459 namelen, name, typename(expected_type),
460 typename(o->type));
461 return NULL;
466 static int peel_onion(const char *name, int len, unsigned char *sha1)
468 unsigned char outer[20];
469 const char *sp;
470 unsigned int expected_type = 0;
471 struct object *o;
474 * "ref^{type}" dereferences ref repeatedly until you cannot
475 * dereference anymore, or you get an object of given type,
476 * whichever comes first. "ref^{}" means just dereference
477 * tags until you get a non-tag. "ref^0" is a shorthand for
478 * "ref^{commit}". "commit^{tree}" could be used to find the
479 * top-level tree of the given commit.
481 if (len < 4 || name[len-1] != '}')
482 return -1;
484 for (sp = name + len - 1; name <= sp; sp--) {
485 int ch = *sp;
486 if (ch == '{' && name < sp && sp[-1] == '^')
487 break;
489 if (sp <= name)
490 return -1;
492 sp++; /* beginning of type name, or closing brace for empty */
493 if (!strncmp(commit_type, sp, 6) && sp[6] == '}')
494 expected_type = OBJ_COMMIT;
495 else if (!strncmp(tree_type, sp, 4) && sp[4] == '}')
496 expected_type = OBJ_TREE;
497 else if (!strncmp(blob_type, sp, 4) && sp[4] == '}')
498 expected_type = OBJ_BLOB;
499 else if (sp[0] == '}')
500 expected_type = OBJ_NONE;
501 else
502 return -1;
504 if (get_sha1_1(name, sp - name - 2, outer))
505 return -1;
507 o = parse_object(outer);
508 if (!o)
509 return -1;
510 if (!expected_type) {
511 o = deref_tag(o, name, sp - name - 2);
512 if (!o || (!o->parsed && !parse_object(o->sha1)))
513 return -1;
514 hashcpy(sha1, o->sha1);
516 else {
518 * At this point, the syntax look correct, so
519 * if we do not get the needed object, we should
520 * barf.
522 o = peel_to_type(name, len, o, expected_type);
523 if (o) {
524 hashcpy(sha1, o->sha1);
525 return 0;
527 return -1;
529 return 0;
532 static int get_describe_name(const char *name, int len, unsigned char *sha1)
534 const char *cp;
536 for (cp = name + len - 1; name + 2 <= cp; cp--) {
537 char ch = *cp;
538 if (hexval(ch) & ~0377) {
539 /* We must be looking at g in "SOMETHING-g"
540 * for it to be describe output.
542 if (ch == 'g' && cp[-1] == '-') {
543 cp++;
544 len -= cp - name;
545 return get_short_sha1(cp, len, sha1, 1);
549 return -1;
552 static int get_sha1_1(const char *name, int len, unsigned char *sha1)
554 int ret, has_suffix;
555 const char *cp;
558 * "name~3" is "name^^^", "name~" is "name~1", and "name^" is "name^1".
560 has_suffix = 0;
561 for (cp = name + len - 1; name <= cp; cp--) {
562 int ch = *cp;
563 if ('0' <= ch && ch <= '9')
564 continue;
565 if (ch == '~' || ch == '^')
566 has_suffix = ch;
567 break;
570 if (has_suffix) {
571 int num = 0;
572 int len1 = cp - name;
573 cp++;
574 while (cp < name + len)
575 num = num * 10 + *cp++ - '0';
576 if (!num && len1 == len - 1)
577 num = 1;
578 if (has_suffix == '^')
579 return get_parent(name, len1, sha1, num);
580 /* else if (has_suffix == '~') -- goes without saying */
581 return get_nth_ancestor(name, len1, sha1, num);
584 ret = peel_onion(name, len, sha1);
585 if (!ret)
586 return 0;
588 ret = get_sha1_basic(name, len, sha1);
589 if (!ret)
590 return 0;
592 /* It could be describe output that is "SOMETHING-gXXXX" */
593 ret = get_describe_name(name, len, sha1);
594 if (!ret)
595 return 0;
597 return get_short_sha1(name, len, sha1, 0);
600 static int handle_one_ref(const char *path,
601 const unsigned char *sha1, int flag, void *cb_data)
603 struct commit_list **list = cb_data;
604 struct object *object = parse_object(sha1);
605 if (!object)
606 return 0;
607 if (object->type == OBJ_TAG) {
608 object = deref_tag(object, path, strlen(path));
609 if (!object)
610 return 0;
612 if (object->type != OBJ_COMMIT)
613 return 0;
614 insert_by_date((struct commit *)object, list);
615 return 0;
619 * This interprets names like ':/Initial revision of "git"' by searching
620 * through history and returning the first commit whose message starts
621 * with the given string.
623 * For future extension, ':/!' is reserved. If you want to match a message
624 * beginning with a '!', you have to repeat the exclamation mark.
627 #define ONELINE_SEEN (1u<<20)
628 static int get_sha1_oneline(const char *prefix, unsigned char *sha1)
630 struct commit_list *list = NULL, *backup = NULL, *l;
631 int retval = -1;
632 char *temp_commit_buffer = NULL;
634 if (prefix[0] == '!') {
635 if (prefix[1] != '!')
636 die ("Invalid search pattern: %s", prefix);
637 prefix++;
639 for_each_ref(handle_one_ref, &list);
640 for (l = list; l; l = l->next)
641 commit_list_insert(l->item, &backup);
642 while (list) {
643 char *p;
644 struct commit *commit;
645 enum object_type type;
646 unsigned long size;
648 commit = pop_most_recent_commit(&list, ONELINE_SEEN);
649 if (!parse_object(commit->object.sha1))
650 continue;
651 free(temp_commit_buffer);
652 if (commit->buffer)
653 p = commit->buffer;
654 else {
655 p = read_sha1_file(commit->object.sha1, &type, &size);
656 if (!p)
657 continue;
658 temp_commit_buffer = p;
660 if (!(p = strstr(p, "\n\n")))
661 continue;
662 if (!prefixcmp(p + 2, prefix)) {
663 hashcpy(sha1, commit->object.sha1);
664 retval = 0;
665 break;
668 free(temp_commit_buffer);
669 free_commit_list(list);
670 for (l = backup; l; l = l->next)
671 clear_commit_marks(l->item, ONELINE_SEEN);
672 return retval;
676 * This is like "get_sha1_basic()", except it allows "sha1 expressions",
677 * notably "xyz^" for "parent of xyz"
679 int get_sha1(const char *name, unsigned char *sha1)
681 unsigned unused;
682 return get_sha1_with_mode(name, sha1, &unused);
685 int get_sha1_with_mode(const char *name, unsigned char *sha1, unsigned *mode)
687 int ret, bracket_depth;
688 int namelen = strlen(name);
689 const char *cp;
691 *mode = S_IFINVALID;
692 ret = get_sha1_1(name, namelen, sha1);
693 if (!ret)
694 return ret;
695 /* sha1:path --> object name of path in ent sha1
696 * :path -> object name of path in index
697 * :[0-3]:path -> object name of path in index at stage
699 if (name[0] == ':') {
700 int stage = 0;
701 struct cache_entry *ce;
702 int pos;
703 if (namelen > 2 && name[1] == '/')
704 return get_sha1_oneline(name + 2, sha1);
705 if (namelen < 3 ||
706 name[2] != ':' ||
707 name[1] < '0' || '3' < name[1])
708 cp = name + 1;
709 else {
710 stage = name[1] - '0';
711 cp = name + 3;
713 namelen = namelen - (cp - name);
714 if (!active_cache)
715 read_cache();
716 pos = cache_name_pos(cp, namelen);
717 if (pos < 0)
718 pos = -pos - 1;
719 while (pos < active_nr) {
720 ce = active_cache[pos];
721 if (ce_namelen(ce) != namelen ||
722 memcmp(ce->name, cp, namelen))
723 break;
724 if (ce_stage(ce) == stage) {
725 hashcpy(sha1, ce->sha1);
726 *mode = ce->ce_mode;
727 return 0;
729 pos++;
731 return -1;
733 for (cp = name, bracket_depth = 0; *cp; cp++) {
734 if (*cp == '{')
735 bracket_depth++;
736 else if (bracket_depth && *cp == '}')
737 bracket_depth--;
738 else if (!bracket_depth && *cp == ':')
739 break;
741 if (*cp == ':') {
742 unsigned char tree_sha1[20];
743 if (!get_sha1_1(name, cp-name, tree_sha1))
744 return get_tree_entry(tree_sha1, cp+1, sha1,
745 mode);
747 return ret;