Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 1 | #include "cache.h" |
Junio C Hamano | 5385f52 | 2005-10-13 18:57:40 -0700 | [diff] [blame] | 2 | #include "tag.h" |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 3 | #include "commit.h" |
Junio C Hamano | 5385f52 | 2005-10-13 18:57:40 -0700 | [diff] [blame] | 4 | #include "tree.h" |
| 5 | #include "blob.h" |
Junio C Hamano | f3ab49d | 2006-04-19 11:56:53 -0700 | [diff] [blame] | 6 | #include "tree-walk.h" |
Shawn Pearce | d556fae | 2006-05-17 05:56:09 -0400 | [diff] [blame] | 7 | #include "refs.h" |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 8 | |
| 9 | static int find_short_object_filename(int len, const char *name, unsigned char *sha1) |
| 10 | { |
Junio C Hamano | 99a19b4 | 2005-10-02 21:40:51 -0700 | [diff] [blame] | 11 | struct alternate_object_database *alt; |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 12 | char hex[40]; |
Junio C Hamano | 99a19b4 | 2005-10-02 21:40:51 -0700 | [diff] [blame] | 13 | int found = 0; |
| 14 | static struct alternate_object_database *fakeent; |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 15 | |
Junio C Hamano | 99a19b4 | 2005-10-02 21:40:51 -0700 | [diff] [blame] | 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] = '/'; |
| 24 | } |
| 25 | fakeent->next = alt_odb_list; |
| 26 | |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 27 | sprintf(hex, "%.2s", name); |
Junio C Hamano | 99a19b4 | 2005-10-02 21:40:51 -0700 | [diff] [blame] | 28 | for (alt = fakeent; alt && found < 2; alt = alt->next) { |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 29 | struct dirent *de; |
Junio C Hamano | 99a19b4 | 2005-10-02 21:40:51 -0700 | [diff] [blame] | 30 | DIR *dir; |
| 31 | sprintf(alt->name, "%.2s/", name); |
| 32 | dir = opendir(alt->base); |
| 33 | if (!dir) |
| 34 | continue; |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 35 | while ((de = readdir(dir)) != NULL) { |
| 36 | if (strlen(de->d_name) != 38) |
| 37 | continue; |
Junio C Hamano | 99a19b4 | 2005-10-02 21:40:51 -0700 | [diff] [blame] | 38 | if (memcmp(de->d_name, name + 2, len - 2)) |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 39 | continue; |
Junio C Hamano | 99a19b4 | 2005-10-02 21:40:51 -0700 | [diff] [blame] | 40 | if (!found) { |
| 41 | memcpy(hex + 2, de->d_name, 38); |
| 42 | found++; |
| 43 | } |
| 44 | else if (memcmp(hex + 2, de->d_name, 38)) { |
| 45 | found = 2; |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 46 | break; |
Junio C Hamano | 99a19b4 | 2005-10-02 21:40:51 -0700 | [diff] [blame] | 47 | } |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 48 | } |
| 49 | closedir(dir); |
| 50 | } |
| 51 | if (found == 1) |
| 52 | return get_sha1_hex(hex, sha1) == 0; |
Junio C Hamano | 99a19b4 | 2005-10-02 21:40:51 -0700 | [diff] [blame] | 53 | return found; |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 54 | } |
| 55 | |
| 56 | static int match_sha(unsigned len, const unsigned char *a, const unsigned char *b) |
| 57 | { |
| 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; |
| 69 | } |
| 70 | |
| 71 | static int find_short_packed_object(int len, const unsigned char *match, unsigned char *sha1) |
| 72 | { |
| 73 | struct packed_git *p; |
Junio C Hamano | 99a19b4 | 2005-10-02 21:40:51 -0700 | [diff] [blame] | 74 | unsigned char found_sha1[20]; |
| 75 | int found = 0; |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 76 | |
| 77 | prepare_packed_git(); |
Junio C Hamano | 99a19b4 | 2005-10-02 21:40:51 -0700 | [diff] [blame] | 78 | for (p = packed_git; p && found < 2; p = p->next) { |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 79 | unsigned num = num_packed_objects(p); |
| 80 | unsigned first = 0, last = num; |
| 81 | while (first < last) { |
| 82 | unsigned mid = (first + last) / 2; |
| 83 | unsigned char now[20]; |
| 84 | int cmp; |
| 85 | |
| 86 | nth_packed_object_sha1(p, mid, now); |
David Rientjes | a89fccd | 2006-08-17 11:54:57 -0700 | [diff] [blame] | 87 | cmp = hashcmp(match, now); |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 88 | if (!cmp) { |
| 89 | first = mid; |
| 90 | break; |
| 91 | } |
| 92 | if (cmp > 0) { |
| 93 | first = mid+1; |
| 94 | continue; |
| 95 | } |
| 96 | last = mid; |
| 97 | } |
| 98 | if (first < num) { |
Junio C Hamano | 0bc4589 | 2005-10-02 21:40:51 -0700 | [diff] [blame] | 99 | unsigned char now[20], next[20]; |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 100 | nth_packed_object_sha1(p, first, now); |
| 101 | if (match_sha(len, match, now)) { |
Junio C Hamano | 0bc4589 | 2005-10-02 21:40:51 -0700 | [diff] [blame] | 102 | if (nth_packed_object_sha1(p, first+1, next) || |
| 103 | !match_sha(len, match, next)) { |
| 104 | /* unique within this pack */ |
| 105 | if (!found) { |
Shawn Pearce | e702496 | 2006-08-23 02:49:00 -0400 | [diff] [blame] | 106 | hashcpy(found_sha1, now); |
Junio C Hamano | 0bc4589 | 2005-10-02 21:40:51 -0700 | [diff] [blame] | 107 | found++; |
| 108 | } |
David Rientjes | a89fccd | 2006-08-17 11:54:57 -0700 | [diff] [blame] | 109 | else if (hashcmp(found_sha1, now)) { |
Junio C Hamano | 0bc4589 | 2005-10-02 21:40:51 -0700 | [diff] [blame] | 110 | found = 2; |
| 111 | break; |
| 112 | } |
Junio C Hamano | 99a19b4 | 2005-10-02 21:40:51 -0700 | [diff] [blame] | 113 | } |
Junio C Hamano | 0bc4589 | 2005-10-02 21:40:51 -0700 | [diff] [blame] | 114 | else { |
| 115 | /* not even unique within this pack */ |
Junio C Hamano | 99a19b4 | 2005-10-02 21:40:51 -0700 | [diff] [blame] | 116 | found = 2; |
| 117 | break; |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 118 | } |
| 119 | } |
| 120 | } |
| 121 | } |
Junio C Hamano | 99a19b4 | 2005-10-02 21:40:51 -0700 | [diff] [blame] | 122 | if (found == 1) |
Shawn Pearce | e702496 | 2006-08-23 02:49:00 -0400 | [diff] [blame] | 123 | hashcpy(sha1, found_sha1); |
Junio C Hamano | 99a19b4 | 2005-10-02 21:40:51 -0700 | [diff] [blame] | 124 | return found; |
| 125 | } |
| 126 | |
Junio C Hamano | 013f276 | 2005-10-11 15:22:48 -0700 | [diff] [blame] | 127 | #define SHORT_NAME_NOT_FOUND (-1) |
| 128 | #define SHORT_NAME_AMBIGUOUS (-2) |
| 129 | |
Junio C Hamano | 99a19b4 | 2005-10-02 21:40:51 -0700 | [diff] [blame] | 130 | static int find_unique_short_object(int len, char *canonical, |
| 131 | unsigned char *res, unsigned char *sha1) |
| 132 | { |
| 133 | int has_unpacked, has_packed; |
| 134 | unsigned char unpacked_sha1[20], packed_sha1[20]; |
| 135 | |
| 136 | has_unpacked = find_short_object_filename(len, canonical, unpacked_sha1); |
| 137 | has_packed = find_short_packed_object(len, res, packed_sha1); |
| 138 | if (!has_unpacked && !has_packed) |
Junio C Hamano | 013f276 | 2005-10-11 15:22:48 -0700 | [diff] [blame] | 139 | return SHORT_NAME_NOT_FOUND; |
Junio C Hamano | 99a19b4 | 2005-10-02 21:40:51 -0700 | [diff] [blame] | 140 | if (1 < has_unpacked || 1 < has_packed) |
Junio C Hamano | 013f276 | 2005-10-11 15:22:48 -0700 | [diff] [blame] | 141 | return SHORT_NAME_AMBIGUOUS; |
Junio C Hamano | 99a19b4 | 2005-10-02 21:40:51 -0700 | [diff] [blame] | 142 | if (has_unpacked != has_packed) { |
Shawn Pearce | e702496 | 2006-08-23 02:49:00 -0400 | [diff] [blame] | 143 | hashcpy(sha1, (has_packed ? packed_sha1 : unpacked_sha1)); |
Junio C Hamano | 99a19b4 | 2005-10-02 21:40:51 -0700 | [diff] [blame] | 144 | return 0; |
| 145 | } |
| 146 | /* Both have unique ones -- do they match? */ |
David Rientjes | a89fccd | 2006-08-17 11:54:57 -0700 | [diff] [blame] | 147 | if (hashcmp(packed_sha1, unpacked_sha1)) |
Uwe Zeisberger | e974c9a | 2006-01-26 12:26:15 +0100 | [diff] [blame] | 148 | return SHORT_NAME_AMBIGUOUS; |
Shawn Pearce | e702496 | 2006-08-23 02:49:00 -0400 | [diff] [blame] | 149 | hashcpy(sha1, packed_sha1); |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 150 | return 0; |
| 151 | } |
| 152 | |
Junio C Hamano | 013f276 | 2005-10-11 15:22:48 -0700 | [diff] [blame] | 153 | static int get_short_sha1(const char *name, int len, unsigned char *sha1, |
| 154 | int quietly) |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 155 | { |
Junio C Hamano | 013f276 | 2005-10-11 15:22:48 -0700 | [diff] [blame] | 156 | int i, status; |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 157 | char canonical[40]; |
| 158 | unsigned char res[20]; |
| 159 | |
pclouds@gmail.com | 8a83157 | 2006-10-19 08:34:41 +0700 | [diff] [blame] | 160 | if (len < MINIMUM_ABBREV || len > 40) |
Linus Torvalds | af61c6e | 2005-09-19 15:16:03 -0700 | [diff] [blame] | 161 | return -1; |
Junio C Hamano | a8e0d16 | 2006-08-23 13:57:23 -0700 | [diff] [blame] | 162 | hashclr(res); |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 163 | memset(canonical, 'x', 40); |
Linus Torvalds | af61c6e | 2005-09-19 15:16:03 -0700 | [diff] [blame] | 164 | for (i = 0; i < len ;i++) { |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 165 | unsigned char c = name[i]; |
| 166 | unsigned char val; |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 167 | if (c >= '0' && c <= '9') |
| 168 | val = c - '0'; |
| 169 | else if (c >= 'a' && c <= 'f') |
| 170 | val = c - 'a' + 10; |
| 171 | else if (c >= 'A' && c <='F') { |
| 172 | val = c - 'A' + 10; |
| 173 | c -= 'A' - 'a'; |
| 174 | } |
| 175 | else |
| 176 | return -1; |
| 177 | canonical[i] = c; |
| 178 | if (!(i & 1)) |
| 179 | val <<= 4; |
| 180 | res[i >> 1] |= val; |
| 181 | } |
Junio C Hamano | 99a19b4 | 2005-10-02 21:40:51 -0700 | [diff] [blame] | 182 | |
Junio C Hamano | 013f276 | 2005-10-11 15:22:48 -0700 | [diff] [blame] | 183 | status = find_unique_short_object(i, canonical, res, sha1); |
| 184 | if (!quietly && (status == SHORT_NAME_AMBIGUOUS)) |
| 185 | return error("short SHA1 %.*s is ambiguous.", len, canonical); |
| 186 | return status; |
| 187 | } |
| 188 | |
| 189 | const char *find_unique_abbrev(const unsigned char *sha1, int len) |
| 190 | { |
Junio C Hamano | 297a1aa | 2006-02-10 01:51:12 -0800 | [diff] [blame] | 191 | int status, is_null; |
Junio C Hamano | 013f276 | 2005-10-11 15:22:48 -0700 | [diff] [blame] | 192 | static char hex[41]; |
Junio C Hamano | 47dd0d5 | 2005-12-13 17:21:41 -0800 | [diff] [blame] | 193 | |
David Rientjes | 0bef57e | 2006-08-15 13:37:19 -0700 | [diff] [blame] | 194 | is_null = is_null_sha1(sha1); |
Junio C Hamano | 013f276 | 2005-10-11 15:22:48 -0700 | [diff] [blame] | 195 | memcpy(hex, sha1_to_hex(sha1), 40); |
Junio C Hamano | 02c5cba | 2006-08-09 13:17:04 -0700 | [diff] [blame] | 196 | if (len == 40 || !len) |
Junio C Hamano | 47dd0d5 | 2005-12-13 17:21:41 -0800 | [diff] [blame] | 197 | return hex; |
Junio C Hamano | 013f276 | 2005-10-11 15:22:48 -0700 | [diff] [blame] | 198 | while (len < 40) { |
| 199 | unsigned char sha1_ret[20]; |
| 200 | status = get_short_sha1(hex, len, sha1_ret, 1); |
Junio C Hamano | 297a1aa | 2006-02-10 01:51:12 -0800 | [diff] [blame] | 201 | if (!status || |
| 202 | (is_null && status != SHORT_NAME_AMBIGUOUS)) { |
Junio C Hamano | 013f276 | 2005-10-11 15:22:48 -0700 | [diff] [blame] | 203 | hex[len] = 0; |
| 204 | return hex; |
| 205 | } |
| 206 | if (status != SHORT_NAME_AMBIGUOUS) |
| 207 | return NULL; |
| 208 | len++; |
| 209 | } |
| 210 | return NULL; |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 211 | } |
| 212 | |
Junio C Hamano | 6677c46 | 2005-12-15 12:54:00 -0800 | [diff] [blame] | 213 | static int ambiguous_path(const char *path, int len) |
Linus Torvalds | af13cdf | 2005-10-28 12:41:49 -0700 | [diff] [blame] | 214 | { |
| 215 | int slash = 1; |
Junio C Hamano | 6677c46 | 2005-12-15 12:54:00 -0800 | [diff] [blame] | 216 | int cnt; |
Linus Torvalds | af13cdf | 2005-10-28 12:41:49 -0700 | [diff] [blame] | 217 | |
Junio C Hamano | 6677c46 | 2005-12-15 12:54:00 -0800 | [diff] [blame] | 218 | for (cnt = 0; cnt < len; cnt++) { |
Linus Torvalds | af13cdf | 2005-10-28 12:41:49 -0700 | [diff] [blame] | 219 | switch (*path++) { |
| 220 | case '\0': |
| 221 | break; |
| 222 | case '/': |
| 223 | if (slash) |
| 224 | break; |
| 225 | slash = 1; |
| 226 | continue; |
| 227 | case '.': |
| 228 | continue; |
| 229 | default: |
| 230 | slash = 0; |
| 231 | continue; |
| 232 | } |
Junio C Hamano | c054d64 | 2005-12-17 00:00:50 -0800 | [diff] [blame] | 233 | break; |
Linus Torvalds | af13cdf | 2005-10-28 12:41:49 -0700 | [diff] [blame] | 234 | } |
Junio C Hamano | 6677c46 | 2005-12-15 12:54:00 -0800 | [diff] [blame] | 235 | return slash; |
Linus Torvalds | af13cdf | 2005-10-28 12:41:49 -0700 | [diff] [blame] | 236 | } |
| 237 | |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 238 | static int get_sha1_basic(const char *str, int len, unsigned char *sha1) |
| 239 | { |
Junio C Hamano | c51d136 | 2006-03-21 01:42:04 -0800 | [diff] [blame] | 240 | static const char *fmt[] = { |
Junio C Hamano | 84a9b58 | 2006-03-23 23:41:18 -0800 | [diff] [blame] | 241 | "%.*s", |
Junio C Hamano | c51d136 | 2006-03-21 01:42:04 -0800 | [diff] [blame] | 242 | "refs/%.*s", |
| 243 | "refs/tags/%.*s", |
| 244 | "refs/heads/%.*s", |
| 245 | "refs/remotes/%.*s", |
| 246 | "refs/remotes/%.*s/HEAD", |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 247 | NULL |
| 248 | }; |
Shawn Pearce | d556fae | 2006-05-17 05:56:09 -0400 | [diff] [blame] | 249 | static const char *warning = "warning: refname '%.*s' is ambiguous.\n"; |
Linus Torvalds | ed378ec | 2006-09-11 20:17:35 -0700 | [diff] [blame] | 250 | const char **p, *ref; |
| 251 | char *real_ref = NULL; |
Junio C Hamano | ab2a1a3 | 2006-10-05 23:16:15 -0700 | [diff] [blame] | 252 | int refs_found = 0; |
| 253 | int at, reflog_len; |
Junio C Hamano | c51d136 | 2006-03-21 01:42:04 -0800 | [diff] [blame] | 254 | unsigned char *this_result; |
| 255 | unsigned char sha1_from_ref[20]; |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 256 | |
Linus Torvalds | 3c3852e | 2005-08-13 11:05:25 -0700 | [diff] [blame] | 257 | if (len == 40 && !get_sha1_hex(str, sha1)) |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 258 | return 0; |
| 259 | |
Junio C Hamano | ab2a1a3 | 2006-10-05 23:16:15 -0700 | [diff] [blame] | 260 | /* basic@{time or number} format to query ref-log */ |
Junio C Hamano | 694500e | 2006-10-23 21:15:34 -0700 | [diff] [blame] | 261 | reflog_len = at = 0; |
Junio C Hamano | ab2a1a3 | 2006-10-05 23:16:15 -0700 | [diff] [blame] | 262 | if (str[len-1] == '}') { |
| 263 | for (at = 1; at < len - 1; at++) { |
| 264 | if (str[at] == '@' && str[at+1] == '{') { |
| 265 | reflog_len = (len-1) - (at+2); |
| 266 | len = at; |
| 267 | break; |
| 268 | } |
Shawn Pearce | d556fae | 2006-05-17 05:56:09 -0400 | [diff] [blame] | 269 | } |
| 270 | } |
| 271 | |
Linus Torvalds | af13cdf | 2005-10-28 12:41:49 -0700 | [diff] [blame] | 272 | /* Accept only unambiguous ref paths. */ |
Junio C Hamano | 6677c46 | 2005-12-15 12:54:00 -0800 | [diff] [blame] | 273 | if (ambiguous_path(str, len)) |
Linus Torvalds | af13cdf | 2005-10-28 12:41:49 -0700 | [diff] [blame] | 274 | return -1; |
| 275 | |
Junio C Hamano | c51d136 | 2006-03-21 01:42:04 -0800 | [diff] [blame] | 276 | for (p = fmt; *p; p++) { |
Shawn Pearce | d556fae | 2006-05-17 05:56:09 -0400 | [diff] [blame] | 277 | this_result = refs_found ? sha1_from_ref : sha1; |
Junio C Hamano | 8da1977 | 2006-09-20 22:02:01 -0700 | [diff] [blame] | 278 | ref = resolve_ref(mkpath(*p, len, str), this_result, 1, NULL); |
Linus Torvalds | ed378ec | 2006-09-11 20:17:35 -0700 | [diff] [blame] | 279 | if (ref) { |
Shawn Pearce | d556fae | 2006-05-17 05:56:09 -0400 | [diff] [blame] | 280 | if (!refs_found++) |
Linus Torvalds | ed378ec | 2006-09-11 20:17:35 -0700 | [diff] [blame] | 281 | real_ref = xstrdup(ref); |
Shawn Pearce | d556fae | 2006-05-17 05:56:09 -0400 | [diff] [blame] | 282 | if (!warn_ambiguous_refs) |
| 283 | break; |
Junio C Hamano | 2f8acdb | 2006-03-20 18:45:47 -0800 | [diff] [blame] | 284 | } |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 285 | } |
Shawn Pearce | d556fae | 2006-05-17 05:56:09 -0400 | [diff] [blame] | 286 | |
| 287 | if (!refs_found) |
| 288 | return -1; |
| 289 | |
| 290 | if (warn_ambiguous_refs && refs_found > 1) |
| 291 | fprintf(stderr, warning, len, str); |
| 292 | |
Junio C Hamano | ab2a1a3 | 2006-10-05 23:16:15 -0700 | [diff] [blame] | 293 | if (reflog_len) { |
| 294 | /* Is it asking for N-th entry, or approxidate? */ |
| 295 | int nth, i; |
| 296 | unsigned long at_time; |
| 297 | for (i = nth = 0; 0 <= nth && i < reflog_len; i++) { |
| 298 | char ch = str[at+2+i]; |
| 299 | if ('0' <= ch && ch <= '9') |
| 300 | nth = nth * 10 + ch - '0'; |
| 301 | else |
| 302 | nth = -1; |
| 303 | } |
| 304 | if (0 <= nth) |
| 305 | at_time = 0; |
| 306 | else |
| 307 | at_time = approxidate(str + at + 2); |
| 308 | read_ref_at(real_ref, at_time, nth, sha1); |
Shawn Pearce | d556fae | 2006-05-17 05:56:09 -0400 | [diff] [blame] | 309 | } |
| 310 | |
Linus Torvalds | ed378ec | 2006-09-11 20:17:35 -0700 | [diff] [blame] | 311 | free(real_ref); |
Shawn Pearce | d556fae | 2006-05-17 05:56:09 -0400 | [diff] [blame] | 312 | return 0; |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 313 | } |
| 314 | |
| 315 | static int get_sha1_1(const char *name, int len, unsigned char *sha1); |
| 316 | |
| 317 | static int get_parent(const char *name, int len, |
| 318 | unsigned char *result, int idx) |
| 319 | { |
| 320 | unsigned char sha1[20]; |
| 321 | int ret = get_sha1_1(name, len, sha1); |
| 322 | struct commit *commit; |
| 323 | struct commit_list *p; |
| 324 | |
| 325 | if (ret) |
| 326 | return ret; |
| 327 | commit = lookup_commit_reference(sha1); |
| 328 | if (!commit) |
| 329 | return -1; |
| 330 | if (parse_commit(commit)) |
| 331 | return -1; |
| 332 | if (!idx) { |
Shawn Pearce | e702496 | 2006-08-23 02:49:00 -0400 | [diff] [blame] | 333 | hashcpy(result, commit->object.sha1); |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 334 | return 0; |
| 335 | } |
| 336 | p = commit->parents; |
| 337 | while (p) { |
| 338 | if (!--idx) { |
Shawn Pearce | e702496 | 2006-08-23 02:49:00 -0400 | [diff] [blame] | 339 | hashcpy(result, p->item->object.sha1); |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 340 | return 0; |
| 341 | } |
| 342 | p = p->next; |
| 343 | } |
| 344 | return -1; |
| 345 | } |
| 346 | |
Junio C Hamano | 4f7599a | 2005-08-21 02:43:54 -0700 | [diff] [blame] | 347 | static int get_nth_ancestor(const char *name, int len, |
| 348 | unsigned char *result, int generation) |
| 349 | { |
| 350 | unsigned char sha1[20]; |
| 351 | int ret = get_sha1_1(name, len, sha1); |
| 352 | if (ret) |
| 353 | return ret; |
| 354 | |
| 355 | while (generation--) { |
| 356 | struct commit *commit = lookup_commit_reference(sha1); |
| 357 | |
| 358 | if (!commit || parse_commit(commit) || !commit->parents) |
| 359 | return -1; |
Shawn Pearce | e702496 | 2006-08-23 02:49:00 -0400 | [diff] [blame] | 360 | hashcpy(sha1, commit->parents->item->object.sha1); |
Junio C Hamano | 4f7599a | 2005-08-21 02:43:54 -0700 | [diff] [blame] | 361 | } |
Shawn Pearce | e702496 | 2006-08-23 02:49:00 -0400 | [diff] [blame] | 362 | hashcpy(result, sha1); |
Junio C Hamano | 4f7599a | 2005-08-21 02:43:54 -0700 | [diff] [blame] | 363 | return 0; |
| 364 | } |
| 365 | |
Junio C Hamano | 5385f52 | 2005-10-13 18:57:40 -0700 | [diff] [blame] | 366 | static int peel_onion(const char *name, int len, unsigned char *sha1) |
| 367 | { |
| 368 | unsigned char outer[20]; |
| 369 | const char *sp; |
Linus Torvalds | 885a86a | 2006-06-14 16:45:13 -0700 | [diff] [blame] | 370 | unsigned int expected_type = 0; |
Junio C Hamano | 5385f52 | 2005-10-13 18:57:40 -0700 | [diff] [blame] | 371 | struct object *o; |
| 372 | |
| 373 | /* |
| 374 | * "ref^{type}" dereferences ref repeatedly until you cannot |
| 375 | * dereference anymore, or you get an object of given type, |
| 376 | * whichever comes first. "ref^{}" means just dereference |
| 377 | * tags until you get a non-tag. "ref^0" is a shorthand for |
| 378 | * "ref^{commit}". "commit^{tree}" could be used to find the |
| 379 | * top-level tree of the given commit. |
| 380 | */ |
| 381 | if (len < 4 || name[len-1] != '}') |
| 382 | return -1; |
| 383 | |
| 384 | for (sp = name + len - 1; name <= sp; sp--) { |
| 385 | int ch = *sp; |
| 386 | if (ch == '{' && name < sp && sp[-1] == '^') |
| 387 | break; |
| 388 | } |
| 389 | if (sp <= name) |
| 390 | return -1; |
| 391 | |
| 392 | sp++; /* beginning of type name, or closing brace for empty */ |
| 393 | if (!strncmp(commit_type, sp, 6) && sp[6] == '}') |
Linus Torvalds | 1974632 | 2006-07-11 20:45:31 -0700 | [diff] [blame] | 394 | expected_type = OBJ_COMMIT; |
Junio C Hamano | 5385f52 | 2005-10-13 18:57:40 -0700 | [diff] [blame] | 395 | else if (!strncmp(tree_type, sp, 4) && sp[4] == '}') |
Linus Torvalds | 1974632 | 2006-07-11 20:45:31 -0700 | [diff] [blame] | 396 | expected_type = OBJ_TREE; |
Junio C Hamano | 5385f52 | 2005-10-13 18:57:40 -0700 | [diff] [blame] | 397 | else if (!strncmp(blob_type, sp, 4) && sp[4] == '}') |
Linus Torvalds | 1974632 | 2006-07-11 20:45:31 -0700 | [diff] [blame] | 398 | expected_type = OBJ_BLOB; |
Junio C Hamano | 5385f52 | 2005-10-13 18:57:40 -0700 | [diff] [blame] | 399 | else if (sp[0] == '}') |
Linus Torvalds | 1974632 | 2006-07-11 20:45:31 -0700 | [diff] [blame] | 400 | expected_type = OBJ_NONE; |
Junio C Hamano | 5385f52 | 2005-10-13 18:57:40 -0700 | [diff] [blame] | 401 | else |
| 402 | return -1; |
| 403 | |
| 404 | if (get_sha1_1(name, sp - name - 2, outer)) |
| 405 | return -1; |
| 406 | |
| 407 | o = parse_object(outer); |
| 408 | if (!o) |
| 409 | return -1; |
Linus Torvalds | 885a86a | 2006-06-14 16:45:13 -0700 | [diff] [blame] | 410 | if (!expected_type) { |
Junio C Hamano | 9534f40 | 2005-11-02 15:19:13 -0800 | [diff] [blame] | 411 | o = deref_tag(o, name, sp - name - 2); |
Junio C Hamano | 6e1c6c1 | 2005-10-19 22:48:16 -0700 | [diff] [blame] | 412 | if (!o || (!o->parsed && !parse_object(o->sha1))) |
| 413 | return -1; |
Shawn Pearce | e702496 | 2006-08-23 02:49:00 -0400 | [diff] [blame] | 414 | hashcpy(sha1, o->sha1); |
Junio C Hamano | 5385f52 | 2005-10-13 18:57:40 -0700 | [diff] [blame] | 415 | } |
| 416 | else { |
| 417 | /* At this point, the syntax look correct, so |
| 418 | * if we do not get the needed object, we should |
| 419 | * barf. |
| 420 | */ |
| 421 | |
| 422 | while (1) { |
Junio C Hamano | 6e1c6c1 | 2005-10-19 22:48:16 -0700 | [diff] [blame] | 423 | if (!o || (!o->parsed && !parse_object(o->sha1))) |
Junio C Hamano | 5385f52 | 2005-10-13 18:57:40 -0700 | [diff] [blame] | 424 | return -1; |
Linus Torvalds | 885a86a | 2006-06-14 16:45:13 -0700 | [diff] [blame] | 425 | if (o->type == expected_type) { |
Shawn Pearce | e702496 | 2006-08-23 02:49:00 -0400 | [diff] [blame] | 426 | hashcpy(sha1, o->sha1); |
Junio C Hamano | 5385f52 | 2005-10-13 18:57:40 -0700 | [diff] [blame] | 427 | return 0; |
| 428 | } |
Linus Torvalds | 1974632 | 2006-07-11 20:45:31 -0700 | [diff] [blame] | 429 | if (o->type == OBJ_TAG) |
Junio C Hamano | 5385f52 | 2005-10-13 18:57:40 -0700 | [diff] [blame] | 430 | o = ((struct tag*) o)->tagged; |
Linus Torvalds | 1974632 | 2006-07-11 20:45:31 -0700 | [diff] [blame] | 431 | else if (o->type == OBJ_COMMIT) |
Junio C Hamano | 5385f52 | 2005-10-13 18:57:40 -0700 | [diff] [blame] | 432 | o = &(((struct commit *) o)->tree->object); |
| 433 | else |
| 434 | return error("%.*s: expected %s type, but the object dereferences to %s type", |
Linus Torvalds | 885a86a | 2006-06-14 16:45:13 -0700 | [diff] [blame] | 435 | len, name, typename(expected_type), |
| 436 | typename(o->type)); |
Junio C Hamano | 5385f52 | 2005-10-13 18:57:40 -0700 | [diff] [blame] | 437 | if (!o->parsed) |
| 438 | parse_object(o->sha1); |
| 439 | } |
| 440 | } |
| 441 | return 0; |
| 442 | } |
| 443 | |
Junio C Hamano | 7dd45e1 | 2006-09-20 16:11:08 -0700 | [diff] [blame] | 444 | static int get_describe_name(const char *name, int len, unsigned char *sha1) |
| 445 | { |
| 446 | const char *cp; |
| 447 | |
| 448 | for (cp = name + len - 1; name + 2 <= cp; cp--) { |
| 449 | char ch = *cp; |
| 450 | if (hexval(ch) & ~0377) { |
| 451 | /* We must be looking at g in "SOMETHING-g" |
| 452 | * for it to be describe output. |
| 453 | */ |
| 454 | if (ch == 'g' && cp[-1] == '-') { |
| 455 | cp++; |
| 456 | len -= cp - name; |
| 457 | return get_short_sha1(cp, len, sha1, 1); |
| 458 | } |
| 459 | } |
| 460 | } |
| 461 | return -1; |
| 462 | } |
| 463 | |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 464 | static int get_sha1_1(const char *name, int len, unsigned char *sha1) |
| 465 | { |
Junio C Hamano | 0601dbe | 2006-02-02 23:48:36 -0800 | [diff] [blame] | 466 | int ret, has_suffix; |
Junio C Hamano | 4f7599a | 2005-08-21 02:43:54 -0700 | [diff] [blame] | 467 | const char *cp; |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 468 | |
Junio C Hamano | 4f7599a | 2005-08-21 02:43:54 -0700 | [diff] [blame] | 469 | /* "name~3" is "name^^^", |
Junio C Hamano | 4f7599a | 2005-08-21 02:43:54 -0700 | [diff] [blame] | 470 | * "name~" and "name~0" are name -- not "name^0"! |
Junio C Hamano | 0601dbe | 2006-02-02 23:48:36 -0800 | [diff] [blame] | 471 | * "name^" is not "name^0"; it is "name^1". |
Junio C Hamano | 4f7599a | 2005-08-21 02:43:54 -0700 | [diff] [blame] | 472 | */ |
Junio C Hamano | 0601dbe | 2006-02-02 23:48:36 -0800 | [diff] [blame] | 473 | has_suffix = 0; |
Junio C Hamano | 4f7599a | 2005-08-21 02:43:54 -0700 | [diff] [blame] | 474 | for (cp = name + len - 1; name <= cp; cp--) { |
| 475 | int ch = *cp; |
| 476 | if ('0' <= ch && ch <= '9') |
| 477 | continue; |
Junio C Hamano | 0601dbe | 2006-02-02 23:48:36 -0800 | [diff] [blame] | 478 | if (ch == '~' || ch == '^') |
| 479 | has_suffix = ch; |
Junio C Hamano | 4f7599a | 2005-08-21 02:43:54 -0700 | [diff] [blame] | 480 | break; |
| 481 | } |
Junio C Hamano | 0601dbe | 2006-02-02 23:48:36 -0800 | [diff] [blame] | 482 | |
| 483 | if (has_suffix) { |
| 484 | int num = 0; |
Junio C Hamano | 4f7599a | 2005-08-21 02:43:54 -0700 | [diff] [blame] | 485 | int len1 = cp - name; |
| 486 | cp++; |
| 487 | while (cp < name + len) |
Junio C Hamano | 0601dbe | 2006-02-02 23:48:36 -0800 | [diff] [blame] | 488 | num = num * 10 + *cp++ - '0'; |
| 489 | if (has_suffix == '^') { |
| 490 | if (!num && len1 == len - 1) |
| 491 | num = 1; |
| 492 | return get_parent(name, len1, sha1, num); |
| 493 | } |
| 494 | /* else if (has_suffix == '~') -- goes without saying */ |
| 495 | return get_nth_ancestor(name, len1, sha1, num); |
Junio C Hamano | 4f7599a | 2005-08-21 02:43:54 -0700 | [diff] [blame] | 496 | } |
| 497 | |
Junio C Hamano | 5385f52 | 2005-10-13 18:57:40 -0700 | [diff] [blame] | 498 | ret = peel_onion(name, len, sha1); |
| 499 | if (!ret) |
| 500 | return 0; |
| 501 | |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 502 | ret = get_sha1_basic(name, len, sha1); |
| 503 | if (!ret) |
| 504 | return 0; |
Junio C Hamano | 7dd45e1 | 2006-09-20 16:11:08 -0700 | [diff] [blame] | 505 | |
| 506 | /* It could be describe output that is "SOMETHING-gXXXX" */ |
| 507 | ret = get_describe_name(name, len, sha1); |
| 508 | if (!ret) |
| 509 | return 0; |
| 510 | |
Junio C Hamano | 013f276 | 2005-10-11 15:22:48 -0700 | [diff] [blame] | 511 | return get_short_sha1(name, len, sha1, 0); |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 512 | } |
| 513 | |
| 514 | /* |
| 515 | * This is like "get_sha1_basic()", except it allows "sha1 expressions", |
| 516 | * notably "xyz^" for "parent of xyz" |
| 517 | */ |
| 518 | int get_sha1(const char *name, unsigned char *sha1) |
| 519 | { |
Shawn Pearce | cce91a2 | 2006-05-19 03:29:43 -0400 | [diff] [blame] | 520 | int ret, bracket_depth; |
Junio C Hamano | 041a730 | 2006-04-19 11:56:07 -0700 | [diff] [blame] | 521 | unsigned unused; |
Junio C Hamano | 73b0e5a | 2006-04-21 17:31:04 -0700 | [diff] [blame] | 522 | int namelen = strlen(name); |
| 523 | const char *cp; |
Linus Torvalds | 5119602 | 2006-04-18 16:45:16 -0700 | [diff] [blame] | 524 | |
Junio C Hamano | 99a19b4 | 2005-10-02 21:40:51 -0700 | [diff] [blame] | 525 | prepare_alt_odb(); |
Junio C Hamano | 73b0e5a | 2006-04-21 17:31:04 -0700 | [diff] [blame] | 526 | ret = get_sha1_1(name, namelen, sha1); |
| 527 | if (!ret) |
| 528 | return ret; |
| 529 | /* sha1:path --> object name of path in ent sha1 |
| 530 | * :path -> object name of path in index |
| 531 | * :[0-3]:path -> object name of path in index at stage |
| 532 | */ |
| 533 | if (name[0] == ':') { |
| 534 | int stage = 0; |
| 535 | struct cache_entry *ce; |
| 536 | int pos; |
| 537 | if (namelen < 3 || |
| 538 | name[2] != ':' || |
| 539 | name[1] < '0' || '3' < name[1]) |
| 540 | cp = name + 1; |
| 541 | else { |
| 542 | stage = name[1] - '0'; |
| 543 | cp = name + 3; |
Linus Torvalds | 5119602 | 2006-04-18 16:45:16 -0700 | [diff] [blame] | 544 | } |
Junio C Hamano | 73b0e5a | 2006-04-21 17:31:04 -0700 | [diff] [blame] | 545 | namelen = namelen - (cp - name); |
| 546 | if (!active_cache) |
| 547 | read_cache(); |
| 548 | if (active_nr < 0) |
| 549 | return -1; |
| 550 | pos = cache_name_pos(cp, namelen); |
| 551 | if (pos < 0) |
| 552 | pos = -pos - 1; |
| 553 | while (pos < active_nr) { |
| 554 | ce = active_cache[pos]; |
| 555 | if (ce_namelen(ce) != namelen || |
| 556 | memcmp(ce->name, cp, namelen)) |
| 557 | break; |
| 558 | if (ce_stage(ce) == stage) { |
Shawn Pearce | e702496 | 2006-08-23 02:49:00 -0400 | [diff] [blame] | 559 | hashcpy(sha1, ce->sha1); |
Junio C Hamano | 73b0e5a | 2006-04-21 17:31:04 -0700 | [diff] [blame] | 560 | return 0; |
| 561 | } |
Junio C Hamano | e7cef45 | 2006-05-08 15:44:06 -0700 | [diff] [blame] | 562 | pos++; |
Junio C Hamano | 73b0e5a | 2006-04-21 17:31:04 -0700 | [diff] [blame] | 563 | } |
| 564 | return -1; |
| 565 | } |
Shawn Pearce | cce91a2 | 2006-05-19 03:29:43 -0400 | [diff] [blame] | 566 | for (cp = name, bracket_depth = 0; *cp; cp++) { |
| 567 | if (*cp == '{') |
| 568 | bracket_depth++; |
| 569 | else if (bracket_depth && *cp == '}') |
| 570 | bracket_depth--; |
| 571 | else if (!bracket_depth && *cp == ':') |
| 572 | break; |
| 573 | } |
| 574 | if (*cp == ':') { |
Junio C Hamano | 73b0e5a | 2006-04-21 17:31:04 -0700 | [diff] [blame] | 575 | unsigned char tree_sha1[20]; |
| 576 | if (!get_sha1_1(name, cp-name, tree_sha1)) |
| 577 | return get_tree_entry(tree_sha1, cp+1, sha1, |
| 578 | &unused); |
Linus Torvalds | 5119602 | 2006-04-18 16:45:16 -0700 | [diff] [blame] | 579 | } |
| 580 | return ret; |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 581 | } |