revparse.c 20.1 KB
Newer Older
1
/*
Edward Thomson committed
2
 * Copyright (C) the libgit2 contributors. All rights reserved.
3 4 5 6 7
 *
 * This file is part of libgit2, distributed under the GNU GPL v2 with
 * a Linking Exception. For full terms see the included COPYING file.
 */

8 9
#include "common.h"

10 11 12
#include <assert.h>

#include "buffer.h"
13
#include "tree.h"
14
#include "refdb.h"
15

Ben Straub committed
16
#include "git2.h"
17

18
static int maybe_sha_or_abbrev(git_object** out, git_repository *repo, const char *spec, size_t speclen)
19 20 21 22 23 24
{
	git_oid oid;

	if (git_oid_fromstrn(&oid, spec, speclen) < 0)
		return GIT_ENOTFOUND;

25
	return git_object_lookup_prefix(out, repo, &oid, speclen, GIT_OBJECT_ANY);
26
}
27

28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44
static int maybe_sha(git_object** out, git_repository *repo, const char *spec)
{
	size_t speclen = strlen(spec);

	if (speclen != GIT_OID_HEXSZ)
		return GIT_ENOTFOUND;

	return maybe_sha_or_abbrev(out, repo, spec, speclen);
}

static int maybe_abbrev(git_object** out, git_repository *repo, const char *spec)
{
	size_t speclen = strlen(spec);

	return maybe_sha_or_abbrev(out, repo, spec, speclen);
}

45 46 47 48 49
static int build_regex(regex_t *regex, const char *pattern)
{
	int error;

	if (*pattern == '\0') {
50
		giterr_set(GITERR_REGEX, "empty pattern");
51
		return GIT_EINVALIDSPEC;
52 53
	}

54
	error = p_regcomp(regex, pattern, REG_EXTENDED);
55 56
	if (!error)
		return 0;
57

58 59
	error = giterr_set_regex(regex, error);

60 61
	regfree(regex);

62
	return error;
63 64
}

65
static int maybe_describe(git_object**out, git_repository *repo, const char *spec)
66
{
67
	const char *substr;
68 69
	int error;
	regex_t regex;
70 71 72

	substr = strstr(spec, "-g");

73 74
	if (substr == NULL)
		return GIT_ENOTFOUND;
75

76 77
	if (build_regex(&regex, ".+-[0-9]+-g[0-9a-fA-F]+") < 0)
		return -1;
78

79 80 81 82
	error = regexec(&regex, spec, 0, NULL, 0);
	regfree(&regex);

	if (error)
83 84
		return GIT_ENOTFOUND;

85
	return maybe_abbrev(out, repo, substr+2);
86 87
}

88 89 90 91 92
static int revparse_lookup_object(
	git_object **object_out,
	git_reference **reference_out,
	git_repository *repo,
	const char *spec)
93 94 95 96
{
	int error;
	git_reference *ref;

97
	if ((error = maybe_sha(object_out, repo, spec)) != GIT_ENOTFOUND)
98 99
		return error;

100
	error = git_reference_dwim(&ref, repo, spec);
101
	if (!error) {
102 103

		error = git_object_lookup(
104
			object_out, repo, git_reference_target(ref), GIT_OBJECT_ANY);
105 106 107 108

		if (!error)
			*reference_out = ref;

109
		return error;
110 111
	}

112
	if (error != GIT_ENOTFOUND)
113
		return error;
114

115 116 117
	if ((strlen(spec) < GIT_OID_HEXSZ) &&
		((error = maybe_abbrev(object_out, repo, spec)) != GIT_ENOTFOUND))
			return error;
118

119
	if ((error = maybe_describe(object_out, repo, spec)) != GIT_ENOTFOUND)
120 121
		return error;

122
	giterr_set(GITERR_REFERENCE, "revspec '%s' not found", spec);
123
	return GIT_ENOTFOUND;
124 125
}

126
static int try_parse_numeric(int *n, const char *curly_braces_content)
Ben Straub committed
127
{
128
	int32_t content;
129 130
	const char *end_ptr;

131 132
	if (git__strntol32(&content, curly_braces_content, strlen(curly_braces_content),
			   &end_ptr, 10) < 0)
133
		return -1;
134

135 136
	if (*end_ptr != '\0')
		return -1;
137

138
	*n = (int)content;
139
	return 0;
Ben Straub committed
140 141
}

142
static int retrieve_previously_checked_out_branch_or_revision(git_object **out, git_reference **base_ref, git_repository *repo, const char *identifier, size_t position)
143
{
144
	git_reference *ref = NULL;
145
	git_reflog *reflog = NULL;
146
	regex_t preg;
147 148
	int error = -1;
	size_t i, numentries, cur;
149
	const git_reflog_entry *entry;
150 151
	const char *msg;
	regmatch_t regexmatches[2];
152 153
	git_buf buf = GIT_BUF_INIT;

154
	cur = position;
155

156
	if (*identifier != '\0' || *base_ref != NULL)
157
		return GIT_EINVALIDSPEC;
158

159 160
	if (build_regex(&preg, "checkout: moving from (.*) to .*") < 0)
		return -1;
161

162 163
	if (git_reference_lookup(&ref, repo, GIT_HEAD_FILE) < 0)
		goto cleanup;
164

165
	if (git_reflog_read(&reflog, repo, GIT_HEAD_FILE) < 0)
166 167 168 169
		goto cleanup;

	numentries  = git_reflog_entrycount(reflog);

170
	for (i = 0; i < numentries; i++) {
171
		entry = git_reflog_entry_byindex(reflog, i);
172
		msg = git_reflog_entry_message(entry);
173 174
		if (!msg)
			continue;
175

176 177 178 179 180 181 182
		if (regexec(&preg, msg, 2, regexmatches, 0))
			continue;

		cur--;

		if (cur > 0)
			continue;
183

184 185
		git_buf_put(&buf, msg+regexmatches[1].rm_so, regexmatches[1].rm_eo - regexmatches[1].rm_so);

186
		if ((error = git_reference_dwim(base_ref, repo, git_buf_cstr(&buf))) == 0)
187 188 189 190 191
			goto cleanup;

		if (error < 0 && error != GIT_ENOTFOUND)
			goto cleanup;

192
		error = maybe_abbrev(out, repo, git_buf_cstr(&buf));
193 194 195

		goto cleanup;
	}
196

197 198 199 200
	error = GIT_ENOTFOUND;

cleanup:
	git_reference_free(ref);
201
	git_buf_dispose(&buf);
202 203 204 205 206
	regfree(&preg);
	git_reflog_free(reflog);
	return error;
}

207
static int retrieve_oid_from_reflog(git_oid *oid, git_reference *ref, size_t identifier)
208 209
{
	git_reflog *reflog;
210
	size_t numentries;
211 212 213
	const git_reflog_entry *entry;
	bool search_by_pos = (identifier <= 100000000);

214
	if (git_reflog_read(&reflog, git_reference_owner(ref), git_reference_name(ref)) < 0)
215 216
		return -1;

217
	numentries = git_reflog_entrycount(reflog);
218 219

	if (search_by_pos) {
220 221
		if (numentries < identifier + 1)
			goto notfound;
222 223

		entry = git_reflog_entry_byindex(reflog, identifier);
224
		git_oid_cpy(oid, git_reflog_entry_id_new(entry));
225
	} else {
226
		size_t i;
227
		git_time commit_time;
228

229
		for (i = 0; i < numentries; i++) {
230 231
			entry = git_reflog_entry_byindex(reflog, i);
			commit_time = git_reflog_entry_committer(entry)->when;
232 233

			if (commit_time.time > (git_time_t)identifier)
234
				continue;
235

236
			git_oid_cpy(oid, git_reflog_entry_id_new(entry));
237
			break;
238 239
		}

240 241
		if (i == numentries)
			goto notfound;
242
	}
243

244
	git_reflog_free(reflog);
245 246 247 248 249
	return 0;

notfound:
	giterr_set(
		GITERR_REFERENCE,
250
		"reflog for '%s' has only %"PRIuZ" entries, asked for %"PRIuZ,
251 252 253 254
		git_reference_name(ref), numentries, identifier);

	git_reflog_free(reflog);
	return GIT_ENOTFOUND;
255
}
256

257
static int retrieve_revobject_from_reflog(git_object **out, git_reference **base_ref, git_repository *repo, const char *identifier, size_t position)
258 259 260 261
{
	git_reference *ref;
	git_oid oid;
	int error = -1;
262

263
	if (*base_ref == NULL) {
264
		if ((error = git_reference_dwim(&ref, repo, identifier)) < 0)
265 266 267 268 269
			return error;
	} else {
		ref = *base_ref;
		*base_ref = NULL;
	}
270

271
	if (position == 0) {
272
		error = git_object_lookup(out, repo, git_reference_target(ref), GIT_OBJECT_ANY);
273 274
		goto cleanup;
	}
275

276 277
	if ((error = retrieve_oid_from_reflog(&oid, ref, position)) < 0)
		goto cleanup;
278

279
	error = git_object_lookup(out, repo, &oid, GIT_OBJECT_ANY);
280 281 282 283 284 285 286 287 288 289 290 291

cleanup:
	git_reference_free(ref);
	return error;
}

static int retrieve_remote_tracking_reference(git_reference **base_ref, const char *identifier, git_repository *repo)
{
	git_reference *tracking, *ref;
	int error = -1;

	if (*base_ref == NULL) {
292
		if ((error = git_reference_dwim(&ref, repo, identifier)) < 0)
293 294 295 296
			return error;
	} else {
		ref = *base_ref;
		*base_ref = NULL;
297 298
	}

299 300 301 302 303
	if (!git_reference_is_branch(ref)) {
		error = GIT_EINVALIDSPEC;
		goto cleanup;
	}

304
	if ((error = git_branch_upstream(&tracking, ref)) < 0)
305
		goto cleanup;
306

307 308
	*base_ref = tracking;

309
cleanup:
310 311 312 313
	git_reference_free(ref);
	return error;
}

314
static int handle_at_syntax(git_object **out, git_reference **ref, const char *spec, size_t identifier_len, git_repository* repo, const char *curly_braces_content)
315 316
{
	bool is_numeric;
317
	int parsed = 0, error = -1;
318 319 320 321 322 323 324 325 326 327 328
	git_buf identifier = GIT_BUF_INIT;
	git_time_t timestamp;

	assert(*out == NULL);

	if (git_buf_put(&identifier, spec, identifier_len) < 0)
		return -1;

	is_numeric = !try_parse_numeric(&parsed, curly_braces_content);

	if (*curly_braces_content == '-' && (!is_numeric || parsed == 0)) {
329
		error = GIT_EINVALIDSPEC;
330 331 332 333 334
		goto cleanup;
	}

	if (is_numeric) {
		if (parsed < 0)
335
			error = retrieve_previously_checked_out_branch_or_revision(out, ref, repo, git_buf_cstr(&identifier), -parsed);
336 337 338 339 340 341 342 343 344 345 346 347 348 349 350
		else
			error = retrieve_revobject_from_reflog(out, ref, repo, git_buf_cstr(&identifier), parsed);

		goto cleanup;
	}

	if (!strcmp(curly_braces_content, "u") || !strcmp(curly_braces_content, "upstream")) {
		error = retrieve_remote_tracking_reference(ref, git_buf_cstr(&identifier), repo);

		goto cleanup;
	}

	if (git__date_parse(&timestamp, curly_braces_content) < 0)
		goto cleanup;

351
	error = retrieve_revobject_from_reflog(out, ref, repo, git_buf_cstr(&identifier), (size_t)timestamp);
352 353

cleanup:
354
	git_buf_dispose(&identifier);
355
	return error;
356 357
}

358
static git_object_t parse_obj_type(const char *str)
359
{
360
	if (!strcmp(str, "commit"))
361
		return GIT_OBJECT_COMMIT;
362 363

	if (!strcmp(str, "tree"))
364
		return GIT_OBJECT_TREE;
365

366
	if (!strcmp(str, "blob"))
367
		return GIT_OBJECT_BLOB;
368 369

	if (!strcmp(str, "tag"))
370
		return GIT_OBJECT_TAG;
371

372
	return GIT_OBJECT_BAD;
373 374
}

375
static int dereference_to_non_tag(git_object **out, git_object *obj)
376
{
377
	if (git_object_type(obj) == GIT_OBJECT_TAG)
378
		return git_tag_peel(out, (git_tag *)obj);
379

380
	return git_object_dup(out, obj);
381
}
382

383 384 385 386
static int handle_caret_parent_syntax(git_object **out, git_object *obj, int n)
{
	git_object *temp_commit = NULL;
	int error;
387

388
	if ((error = git_object_peel(&temp_commit, obj, GIT_OBJECT_COMMIT)) < 0)
389 390
		return (error == GIT_EAMBIGUOUS || error == GIT_ENOTFOUND) ?
			GIT_EINVALIDSPEC : error;
391 392

	if (n == 0) {
393
		*out = temp_commit;
394 395 396
		return 0;
	}

397
	error = git_commit_parent((git_commit **)out, (git_commit*)temp_commit, n - 1);
398

399 400
	git_object_free(temp_commit);
	return error;
401
}
402

403
static int handle_linear_syntax(git_object **out, git_object *obj, int n)
404
{
405 406
	git_object *temp_commit = NULL;
	int error;
407

408
	if ((error = git_object_peel(&temp_commit, obj, GIT_OBJECT_COMMIT)) < 0)
409 410
		return (error == GIT_EAMBIGUOUS || error == GIT_ENOTFOUND) ?
			GIT_EINVALIDSPEC : error;
411

412
	error = git_commit_nth_gen_ancestor((git_commit **)out, (git_commit*)temp_commit, n);
413

414 415
	git_object_free(temp_commit);
	return error;
416 417
}

418 419
static int handle_colon_syntax(
	git_object **out,
420 421
	git_object *obj,
	const char *path)
422
{
423
	git_object *tree;
424 425
	int error = -1;
	git_tree_entry *entry = NULL;
426

427
	if ((error = git_object_peel(&tree, obj, GIT_OBJECT_TREE)) < 0)
428
		return error == GIT_ENOTFOUND ? GIT_EINVALIDSPEC : error;
429

430 431 432 433
	if (*path == '\0') {
		*out = tree;
		return 0;
	}
434

435 436 437 438 439 440 441
	/*
	 * TODO: Handle the relative path syntax
	 * (:./relative/path and :../relative/path)
	 */
	if ((error = git_tree_entry_bypath(&entry, (git_tree *)tree, path)) < 0)
		goto cleanup;

442
	error = git_tree_entry_to_object(out, git_object_owner(tree), entry);
443

444 445
cleanup:
	git_tree_entry_free(entry);
446
	git_object_free(tree);
447 448

	return error;
449 450
}

451
static int walk_and_search(git_object **out, git_revwalk *walk, regex_t *regex)
452
{
453 454 455
	int error;
	git_oid oid;
	git_object *obj;
456

457
	while (!(error = git_revwalk_next(&oid, walk))) {
458

459
		error = git_object_lookup(&obj, git_revwalk_repository(walk), &oid, GIT_OBJECT_COMMIT);
460
		if ((error < 0) && (error != GIT_ENOTFOUND))
461 462 463 464 465 466 467 468
			return -1;

		if (!regexec(regex, git_commit_message((git_commit*)obj), 0, NULL, 0)) {
			*out = obj;
			return 0;
		}

		git_object_free(obj);
469 470
	}

Russell Belfer committed
471
	if (error < 0 && error == GIT_ITEROVER)
472 473 474 475 476 477 478 479 480
		error = GIT_ENOTFOUND;

	return error;
}

static int handle_grep_syntax(git_object **out, git_repository *repo, const git_oid *spec_oid, const char *pattern)
{
	regex_t preg;
	git_revwalk *walk = NULL;
481
	int error;
482

483 484
	if ((error = build_regex(&preg, pattern)) < 0)
		return error;
485

486
	if ((error = git_revwalk_new(&walk, repo)) < 0)
487 488 489 490 491
		goto cleanup;

	git_revwalk_sorting(walk, GIT_SORT_TIME);

	if (spec_oid == NULL) {
492
		if ((error = git_revwalk_push_glob(walk, "refs/*")) < 0)
493
			goto cleanup;
494
	} else if ((error = git_revwalk_push(walk, spec_oid)) < 0)
495 496 497
			goto cleanup;

	error = walk_and_search(out, walk, &preg);
498

499 500 501 502 503 504 505 506 507
cleanup:
	regfree(&preg);
	git_revwalk_free(walk);

	return error;
}

static int handle_caret_curly_syntax(git_object **out, git_object *obj, const char *curly_braces_content)
{
508
	git_object_t expected_type;
509 510 511 512 513 514 515 516 517

	if (*curly_braces_content == '\0')
		return dereference_to_non_tag(out, obj);

	if (*curly_braces_content == '/')
		return handle_grep_syntax(out, git_object_owner(obj), git_object_id(obj), curly_braces_content + 1);

	expected_type = parse_obj_type(curly_braces_content);

518
	if (expected_type == GIT_OBJECT_BAD)
519
		return GIT_EINVALIDSPEC;
520

521
	return git_object_peel(out, obj, expected_type);
522 523
}

524
static int extract_curly_braces_content(git_buf *buf, const char *spec, size_t *pos)
525 526 527 528 529 530 531 532
{
	git_buf_clear(buf);

	assert(spec[*pos] == '^' || spec[*pos] == '@');

	(*pos)++;

	if (spec[*pos] == '\0' || spec[*pos] != '{')
533
		return GIT_EINVALIDSPEC;
534 535 536 537 538

	(*pos)++;

	while (spec[*pos] != '}') {
		if (spec[*pos] == '\0')
539
			return GIT_EINVALIDSPEC;
540 541 542 543 544 545 546 547 548

		git_buf_putc(buf, spec[(*pos)++]);
	}

	(*pos)++;

	return 0;
}

549
static int extract_path(git_buf *buf, const char *spec, size_t *pos)
550 551 552 553 554 555 556 557 558 559 560 561 562 563 564
{
	git_buf_clear(buf);

	assert(spec[*pos] == ':');

	(*pos)++;

	if (git_buf_puts(buf, spec + *pos) < 0)
		return -1;

	*pos += git_buf_len(buf);

	return 0;
}

565
static int extract_how_many(int *n, const char *spec, size_t *pos)
566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581
{
	const char *end_ptr;
	int parsed, accumulated;
	char kind = spec[*pos];

	assert(spec[*pos] == '^' || spec[*pos] == '~');

	accumulated = 0;

	do {
		do {
			(*pos)++;
			accumulated++;
		} while (spec[(*pos)] == kind && kind == '~');

		if (git__isdigit(spec[*pos])) {
582
			if (git__strntol32(&parsed, spec + *pos, strlen(spec + *pos), &end_ptr, 10) < 0)
583
				return GIT_EINVALIDSPEC;
584 585 586

			accumulated += (parsed - 1);
			*pos = end_ptr - spec;
587
		}
588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603

	} 	while (spec[(*pos)] == kind && kind == '~');

	*n = accumulated;

	return 0;
}

static int object_from_reference(git_object **object, git_reference *reference)
{
	git_reference *resolved = NULL;
	int error;

	if (git_reference_resolve(&resolved, reference) < 0)
		return -1;

604
	error = git_object_lookup(object, reference->db->repo, git_reference_target(resolved), GIT_OBJECT_ANY);
605 606 607 608 609
	git_reference_free(resolved);

	return error;
}

610
static int ensure_base_rev_loaded(git_object **object, git_reference **reference, const char *spec, size_t identifier_len, git_repository *repo, bool allow_empty_identifier)
611 612 613 614 615 616 617
{
	int error;
	git_buf identifier = GIT_BUF_INIT;

	if (*object != NULL)
		return 0;

618 619
	if (*reference != NULL)
		return object_from_reference(object, *reference);
620

621
	if (!allow_empty_identifier && identifier_len == 0)
622
		return GIT_EINVALIDSPEC;
623 624 625 626

	if (git_buf_put(&identifier, spec, identifier_len) < 0)
		return -1;

627
	error = revparse_lookup_object(object, reference, repo, git_buf_cstr(&identifier));
628
	git_buf_dispose(&identifier);
629 630 631 632

	return error;
}

633
static int ensure_base_rev_is_not_known_yet(git_object *object)
634 635 636 637
{
	if (object == NULL)
		return 0;

638
	return GIT_EINVALIDSPEC;
639 640
}

641
static bool any_left_hand_identifier(git_object *object, git_reference *reference, size_t identifier_len)
642 643 644 645 646 647 648 649 650 651 652 653 654
{
	if (object != NULL)
		return true;

	if (reference != NULL)
		return true;

	if (identifier_len > 0)
		return true;

	return false;
}

655
static int ensure_left_hand_identifier_is_not_known_yet(git_object *object, git_reference *reference)
656
{
657
	if (!ensure_base_rev_is_not_known_yet(object) && reference == NULL)
658 659
		return 0;

660
	return GIT_EINVALIDSPEC;
661 662
}

663 664 665
int revparse__ext(
	git_object **object_out,
	git_reference **reference_out,
Russell Belfer committed
666
	size_t *identifier_len_out,
667 668
	git_repository *repo,
	const char *spec)
669
{
670
	size_t pos = 0, identifier_len = 0;
671 672 673 674 675
	int error = -1, n;
	git_buf buf = GIT_BUF_INIT;

	git_reference *reference = NULL;
	git_object *base_rev = NULL;
676

677 678
	bool should_return_reference = true;

679
	assert(object_out && reference_out && repo && spec);
680

681 682
	*object_out = NULL;
	*reference_out = NULL;
683

684
	while (spec[pos]) {
685 686
		switch (spec[pos]) {
		case '^':
687 688
			should_return_reference = false;

689
			if ((error = ensure_base_rev_loaded(&base_rev, &reference, spec, identifier_len, repo, false)) < 0)
690
				goto cleanup;
691

692 693
			if (spec[pos+1] == '{') {
				git_object *temp_object = NULL;
694

695 696
				if ((error = extract_curly_braces_content(&buf, spec, &pos)) < 0)
					goto cleanup;
697

698 699 700 701 702
				if ((error = handle_caret_curly_syntax(&temp_object, base_rev, git_buf_cstr(&buf))) < 0)
					goto cleanup;

				git_object_free(base_rev);
				base_rev = temp_object;
703
			} else {
704 705 706 707 708 709 710 711 712 713
				git_object *temp_object = NULL;

				if ((error = extract_how_many(&n, spec, &pos)) < 0)
					goto cleanup;

				if ((error = handle_caret_parent_syntax(&temp_object, base_rev, n)) < 0)
					goto cleanup;

				git_object_free(base_rev);
				base_rev = temp_object;
714 715 716
			}
			break;

717 718 719 720
		case '~':
		{
			git_object *temp_object = NULL;

721 722
			should_return_reference = false;

723 724 725
			if ((error = extract_how_many(&n, spec, &pos)) < 0)
				goto cleanup;

726
			if ((error = ensure_base_rev_loaded(&base_rev, &reference, spec, identifier_len, repo, false)) < 0)
727 728 729 730 731 732 733
				goto cleanup;

			if ((error = handle_linear_syntax(&temp_object, base_rev, n)) < 0)
				goto cleanup;

			git_object_free(base_rev);
			base_rev = temp_object;
734
			break;
735
		}
736

737 738 739 740
		case ':':
		{
			git_object *temp_object = NULL;

741 742
			should_return_reference = false;

743 744 745 746
			if ((error = extract_path(&buf, spec, &pos)) < 0)
				goto cleanup;

			if (any_left_hand_identifier(base_rev, reference, identifier_len)) {
747
				if ((error = ensure_base_rev_loaded(&base_rev, &reference, spec, identifier_len, repo, true)) < 0)
748 749 750 751
					goto cleanup;

				if ((error = handle_colon_syntax(&temp_object, base_rev, git_buf_cstr(&buf))) < 0)
					goto cleanup;
752
			} else {
753 754 755 756 757 758 759 760 761
				if (*git_buf_cstr(&buf) == '/') {
					if ((error = handle_grep_syntax(&temp_object, repo, NULL, git_buf_cstr(&buf) + 1)) < 0)
						goto cleanup;
				} else {

					/*
					 * TODO: support merge-stage path lookup (":2:Makefile")
					 * and plain index blob lookup (:i-am/a/blob)
					 */
762
					giterr_set(GITERR_INVALID, "unimplemented");
763 764 765
					error = GIT_ERROR;
					goto cleanup;
				}
766
			}
767 768 769

			git_object_free(base_rev);
			base_rev = temp_object;
770
			break;
771 772 773
		}

		case '@':
774 775
			if (spec[pos+1] == '{') {
				git_object *temp_object = NULL;
776

777 778
				if ((error = extract_curly_braces_content(&buf, spec, &pos)) < 0)
					goto cleanup;
779

780
				if ((error = ensure_base_rev_is_not_known_yet(base_rev)) < 0)
781
					goto cleanup;
782

783 784
				if ((error = handle_at_syntax(&temp_object, &reference, spec, identifier_len, repo, git_buf_cstr(&buf))) < 0)
					goto cleanup;
785

786 787 788 789
				if (temp_object != NULL)
					base_rev = temp_object;
				break;
			}
790
			/* fall through */
791

792
		default:
793
			if ((error = ensure_left_hand_identifier_is_not_known_yet(base_rev, reference)) < 0)
794 795 796 797
				goto cleanup;

			pos++;
			identifier_len++;
798
		}
799
	}
800

801
	if ((error = ensure_base_rev_loaded(&base_rev, &reference, spec, identifier_len, repo, false)) < 0)
802 803
		goto cleanup;

804 805 806 807 808
	if (!should_return_reference) {
		git_reference_free(reference);
		reference = NULL;
	}

809 810 811
	*object_out = base_rev;
	*reference_out = reference;
	*identifier_len_out = identifier_len;
812
	error = 0;
813

814
cleanup:
815 816 817
	if (error) {
		if (error == GIT_EINVALIDSPEC)
			giterr_set(GITERR_INVALID,
818
				"failed to parse revision specifier - Invalid pattern '%s'", spec);
819

820
		git_object_free(base_rev);
821
		git_reference_free(reference);
822
	}
823

824
	git_buf_dispose(&buf);
825
	return error;
826
}
827

828 829 830 831 832 833
int git_revparse_ext(
	git_object **object_out,
	git_reference **reference_out,
	git_repository *repo,
	const char *spec)
{
Russell Belfer committed
834 835
	int error;
	size_t identifier_len;
836 837 838 839 840 841 842 843
	git_object *obj = NULL;
	git_reference *ref = NULL;

	if ((error = revparse__ext(&obj, &ref, &identifier_len, repo, spec)) < 0)
		goto cleanup;

	*object_out = obj;
	*reference_out = ref;
Russell Belfer committed
844
	GIT_UNUSED(identifier_len);
845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875

	return 0;

cleanup:
	git_object_free(obj);
	git_reference_free(ref);
	return error;
}

int git_revparse_single(git_object **out, git_repository *repo, const char *spec)
{
	int error;
	git_object *obj = NULL;
	git_reference *ref = NULL;

	*out = NULL;

	if ((error = git_revparse_ext(&obj, &ref, repo, spec)) < 0)
		goto cleanup;

	git_reference_free(ref);

	*out = obj;

	return 0;

cleanup:
	git_object_free(obj);
	git_reference_free(ref);
	return error;
}
876 877

int git_revparse(
878
	git_revspec *revspec,
Vicent Marti committed
879 880
	git_repository *repo,
	const char *spec)
881
{
882
	const char *dotdot;
883 884
	int error = 0;

885
	assert(revspec && repo && spec);
Vicent Marti committed
886

887
	memset(revspec, 0x0, sizeof(*revspec));
888 889 890 891

	if ((dotdot = strstr(spec, "..")) != NULL) {
		char *lstr;
		const char *rstr;
892
		revspec->flags = GIT_REVPARSE_RANGE;
893

894 895 896 897 898 899 900 901 902 903 904
		/*
		 * Following git.git, don't allow '..' because it makes command line
		 * arguments which can be either paths or revisions ambiguous when the
		 * path is almost certainly intended. The empty range '...' is still
		 * allowed.
		 */
		if (!git__strcmp(spec, "..")) {
			giterr_set(GITERR_INVALID, "Invalid pattern '..'");
			return GIT_EINVALIDSPEC;
		}

Vicent Marti committed
905
		lstr = git__substrdup(spec, dotdot - spec);
906 907
		rstr = dotdot + 2;
		if (dotdot[2] == '.') {
908
			revspec->flags |= GIT_REVPARSE_MERGE_BASE;
909 910 911
			rstr++;
		}

912 913 914 915 916 917 918 919 920 921 922
		error = git_revparse_single(
			&revspec->from,
			repo,
			*lstr == '\0' ? "HEAD" : lstr);

		if (!error) {
			error = git_revparse_single(
				&revspec->to,
				repo,
				*rstr == '\0' ? "HEAD" : rstr);
		}
923 924

		git__free((void*)lstr);
925
	} else {
926 927
		revspec->flags = GIT_REVPARSE_SINGLE;
		error = git_revparse_single(&revspec->from, repo, spec);
928 929 930 931
	}

	return error;
}