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; |
Nicolas Pitre | d72308e | 2007-04-04 16:49:04 -0400 | [diff] [blame] | 74 | const unsigned char *found_sha1 = NULL; |
Junio C Hamano | 99a19b4 | 2005-10-02 21:40:51 -0700 | [diff] [blame] | 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) { |
James Bowes | 1055880 | 2007-05-29 19:29:51 -0400 | [diff] [blame] | 79 | uint32_t num, last; |
| 80 | uint32_t first = 0; |
| 81 | open_pack_index(p); |
| 82 | num = p->num_objects; |
| 83 | last = num; |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 84 | while (first < last) { |
Shawn O. Pearce | 326bf39 | 2007-03-06 20:44:19 -0500 | [diff] [blame] | 85 | uint32_t mid = (first + last) / 2; |
Nicolas Pitre | d72308e | 2007-04-04 16:49:04 -0400 | [diff] [blame] | 86 | const unsigned char *now; |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 87 | int cmp; |
| 88 | |
Nicolas Pitre | d72308e | 2007-04-04 16:49:04 -0400 | [diff] [blame] | 89 | now = nth_packed_object_sha1(p, mid); |
David Rientjes | a89fccd | 2006-08-17 11:54:57 -0700 | [diff] [blame] | 90 | cmp = hashcmp(match, now); |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 91 | if (!cmp) { |
| 92 | first = mid; |
| 93 | break; |
| 94 | } |
| 95 | if (cmp > 0) { |
| 96 | first = mid+1; |
| 97 | continue; |
| 98 | } |
| 99 | last = mid; |
| 100 | } |
| 101 | if (first < num) { |
Nicolas Pitre | d72308e | 2007-04-04 16:49:04 -0400 | [diff] [blame] | 102 | const unsigned char *now, *next; |
| 103 | now = nth_packed_object_sha1(p, first); |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 104 | if (match_sha(len, match, now)) { |
Nicolas Pitre | d72308e | 2007-04-04 16:49:04 -0400 | [diff] [blame] | 105 | next = nth_packed_object_sha1(p, first+1); |
| 106 | if (!next|| !match_sha(len, match, next)) { |
Junio C Hamano | 0bc4589 | 2005-10-02 21:40:51 -0700 | [diff] [blame] | 107 | /* unique within this pack */ |
| 108 | if (!found) { |
Nicolas Pitre | d72308e | 2007-04-04 16:49:04 -0400 | [diff] [blame] | 109 | found_sha1 = now; |
Junio C Hamano | 0bc4589 | 2005-10-02 21:40:51 -0700 | [diff] [blame] | 110 | found++; |
| 111 | } |
David Rientjes | a89fccd | 2006-08-17 11:54:57 -0700 | [diff] [blame] | 112 | else if (hashcmp(found_sha1, now)) { |
Junio C Hamano | 0bc4589 | 2005-10-02 21:40:51 -0700 | [diff] [blame] | 113 | found = 2; |
| 114 | break; |
| 115 | } |
Junio C Hamano | 99a19b4 | 2005-10-02 21:40:51 -0700 | [diff] [blame] | 116 | } |
Junio C Hamano | 0bc4589 | 2005-10-02 21:40:51 -0700 | [diff] [blame] | 117 | else { |
| 118 | /* not even unique within this pack */ |
Junio C Hamano | 99a19b4 | 2005-10-02 21:40:51 -0700 | [diff] [blame] | 119 | found = 2; |
| 120 | break; |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 121 | } |
| 122 | } |
| 123 | } |
| 124 | } |
Junio C Hamano | 99a19b4 | 2005-10-02 21:40:51 -0700 | [diff] [blame] | 125 | if (found == 1) |
Shawn Pearce | e702496 | 2006-08-23 02:49:00 -0400 | [diff] [blame] | 126 | hashcpy(sha1, found_sha1); |
Junio C Hamano | 99a19b4 | 2005-10-02 21:40:51 -0700 | [diff] [blame] | 127 | return found; |
| 128 | } |
| 129 | |
Junio C Hamano | 013f276 | 2005-10-11 15:22:48 -0700 | [diff] [blame] | 130 | #define SHORT_NAME_NOT_FOUND (-1) |
| 131 | #define SHORT_NAME_AMBIGUOUS (-2) |
| 132 | |
Junio C Hamano | 99a19b4 | 2005-10-02 21:40:51 -0700 | [diff] [blame] | 133 | static int find_unique_short_object(int len, char *canonical, |
| 134 | unsigned char *res, unsigned char *sha1) |
| 135 | { |
| 136 | int has_unpacked, has_packed; |
| 137 | unsigned char unpacked_sha1[20], packed_sha1[20]; |
| 138 | |
Shawn O. Pearce | 693d2bc | 2007-05-26 01:25:11 -0400 | [diff] [blame] | 139 | prepare_alt_odb(); |
Junio C Hamano | 99a19b4 | 2005-10-02 21:40:51 -0700 | [diff] [blame] | 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) |
Junio C Hamano | 013f276 | 2005-10-11 15:22:48 -0700 | [diff] [blame] | 143 | return SHORT_NAME_NOT_FOUND; |
Junio C Hamano | 99a19b4 | 2005-10-02 21:40:51 -0700 | [diff] [blame] | 144 | if (1 < has_unpacked || 1 < has_packed) |
Junio C Hamano | 013f276 | 2005-10-11 15:22:48 -0700 | [diff] [blame] | 145 | return SHORT_NAME_AMBIGUOUS; |
Junio C Hamano | 99a19b4 | 2005-10-02 21:40:51 -0700 | [diff] [blame] | 146 | if (has_unpacked != has_packed) { |
Shawn Pearce | e702496 | 2006-08-23 02:49:00 -0400 | [diff] [blame] | 147 | hashcpy(sha1, (has_packed ? packed_sha1 : unpacked_sha1)); |
Junio C Hamano | 99a19b4 | 2005-10-02 21:40:51 -0700 | [diff] [blame] | 148 | return 0; |
| 149 | } |
| 150 | /* Both have unique ones -- do they match? */ |
David Rientjes | a89fccd | 2006-08-17 11:54:57 -0700 | [diff] [blame] | 151 | if (hashcmp(packed_sha1, unpacked_sha1)) |
Uwe Zeisberger | e974c9a | 2006-01-26 12:26:15 +0100 | [diff] [blame] | 152 | return SHORT_NAME_AMBIGUOUS; |
Shawn Pearce | e702496 | 2006-08-23 02:49:00 -0400 | [diff] [blame] | 153 | hashcpy(sha1, packed_sha1); |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 154 | return 0; |
| 155 | } |
| 156 | |
Junio C Hamano | 013f276 | 2005-10-11 15:22:48 -0700 | [diff] [blame] | 157 | static int get_short_sha1(const char *name, int len, unsigned char *sha1, |
| 158 | int quietly) |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 159 | { |
Junio C Hamano | 013f276 | 2005-10-11 15:22:48 -0700 | [diff] [blame] | 160 | int i, status; |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 161 | char canonical[40]; |
| 162 | unsigned char res[20]; |
| 163 | |
pclouds@gmail.com | 8a83157 | 2006-10-19 08:34:41 +0700 | [diff] [blame] | 164 | if (len < MINIMUM_ABBREV || len > 40) |
Linus Torvalds | af61c6e | 2005-09-19 15:16:03 -0700 | [diff] [blame] | 165 | return -1; |
Junio C Hamano | a8e0d16 | 2006-08-23 13:57:23 -0700 | [diff] [blame] | 166 | hashclr(res); |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 167 | memset(canonical, 'x', 40); |
Linus Torvalds | af61c6e | 2005-09-19 15:16:03 -0700 | [diff] [blame] | 168 | for (i = 0; i < len ;i++) { |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 169 | unsigned char c = name[i]; |
| 170 | unsigned char val; |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 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'; |
| 178 | } |
| 179 | else |
| 180 | return -1; |
| 181 | canonical[i] = c; |
| 182 | if (!(i & 1)) |
| 183 | val <<= 4; |
| 184 | res[i >> 1] |= val; |
| 185 | } |
Junio C Hamano | 99a19b4 | 2005-10-02 21:40:51 -0700 | [diff] [blame] | 186 | |
Junio C Hamano | 013f276 | 2005-10-11 15:22:48 -0700 | [diff] [blame] | 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; |
| 191 | } |
| 192 | |
| 193 | const char *find_unique_abbrev(const unsigned char *sha1, int len) |
| 194 | { |
Junio C Hamano | b66fde9 | 2008-03-01 23:35:32 -0800 | [diff] [blame] | 195 | int status, exists; |
Junio C Hamano | 013f276 | 2005-10-11 15:22:48 -0700 | [diff] [blame] | 196 | static char hex[41]; |
Junio C Hamano | 47dd0d5 | 2005-12-13 17:21:41 -0800 | [diff] [blame] | 197 | |
Junio C Hamano | b66fde9 | 2008-03-01 23:35:32 -0800 | [diff] [blame] | 198 | exists = has_sha1_file(sha1); |
Junio C Hamano | 013f276 | 2005-10-11 15:22:48 -0700 | [diff] [blame] | 199 | memcpy(hex, sha1_to_hex(sha1), 40); |
Junio C Hamano | 02c5cba | 2006-08-09 13:17:04 -0700 | [diff] [blame] | 200 | if (len == 40 || !len) |
Junio C Hamano | 47dd0d5 | 2005-12-13 17:21:41 -0800 | [diff] [blame] | 201 | return hex; |
Junio C Hamano | 013f276 | 2005-10-11 15:22:48 -0700 | [diff] [blame] | 202 | while (len < 40) { |
| 203 | unsigned char sha1_ret[20]; |
| 204 | status = get_short_sha1(hex, len, sha1_ret, 1); |
Junio C Hamano | b66fde9 | 2008-03-01 23:35:32 -0800 | [diff] [blame] | 205 | if (exists |
| 206 | ? !status |
| 207 | : status == SHORT_NAME_NOT_FOUND) { |
Junio C Hamano | 013f276 | 2005-10-11 15:22:48 -0700 | [diff] [blame] | 208 | hex[len] = 0; |
| 209 | return hex; |
| 210 | } |
Junio C Hamano | 013f276 | 2005-10-11 15:22:48 -0700 | [diff] [blame] | 211 | len++; |
| 212 | } |
Junio C Hamano | b66fde9 | 2008-03-01 23:35:32 -0800 | [diff] [blame] | 213 | return hex; |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 214 | } |
| 215 | |
Junio C Hamano | 6677c46 | 2005-12-15 12:54:00 -0800 | [diff] [blame] | 216 | static int ambiguous_path(const char *path, int len) |
Linus Torvalds | af13cdf | 2005-10-28 12:41:49 -0700 | [diff] [blame] | 217 | { |
| 218 | int slash = 1; |
Junio C Hamano | 6677c46 | 2005-12-15 12:54:00 -0800 | [diff] [blame] | 219 | int cnt; |
Linus Torvalds | af13cdf | 2005-10-28 12:41:49 -0700 | [diff] [blame] | 220 | |
Junio C Hamano | 6677c46 | 2005-12-15 12:54:00 -0800 | [diff] [blame] | 221 | for (cnt = 0; cnt < len; cnt++) { |
Linus Torvalds | af13cdf | 2005-10-28 12:41:49 -0700 | [diff] [blame] | 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; |
| 235 | } |
Junio C Hamano | c054d64 | 2005-12-17 00:00:50 -0800 | [diff] [blame] | 236 | break; |
Linus Torvalds | af13cdf | 2005-10-28 12:41:49 -0700 | [diff] [blame] | 237 | } |
Junio C Hamano | 6677c46 | 2005-12-15 12:54:00 -0800 | [diff] [blame] | 238 | return slash; |
Linus Torvalds | af13cdf | 2005-10-28 12:41:49 -0700 | [diff] [blame] | 239 | } |
| 240 | |
Johannes Schindelin | aa9c55b | 2009-01-17 19:08:12 +0100 | [diff] [blame] | 241 | /* |
| 242 | * *string and *len will only be substituted, and *string returned (for |
| 243 | * later free()ing) if the string passed in is of the form @{-<n>}. |
| 244 | */ |
Junio C Hamano | 431b196 | 2009-03-21 12:51:34 -0700 | [diff] [blame] | 245 | static char *substitute_branch_name(const char **string, int *len) |
Johannes Schindelin | aa9c55b | 2009-01-17 19:08:12 +0100 | [diff] [blame] | 246 | { |
| 247 | struct strbuf buf = STRBUF_INIT; |
Junio C Hamano | 431b196 | 2009-03-21 12:51:34 -0700 | [diff] [blame] | 248 | int ret = interpret_branch_name(*string, &buf); |
Johannes Schindelin | aa9c55b | 2009-01-17 19:08:12 +0100 | [diff] [blame] | 249 | |
| 250 | if (ret == *len) { |
| 251 | size_t size; |
| 252 | *string = strbuf_detach(&buf, &size); |
| 253 | *len = size; |
| 254 | return (char *)*string; |
| 255 | } |
| 256 | |
| 257 | return NULL; |
| 258 | } |
| 259 | |
Junio C Hamano | e86eb66 | 2007-01-19 01:15:15 -0800 | [diff] [blame] | 260 | int dwim_ref(const char *str, int len, unsigned char *sha1, char **ref) |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 261 | { |
Junio C Hamano | 431b196 | 2009-03-21 12:51:34 -0700 | [diff] [blame] | 262 | char *last_branch = substitute_branch_name(&str, &len); |
Junio C Hamano | e86eb66 | 2007-01-19 01:15:15 -0800 | [diff] [blame] | 263 | const char **p, *r; |
| 264 | int refs_found = 0; |
| 265 | |
| 266 | *ref = NULL; |
Steffen Prohaska | 7980332 | 2007-11-11 15:01:46 +0100 | [diff] [blame] | 267 | for (p = ref_rev_parse_rules; *p; p++) { |
Alex Riesen | 94cc355 | 2008-10-26 23:07:24 +0100 | [diff] [blame] | 268 | char fullref[PATH_MAX]; |
Junio C Hamano | e86eb66 | 2007-01-19 01:15:15 -0800 | [diff] [blame] | 269 | unsigned char sha1_from_ref[20]; |
| 270 | unsigned char *this_result; |
Junio C Hamano | 057e713 | 2009-02-08 23:52:01 -0800 | [diff] [blame] | 271 | int flag; |
Junio C Hamano | e86eb66 | 2007-01-19 01:15:15 -0800 | [diff] [blame] | 272 | |
| 273 | this_result = refs_found ? sha1_from_ref : sha1; |
Alex Riesen | 94cc355 | 2008-10-26 23:07:24 +0100 | [diff] [blame] | 274 | mksnpath(fullref, sizeof(fullref), *p, len, str); |
Junio C Hamano | 057e713 | 2009-02-08 23:52:01 -0800 | [diff] [blame] | 275 | r = resolve_ref(fullref, this_result, 1, &flag); |
Junio C Hamano | e86eb66 | 2007-01-19 01:15:15 -0800 | [diff] [blame] | 276 | if (r) { |
| 277 | if (!refs_found++) |
| 278 | *ref = xstrdup(r); |
| 279 | if (!warn_ambiguous_refs) |
| 280 | break; |
Junio C Hamano | 9e5b80c | 2009-02-11 09:22:16 -0800 | [diff] [blame] | 281 | } else if ((flag & REF_ISSYMREF) && |
| 282 | (len != 4 || strcmp(str, "HEAD"))) |
Junio C Hamano | 057e713 | 2009-02-08 23:52:01 -0800 | [diff] [blame] | 283 | warning("ignoring dangling symref %s.", fullref); |
Junio C Hamano | e86eb66 | 2007-01-19 01:15:15 -0800 | [diff] [blame] | 284 | } |
Johannes Schindelin | aa9c55b | 2009-01-17 19:08:12 +0100 | [diff] [blame] | 285 | free(last_branch); |
Junio C Hamano | e86eb66 | 2007-01-19 01:15:15 -0800 | [diff] [blame] | 286 | return refs_found; |
| 287 | } |
| 288 | |
Johannes Schindelin | eb3a482 | 2007-02-09 01:28:23 +0100 | [diff] [blame] | 289 | int dwim_log(const char *str, int len, unsigned char *sha1, char **log) |
Nicolas Pitre | f2eba66 | 2007-02-03 21:49:16 -0500 | [diff] [blame] | 290 | { |
Junio C Hamano | 431b196 | 2009-03-21 12:51:34 -0700 | [diff] [blame] | 291 | char *last_branch = substitute_branch_name(&str, &len); |
Nicolas Pitre | f2eba66 | 2007-02-03 21:49:16 -0500 | [diff] [blame] | 292 | const char **p; |
| 293 | int logs_found = 0; |
| 294 | |
| 295 | *log = NULL; |
Steffen Prohaska | 7980332 | 2007-11-11 15:01:46 +0100 | [diff] [blame] | 296 | for (p = ref_rev_parse_rules; *p; p++) { |
Nicolas Pitre | f2eba66 | 2007-02-03 21:49:16 -0500 | [diff] [blame] | 297 | struct stat st; |
Junio C Hamano | 40facde | 2007-02-08 23:24:51 -0800 | [diff] [blame] | 298 | unsigned char hash[20]; |
| 299 | char path[PATH_MAX]; |
| 300 | const char *ref, *it; |
| 301 | |
Alex Riesen | 94cc355 | 2008-10-26 23:07:24 +0100 | [diff] [blame] | 302 | mksnpath(path, sizeof(path), *p, len, str); |
Junio C Hamano | 0c4cd7f | 2008-07-23 17:22:58 -0700 | [diff] [blame] | 303 | ref = resolve_ref(path, hash, 1, NULL); |
Junio C Hamano | 40facde | 2007-02-08 23:24:51 -0800 | [diff] [blame] | 304 | if (!ref) |
| 305 | continue; |
Nicolas Pitre | f2eba66 | 2007-02-03 21:49:16 -0500 | [diff] [blame] | 306 | if (!stat(git_path("logs/%s", path), &st) && |
Junio C Hamano | 40facde | 2007-02-08 23:24:51 -0800 | [diff] [blame] | 307 | S_ISREG(st.st_mode)) |
| 308 | it = path; |
| 309 | else if (strcmp(ref, path) && |
| 310 | !stat(git_path("logs/%s", ref), &st) && |
| 311 | S_ISREG(st.st_mode)) |
| 312 | it = ref; |
| 313 | else |
| 314 | continue; |
| 315 | if (!logs_found++) { |
| 316 | *log = xstrdup(it); |
| 317 | hashcpy(sha1, hash); |
Nicolas Pitre | f2eba66 | 2007-02-03 21:49:16 -0500 | [diff] [blame] | 318 | } |
Junio C Hamano | 40facde | 2007-02-08 23:24:51 -0800 | [diff] [blame] | 319 | if (!warn_ambiguous_refs) |
| 320 | break; |
Nicolas Pitre | f2eba66 | 2007-02-03 21:49:16 -0500 | [diff] [blame] | 321 | } |
Johannes Schindelin | aa9c55b | 2009-01-17 19:08:12 +0100 | [diff] [blame] | 322 | free(last_branch); |
Nicolas Pitre | f2eba66 | 2007-02-03 21:49:16 -0500 | [diff] [blame] | 323 | return logs_found; |
| 324 | } |
| 325 | |
Thomas Rast | d18ba22 | 2009-01-17 17:09:55 +0100 | [diff] [blame] | 326 | static int get_sha1_1(const char *name, int len, unsigned char *sha1); |
| 327 | |
Junio C Hamano | e86eb66 | 2007-01-19 01:15:15 -0800 | [diff] [blame] | 328 | static int get_sha1_basic(const char *str, int len, unsigned char *sha1) |
| 329 | { |
Shawn Pearce | d556fae | 2006-05-17 05:56:09 -0400 | [diff] [blame] | 330 | static const char *warning = "warning: refname '%.*s' is ambiguous.\n"; |
Linus Torvalds | ed378ec | 2006-09-11 20:17:35 -0700 | [diff] [blame] | 331 | char *real_ref = NULL; |
Junio C Hamano | ab2a1a3 | 2006-10-05 23:16:15 -0700 | [diff] [blame] | 332 | int refs_found = 0; |
| 333 | int at, reflog_len; |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 334 | |
Linus Torvalds | 3c3852e | 2005-08-13 11:05:25 -0700 | [diff] [blame] | 335 | if (len == 40 && !get_sha1_hex(str, sha1)) |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 336 | return 0; |
| 337 | |
Thomas Rast | d18ba22 | 2009-01-17 17:09:55 +0100 | [diff] [blame] | 338 | /* basic@{time or number or -number} format to query ref-log */ |
Junio C Hamano | 694500e | 2006-10-23 21:15:34 -0700 | [diff] [blame] | 339 | reflog_len = at = 0; |
Johannes Schindelin | f265458 | 2009-01-28 00:07:46 +0100 | [diff] [blame] | 340 | if (len && str[len-1] == '}') { |
Johannes Schindelin | aa9c55b | 2009-01-17 19:08:12 +0100 | [diff] [blame] | 341 | for (at = len-2; at >= 0; at--) { |
Junio C Hamano | ab2a1a3 | 2006-10-05 23:16:15 -0700 | [diff] [blame] | 342 | if (str[at] == '@' && str[at+1] == '{') { |
| 343 | reflog_len = (len-1) - (at+2); |
| 344 | len = at; |
| 345 | break; |
| 346 | } |
Shawn Pearce | d556fae | 2006-05-17 05:56:09 -0400 | [diff] [blame] | 347 | } |
| 348 | } |
| 349 | |
Linus Torvalds | af13cdf | 2005-10-28 12:41:49 -0700 | [diff] [blame] | 350 | /* Accept only unambiguous ref paths. */ |
Nicolas Pitre | 11cf880 | 2007-02-01 17:29:33 -0500 | [diff] [blame] | 351 | if (len && ambiguous_path(str, len)) |
Linus Torvalds | af13cdf | 2005-10-28 12:41:49 -0700 | [diff] [blame] | 352 | return -1; |
| 353 | |
Nicolas Pitre | 11cf880 | 2007-02-01 17:29:33 -0500 | [diff] [blame] | 354 | if (!len && reflog_len) { |
Thomas Rast | d18ba22 | 2009-01-17 17:09:55 +0100 | [diff] [blame] | 355 | struct strbuf buf = STRBUF_INIT; |
| 356 | int ret; |
| 357 | /* try the @{-N} syntax for n-th checkout */ |
Junio C Hamano | 431b196 | 2009-03-21 12:51:34 -0700 | [diff] [blame] | 358 | ret = interpret_branch_name(str+at, &buf); |
Thomas Rast | d18ba22 | 2009-01-17 17:09:55 +0100 | [diff] [blame] | 359 | if (ret > 0) { |
| 360 | /* substitute this branch name and restart */ |
| 361 | return get_sha1_1(buf.buf, buf.len, sha1); |
| 362 | } else if (ret == 0) { |
| 363 | return -1; |
| 364 | } |
Nicolas Pitre | 11cf880 | 2007-02-01 17:29:33 -0500 | [diff] [blame] | 365 | /* allow "@{...}" to mean the current branch reflog */ |
| 366 | refs_found = dwim_ref("HEAD", 4, sha1, &real_ref); |
Nicolas Pitre | f2eba66 | 2007-02-03 21:49:16 -0500 | [diff] [blame] | 367 | } else if (reflog_len) |
| 368 | refs_found = dwim_log(str, len, sha1, &real_ref); |
| 369 | else |
Nicolas Pitre | 11cf880 | 2007-02-01 17:29:33 -0500 | [diff] [blame] | 370 | refs_found = dwim_ref(str, len, sha1, &real_ref); |
Shawn Pearce | d556fae | 2006-05-17 05:56:09 -0400 | [diff] [blame] | 371 | |
| 372 | if (!refs_found) |
| 373 | return -1; |
| 374 | |
| 375 | if (warn_ambiguous_refs && refs_found > 1) |
| 376 | fprintf(stderr, warning, len, str); |
| 377 | |
Junio C Hamano | ab2a1a3 | 2006-10-05 23:16:15 -0700 | [diff] [blame] | 378 | if (reflog_len) { |
Junio C Hamano | ab2a1a3 | 2006-10-05 23:16:15 -0700 | [diff] [blame] | 379 | int nth, i; |
| 380 | unsigned long at_time; |
Junio C Hamano | 16d7cc9 | 2007-01-19 01:19:05 -0800 | [diff] [blame] | 381 | unsigned long co_time; |
| 382 | int co_tz, co_cnt; |
| 383 | |
Nicolas Pitre | fe55851 | 2007-02-01 12:33:23 -0500 | [diff] [blame] | 384 | /* Is it asking for N-th entry, or approxidate? */ |
Junio C Hamano | ab2a1a3 | 2006-10-05 23:16:15 -0700 | [diff] [blame] | 385 | for (i = nth = 0; 0 <= nth && i < reflog_len; i++) { |
| 386 | char ch = str[at+2+i]; |
| 387 | if ('0' <= ch && ch <= '9') |
| 388 | nth = nth * 10 + ch - '0'; |
| 389 | else |
| 390 | nth = -1; |
| 391 | } |
Shawn O. Pearce | ea360dd | 2008-08-21 08:40:44 -0700 | [diff] [blame] | 392 | if (100000000 <= nth) { |
| 393 | at_time = nth; |
| 394 | nth = -1; |
| 395 | } else if (0 <= nth) |
Junio C Hamano | ab2a1a3 | 2006-10-05 23:16:15 -0700 | [diff] [blame] | 396 | at_time = 0; |
Jeff King | 861f00e | 2008-04-30 00:13:58 -0400 | [diff] [blame] | 397 | else { |
| 398 | char *tmp = xstrndup(str + at + 2, reflog_len); |
| 399 | at_time = approxidate(tmp); |
| 400 | free(tmp); |
| 401 | } |
Junio C Hamano | 16d7cc9 | 2007-01-19 01:19:05 -0800 | [diff] [blame] | 402 | if (read_ref_at(real_ref, at_time, nth, sha1, NULL, |
| 403 | &co_time, &co_tz, &co_cnt)) { |
| 404 | if (at_time) |
| 405 | fprintf(stderr, |
| 406 | "warning: Log for '%.*s' only goes " |
| 407 | "back to %s.\n", len, str, |
Junio C Hamano | 73013af | 2007-07-13 23:14:52 -0700 | [diff] [blame] | 408 | show_date(co_time, co_tz, DATE_RFC2822)); |
Junio C Hamano | 16d7cc9 | 2007-01-19 01:19:05 -0800 | [diff] [blame] | 409 | else |
| 410 | fprintf(stderr, |
| 411 | "warning: Log for '%.*s' only has " |
| 412 | "%d entries.\n", len, str, co_cnt); |
| 413 | } |
Shawn Pearce | d556fae | 2006-05-17 05:56:09 -0400 | [diff] [blame] | 414 | } |
| 415 | |
Linus Torvalds | ed378ec | 2006-09-11 20:17:35 -0700 | [diff] [blame] | 416 | free(real_ref); |
Shawn Pearce | d556fae | 2006-05-17 05:56:09 -0400 | [diff] [blame] | 417 | return 0; |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 418 | } |
| 419 | |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 420 | static int get_parent(const char *name, int len, |
| 421 | unsigned char *result, int idx) |
| 422 | { |
| 423 | unsigned char sha1[20]; |
| 424 | int ret = get_sha1_1(name, len, sha1); |
| 425 | struct commit *commit; |
| 426 | struct commit_list *p; |
| 427 | |
| 428 | if (ret) |
| 429 | return ret; |
| 430 | commit = lookup_commit_reference(sha1); |
| 431 | if (!commit) |
| 432 | return -1; |
| 433 | if (parse_commit(commit)) |
| 434 | return -1; |
| 435 | if (!idx) { |
Shawn Pearce | e702496 | 2006-08-23 02:49:00 -0400 | [diff] [blame] | 436 | hashcpy(result, commit->object.sha1); |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 437 | return 0; |
| 438 | } |
| 439 | p = commit->parents; |
| 440 | while (p) { |
| 441 | if (!--idx) { |
Shawn Pearce | e702496 | 2006-08-23 02:49:00 -0400 | [diff] [blame] | 442 | hashcpy(result, p->item->object.sha1); |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 443 | return 0; |
| 444 | } |
| 445 | p = p->next; |
| 446 | } |
| 447 | return -1; |
| 448 | } |
| 449 | |
Junio C Hamano | 4f7599a | 2005-08-21 02:43:54 -0700 | [diff] [blame] | 450 | static int get_nth_ancestor(const char *name, int len, |
| 451 | unsigned char *result, int generation) |
| 452 | { |
| 453 | unsigned char sha1[20]; |
Linus Torvalds | 621ff67 | 2008-03-14 11:49:40 -0700 | [diff] [blame] | 454 | struct commit *commit; |
| 455 | int ret; |
| 456 | |
| 457 | ret = get_sha1_1(name, len, sha1); |
Junio C Hamano | 4f7599a | 2005-08-21 02:43:54 -0700 | [diff] [blame] | 458 | if (ret) |
| 459 | return ret; |
Linus Torvalds | 621ff67 | 2008-03-14 11:49:40 -0700 | [diff] [blame] | 460 | commit = lookup_commit_reference(sha1); |
| 461 | if (!commit) |
| 462 | return -1; |
Junio C Hamano | 4f7599a | 2005-08-21 02:43:54 -0700 | [diff] [blame] | 463 | |
| 464 | while (generation--) { |
Linus Torvalds | 621ff67 | 2008-03-14 11:49:40 -0700 | [diff] [blame] | 465 | if (parse_commit(commit) || !commit->parents) |
Junio C Hamano | 4f7599a | 2005-08-21 02:43:54 -0700 | [diff] [blame] | 466 | return -1; |
Linus Torvalds | 621ff67 | 2008-03-14 11:49:40 -0700 | [diff] [blame] | 467 | commit = commit->parents->item; |
Junio C Hamano | 4f7599a | 2005-08-21 02:43:54 -0700 | [diff] [blame] | 468 | } |
Linus Torvalds | 621ff67 | 2008-03-14 11:49:40 -0700 | [diff] [blame] | 469 | hashcpy(result, commit->object.sha1); |
Junio C Hamano | 4f7599a | 2005-08-21 02:43:54 -0700 | [diff] [blame] | 470 | return 0; |
| 471 | } |
| 472 | |
Junio C Hamano | 8177631 | 2007-12-24 00:51:01 -0800 | [diff] [blame] | 473 | struct object *peel_to_type(const char *name, int namelen, |
| 474 | struct object *o, enum object_type expected_type) |
| 475 | { |
| 476 | if (name && !namelen) |
| 477 | namelen = strlen(name); |
| 478 | if (!o) { |
| 479 | unsigned char sha1[20]; |
| 480 | if (get_sha1_1(name, namelen, sha1)) |
| 481 | return NULL; |
| 482 | o = parse_object(sha1); |
| 483 | } |
| 484 | while (1) { |
| 485 | if (!o || (!o->parsed && !parse_object(o->sha1))) |
| 486 | return NULL; |
| 487 | if (o->type == expected_type) |
| 488 | return o; |
| 489 | if (o->type == OBJ_TAG) |
| 490 | o = ((struct tag*) o)->tagged; |
| 491 | else if (o->type == OBJ_COMMIT) |
| 492 | o = &(((struct commit *) o)->tree->object); |
| 493 | else { |
| 494 | if (name) |
| 495 | error("%.*s: expected %s type, but the object " |
| 496 | "dereferences to %s type", |
| 497 | namelen, name, typename(expected_type), |
| 498 | typename(o->type)); |
| 499 | return NULL; |
| 500 | } |
| 501 | } |
| 502 | } |
| 503 | |
Junio C Hamano | 5385f52 | 2005-10-13 18:57:40 -0700 | [diff] [blame] | 504 | static int peel_onion(const char *name, int len, unsigned char *sha1) |
| 505 | { |
| 506 | unsigned char outer[20]; |
| 507 | const char *sp; |
Linus Torvalds | 885a86a | 2006-06-14 16:45:13 -0700 | [diff] [blame] | 508 | unsigned int expected_type = 0; |
Junio C Hamano | 5385f52 | 2005-10-13 18:57:40 -0700 | [diff] [blame] | 509 | struct object *o; |
| 510 | |
| 511 | /* |
| 512 | * "ref^{type}" dereferences ref repeatedly until you cannot |
| 513 | * dereference anymore, or you get an object of given type, |
| 514 | * whichever comes first. "ref^{}" means just dereference |
| 515 | * tags until you get a non-tag. "ref^0" is a shorthand for |
| 516 | * "ref^{commit}". "commit^{tree}" could be used to find the |
| 517 | * top-level tree of the given commit. |
| 518 | */ |
| 519 | if (len < 4 || name[len-1] != '}') |
| 520 | return -1; |
| 521 | |
| 522 | for (sp = name + len - 1; name <= sp; sp--) { |
| 523 | int ch = *sp; |
| 524 | if (ch == '{' && name < sp && sp[-1] == '^') |
| 525 | break; |
| 526 | } |
| 527 | if (sp <= name) |
| 528 | return -1; |
| 529 | |
| 530 | sp++; /* beginning of type name, or closing brace for empty */ |
| 531 | if (!strncmp(commit_type, sp, 6) && sp[6] == '}') |
Linus Torvalds | 1974632 | 2006-07-11 20:45:31 -0700 | [diff] [blame] | 532 | expected_type = OBJ_COMMIT; |
Junio C Hamano | 5385f52 | 2005-10-13 18:57:40 -0700 | [diff] [blame] | 533 | else if (!strncmp(tree_type, sp, 4) && sp[4] == '}') |
Linus Torvalds | 1974632 | 2006-07-11 20:45:31 -0700 | [diff] [blame] | 534 | expected_type = OBJ_TREE; |
Junio C Hamano | 5385f52 | 2005-10-13 18:57:40 -0700 | [diff] [blame] | 535 | else if (!strncmp(blob_type, sp, 4) && sp[4] == '}') |
Linus Torvalds | 1974632 | 2006-07-11 20:45:31 -0700 | [diff] [blame] | 536 | expected_type = OBJ_BLOB; |
Junio C Hamano | 5385f52 | 2005-10-13 18:57:40 -0700 | [diff] [blame] | 537 | else if (sp[0] == '}') |
Linus Torvalds | 1974632 | 2006-07-11 20:45:31 -0700 | [diff] [blame] | 538 | expected_type = OBJ_NONE; |
Junio C Hamano | 5385f52 | 2005-10-13 18:57:40 -0700 | [diff] [blame] | 539 | else |
| 540 | return -1; |
| 541 | |
| 542 | if (get_sha1_1(name, sp - name - 2, outer)) |
| 543 | return -1; |
| 544 | |
| 545 | o = parse_object(outer); |
| 546 | if (!o) |
| 547 | return -1; |
Linus Torvalds | 885a86a | 2006-06-14 16:45:13 -0700 | [diff] [blame] | 548 | if (!expected_type) { |
Junio C Hamano | 9534f40 | 2005-11-02 15:19:13 -0800 | [diff] [blame] | 549 | o = deref_tag(o, name, sp - name - 2); |
Junio C Hamano | 6e1c6c1 | 2005-10-19 22:48:16 -0700 | [diff] [blame] | 550 | if (!o || (!o->parsed && !parse_object(o->sha1))) |
| 551 | return -1; |
Shawn Pearce | e702496 | 2006-08-23 02:49:00 -0400 | [diff] [blame] | 552 | hashcpy(sha1, o->sha1); |
Junio C Hamano | 5385f52 | 2005-10-13 18:57:40 -0700 | [diff] [blame] | 553 | } |
| 554 | else { |
Junio C Hamano | 8177631 | 2007-12-24 00:51:01 -0800 | [diff] [blame] | 555 | /* |
| 556 | * At this point, the syntax look correct, so |
Junio C Hamano | 5385f52 | 2005-10-13 18:57:40 -0700 | [diff] [blame] | 557 | * if we do not get the needed object, we should |
| 558 | * barf. |
| 559 | */ |
Junio C Hamano | 8177631 | 2007-12-24 00:51:01 -0800 | [diff] [blame] | 560 | o = peel_to_type(name, len, o, expected_type); |
| 561 | if (o) { |
| 562 | hashcpy(sha1, o->sha1); |
| 563 | return 0; |
Junio C Hamano | 5385f52 | 2005-10-13 18:57:40 -0700 | [diff] [blame] | 564 | } |
Junio C Hamano | 8177631 | 2007-12-24 00:51:01 -0800 | [diff] [blame] | 565 | return -1; |
Junio C Hamano | 5385f52 | 2005-10-13 18:57:40 -0700 | [diff] [blame] | 566 | } |
| 567 | return 0; |
| 568 | } |
| 569 | |
Junio C Hamano | 7dd45e1 | 2006-09-20 16:11:08 -0700 | [diff] [blame] | 570 | static int get_describe_name(const char *name, int len, unsigned char *sha1) |
| 571 | { |
| 572 | const char *cp; |
| 573 | |
| 574 | for (cp = name + len - 1; name + 2 <= cp; cp--) { |
| 575 | char ch = *cp; |
| 576 | if (hexval(ch) & ~0377) { |
| 577 | /* We must be looking at g in "SOMETHING-g" |
| 578 | * for it to be describe output. |
| 579 | */ |
| 580 | if (ch == 'g' && cp[-1] == '-') { |
| 581 | cp++; |
| 582 | len -= cp - name; |
| 583 | return get_short_sha1(cp, len, sha1, 1); |
| 584 | } |
| 585 | } |
| 586 | } |
| 587 | return -1; |
| 588 | } |
| 589 | |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 590 | static int get_sha1_1(const char *name, int len, unsigned char *sha1) |
| 591 | { |
Junio C Hamano | 0601dbe | 2006-02-02 23:48:36 -0800 | [diff] [blame] | 592 | int ret, has_suffix; |
Junio C Hamano | 4f7599a | 2005-08-21 02:43:54 -0700 | [diff] [blame] | 593 | const char *cp; |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 594 | |
Linus Torvalds | 621ff67 | 2008-03-14 11:49:40 -0700 | [diff] [blame] | 595 | /* |
| 596 | * "name~3" is "name^^^", "name~" is "name~1", and "name^" is "name^1". |
Junio C Hamano | 4f7599a | 2005-08-21 02:43:54 -0700 | [diff] [blame] | 597 | */ |
Junio C Hamano | 0601dbe | 2006-02-02 23:48:36 -0800 | [diff] [blame] | 598 | has_suffix = 0; |
Junio C Hamano | 4f7599a | 2005-08-21 02:43:54 -0700 | [diff] [blame] | 599 | for (cp = name + len - 1; name <= cp; cp--) { |
| 600 | int ch = *cp; |
| 601 | if ('0' <= ch && ch <= '9') |
| 602 | continue; |
Junio C Hamano | 0601dbe | 2006-02-02 23:48:36 -0800 | [diff] [blame] | 603 | if (ch == '~' || ch == '^') |
| 604 | has_suffix = ch; |
Junio C Hamano | 4f7599a | 2005-08-21 02:43:54 -0700 | [diff] [blame] | 605 | break; |
| 606 | } |
Junio C Hamano | 0601dbe | 2006-02-02 23:48:36 -0800 | [diff] [blame] | 607 | |
| 608 | if (has_suffix) { |
| 609 | int num = 0; |
Junio C Hamano | 4f7599a | 2005-08-21 02:43:54 -0700 | [diff] [blame] | 610 | int len1 = cp - name; |
| 611 | cp++; |
| 612 | while (cp < name + len) |
Junio C Hamano | 0601dbe | 2006-02-02 23:48:36 -0800 | [diff] [blame] | 613 | num = num * 10 + *cp++ - '0'; |
Linus Torvalds | 621ff67 | 2008-03-14 11:49:40 -0700 | [diff] [blame] | 614 | if (!num && len1 == len - 1) |
| 615 | num = 1; |
| 616 | if (has_suffix == '^') |
Junio C Hamano | 0601dbe | 2006-02-02 23:48:36 -0800 | [diff] [blame] | 617 | return get_parent(name, len1, sha1, num); |
Junio C Hamano | 0601dbe | 2006-02-02 23:48:36 -0800 | [diff] [blame] | 618 | /* else if (has_suffix == '~') -- goes without saying */ |
| 619 | return get_nth_ancestor(name, len1, sha1, num); |
Junio C Hamano | 4f7599a | 2005-08-21 02:43:54 -0700 | [diff] [blame] | 620 | } |
| 621 | |
Junio C Hamano | 5385f52 | 2005-10-13 18:57:40 -0700 | [diff] [blame] | 622 | ret = peel_onion(name, len, sha1); |
| 623 | if (!ret) |
| 624 | return 0; |
| 625 | |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 626 | ret = get_sha1_basic(name, len, sha1); |
| 627 | if (!ret) |
| 628 | return 0; |
Junio C Hamano | 7dd45e1 | 2006-09-20 16:11:08 -0700 | [diff] [blame] | 629 | |
| 630 | /* It could be describe output that is "SOMETHING-gXXXX" */ |
| 631 | ret = get_describe_name(name, len, sha1); |
| 632 | if (!ret) |
| 633 | return 0; |
| 634 | |
Junio C Hamano | 013f276 | 2005-10-11 15:22:48 -0700 | [diff] [blame] | 635 | return get_short_sha1(name, len, sha1, 0); |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 636 | } |
| 637 | |
Johannes Schindelin | 28a4d94 | 2007-02-24 03:08:20 +0100 | [diff] [blame] | 638 | static int handle_one_ref(const char *path, |
| 639 | const unsigned char *sha1, int flag, void *cb_data) |
| 640 | { |
| 641 | struct commit_list **list = cb_data; |
| 642 | struct object *object = parse_object(sha1); |
| 643 | if (!object) |
| 644 | return 0; |
Martin Koegler | affeef1 | 2008-02-18 08:31:54 +0100 | [diff] [blame] | 645 | if (object->type == OBJ_TAG) { |
Johannes Schindelin | 28a4d94 | 2007-02-24 03:08:20 +0100 | [diff] [blame] | 646 | object = deref_tag(object, path, strlen(path)); |
Martin Koegler | affeef1 | 2008-02-18 08:31:54 +0100 | [diff] [blame] | 647 | if (!object) |
| 648 | return 0; |
| 649 | } |
Johannes Schindelin | 28a4d94 | 2007-02-24 03:08:20 +0100 | [diff] [blame] | 650 | if (object->type != OBJ_COMMIT) |
| 651 | return 0; |
| 652 | insert_by_date((struct commit *)object, list); |
| 653 | return 0; |
| 654 | } |
| 655 | |
| 656 | /* |
| 657 | * This interprets names like ':/Initial revision of "git"' by searching |
| 658 | * through history and returning the first commit whose message starts |
| 659 | * with the given string. |
| 660 | * |
| 661 | * For future extension, ':/!' is reserved. If you want to match a message |
| 662 | * beginning with a '!', you have to repeat the exclamation mark. |
| 663 | */ |
| 664 | |
| 665 | #define ONELINE_SEEN (1u<<20) |
Linus Torvalds | 1358e7d | 2007-03-12 11:30:38 -0700 | [diff] [blame] | 666 | static int get_sha1_oneline(const char *prefix, unsigned char *sha1) |
Johannes Schindelin | 28a4d94 | 2007-02-24 03:08:20 +0100 | [diff] [blame] | 667 | { |
| 668 | struct commit_list *list = NULL, *backup = NULL, *l; |
Linus Torvalds | 1358e7d | 2007-03-12 11:30:38 -0700 | [diff] [blame] | 669 | int retval = -1; |
Johannes Schindelin | 364d3e6 | 2007-12-03 18:42:39 +0000 | [diff] [blame] | 670 | char *temp_commit_buffer = NULL; |
Johannes Schindelin | 28a4d94 | 2007-02-24 03:08:20 +0100 | [diff] [blame] | 671 | |
| 672 | if (prefix[0] == '!') { |
| 673 | if (prefix[1] != '!') |
| 674 | die ("Invalid search pattern: %s", prefix); |
| 675 | prefix++; |
| 676 | } |
Johannes Schindelin | 28a4d94 | 2007-02-24 03:08:20 +0100 | [diff] [blame] | 677 | for_each_ref(handle_one_ref, &list); |
| 678 | for (l = list; l; l = l->next) |
| 679 | commit_list_insert(l->item, &backup); |
Jim Meyering | ed8ad7e | 2007-03-11 19:49:08 +0100 | [diff] [blame] | 680 | while (list) { |
Johannes Schindelin | 28a4d94 | 2007-02-24 03:08:20 +0100 | [diff] [blame] | 681 | char *p; |
Linus Torvalds | 1358e7d | 2007-03-12 11:30:38 -0700 | [diff] [blame] | 682 | struct commit *commit; |
Johannes Schindelin | 364d3e6 | 2007-12-03 18:42:39 +0000 | [diff] [blame] | 683 | enum object_type type; |
| 684 | unsigned long size; |
Jim Meyering | ed8ad7e | 2007-03-11 19:49:08 +0100 | [diff] [blame] | 685 | |
| 686 | commit = pop_most_recent_commit(&list, ONELINE_SEEN); |
Martin Koegler | 283cdbc | 2008-02-18 21:47:53 +0100 | [diff] [blame] | 687 | if (!parse_object(commit->object.sha1)) |
| 688 | continue; |
Jim Meyering | 8e0f700 | 2008-01-31 18:26:32 +0100 | [diff] [blame] | 689 | free(temp_commit_buffer); |
Johannes Schindelin | 364d3e6 | 2007-12-03 18:42:39 +0000 | [diff] [blame] | 690 | if (commit->buffer) |
| 691 | p = commit->buffer; |
| 692 | else { |
| 693 | p = read_sha1_file(commit->object.sha1, &type, &size); |
| 694 | if (!p) |
| 695 | continue; |
| 696 | temp_commit_buffer = p; |
| 697 | } |
| 698 | if (!(p = strstr(p, "\n\n"))) |
Johannes Schindelin | 28a4d94 | 2007-02-24 03:08:20 +0100 | [diff] [blame] | 699 | continue; |
| 700 | if (!prefixcmp(p + 2, prefix)) { |
| 701 | hashcpy(sha1, commit->object.sha1); |
Linus Torvalds | 1358e7d | 2007-03-12 11:30:38 -0700 | [diff] [blame] | 702 | retval = 0; |
Johannes Schindelin | 28a4d94 | 2007-02-24 03:08:20 +0100 | [diff] [blame] | 703 | break; |
| 704 | } |
| 705 | } |
Jim Meyering | 8e0f700 | 2008-01-31 18:26:32 +0100 | [diff] [blame] | 706 | free(temp_commit_buffer); |
Johannes Schindelin | 28a4d94 | 2007-02-24 03:08:20 +0100 | [diff] [blame] | 707 | free_commit_list(list); |
| 708 | for (l = backup; l; l = l->next) |
| 709 | clear_commit_marks(l->item, ONELINE_SEEN); |
Linus Torvalds | 1358e7d | 2007-03-12 11:30:38 -0700 | [diff] [blame] | 710 | return retval; |
Johannes Schindelin | 28a4d94 | 2007-02-24 03:08:20 +0100 | [diff] [blame] | 711 | } |
| 712 | |
Junio C Hamano | ae5a6c3 | 2009-01-17 17:09:53 +0100 | [diff] [blame] | 713 | struct grab_nth_branch_switch_cbdata { |
Junio C Hamano | c2883e6 | 2009-01-19 00:04:25 -0800 | [diff] [blame] | 714 | long cnt, alloc; |
Junio C Hamano | ae5a6c3 | 2009-01-17 17:09:53 +0100 | [diff] [blame] | 715 | struct strbuf *buf; |
| 716 | }; |
| 717 | |
| 718 | static int grab_nth_branch_switch(unsigned char *osha1, unsigned char *nsha1, |
| 719 | const char *email, unsigned long timestamp, int tz, |
| 720 | const char *message, void *cb_data) |
| 721 | { |
| 722 | struct grab_nth_branch_switch_cbdata *cb = cb_data; |
Thomas Rast | a884d0c | 2009-01-17 17:09:54 +0100 | [diff] [blame] | 723 | const char *match = NULL, *target = NULL; |
| 724 | size_t len; |
Junio C Hamano | c2883e6 | 2009-01-19 00:04:25 -0800 | [diff] [blame] | 725 | int nth; |
Junio C Hamano | ae5a6c3 | 2009-01-17 17:09:53 +0100 | [diff] [blame] | 726 | |
Thomas Rast | a884d0c | 2009-01-17 17:09:54 +0100 | [diff] [blame] | 727 | if (!prefixcmp(message, "checkout: moving from ")) { |
| 728 | match = message + strlen("checkout: moving from "); |
Junio C Hamano | d7c03c1 | 2009-01-21 00:37:38 -0800 | [diff] [blame] | 729 | target = strstr(match, " to "); |
Junio C Hamano | ae5a6c3 | 2009-01-17 17:09:53 +0100 | [diff] [blame] | 730 | } |
| 731 | |
Junio C Hamano | c829774 | 2009-01-19 16:44:08 -0800 | [diff] [blame] | 732 | if (!match || !target) |
Junio C Hamano | ae5a6c3 | 2009-01-17 17:09:53 +0100 | [diff] [blame] | 733 | return 0; |
| 734 | |
Junio C Hamano | d7c03c1 | 2009-01-21 00:37:38 -0800 | [diff] [blame] | 735 | len = target - match; |
Junio C Hamano | c2883e6 | 2009-01-19 00:04:25 -0800 | [diff] [blame] | 736 | nth = cb->cnt++ % cb->alloc; |
| 737 | strbuf_reset(&cb->buf[nth]); |
| 738 | strbuf_add(&cb->buf[nth], match, len); |
Junio C Hamano | ae5a6c3 | 2009-01-17 17:09:53 +0100 | [diff] [blame] | 739 | return 0; |
| 740 | } |
| 741 | |
| 742 | /* |
| 743 | * This reads "@{-N}" syntax, finds the name of the Nth previous |
| 744 | * branch we were on, and places the name of the branch in the given |
Thomas Rast | a884d0c | 2009-01-17 17:09:54 +0100 | [diff] [blame] | 745 | * buf and returns the number of characters parsed if successful. |
Junio C Hamano | ae5a6c3 | 2009-01-17 17:09:53 +0100 | [diff] [blame] | 746 | * |
| 747 | * If the input is not of the accepted format, it returns a negative |
| 748 | * number to signal an error. |
Thomas Rast | a884d0c | 2009-01-17 17:09:54 +0100 | [diff] [blame] | 749 | * |
| 750 | * If the input was ok but there are not N branch switches in the |
| 751 | * reflog, it returns 0. |
Junio C Hamano | ae5a6c3 | 2009-01-17 17:09:53 +0100 | [diff] [blame] | 752 | */ |
Junio C Hamano | 431b196 | 2009-03-21 12:51:34 -0700 | [diff] [blame] | 753 | int interpret_branch_name(const char *name, struct strbuf *buf) |
Junio C Hamano | ae5a6c3 | 2009-01-17 17:09:53 +0100 | [diff] [blame] | 754 | { |
Junio C Hamano | c2883e6 | 2009-01-19 00:04:25 -0800 | [diff] [blame] | 755 | long nth; |
Junio C Hamano | 39765e5 | 2009-01-19 21:58:31 -0800 | [diff] [blame] | 756 | int i, retval; |
Junio C Hamano | ae5a6c3 | 2009-01-17 17:09:53 +0100 | [diff] [blame] | 757 | struct grab_nth_branch_switch_cbdata cb; |
Thomas Rast | a884d0c | 2009-01-17 17:09:54 +0100 | [diff] [blame] | 758 | const char *brace; |
| 759 | char *num_end; |
Junio C Hamano | ae5a6c3 | 2009-01-17 17:09:53 +0100 | [diff] [blame] | 760 | |
| 761 | if (name[0] != '@' || name[1] != '{' || name[2] != '-') |
| 762 | return -1; |
Thomas Rast | a884d0c | 2009-01-17 17:09:54 +0100 | [diff] [blame] | 763 | brace = strchr(name, '}'); |
| 764 | if (!brace) |
| 765 | return -1; |
| 766 | nth = strtol(name+3, &num_end, 10); |
| 767 | if (num_end != brace) |
Junio C Hamano | ae5a6c3 | 2009-01-17 17:09:53 +0100 | [diff] [blame] | 768 | return -1; |
Junio C Hamano | c2883e6 | 2009-01-19 00:04:25 -0800 | [diff] [blame] | 769 | if (nth <= 0) |
| 770 | return -1; |
| 771 | cb.alloc = nth; |
| 772 | cb.buf = xmalloc(nth * sizeof(struct strbuf)); |
| 773 | for (i = 0; i < nth; i++) |
| 774 | strbuf_init(&cb.buf[i], 20); |
| 775 | cb.cnt = 0; |
Junio C Hamano | 39765e5 | 2009-01-19 21:58:31 -0800 | [diff] [blame] | 776 | retval = 0; |
Junio C Hamano | 101d15e | 2009-01-19 22:18:29 -0800 | [diff] [blame] | 777 | for_each_recent_reflog_ent("HEAD", grab_nth_branch_switch, 40960, &cb); |
| 778 | if (cb.cnt < nth) { |
| 779 | cb.cnt = 0; |
Junio C Hamano | 101d15e | 2009-01-19 22:18:29 -0800 | [diff] [blame] | 780 | for_each_reflog_ent("HEAD", grab_nth_branch_switch, &cb); |
| 781 | } |
Junio C Hamano | c2883e6 | 2009-01-19 00:04:25 -0800 | [diff] [blame] | 782 | if (cb.cnt < nth) |
Junio C Hamano | 39765e5 | 2009-01-19 21:58:31 -0800 | [diff] [blame] | 783 | goto release_return; |
Junio C Hamano | c2883e6 | 2009-01-19 00:04:25 -0800 | [diff] [blame] | 784 | i = cb.cnt % nth; |
| 785 | strbuf_reset(buf); |
| 786 | strbuf_add(buf, cb.buf[i].buf, cb.buf[i].len); |
Junio C Hamano | 39765e5 | 2009-01-19 21:58:31 -0800 | [diff] [blame] | 787 | retval = brace-name+1; |
| 788 | |
| 789 | release_return: |
Junio C Hamano | c2883e6 | 2009-01-19 00:04:25 -0800 | [diff] [blame] | 790 | for (i = 0; i < nth; i++) |
| 791 | strbuf_release(&cb.buf[i]); |
| 792 | free(cb.buf); |
Thomas Rast | a884d0c | 2009-01-17 17:09:54 +0100 | [diff] [blame] | 793 | |
Junio C Hamano | 39765e5 | 2009-01-19 21:58:31 -0800 | [diff] [blame] | 794 | return retval; |
Junio C Hamano | ae5a6c3 | 2009-01-17 17:09:53 +0100 | [diff] [blame] | 795 | } |
| 796 | |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 797 | /* |
| 798 | * This is like "get_sha1_basic()", except it allows "sha1 expressions", |
| 799 | * notably "xyz^" for "parent of xyz" |
| 800 | */ |
| 801 | int get_sha1(const char *name, unsigned char *sha1) |
| 802 | { |
Junio C Hamano | 041a730 | 2006-04-19 11:56:07 -0700 | [diff] [blame] | 803 | unsigned unused; |
Martin Koegler | a0cd87a | 2007-04-23 22:55:05 +0200 | [diff] [blame] | 804 | return get_sha1_with_mode(name, sha1, &unused); |
| 805 | } |
| 806 | |
| 807 | int get_sha1_with_mode(const char *name, unsigned char *sha1, unsigned *mode) |
| 808 | { |
| 809 | int ret, bracket_depth; |
Junio C Hamano | 73b0e5a | 2006-04-21 17:31:04 -0700 | [diff] [blame] | 810 | int namelen = strlen(name); |
| 811 | const char *cp; |
Linus Torvalds | 5119602 | 2006-04-18 16:45:16 -0700 | [diff] [blame] | 812 | |
Martin Koegler | a0cd87a | 2007-04-23 22:55:05 +0200 | [diff] [blame] | 813 | *mode = S_IFINVALID; |
Junio C Hamano | 73b0e5a | 2006-04-21 17:31:04 -0700 | [diff] [blame] | 814 | ret = get_sha1_1(name, namelen, sha1); |
| 815 | if (!ret) |
| 816 | return ret; |
| 817 | /* sha1:path --> object name of path in ent sha1 |
| 818 | * :path -> object name of path in index |
| 819 | * :[0-3]:path -> object name of path in index at stage |
| 820 | */ |
| 821 | if (name[0] == ':') { |
| 822 | int stage = 0; |
| 823 | struct cache_entry *ce; |
| 824 | int pos; |
Johannes Schindelin | 28a4d94 | 2007-02-24 03:08:20 +0100 | [diff] [blame] | 825 | if (namelen > 2 && name[1] == '/') |
| 826 | return get_sha1_oneline(name + 2, sha1); |
Junio C Hamano | 73b0e5a | 2006-04-21 17:31:04 -0700 | [diff] [blame] | 827 | if (namelen < 3 || |
| 828 | name[2] != ':' || |
| 829 | name[1] < '0' || '3' < name[1]) |
| 830 | cp = name + 1; |
| 831 | else { |
| 832 | stage = name[1] - '0'; |
| 833 | cp = name + 3; |
Linus Torvalds | 5119602 | 2006-04-18 16:45:16 -0700 | [diff] [blame] | 834 | } |
Junio C Hamano | 73b0e5a | 2006-04-21 17:31:04 -0700 | [diff] [blame] | 835 | namelen = namelen - (cp - name); |
| 836 | if (!active_cache) |
| 837 | read_cache(); |
Junio C Hamano | 73b0e5a | 2006-04-21 17:31:04 -0700 | [diff] [blame] | 838 | pos = cache_name_pos(cp, namelen); |
| 839 | if (pos < 0) |
| 840 | pos = -pos - 1; |
| 841 | while (pos < active_nr) { |
| 842 | ce = active_cache[pos]; |
| 843 | if (ce_namelen(ce) != namelen || |
| 844 | memcmp(ce->name, cp, namelen)) |
| 845 | break; |
| 846 | if (ce_stage(ce) == stage) { |
Shawn Pearce | e702496 | 2006-08-23 02:49:00 -0400 | [diff] [blame] | 847 | hashcpy(sha1, ce->sha1); |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 848 | *mode = ce->ce_mode; |
Junio C Hamano | 73b0e5a | 2006-04-21 17:31:04 -0700 | [diff] [blame] | 849 | return 0; |
| 850 | } |
Junio C Hamano | e7cef45 | 2006-05-08 15:44:06 -0700 | [diff] [blame] | 851 | pos++; |
Junio C Hamano | 73b0e5a | 2006-04-21 17:31:04 -0700 | [diff] [blame] | 852 | } |
| 853 | return -1; |
| 854 | } |
Shawn Pearce | cce91a2 | 2006-05-19 03:29:43 -0400 | [diff] [blame] | 855 | for (cp = name, bracket_depth = 0; *cp; cp++) { |
| 856 | if (*cp == '{') |
| 857 | bracket_depth++; |
| 858 | else if (bracket_depth && *cp == '}') |
| 859 | bracket_depth--; |
| 860 | else if (!bracket_depth && *cp == ':') |
| 861 | break; |
| 862 | } |
| 863 | if (*cp == ':') { |
Junio C Hamano | 73b0e5a | 2006-04-21 17:31:04 -0700 | [diff] [blame] | 864 | unsigned char tree_sha1[20]; |
| 865 | if (!get_sha1_1(name, cp-name, tree_sha1)) |
| 866 | return get_tree_entry(tree_sha1, cp+1, sha1, |
Martin Koegler | a0cd87a | 2007-04-23 22:55:05 +0200 | [diff] [blame] | 867 | mode); |
Linus Torvalds | 5119602 | 2006-04-18 16:45:16 -0700 | [diff] [blame] | 868 | } |
| 869 | return ret; |
Junio C Hamano | 9938af6 | 2005-08-03 22:15:49 -0700 | [diff] [blame] | 870 | } |