]>
Commit | Line | Data |
---|---|---|
9938af6a | 1 | #include "cache.h" |
5385f52d | 2 | #include "tag.h" |
9938af6a | 3 | #include "commit.h" |
5385f52d JH |
4 | #include "tree.h" |
5 | #include "blob.h" | |
f3ab49db | 6 | #include "tree-walk.h" |
d556fae2 | 7 | #include "refs.h" |
28fb8438 | 8 | #include "remote.h" |
9938af6a | 9 | |
32574b68 NTND |
10 | static int get_sha1_oneline(const char *, unsigned char *, struct commit_list *); |
11 | ||
a78fafe7 JH |
12 | typedef int (*disambiguate_hint_fn)(const unsigned char *, void *); |
13 | ||
14 | struct disambiguate_state { | |
15 | disambiguate_hint_fn fn; | |
16 | void *cb_data; | |
17 | unsigned char candidate[20]; | |
18 | unsigned candidate_exists:1; | |
19 | unsigned candidate_checked:1; | |
20 | unsigned candidate_ok:1; | |
21 | unsigned disambiguate_fn_used:1; | |
22 | unsigned ambiguous:1; | |
957d7406 | 23 | unsigned always_call_fn:1; |
a78fafe7 JH |
24 | }; |
25 | ||
26 | static void update_candidates(struct disambiguate_state *ds, const unsigned char *current) | |
27 | { | |
957d7406 JH |
28 | if (ds->always_call_fn) { |
29 | ds->ambiguous = ds->fn(current, ds->cb_data) ? 1 : 0; | |
30 | return; | |
31 | } | |
a78fafe7 JH |
32 | if (!ds->candidate_exists) { |
33 | /* this is the first candidate */ | |
34 | hashcpy(ds->candidate, current); | |
35 | ds->candidate_exists = 1; | |
36 | return; | |
37 | } else if (!hashcmp(ds->candidate, current)) { | |
38 | /* the same as what we already have seen */ | |
39 | return; | |
40 | } | |
41 | ||
42 | if (!ds->fn) { | |
43 | /* cannot disambiguate between ds->candidate and current */ | |
44 | ds->ambiguous = 1; | |
45 | return; | |
46 | } | |
47 | ||
48 | if (!ds->candidate_checked) { | |
49 | ds->candidate_ok = ds->fn(ds->candidate, ds->cb_data); | |
50 | ds->disambiguate_fn_used = 1; | |
51 | ds->candidate_checked = 1; | |
52 | } | |
53 | ||
54 | if (!ds->candidate_ok) { | |
749f763d | 55 | /* discard the candidate; we know it does not satisfy fn */ |
a78fafe7 JH |
56 | hashcpy(ds->candidate, current); |
57 | ds->candidate_checked = 0; | |
58 | return; | |
59 | } | |
60 | ||
61 | /* if we reach this point, we know ds->candidate satisfies fn */ | |
62 | if (ds->fn(current, ds->cb_data)) { | |
63 | /* | |
64 | * if both current and candidate satisfy fn, we cannot | |
65 | * disambiguate. | |
66 | */ | |
67 | ds->candidate_ok = 0; | |
68 | ds->ambiguous = 1; | |
69 | } | |
70 | ||
71 | /* otherwise, current can be discarded and candidate is still good */ | |
72 | } | |
73 | ||
74 | static void find_short_object_filename(int len, const char *hex_pfx, struct disambiguate_state *ds) | |
9938af6a | 75 | { |
99a19b43 | 76 | struct alternate_object_database *alt; |
9938af6a | 77 | char hex[40]; |
99a19b43 JH |
78 | static struct alternate_object_database *fakeent; |
79 | ||
80 | if (!fakeent) { | |
274ac009 JH |
81 | /* |
82 | * Create a "fake" alternate object database that | |
83 | * points to our own object database, to make it | |
84 | * easier to get a temporary working space in | |
85 | * alt->name/alt->base while iterating over the | |
86 | * object databases including our own. | |
87 | */ | |
99a19b43 JH |
88 | const char *objdir = get_object_directory(); |
89 | int objdir_len = strlen(objdir); | |
90 | int entlen = objdir_len + 43; | |
91 | fakeent = xmalloc(sizeof(*fakeent) + entlen); | |
92 | memcpy(fakeent->base, objdir, objdir_len); | |
93 | fakeent->name = fakeent->base + objdir_len + 1; | |
94 | fakeent->name[-1] = '/'; | |
95 | } | |
96 | fakeent->next = alt_odb_list; | |
9938af6a | 97 | |
1703f9aa | 98 | sprintf(hex, "%.2s", hex_pfx); |
a78fafe7 | 99 | for (alt = fakeent; alt && !ds->ambiguous; alt = alt->next) { |
9938af6a | 100 | struct dirent *de; |
99a19b43 | 101 | DIR *dir; |
1703f9aa | 102 | sprintf(alt->name, "%.2s/", hex_pfx); |
99a19b43 JH |
103 | dir = opendir(alt->base); |
104 | if (!dir) | |
105 | continue; | |
a78fafe7 JH |
106 | |
107 | while (!ds->ambiguous && (de = readdir(dir)) != NULL) { | |
108 | unsigned char sha1[20]; | |
109 | ||
9938af6a JH |
110 | if (strlen(de->d_name) != 38) |
111 | continue; | |
1703f9aa | 112 | if (memcmp(de->d_name, hex_pfx + 2, len - 2)) |
9938af6a | 113 | continue; |
a78fafe7 JH |
114 | memcpy(hex + 2, de->d_name, 38); |
115 | if (!get_sha1_hex(hex, sha1)) | |
116 | update_candidates(ds, sha1); | |
9938af6a JH |
117 | } |
118 | closedir(dir); | |
119 | } | |
9938af6a JH |
120 | } |
121 | ||
122 | static int match_sha(unsigned len, const unsigned char *a, const unsigned char *b) | |
123 | { | |
124 | do { | |
125 | if (*a != *b) | |
126 | return 0; | |
127 | a++; | |
128 | b++; | |
129 | len -= 2; | |
130 | } while (len > 1); | |
131 | if (len) | |
132 | if ((*a ^ *b) & 0xf0) | |
133 | return 0; | |
134 | return 1; | |
135 | } | |
136 | ||
a78fafe7 | 137 | static void unique_in_pack(int len, |
1703f9aa | 138 | const unsigned char *bin_pfx, |
a78fafe7 JH |
139 | struct packed_git *p, |
140 | struct disambiguate_state *ds) | |
9938af6a | 141 | { |
f703e6ea JH |
142 | uint32_t num, last, i, first = 0; |
143 | const unsigned char *current = NULL; | |
144 | ||
145 | open_pack_index(p); | |
146 | num = p->num_objects; | |
147 | last = num; | |
148 | while (first < last) { | |
149 | uint32_t mid = (first + last) / 2; | |
150 | const unsigned char *current; | |
151 | int cmp; | |
152 | ||
153 | current = nth_packed_object_sha1(p, mid); | |
1703f9aa | 154 | cmp = hashcmp(bin_pfx, current); |
f703e6ea JH |
155 | if (!cmp) { |
156 | first = mid; | |
157 | break; | |
9938af6a | 158 | } |
f703e6ea JH |
159 | if (cmp > 0) { |
160 | first = mid+1; | |
161 | continue; | |
9938af6a | 162 | } |
f703e6ea JH |
163 | last = mid; |
164 | } | |
165 | ||
166 | /* | |
167 | * At this point, "first" is the location of the lowest object | |
1703f9aa | 168 | * with an object name that could match "bin_pfx". See if we have |
f703e6ea JH |
169 | * 0, 1 or more objects that actually match(es). |
170 | */ | |
a78fafe7 JH |
171 | for (i = first; i < num && !ds->ambiguous; i++) { |
172 | current = nth_packed_object_sha1(p, i); | |
1703f9aa | 173 | if (!match_sha(len, bin_pfx, current)) |
f703e6ea | 174 | break; |
a78fafe7 | 175 | update_candidates(ds, current); |
9938af6a | 176 | } |
f703e6ea JH |
177 | } |
178 | ||
a78fafe7 JH |
179 | static void find_short_packed_object(int len, const unsigned char *bin_pfx, |
180 | struct disambiguate_state *ds) | |
9938af6a JH |
181 | { |
182 | struct packed_git *p; | |
183 | ||
184 | prepare_packed_git(); | |
a78fafe7 JH |
185 | for (p = packed_git; p && !ds->ambiguous; p = p->next) |
186 | unique_in_pack(len, bin_pfx, p, ds); | |
99a19b43 JH |
187 | } |
188 | ||
013f276e JH |
189 | #define SHORT_NAME_NOT_FOUND (-1) |
190 | #define SHORT_NAME_AMBIGUOUS (-2) | |
191 | ||
a78fafe7 JH |
192 | static int finish_object_disambiguation(struct disambiguate_state *ds, |
193 | unsigned char *sha1) | |
99a19b43 | 194 | { |
a78fafe7 JH |
195 | if (ds->ambiguous) |
196 | return SHORT_NAME_AMBIGUOUS; | |
99a19b43 | 197 | |
a78fafe7 | 198 | if (!ds->candidate_exists) |
013f276e | 199 | return SHORT_NAME_NOT_FOUND; |
a78fafe7 JH |
200 | |
201 | if (!ds->candidate_checked) | |
202 | /* | |
203 | * If this is the only candidate, there is no point | |
204 | * calling the disambiguation hint callback. | |
205 | * | |
206 | * On the other hand, if the current candidate | |
207 | * replaced an earlier candidate that did _not_ pass | |
208 | * the disambiguation hint callback, then we do have | |
209 | * more than one objects that match the short name | |
210 | * given, so we should make sure this one matches; | |
211 | * otherwise, if we discovered this one and the one | |
212 | * that we previously discarded in the reverse order, | |
213 | * we would end up showing different results in the | |
214 | * same repository! | |
215 | */ | |
216 | ds->candidate_ok = (!ds->disambiguate_fn_used || | |
217 | ds->fn(ds->candidate, ds->cb_data)); | |
218 | ||
219 | if (!ds->candidate_ok) | |
013f276e | 220 | return SHORT_NAME_AMBIGUOUS; |
a78fafe7 JH |
221 | |
222 | hashcpy(sha1, ds->candidate); | |
9938af6a JH |
223 | return 0; |
224 | } | |
225 | ||
aa1dec9e JH |
226 | static int disambiguate_commit_only(const unsigned char *sha1, void *cb_data_unused) |
227 | { | |
228 | int kind = sha1_object_info(sha1, NULL); | |
229 | return kind == OBJ_COMMIT; | |
230 | } | |
231 | ||
e2643617 JH |
232 | static int disambiguate_committish_only(const unsigned char *sha1, void *cb_data_unused) |
233 | { | |
234 | struct object *obj; | |
235 | int kind; | |
236 | ||
237 | kind = sha1_object_info(sha1, NULL); | |
238 | if (kind == OBJ_COMMIT) | |
239 | return 1; | |
240 | if (kind != OBJ_TAG) | |
99a19b43 | 241 | return 0; |
e2643617 JH |
242 | |
243 | /* We need to do this the hard way... */ | |
94d75d1e | 244 | obj = deref_tag(parse_object(sha1), NULL, 0); |
e2643617 JH |
245 | if (obj && obj->type == OBJ_COMMIT) |
246 | return 1; | |
9938af6a JH |
247 | return 0; |
248 | } | |
249 | ||
daba53ae | 250 | static int disambiguate_tree_only(const unsigned char *sha1, void *cb_data_unused) |
9938af6a | 251 | { |
daba53ae JH |
252 | int kind = sha1_object_info(sha1, NULL); |
253 | return kind == OBJ_TREE; | |
254 | } | |
9938af6a | 255 | |
daba53ae JH |
256 | static int disambiguate_treeish_only(const unsigned char *sha1, void *cb_data_unused) |
257 | { | |
258 | struct object *obj; | |
259 | int kind; | |
260 | ||
261 | kind = sha1_object_info(sha1, NULL); | |
262 | if (kind == OBJ_TREE || kind == OBJ_COMMIT) | |
263 | return 1; | |
264 | if (kind != OBJ_TAG) | |
265 | return 0; | |
266 | ||
267 | /* We need to do this the hard way... */ | |
268 | obj = deref_tag(lookup_object(sha1), NULL, 0); | |
269 | if (obj && (obj->type == OBJ_TREE || obj->type == OBJ_COMMIT)) | |
270 | return 1; | |
271 | return 0; | |
272 | } | |
273 | ||
274 | static int disambiguate_blob_only(const unsigned char *sha1, void *cb_data_unused) | |
275 | { | |
276 | int kind = sha1_object_info(sha1, NULL); | |
277 | return kind == OBJ_BLOB; | |
278 | } | |
279 | ||
957d7406 JH |
280 | static int prepare_prefixes(const char *name, int len, |
281 | unsigned char *bin_pfx, | |
282 | char *hex_pfx) | |
9938af6a | 283 | { |
957d7406 | 284 | int i; |
9938af6a | 285 | |
1703f9aa JH |
286 | hashclr(bin_pfx); |
287 | memset(hex_pfx, 'x', 40); | |
af61c6e0 | 288 | for (i = 0; i < len ;i++) { |
9938af6a JH |
289 | unsigned char c = name[i]; |
290 | unsigned char val; | |
9938af6a JH |
291 | if (c >= '0' && c <= '9') |
292 | val = c - '0'; | |
293 | else if (c >= 'a' && c <= 'f') | |
294 | val = c - 'a' + 10; | |
295 | else if (c >= 'A' && c <='F') { | |
296 | val = c - 'A' + 10; | |
297 | c -= 'A' - 'a'; | |
298 | } | |
299 | else | |
300 | return -1; | |
1703f9aa | 301 | hex_pfx[i] = c; |
9938af6a JH |
302 | if (!(i & 1)) |
303 | val <<= 4; | |
1703f9aa | 304 | bin_pfx[i >> 1] |= val; |
9938af6a | 305 | } |
957d7406 JH |
306 | return 0; |
307 | } | |
308 | ||
309 | static int get_short_sha1(const char *name, int len, unsigned char *sha1, | |
310 | unsigned flags) | |
311 | { | |
312 | int status; | |
313 | char hex_pfx[40]; | |
314 | unsigned char bin_pfx[20]; | |
315 | struct disambiguate_state ds; | |
316 | int quietly = !!(flags & GET_SHA1_QUIETLY); | |
317 | ||
318 | if (len < MINIMUM_ABBREV || len > 40) | |
319 | return -1; | |
320 | if (prepare_prefixes(name, len, bin_pfx, hex_pfx) < 0) | |
321 | return -1; | |
99a19b43 | 322 | |
a78fafe7 JH |
323 | prepare_alt_odb(); |
324 | ||
325 | memset(&ds, 0, sizeof(ds)); | |
aa1dec9e JH |
326 | if (flags & GET_SHA1_COMMIT) |
327 | ds.fn = disambiguate_commit_only; | |
e2643617 JH |
328 | else if (flags & GET_SHA1_COMMITTISH) |
329 | ds.fn = disambiguate_committish_only; | |
daba53ae JH |
330 | else if (flags & GET_SHA1_TREE) |
331 | ds.fn = disambiguate_tree_only; | |
332 | else if (flags & GET_SHA1_TREEISH) | |
333 | ds.fn = disambiguate_treeish_only; | |
334 | else if (flags & GET_SHA1_BLOB) | |
335 | ds.fn = disambiguate_blob_only; | |
aa1dec9e | 336 | |
a78fafe7 JH |
337 | find_short_object_filename(len, hex_pfx, &ds); |
338 | find_short_packed_object(len, bin_pfx, &ds); | |
339 | status = finish_object_disambiguation(&ds, sha1); | |
99a19b43 | 340 | |
013f276e | 341 | if (!quietly && (status == SHORT_NAME_AMBIGUOUS)) |
1703f9aa | 342 | return error("short SHA1 %.*s is ambiguous.", len, hex_pfx); |
013f276e JH |
343 | return status; |
344 | } | |
345 | ||
957d7406 JH |
346 | int for_each_abbrev(const char *prefix, each_abbrev_fn fn, void *cb_data) |
347 | { | |
348 | char hex_pfx[40]; | |
349 | unsigned char bin_pfx[20]; | |
350 | struct disambiguate_state ds; | |
351 | int len = strlen(prefix); | |
352 | ||
353 | if (len < MINIMUM_ABBREV || len > 40) | |
354 | return -1; | |
355 | if (prepare_prefixes(prefix, len, bin_pfx, hex_pfx) < 0) | |
356 | return -1; | |
357 | ||
358 | prepare_alt_odb(); | |
359 | ||
360 | memset(&ds, 0, sizeof(ds)); | |
361 | ds.always_call_fn = 1; | |
362 | ds.cb_data = cb_data; | |
363 | ds.fn = fn; | |
364 | ||
365 | find_short_object_filename(len, hex_pfx, &ds); | |
366 | find_short_packed_object(len, bin_pfx, &ds); | |
367 | return ds.ambiguous; | |
368 | } | |
369 | ||
013f276e JH |
370 | const char *find_unique_abbrev(const unsigned char *sha1, int len) |
371 | { | |
b66fde9a | 372 | int status, exists; |
013f276e | 373 | static char hex[41]; |
47dd0d59 | 374 | |
b66fde9a | 375 | exists = has_sha1_file(sha1); |
013f276e | 376 | memcpy(hex, sha1_to_hex(sha1), 40); |
02c5cba2 | 377 | if (len == 40 || !len) |
47dd0d59 | 378 | return hex; |
013f276e JH |
379 | while (len < 40) { |
380 | unsigned char sha1_ret[20]; | |
37c00e55 | 381 | status = get_short_sha1(hex, len, sha1_ret, GET_SHA1_QUIETLY); |
b66fde9a JH |
382 | if (exists |
383 | ? !status | |
384 | : status == SHORT_NAME_NOT_FOUND) { | |
ea2c69ed | 385 | hex[len] = 0; |
013f276e JH |
386 | return hex; |
387 | } | |
013f276e JH |
388 | len++; |
389 | } | |
b66fde9a | 390 | return hex; |
9938af6a JH |
391 | } |
392 | ||
6677c466 | 393 | static int ambiguous_path(const char *path, int len) |
af13cdf2 LT |
394 | { |
395 | int slash = 1; | |
6677c466 | 396 | int cnt; |
af13cdf2 | 397 | |
6677c466 | 398 | for (cnt = 0; cnt < len; cnt++) { |
af13cdf2 LT |
399 | switch (*path++) { |
400 | case '\0': | |
401 | break; | |
402 | case '/': | |
403 | if (slash) | |
404 | break; | |
405 | slash = 1; | |
406 | continue; | |
407 | case '.': | |
408 | continue; | |
409 | default: | |
410 | slash = 0; | |
411 | continue; | |
412 | } | |
c054d64e | 413 | break; |
af13cdf2 | 414 | } |
6677c466 | 415 | return slash; |
af13cdf2 LT |
416 | } |
417 | ||
ae0ba8e2 JH |
418 | static inline int upstream_mark(const char *string, int len) |
419 | { | |
420 | const char *suffix[] = { "@{upstream}", "@{u}" }; | |
421 | int i; | |
422 | ||
423 | for (i = 0; i < ARRAY_SIZE(suffix); i++) { | |
424 | int suffix_len = strlen(suffix[i]); | |
425 | if (suffix_len <= len | |
426 | && !memcmp(string, suffix[i], suffix_len)) | |
427 | return suffix_len; | |
428 | } | |
429 | return 0; | |
430 | } | |
431 | ||
e48ba200 | 432 | static int get_sha1_1(const char *name, int len, unsigned char *sha1, unsigned lookup_flags); |
8cd4249c | 433 | static int interpret_nth_prior_checkout(const char *name, int namelen, struct strbuf *buf); |
d18ba221 | 434 | |
e86eb666 JH |
435 | static int get_sha1_basic(const char *str, int len, unsigned char *sha1) |
436 | { | |
eedce784 | 437 | static const char *warn_msg = "refname '%.*s' is ambiguous."; |
798c35fc NTND |
438 | static const char *object_name_msg = N_( |
439 | "Git normally never creates a ref that ends with 40 hex characters\n" | |
440 | "because it will be ignored when you just specify 40-hex. These refs\n" | |
441 | "may be created by mistake. For example,\n" | |
442 | "\n" | |
443 | " git checkout -b $br $(git rev-parse ...)\n" | |
444 | "\n" | |
445 | "where \"$br\" is somehow empty and a 40-hex ref is created. Please\n" | |
446 | "examine these refs and maybe delete them. Turn this message off by\n" | |
8dc84fdc | 447 | "running \"git config advice.objectNameWarning false\""); |
798c35fc | 448 | unsigned char tmp_sha1[20]; |
ed378ec7 | 449 | char *real_ref = NULL; |
ab2a1a32 | 450 | int refs_found = 0; |
128fd54d | 451 | int at, reflog_len, nth_prior = 0; |
9938af6a | 452 | |
798c35fc | 453 | if (len == 40 && !get_sha1_hex(str, sha1)) { |
832cf74c | 454 | if (warn_ambiguous_refs && warn_on_object_refname_ambiguity) { |
25fba78d | 455 | refs_found = dwim_ref(str, len, tmp_sha1, &real_ref); |
832cf74c | 456 | if (refs_found > 0) { |
25fba78d JK |
457 | warning(warn_msg, len, str); |
458 | if (advice_object_name_warning) | |
459 | fprintf(stderr, "%s\n", _(object_name_msg)); | |
460 | } | |
461 | free(real_ref); | |
798c35fc | 462 | } |
9938af6a | 463 | return 0; |
798c35fc | 464 | } |
9938af6a | 465 | |
d18ba221 | 466 | /* basic@{time or number or -number} format to query ref-log */ |
694500ed | 467 | reflog_len = at = 0; |
f265458f | 468 | if (len && str[len-1] == '}') { |
e883a057 | 469 | for (at = len-4; at >= 0; at--) { |
ab2a1a32 | 470 | if (str[at] == '@' && str[at+1] == '{') { |
83d16bc7 RR |
471 | if (str[at+2] == '-') { |
472 | if (at != 0) | |
473 | /* @{-N} not at start */ | |
474 | return -1; | |
128fd54d FC |
475 | nth_prior = 1; |
476 | continue; | |
477 | } | |
ae0ba8e2 | 478 | if (!upstream_mark(str + at, len - at)) { |
28fb8438 JS |
479 | reflog_len = (len-1) - (at+2); |
480 | len = at; | |
481 | } | |
ab2a1a32 JH |
482 | break; |
483 | } | |
d556fae2 SP |
484 | } |
485 | } | |
486 | ||
af13cdf2 | 487 | /* Accept only unambiguous ref paths. */ |
11cf8801 | 488 | if (len && ambiguous_path(str, len)) |
af13cdf2 LT |
489 | return -1; |
490 | ||
128fd54d | 491 | if (nth_prior) { |
d18ba221 | 492 | struct strbuf buf = STRBUF_INIT; |
128fd54d FC |
493 | int detached; |
494 | ||
8cd4249c | 495 | if (interpret_nth_prior_checkout(str, len, &buf) > 0) { |
128fd54d FC |
496 | detached = (buf.len == 40 && !get_sha1_hex(buf.buf, sha1)); |
497 | strbuf_release(&buf); | |
498 | if (detached) | |
499 | return 0; | |
d18ba221 | 500 | } |
128fd54d FC |
501 | } |
502 | ||
503 | if (!len && reflog_len) | |
11cf8801 NP |
504 | /* allow "@{...}" to mean the current branch reflog */ |
505 | refs_found = dwim_ref("HEAD", 4, sha1, &real_ref); | |
128fd54d | 506 | else if (reflog_len) |
f2eba66d NP |
507 | refs_found = dwim_log(str, len, sha1, &real_ref); |
508 | else | |
11cf8801 | 509 | refs_found = dwim_ref(str, len, sha1, &real_ref); |
d556fae2 SP |
510 | |
511 | if (!refs_found) | |
512 | return -1; | |
513 | ||
798c35fc NTND |
514 | if (warn_ambiguous_refs && |
515 | (refs_found > 1 || | |
516 | !get_short_sha1(str, len, tmp_sha1, GET_SHA1_QUIETLY))) | |
eedce784 | 517 | warning(warn_msg, len, str); |
d556fae2 | 518 | |
ab2a1a32 | 519 | if (reflog_len) { |
ab2a1a32 JH |
520 | int nth, i; |
521 | unsigned long at_time; | |
16d7cc90 JH |
522 | unsigned long co_time; |
523 | int co_tz, co_cnt; | |
524 | ||
fe558516 | 525 | /* Is it asking for N-th entry, or approxidate? */ |
ab2a1a32 JH |
526 | for (i = nth = 0; 0 <= nth && i < reflog_len; i++) { |
527 | char ch = str[at+2+i]; | |
528 | if ('0' <= ch && ch <= '9') | |
529 | nth = nth * 10 + ch - '0'; | |
530 | else | |
531 | nth = -1; | |
532 | } | |
ea360dd0 SP |
533 | if (100000000 <= nth) { |
534 | at_time = nth; | |
535 | nth = -1; | |
536 | } else if (0 <= nth) | |
ab2a1a32 | 537 | at_time = 0; |
861f00e3 | 538 | else { |
93cfa7c7 | 539 | int errors = 0; |
861f00e3 | 540 | char *tmp = xstrndup(str + at + 2, reflog_len); |
93cfa7c7 | 541 | at_time = approxidate_careful(tmp, &errors); |
861f00e3 | 542 | free(tmp); |
a5e10acb JH |
543 | if (errors) |
544 | return -1; | |
861f00e3 | 545 | } |
16d7cc90 JH |
546 | if (read_ref_at(real_ref, at_time, nth, sha1, NULL, |
547 | &co_time, &co_tz, &co_cnt)) { | |
305ebea0 | 548 | if (!len) { |
59556548 | 549 | if (starts_with(real_ref, "refs/heads/")) { |
305ebea0 RR |
550 | str = real_ref + 11; |
551 | len = strlen(real_ref + 11); | |
552 | } else { | |
553 | /* detached HEAD */ | |
554 | str = "HEAD"; | |
555 | len = 4; | |
556 | } | |
557 | } | |
16d7cc90 | 558 | if (at_time) |
eedce784 JS |
559 | warning("Log for '%.*s' only goes " |
560 | "back to %s.", len, str, | |
73013afd | 561 | show_date(co_time, co_tz, DATE_RFC2822)); |
e6eedc31 | 562 | else { |
e6eedc31 JS |
563 | die("Log for '%.*s' only has %d entries.", |
564 | len, str, co_cnt); | |
565 | } | |
16d7cc90 | 566 | } |
d556fae2 SP |
567 | } |
568 | ||
ed378ec7 | 569 | free(real_ref); |
d556fae2 | 570 | return 0; |
9938af6a JH |
571 | } |
572 | ||
9938af6a JH |
573 | static int get_parent(const char *name, int len, |
574 | unsigned char *result, int idx) | |
575 | { | |
576 | unsigned char sha1[20]; | |
e2643617 | 577 | int ret = get_sha1_1(name, len, sha1, GET_SHA1_COMMITTISH); |
9938af6a JH |
578 | struct commit *commit; |
579 | struct commit_list *p; | |
580 | ||
581 | if (ret) | |
582 | return ret; | |
583 | commit = lookup_commit_reference(sha1); | |
9938af6a JH |
584 | if (parse_commit(commit)) |
585 | return -1; | |
586 | if (!idx) { | |
e702496e | 587 | hashcpy(result, commit->object.sha1); |
9938af6a JH |
588 | return 0; |
589 | } | |
590 | p = commit->parents; | |
591 | while (p) { | |
592 | if (!--idx) { | |
e702496e | 593 | hashcpy(result, p->item->object.sha1); |
9938af6a JH |
594 | return 0; |
595 | } | |
596 | p = p->next; | |
597 | } | |
598 | return -1; | |
599 | } | |
600 | ||
4f7599ac JH |
601 | static int get_nth_ancestor(const char *name, int len, |
602 | unsigned char *result, int generation) | |
603 | { | |
604 | unsigned char sha1[20]; | |
621ff675 LT |
605 | struct commit *commit; |
606 | int ret; | |
607 | ||
e2643617 | 608 | ret = get_sha1_1(name, len, sha1, GET_SHA1_COMMITTISH); |
4f7599ac JH |
609 | if (ret) |
610 | return ret; | |
621ff675 LT |
611 | commit = lookup_commit_reference(sha1); |
612 | if (!commit) | |
613 | return -1; | |
4f7599ac JH |
614 | |
615 | while (generation--) { | |
621ff675 | 616 | if (parse_commit(commit) || !commit->parents) |
4f7599ac | 617 | return -1; |
621ff675 | 618 | commit = commit->parents->item; |
4f7599ac | 619 | } |
621ff675 | 620 | hashcpy(result, commit->object.sha1); |
4f7599ac JH |
621 | return 0; |
622 | } | |
623 | ||
81776315 JH |
624 | struct object *peel_to_type(const char *name, int namelen, |
625 | struct object *o, enum object_type expected_type) | |
626 | { | |
627 | if (name && !namelen) | |
628 | namelen = strlen(name); | |
81776315 JH |
629 | while (1) { |
630 | if (!o || (!o->parsed && !parse_object(o->sha1))) | |
631 | return NULL; | |
a6a3f2cc | 632 | if (expected_type == OBJ_ANY || o->type == expected_type) |
81776315 JH |
633 | return o; |
634 | if (o->type == OBJ_TAG) | |
635 | o = ((struct tag*) o)->tagged; | |
636 | else if (o->type == OBJ_COMMIT) | |
637 | o = &(((struct commit *) o)->tree->object); | |
638 | else { | |
639 | if (name) | |
640 | error("%.*s: expected %s type, but the object " | |
641 | "dereferences to %s type", | |
642 | namelen, name, typename(expected_type), | |
643 | typename(o->type)); | |
644 | return NULL; | |
645 | } | |
646 | } | |
647 | } | |
648 | ||
5385f52d JH |
649 | static int peel_onion(const char *name, int len, unsigned char *sha1) |
650 | { | |
651 | unsigned char outer[20]; | |
652 | const char *sp; | |
885a86ab | 653 | unsigned int expected_type = 0; |
e2643617 | 654 | unsigned lookup_flags = 0; |
5385f52d JH |
655 | struct object *o; |
656 | ||
657 | /* | |
658 | * "ref^{type}" dereferences ref repeatedly until you cannot | |
659 | * dereference anymore, or you get an object of given type, | |
660 | * whichever comes first. "ref^{}" means just dereference | |
661 | * tags until you get a non-tag. "ref^0" is a shorthand for | |
662 | * "ref^{commit}". "commit^{tree}" could be used to find the | |
663 | * top-level tree of the given commit. | |
664 | */ | |
665 | if (len < 4 || name[len-1] != '}') | |
666 | return -1; | |
667 | ||
668 | for (sp = name + len - 1; name <= sp; sp--) { | |
669 | int ch = *sp; | |
670 | if (ch == '{' && name < sp && sp[-1] == '^') | |
671 | break; | |
672 | } | |
673 | if (sp <= name) | |
674 | return -1; | |
675 | ||
676 | sp++; /* beginning of type name, or closing brace for empty */ | |
59556548 | 677 | if (starts_with(sp, "commit}")) |
1974632c | 678 | expected_type = OBJ_COMMIT; |
59556548 | 679 | else if (starts_with(sp, "tag}")) |
75aa26d3 | 680 | expected_type = OBJ_TAG; |
59556548 | 681 | else if (starts_with(sp, "tree}")) |
1974632c | 682 | expected_type = OBJ_TREE; |
59556548 | 683 | else if (starts_with(sp, "blob}")) |
1974632c | 684 | expected_type = OBJ_BLOB; |
59556548 | 685 | else if (starts_with(sp, "object}")) |
a6a3f2cc | 686 | expected_type = OBJ_ANY; |
5385f52d | 687 | else if (sp[0] == '}') |
1974632c | 688 | expected_type = OBJ_NONE; |
32574b68 NTND |
689 | else if (sp[0] == '/') |
690 | expected_type = OBJ_COMMIT; | |
5385f52d JH |
691 | else |
692 | return -1; | |
693 | ||
e2643617 JH |
694 | if (expected_type == OBJ_COMMIT) |
695 | lookup_flags = GET_SHA1_COMMITTISH; | |
ed1ca602 JH |
696 | else if (expected_type == OBJ_TREE) |
697 | lookup_flags = GET_SHA1_TREEISH; | |
e2643617 JH |
698 | |
699 | if (get_sha1_1(name, sp - name - 2, outer, lookup_flags)) | |
5385f52d JH |
700 | return -1; |
701 | ||
702 | o = parse_object(outer); | |
703 | if (!o) | |
704 | return -1; | |
885a86ab | 705 | if (!expected_type) { |
9534f40b | 706 | o = deref_tag(o, name, sp - name - 2); |
6e1c6c10 JH |
707 | if (!o || (!o->parsed && !parse_object(o->sha1))) |
708 | return -1; | |
e702496e | 709 | hashcpy(sha1, o->sha1); |
32574b68 | 710 | return 0; |
5385f52d | 711 | } |
32574b68 NTND |
712 | |
713 | /* | |
714 | * At this point, the syntax look correct, so | |
715 | * if we do not get the needed object, we should | |
716 | * barf. | |
717 | */ | |
718 | o = peel_to_type(name, len, o, expected_type); | |
719 | if (!o) | |
81776315 | 720 | return -1; |
32574b68 NTND |
721 | |
722 | hashcpy(sha1, o->sha1); | |
723 | if (sp[0] == '/') { | |
724 | /* "$commit^{/foo}" */ | |
725 | char *prefix; | |
726 | int ret; | |
727 | struct commit_list *list = NULL; | |
728 | ||
81776315 | 729 | /* |
4322842a NTND |
730 | * $commit^{/}. Some regex implementation may reject. |
731 | * We don't need regex anyway. '' pattern always matches. | |
5385f52d | 732 | */ |
4322842a | 733 | if (sp[1] == '}') |
81776315 | 734 | return 0; |
4322842a | 735 | |
32574b68 NTND |
736 | prefix = xstrndup(sp + 1, name + len - 1 - (sp + 1)); |
737 | commit_list_insert((struct commit *)o, &list); | |
738 | ret = get_sha1_oneline(prefix, sha1, list); | |
739 | free(prefix); | |
740 | return ret; | |
5385f52d JH |
741 | } |
742 | return 0; | |
743 | } | |
744 | ||
7dd45e15 JH |
745 | static int get_describe_name(const char *name, int len, unsigned char *sha1) |
746 | { | |
747 | const char *cp; | |
6269b6b6 | 748 | unsigned flags = GET_SHA1_QUIETLY | GET_SHA1_COMMIT; |
7dd45e15 JH |
749 | |
750 | for (cp = name + len - 1; name + 2 <= cp; cp--) { | |
751 | char ch = *cp; | |
752 | if (hexval(ch) & ~0377) { | |
753 | /* We must be looking at g in "SOMETHING-g" | |
754 | * for it to be describe output. | |
755 | */ | |
756 | if (ch == 'g' && cp[-1] == '-') { | |
757 | cp++; | |
758 | len -= cp - name; | |
6269b6b6 | 759 | return get_short_sha1(cp, len, sha1, flags); |
7dd45e15 JH |
760 | } |
761 | } | |
762 | } | |
763 | return -1; | |
764 | } | |
765 | ||
e48ba200 | 766 | static int get_sha1_1(const char *name, int len, unsigned char *sha1, unsigned lookup_flags) |
9938af6a | 767 | { |
0601dbe1 | 768 | int ret, has_suffix; |
4f7599ac | 769 | const char *cp; |
9938af6a | 770 | |
621ff675 LT |
771 | /* |
772 | * "name~3" is "name^^^", "name~" is "name~1", and "name^" is "name^1". | |
4f7599ac | 773 | */ |
0601dbe1 | 774 | has_suffix = 0; |
4f7599ac JH |
775 | for (cp = name + len - 1; name <= cp; cp--) { |
776 | int ch = *cp; | |
777 | if ('0' <= ch && ch <= '9') | |
778 | continue; | |
0601dbe1 JH |
779 | if (ch == '~' || ch == '^') |
780 | has_suffix = ch; | |
4f7599ac JH |
781 | break; |
782 | } | |
0601dbe1 JH |
783 | |
784 | if (has_suffix) { | |
785 | int num = 0; | |
4f7599ac JH |
786 | int len1 = cp - name; |
787 | cp++; | |
788 | while (cp < name + len) | |
0601dbe1 | 789 | num = num * 10 + *cp++ - '0'; |
621ff675 LT |
790 | if (!num && len1 == len - 1) |
791 | num = 1; | |
792 | if (has_suffix == '^') | |
0601dbe1 | 793 | return get_parent(name, len1, sha1, num); |
0601dbe1 JH |
794 | /* else if (has_suffix == '~') -- goes without saying */ |
795 | return get_nth_ancestor(name, len1, sha1, num); | |
4f7599ac JH |
796 | } |
797 | ||
5385f52d JH |
798 | ret = peel_onion(name, len, sha1); |
799 | if (!ret) | |
800 | return 0; | |
801 | ||
9938af6a JH |
802 | ret = get_sha1_basic(name, len, sha1); |
803 | if (!ret) | |
804 | return 0; | |
7dd45e15 JH |
805 | |
806 | /* It could be describe output that is "SOMETHING-gXXXX" */ | |
807 | ret = get_describe_name(name, len, sha1); | |
808 | if (!ret) | |
809 | return 0; | |
810 | ||
e2643617 | 811 | return get_short_sha1(name, len, sha1, lookup_flags); |
9938af6a JH |
812 | } |
813 | ||
f7bff003 JH |
814 | /* |
815 | * This interprets names like ':/Initial revision of "git"' by searching | |
816 | * through history and returning the first commit whose message starts | |
3d045897 | 817 | * the given regular expression. |
f7bff003 JH |
818 | * |
819 | * For future extension, ':/!' is reserved. If you want to match a message | |
820 | * beginning with a '!', you have to repeat the exclamation mark. | |
821 | */ | |
208acbfb NTND |
822 | |
823 | /* Remember to update object flag allocation in object.h */ | |
f7bff003 JH |
824 | #define ONELINE_SEEN (1u<<20) |
825 | ||
28a4d940 JS |
826 | static int handle_one_ref(const char *path, |
827 | const unsigned char *sha1, int flag, void *cb_data) | |
828 | { | |
829 | struct commit_list **list = cb_data; | |
830 | struct object *object = parse_object(sha1); | |
831 | if (!object) | |
832 | return 0; | |
affeef12 | 833 | if (object->type == OBJ_TAG) { |
28a4d940 | 834 | object = deref_tag(object, path, strlen(path)); |
affeef12 MK |
835 | if (!object) |
836 | return 0; | |
837 | } | |
28a4d940 JS |
838 | if (object->type != OBJ_COMMIT) |
839 | return 0; | |
47e44ed1 | 840 | commit_list_insert_by_date((struct commit *)object, list); |
28a4d940 JS |
841 | return 0; |
842 | } | |
843 | ||
84baa31b NTND |
844 | static int get_sha1_oneline(const char *prefix, unsigned char *sha1, |
845 | struct commit_list *list) | |
28a4d940 | 846 | { |
84baa31b | 847 | struct commit_list *backup = NULL, *l; |
28042dbc | 848 | int found = 0; |
57895105 | 849 | regex_t regex; |
28a4d940 JS |
850 | |
851 | if (prefix[0] == '!') { | |
852 | if (prefix[1] != '!') | |
853 | die ("Invalid search pattern: %s", prefix); | |
854 | prefix++; | |
855 | } | |
57895105 LT |
856 | |
857 | if (regcomp(®ex, prefix, REG_EXTENDED)) | |
858 | die("Invalid search pattern: %s", prefix); | |
859 | ||
84baa31b NTND |
860 | for (l = list; l; l = l->next) { |
861 | l->item->object.flags |= ONELINE_SEEN; | |
28a4d940 | 862 | commit_list_insert(l->item, &backup); |
84baa31b | 863 | } |
ed8ad7e2 | 864 | while (list) { |
28042dbc | 865 | char *p, *to_free = NULL; |
1358e7d6 | 866 | struct commit *commit; |
364d3e65 JS |
867 | enum object_type type; |
868 | unsigned long size; | |
28042dbc | 869 | int matches; |
ed8ad7e2 JM |
870 | |
871 | commit = pop_most_recent_commit(&list, ONELINE_SEEN); | |
283cdbcf MK |
872 | if (!parse_object(commit->object.sha1)) |
873 | continue; | |
364d3e65 JS |
874 | if (commit->buffer) |
875 | p = commit->buffer; | |
876 | else { | |
877 | p = read_sha1_file(commit->object.sha1, &type, &size); | |
878 | if (!p) | |
879 | continue; | |
28042dbc | 880 | to_free = p; |
364d3e65 | 881 | } |
28042dbc JH |
882 | |
883 | p = strstr(p, "\n\n"); | |
884 | matches = p && !regexec(®ex, p + 2, 0, NULL, 0); | |
885 | free(to_free); | |
886 | ||
887 | if (matches) { | |
28a4d940 | 888 | hashcpy(sha1, commit->object.sha1); |
28042dbc | 889 | found = 1; |
28a4d940 JS |
890 | break; |
891 | } | |
892 | } | |
57895105 | 893 | regfree(®ex); |
28a4d940 JS |
894 | free_commit_list(list); |
895 | for (l = backup; l; l = l->next) | |
896 | clear_commit_marks(l->item, ONELINE_SEEN); | |
28042dbc JH |
897 | free_commit_list(backup); |
898 | return found ? 0 : -1; | |
28a4d940 JS |
899 | } |
900 | ||
ae5a6c36 | 901 | struct grab_nth_branch_switch_cbdata { |
98f85ff4 JH |
902 | int remaining; |
903 | struct strbuf buf; | |
ae5a6c36 JH |
904 | }; |
905 | ||
906 | static int grab_nth_branch_switch(unsigned char *osha1, unsigned char *nsha1, | |
907 | const char *email, unsigned long timestamp, int tz, | |
908 | const char *message, void *cb_data) | |
909 | { | |
910 | struct grab_nth_branch_switch_cbdata *cb = cb_data; | |
a884d0cb TR |
911 | const char *match = NULL, *target = NULL; |
912 | size_t len; | |
913 | ||
59556548 | 914 | if (starts_with(message, "checkout: moving from ")) { |
a884d0cb | 915 | match = message + strlen("checkout: moving from "); |
d7c03c1f | 916 | target = strstr(match, " to "); |
ae5a6c36 JH |
917 | } |
918 | ||
c829774c | 919 | if (!match || !target) |
ae5a6c36 | 920 | return 0; |
98f85ff4 JH |
921 | if (--(cb->remaining) == 0) { |
922 | len = target - match; | |
923 | strbuf_reset(&cb->buf); | |
924 | strbuf_add(&cb->buf, match, len); | |
925 | return 1; /* we are done */ | |
926 | } | |
ae5a6c36 JH |
927 | return 0; |
928 | } | |
929 | ||
930 | /* | |
ae0ba8e2 JH |
931 | * Parse @{-N} syntax, return the number of characters parsed |
932 | * if successful; otherwise signal an error with negative value. | |
ae5a6c36 | 933 | */ |
8cd4249c JK |
934 | static int interpret_nth_prior_checkout(const char *name, int namelen, |
935 | struct strbuf *buf) | |
ae5a6c36 | 936 | { |
c2883e62 | 937 | long nth; |
98f85ff4 | 938 | int retval; |
ae5a6c36 | 939 | struct grab_nth_branch_switch_cbdata cb; |
a884d0cb TR |
940 | const char *brace; |
941 | char *num_end; | |
ae5a6c36 | 942 | |
8cd4249c JK |
943 | if (namelen < 4) |
944 | return -1; | |
ae5a6c36 JH |
945 | if (name[0] != '@' || name[1] != '{' || name[2] != '-') |
946 | return -1; | |
8cd4249c | 947 | brace = memchr(name, '}', namelen); |
a884d0cb TR |
948 | if (!brace) |
949 | return -1; | |
98f85ff4 | 950 | nth = strtol(name + 3, &num_end, 10); |
a884d0cb | 951 | if (num_end != brace) |
ae5a6c36 | 952 | return -1; |
c2883e62 JH |
953 | if (nth <= 0) |
954 | return -1; | |
98f85ff4 JH |
955 | cb.remaining = nth; |
956 | strbuf_init(&cb.buf, 20); | |
957 | ||
39765e59 | 958 | retval = 0; |
98f85ff4 JH |
959 | if (0 < for_each_reflog_ent_reverse("HEAD", grab_nth_branch_switch, &cb)) { |
960 | strbuf_reset(buf); | |
961 | strbuf_add(buf, cb.buf.buf, cb.buf.len); | |
962 | retval = brace - name + 1; | |
963 | } | |
a884d0cb | 964 | |
98f85ff4 | 965 | strbuf_release(&cb.buf); |
39765e59 | 966 | return retval; |
ae5a6c36 JH |
967 | } |
968 | ||
619a644d JH |
969 | int get_sha1_mb(const char *name, unsigned char *sha1) |
970 | { | |
971 | struct commit *one, *two; | |
972 | struct commit_list *mbs; | |
973 | unsigned char sha1_tmp[20]; | |
974 | const char *dots; | |
975 | int st; | |
976 | ||
977 | dots = strstr(name, "..."); | |
978 | if (!dots) | |
979 | return get_sha1(name, sha1); | |
980 | if (dots == name) | |
981 | st = get_sha1("HEAD", sha1_tmp); | |
982 | else { | |
983 | struct strbuf sb; | |
984 | strbuf_init(&sb, dots - name); | |
985 | strbuf_add(&sb, name, dots - name); | |
cd74e473 | 986 | st = get_sha1_committish(sb.buf, sha1_tmp); |
619a644d JH |
987 | strbuf_release(&sb); |
988 | } | |
989 | if (st) | |
990 | return st; | |
991 | one = lookup_commit_reference_gently(sha1_tmp, 0); | |
992 | if (!one) | |
993 | return -1; | |
994 | ||
cd74e473 | 995 | if (get_sha1_committish(dots[3] ? (dots + 3) : "HEAD", sha1_tmp)) |
619a644d JH |
996 | return -1; |
997 | two = lookup_commit_reference_gently(sha1_tmp, 0); | |
998 | if (!two) | |
999 | return -1; | |
1000 | mbs = get_merge_bases(one, two, 1); | |
1001 | if (!mbs || mbs->next) | |
1002 | st = -1; | |
1003 | else { | |
1004 | st = 0; | |
1005 | hashcpy(sha1, mbs->item->object.sha1); | |
1006 | } | |
1007 | free_commit_list(mbs); | |
1008 | return st; | |
1009 | } | |
1010 | ||
9ba89f48 FC |
1011 | /* parse @something syntax, when 'something' is not {.*} */ |
1012 | static int interpret_empty_at(const char *name, int namelen, int len, struct strbuf *buf) | |
1013 | { | |
1014 | const char *next; | |
1015 | ||
1016 | if (len || name[1] == '{') | |
1017 | return -1; | |
1018 | ||
1019 | /* make sure it's a single @, or @@{.*}, not @foo */ | |
8cd4249c | 1020 | next = memchr(name + len + 1, '@', namelen - len - 1); |
9ba89f48 FC |
1021 | if (next && next[1] != '{') |
1022 | return -1; | |
1023 | if (!next) | |
1024 | next = name + namelen; | |
1025 | if (next != name + 1) | |
1026 | return -1; | |
1027 | ||
1028 | strbuf_reset(buf); | |
1029 | strbuf_add(buf, "HEAD", 4); | |
1030 | return 1; | |
1031 | } | |
1032 | ||
7a0a49a7 FC |
1033 | static int reinterpret(const char *name, int namelen, int len, struct strbuf *buf) |
1034 | { | |
1035 | /* we have extra data, which might need further processing */ | |
1036 | struct strbuf tmp = STRBUF_INIT; | |
1037 | int used = buf->len; | |
1038 | int ret; | |
1039 | ||
1040 | strbuf_add(buf, name + len, namelen - len); | |
cf99a761 | 1041 | ret = interpret_branch_name(buf->buf, buf->len, &tmp); |
7a0a49a7 FC |
1042 | /* that data was not interpreted, remove our cruft */ |
1043 | if (ret < 0) { | |
1044 | strbuf_setlen(buf, used); | |
1045 | return len; | |
1046 | } | |
1047 | strbuf_reset(buf); | |
1048 | strbuf_addbuf(buf, &tmp); | |
1049 | strbuf_release(&tmp); | |
1050 | /* tweak for size of {-N} versus expanded ref name */ | |
1051 | return ret - used + len; | |
1052 | } | |
1053 | ||
a39c14af JK |
1054 | static void set_shortened_ref(struct strbuf *buf, const char *ref) |
1055 | { | |
1056 | char *s = shorten_unambiguous_ref(ref, 0); | |
1057 | strbuf_reset(buf); | |
1058 | strbuf_addstr(buf, s); | |
1059 | free(s); | |
1060 | } | |
1061 | ||
1062 | static const char *get_upstream_branch(const char *branch_buf, int len) | |
1063 | { | |
1064 | char *branch = xstrndup(branch_buf, len); | |
1065 | struct branch *upstream = branch_get(*branch ? branch : NULL); | |
1066 | ||
1067 | /* | |
1068 | * Upstream can be NULL only if branch refers to HEAD and HEAD | |
1069 | * points to something different than a branch. | |
1070 | */ | |
1071 | if (!upstream) | |
1072 | die(_("HEAD does not point to a branch")); | |
1073 | if (!upstream->merge || !upstream->merge[0]->dst) { | |
1074 | if (!ref_exists(upstream->refname)) | |
1075 | die(_("No such branch: '%s'"), branch); | |
1076 | if (!upstream->merge) { | |
1077 | die(_("No upstream configured for branch '%s'"), | |
1078 | upstream->name); | |
1079 | } | |
1080 | die( | |
1081 | _("Upstream branch '%s' not stored as a remote-tracking branch"), | |
1082 | upstream->merge[0]->src); | |
1083 | } | |
1084 | free(branch); | |
1085 | ||
1086 | return upstream->merge[0]->dst; | |
1087 | } | |
1088 | ||
1089 | static int interpret_upstream_mark(const char *name, int namelen, | |
1090 | int at, struct strbuf *buf) | |
1091 | { | |
1092 | int len; | |
1093 | ||
1094 | len = upstream_mark(name + at, namelen - at); | |
1095 | if (!len) | |
1096 | return -1; | |
1097 | ||
3f6eb30f JK |
1098 | if (memchr(name, ':', at)) |
1099 | return -1; | |
1100 | ||
a39c14af JK |
1101 | set_shortened_ref(buf, get_upstream_branch(name, at)); |
1102 | return len + at; | |
1103 | } | |
1104 | ||
ae0ba8e2 JH |
1105 | /* |
1106 | * This reads short-hand syntax that not only evaluates to a commit | |
1107 | * object name, but also can act as if the end user spelled the name | |
1108 | * of the branch from the command line. | |
1109 | * | |
1110 | * - "@{-N}" finds the name of the Nth previous branch we were on, and | |
1111 | * places the name of the branch in the given buf and returns the | |
1112 | * number of characters parsed if successful. | |
1113 | * | |
1114 | * - "<branch>@{upstream}" finds the name of the other ref that | |
1115 | * <branch> is configured to merge with (missing <branch> defaults | |
1116 | * to the current branch), and places the name of the branch in the | |
1117 | * given buf and returns the number of characters parsed if | |
1118 | * successful. | |
1119 | * | |
1120 | * If the input is not of the accepted format, it returns a negative | |
1121 | * number to signal an error. | |
1122 | * | |
1123 | * If the input was ok but there are not N branch switches in the | |
1124 | * reflog, it returns 0. | |
1125 | */ | |
cf99a761 | 1126 | int interpret_branch_name(const char *name, int namelen, struct strbuf *buf) |
ae0ba8e2 | 1127 | { |
f278f40f | 1128 | char *at; |
9892d5d4 | 1129 | const char *start; |
8cd4249c | 1130 | int len = interpret_nth_prior_checkout(name, namelen, buf); |
ae0ba8e2 | 1131 | |
cf99a761 FC |
1132 | if (!namelen) |
1133 | namelen = strlen(name); | |
1134 | ||
1f27e7d5 | 1135 | if (!len) { |
ae0ba8e2 | 1136 | return len; /* syntax Ok, not enough switches */ |
1f27e7d5 FC |
1137 | } else if (len > 0) { |
1138 | if (len == namelen) | |
1139 | return len; /* consumed all */ | |
1140 | else | |
1141 | return reinterpret(name, namelen, len, buf); | |
d46a8301 JK |
1142 | } |
1143 | ||
9892d5d4 JK |
1144 | for (start = name; |
1145 | (at = memchr(start, '@', namelen - (start - name))); | |
1146 | start = at + 1) { | |
9ba89f48 | 1147 | |
9892d5d4 JK |
1148 | len = interpret_empty_at(name, namelen, at - name, buf); |
1149 | if (len > 0) | |
1150 | return reinterpret(name, namelen, len, buf); | |
9ba89f48 | 1151 | |
9892d5d4 JK |
1152 | len = interpret_upstream_mark(name, namelen, at - name, buf); |
1153 | if (len > 0) | |
1154 | return len; | |
bb0dab5d | 1155 | } |
9ba89f48 | 1156 | |
a39c14af | 1157 | return -1; |
ae0ba8e2 JH |
1158 | } |
1159 | ||
6bab74e7 JN |
1160 | int strbuf_branchname(struct strbuf *sb, const char *name) |
1161 | { | |
1162 | int len = strlen(name); | |
cf99a761 | 1163 | int used = interpret_branch_name(name, len, sb); |
84cf2466 JH |
1164 | |
1165 | if (used == len) | |
6bab74e7 | 1166 | return 0; |
84cf2466 JH |
1167 | if (used < 0) |
1168 | used = 0; | |
1169 | strbuf_add(sb, name + used, len - used); | |
6bab74e7 JN |
1170 | return len; |
1171 | } | |
1172 | ||
1173 | int strbuf_check_branch_ref(struct strbuf *sb, const char *name) | |
1174 | { | |
1175 | strbuf_branchname(sb, name); | |
1176 | if (name[0] == '-') | |
8d9c5010 | 1177 | return -1; |
6bab74e7 | 1178 | strbuf_splice(sb, 0, 0, "refs/heads/", 11); |
8d9c5010 | 1179 | return check_refname_format(sb->buf, 0); |
6bab74e7 JN |
1180 | } |
1181 | ||
9938af6a JH |
1182 | /* |
1183 | * This is like "get_sha1_basic()", except it allows "sha1 expressions", | |
1184 | * notably "xyz^" for "parent of xyz" | |
1185 | */ | |
1186 | int get_sha1(const char *name, unsigned char *sha1) | |
1187 | { | |
573285e5 | 1188 | struct object_context unused; |
33bd598c | 1189 | return get_sha1_with_context(name, 0, sha1, &unused); |
a0cd87a5 MK |
1190 | } |
1191 | ||
cd74e473 | 1192 | /* |
a8a5406a | 1193 | * Many callers know that the user meant to name a commit-ish by |
cd74e473 JH |
1194 | * syntactical positions where the object name appears. Calling this |
1195 | * function allows the machinery to disambiguate shorter-than-unique | |
a8a5406a | 1196 | * abbreviated object names between commit-ish and others. |
cd74e473 JH |
1197 | * |
1198 | * Note that this does NOT error out when the named object is not a | |
a8a5406a | 1199 | * commit-ish. It is merely to give a hint to the disambiguation |
cd74e473 JH |
1200 | * machinery. |
1201 | */ | |
1202 | int get_sha1_committish(const char *name, unsigned char *sha1) | |
1203 | { | |
1204 | struct object_context unused; | |
1205 | return get_sha1_with_context(name, GET_SHA1_COMMITTISH, | |
1206 | sha1, &unused); | |
1207 | } | |
1208 | ||
daba53ae JH |
1209 | int get_sha1_treeish(const char *name, unsigned char *sha1) |
1210 | { | |
1211 | struct object_context unused; | |
1212 | return get_sha1_with_context(name, GET_SHA1_TREEISH, | |
1213 | sha1, &unused); | |
1214 | } | |
1215 | ||
1216 | int get_sha1_commit(const char *name, unsigned char *sha1) | |
1217 | { | |
1218 | struct object_context unused; | |
1219 | return get_sha1_with_context(name, GET_SHA1_COMMIT, | |
1220 | sha1, &unused); | |
1221 | } | |
1222 | ||
1223 | int get_sha1_tree(const char *name, unsigned char *sha1) | |
1224 | { | |
1225 | struct object_context unused; | |
1226 | return get_sha1_with_context(name, GET_SHA1_TREE, | |
1227 | sha1, &unused); | |
1228 | } | |
1229 | ||
1230 | int get_sha1_blob(const char *name, unsigned char *sha1) | |
1231 | { | |
1232 | struct object_context unused; | |
1233 | return get_sha1_with_context(name, GET_SHA1_BLOB, | |
1234 | sha1, &unused); | |
a0cd87a5 MK |
1235 | } |
1236 | ||
009fee47 MM |
1237 | /* Must be called only when object_name:filename doesn't exist. */ |
1238 | static void diagnose_invalid_sha1_path(const char *prefix, | |
1239 | const char *filename, | |
1240 | const unsigned char *tree_sha1, | |
b2981d06 RS |
1241 | const char *object_name, |
1242 | int object_name_len) | |
009fee47 MM |
1243 | { |
1244 | struct stat st; | |
1245 | unsigned char sha1[20]; | |
1246 | unsigned mode; | |
1247 | ||
1248 | if (!prefix) | |
1249 | prefix = ""; | |
1250 | ||
1251 | if (!lstat(filename, &st)) | |
b2981d06 RS |
1252 | die("Path '%s' exists on disk, but not in '%.*s'.", |
1253 | filename, object_name_len, object_name); | |
009fee47 MM |
1254 | if (errno == ENOENT || errno == ENOTDIR) { |
1255 | char *fullname = xmalloc(strlen(filename) | |
1256 | + strlen(prefix) + 1); | |
1257 | strcpy(fullname, prefix); | |
1258 | strcat(fullname, filename); | |
1259 | ||
1260 | if (!get_tree_entry(tree_sha1, fullname, | |
1261 | sha1, &mode)) { | |
1262 | die("Path '%s' exists, but not '%s'.\n" | |
b2981d06 | 1263 | "Did you mean '%.*s:%s' aka '%.*s:./%s'?", |
009fee47 MM |
1264 | fullname, |
1265 | filename, | |
b2981d06 | 1266 | object_name_len, object_name, |
e41d718c | 1267 | fullname, |
b2981d06 | 1268 | object_name_len, object_name, |
e41d718c | 1269 | filename); |
009fee47 | 1270 | } |
b2981d06 RS |
1271 | die("Path '%s' does not exist in '%.*s'", |
1272 | filename, object_name_len, object_name); | |
009fee47 MM |
1273 | } |
1274 | } | |
1275 | ||
1276 | /* Must be called only when :stage:filename doesn't exist. */ | |
1277 | static void diagnose_invalid_index_path(int stage, | |
1278 | const char *prefix, | |
1279 | const char *filename) | |
1280 | { | |
1281 | struct stat st; | |
9c5e6c80 | 1282 | const struct cache_entry *ce; |
009fee47 MM |
1283 | int pos; |
1284 | unsigned namelen = strlen(filename); | |
1285 | unsigned fullnamelen; | |
1286 | char *fullname; | |
1287 | ||
1288 | if (!prefix) | |
1289 | prefix = ""; | |
1290 | ||
1291 | /* Wrong stage number? */ | |
1292 | pos = cache_name_pos(filename, namelen); | |
1293 | if (pos < 0) | |
1294 | pos = -pos - 1; | |
77e8466f MH |
1295 | if (pos < active_nr) { |
1296 | ce = active_cache[pos]; | |
1297 | if (ce_namelen(ce) == namelen && | |
1298 | !memcmp(ce->name, filename, namelen)) | |
1299 | die("Path '%s' is in the index, but not at stage %d.\n" | |
1300 | "Did you mean ':%d:%s'?", | |
1301 | filename, stage, | |
1302 | ce_stage(ce), filename); | |
1303 | } | |
009fee47 MM |
1304 | |
1305 | /* Confusion between relative and absolute filenames? */ | |
1306 | fullnamelen = namelen + strlen(prefix); | |
1307 | fullname = xmalloc(fullnamelen + 1); | |
1308 | strcpy(fullname, prefix); | |
1309 | strcat(fullname, filename); | |
1310 | pos = cache_name_pos(fullname, fullnamelen); | |
1311 | if (pos < 0) | |
1312 | pos = -pos - 1; | |
77e8466f MH |
1313 | if (pos < active_nr) { |
1314 | ce = active_cache[pos]; | |
1315 | if (ce_namelen(ce) == fullnamelen && | |
1316 | !memcmp(ce->name, fullname, fullnamelen)) | |
1317 | die("Path '%s' is in the index, but not '%s'.\n" | |
e41d718c | 1318 | "Did you mean ':%d:%s' aka ':%d:./%s'?", |
77e8466f | 1319 | fullname, filename, |
e41d718c MG |
1320 | ce_stage(ce), fullname, |
1321 | ce_stage(ce), filename); | |
77e8466f | 1322 | } |
009fee47 MM |
1323 | |
1324 | if (!lstat(filename, &st)) | |
1325 | die("Path '%s' exists on disk, but not in the index.", filename); | |
1326 | if (errno == ENOENT || errno == ENOTDIR) | |
1327 | die("Path '%s' does not exist (neither on disk nor in the index).", | |
1328 | filename); | |
1329 | ||
1330 | free(fullname); | |
1331 | } | |
1332 | ||
1333 | ||
979f7929 NTND |
1334 | static char *resolve_relative_path(const char *rel) |
1335 | { | |
59556548 | 1336 | if (!starts_with(rel, "./") && !starts_with(rel, "../")) |
979f7929 NTND |
1337 | return NULL; |
1338 | ||
1339 | if (!startup_info) | |
1340 | die("BUG: startup_info struct is not initialized."); | |
1341 | ||
1342 | if (!is_inside_work_tree()) | |
1343 | die("relative path syntax can't be used outside working tree."); | |
1344 | ||
1345 | /* die() inside prefix_path() if resolved path is outside worktree */ | |
1346 | return prefix_path(startup_info->prefix, | |
1347 | startup_info->prefix ? strlen(startup_info->prefix) : 0, | |
1348 | rel); | |
1349 | } | |
1350 | ||
33bd598c JH |
1351 | static int get_sha1_with_context_1(const char *name, |
1352 | unsigned flags, | |
1353 | const char *prefix, | |
1354 | unsigned char *sha1, | |
1355 | struct object_context *oc) | |
a0cd87a5 MK |
1356 | { |
1357 | int ret, bracket_depth; | |
73b0e5af JH |
1358 | int namelen = strlen(name); |
1359 | const char *cp; | |
33bd598c | 1360 | int only_to_die = flags & GET_SHA1_ONLY_TO_DIE; |
5119602a | 1361 | |
573285e5 CP |
1362 | memset(oc, 0, sizeof(*oc)); |
1363 | oc->mode = S_IFINVALID; | |
33bd598c | 1364 | ret = get_sha1_1(name, namelen, sha1, flags); |
73b0e5af JH |
1365 | if (!ret) |
1366 | return ret; | |
33bd598c JH |
1367 | /* |
1368 | * sha1:path --> object name of path in ent sha1 | |
979f7929 NTND |
1369 | * :path -> object name of absolute path in index |
1370 | * :./path -> object name of path relative to cwd in index | |
73b0e5af | 1371 | * :[0-3]:path -> object name of path in index at stage |
95ad6d2d | 1372 | * :/foo -> recent commit matching foo |
73b0e5af JH |
1373 | */ |
1374 | if (name[0] == ':') { | |
1375 | int stage = 0; | |
9c5e6c80 | 1376 | const struct cache_entry *ce; |
979f7929 | 1377 | char *new_path = NULL; |
73b0e5af | 1378 | int pos; |
2e83b66c | 1379 | if (!only_to_die && namelen > 2 && name[1] == '/') { |
84baa31b NTND |
1380 | struct commit_list *list = NULL; |
1381 | for_each_ref(handle_one_ref, &list); | |
1382 | return get_sha1_oneline(name + 2, sha1, list); | |
1383 | } | |
73b0e5af JH |
1384 | if (namelen < 3 || |
1385 | name[2] != ':' || | |
1386 | name[1] < '0' || '3' < name[1]) | |
1387 | cp = name + 1; | |
1388 | else { | |
1389 | stage = name[1] - '0'; | |
1390 | cp = name + 3; | |
5119602a | 1391 | } |
3d6e0f74 JH |
1392 | new_path = resolve_relative_path(cp); |
1393 | if (!new_path) { | |
1394 | namelen = namelen - (cp - name); | |
1395 | } else { | |
1396 | cp = new_path; | |
1397 | namelen = strlen(cp); | |
1398 | } | |
573285e5 CP |
1399 | |
1400 | strncpy(oc->path, cp, | |
1401 | sizeof(oc->path)); | |
1402 | oc->path[sizeof(oc->path)-1] = '\0'; | |
1403 | ||
73b0e5af JH |
1404 | if (!active_cache) |
1405 | read_cache(); | |
73b0e5af JH |
1406 | pos = cache_name_pos(cp, namelen); |
1407 | if (pos < 0) | |
1408 | pos = -pos - 1; | |
1409 | while (pos < active_nr) { | |
1410 | ce = active_cache[pos]; | |
1411 | if (ce_namelen(ce) != namelen || | |
1412 | memcmp(ce->name, cp, namelen)) | |
1413 | break; | |
1414 | if (ce_stage(ce) == stage) { | |
e702496e | 1415 | hashcpy(sha1, ce->sha1); |
90064710 | 1416 | oc->mode = ce->ce_mode; |
979f7929 | 1417 | free(new_path); |
73b0e5af JH |
1418 | return 0; |
1419 | } | |
e7cef45f | 1420 | pos++; |
73b0e5af | 1421 | } |
2e83b66c | 1422 | if (only_to_die && name[1] && name[1] != '/') |
009fee47 | 1423 | diagnose_invalid_index_path(stage, prefix, cp); |
979f7929 | 1424 | free(new_path); |
73b0e5af JH |
1425 | return -1; |
1426 | } | |
cce91a2c SP |
1427 | for (cp = name, bracket_depth = 0; *cp; cp++) { |
1428 | if (*cp == '{') | |
1429 | bracket_depth++; | |
1430 | else if (bracket_depth && *cp == '}') | |
1431 | bracket_depth--; | |
1432 | else if (!bracket_depth && *cp == ':') | |
1433 | break; | |
1434 | } | |
1435 | if (*cp == ':') { | |
73b0e5af | 1436 | unsigned char tree_sha1[20]; |
b2981d06 RS |
1437 | int len = cp - name; |
1438 | if (!get_sha1_1(name, len, tree_sha1, GET_SHA1_TREEISH)) { | |
009fee47 | 1439 | const char *filename = cp+1; |
979f7929 NTND |
1440 | char *new_filename = NULL; |
1441 | ||
1442 | new_filename = resolve_relative_path(filename); | |
1443 | if (new_filename) | |
1444 | filename = new_filename; | |
573285e5 | 1445 | ret = get_tree_entry(tree_sha1, filename, sha1, &oc->mode); |
d7236c43 | 1446 | if (ret && only_to_die) { |
009fee47 | 1447 | diagnose_invalid_sha1_path(prefix, filename, |
b2981d06 RS |
1448 | tree_sha1, |
1449 | name, len); | |
009fee47 | 1450 | } |
573285e5 CP |
1451 | hashcpy(oc->tree, tree_sha1); |
1452 | strncpy(oc->path, filename, | |
1453 | sizeof(oc->path)); | |
1454 | oc->path[sizeof(oc->path)-1] = '\0'; | |
1455 | ||
979f7929 | 1456 | free(new_filename); |
009fee47 MM |
1457 | return ret; |
1458 | } else { | |
2e83b66c | 1459 | if (only_to_die) |
b2981d06 | 1460 | die("Invalid object name '%.*s'.", len, name); |
009fee47 | 1461 | } |
5119602a LT |
1462 | } |
1463 | return ret; | |
9938af6a | 1464 | } |
f01cc14c | 1465 | |
8c135ea2 JH |
1466 | /* |
1467 | * Call this function when you know "name" given by the end user must | |
1468 | * name an object but it doesn't; the function _may_ die with a better | |
1469 | * diagnostic message than "no such object 'name'", e.g. "Path 'doc' does not | |
1470 | * exist in 'HEAD'" when given "HEAD:doc", or it may return in which case | |
1471 | * you have a chance to diagnose the error further. | |
1472 | */ | |
1473 | void maybe_die_on_misspelt_object_name(const char *name, const char *prefix) | |
f01cc14c JH |
1474 | { |
1475 | struct object_context oc; | |
8c135ea2 | 1476 | unsigned char sha1[20]; |
33bd598c | 1477 | get_sha1_with_context_1(name, GET_SHA1_ONLY_TO_DIE, prefix, sha1, &oc); |
8c135ea2 JH |
1478 | } |
1479 | ||
33bd598c | 1480 | int get_sha1_with_context(const char *str, unsigned flags, unsigned char *sha1, struct object_context *orc) |
f01cc14c | 1481 | { |
33bd598c | 1482 | return get_sha1_with_context_1(str, flags, NULL, sha1, orc); |
f01cc14c | 1483 | } |