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

#include <assert.h>

#include "common.h"
#include "buffer.h"
12
#include "tree.h"
13
#include "refdb.h"
14

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

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

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

	return git_object_lookup_prefix(out, repo, &oid, speclen, GIT_OBJ_ANY);
}
26

27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43
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);
}

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

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

	error = regcomp(regex, pattern, REG_EXTENDED);
	if (!error)
		return 0;
56

57 58
	error = giterr_set_regex(regex, error);

59 60
	regfree(regex);

61
	return error;
62 63
}

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

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

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

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

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

	if (error)
82 83
		return GIT_ENOTFOUND;

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

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

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

99
	error = git_reference_dwim(&ref, repo, spec);
100
	if (!error) {
101 102 103 104 105 106 107

		error = git_object_lookup(
			object_out, repo, git_reference_target(ref), GIT_OBJ_ANY);

		if (!error)
			*reference_out = ref;

108
		return error;
109 110
	}

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

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

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

121
	giterr_set(GITERR_REFERENCE, "Revspec '%s' not found.", spec);
122
	return GIT_ENOTFOUND;
123 124
}

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

	if (git__strtol32(&content, curly_braces_content, &end_ptr, 10) < 0)
		return -1;
132

133 134
	if (*end_ptr != '\0')
		return -1;
135

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

140
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)
141
{
142
	git_reference *ref = NULL;
143
	git_reflog *reflog = NULL;
144
	regex_t preg;
145 146
	int error = -1;
	size_t i, numentries, cur;
147
	const git_reflog_entry *entry;
148 149
	const char *msg;
	regmatch_t regexmatches[2];
150 151
	git_buf buf = GIT_BUF_INIT;

152
	cur = position;
153

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

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

160 161
	if (git_reference_lookup(&ref, repo, GIT_HEAD_FILE) < 0)
		goto cleanup;
162

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

	numentries  = git_reflog_entrycount(reflog);

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

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

		cur--;

		if (cur > 0)
			continue;
181

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

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

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

190
		error = maybe_abbrev(out, repo, git_buf_cstr(&buf));
191 192 193

		goto cleanup;
	}
194

195 196 197 198 199 200 201 202 203 204
	error = GIT_ENOTFOUND;

cleanup:
	git_reference_free(ref);
	git_buf_free(&buf);
	regfree(&preg);
	git_reflog_free(reflog);
	return error;
}

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

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

215
	numentries = git_reflog_entrycount(reflog);
216 217

	if (search_by_pos) {
218 219
		if (numentries < identifier + 1)
			goto notfound;
220 221

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

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

			if (commit_time.time > (git_time_t)identifier)
232
				continue;
233

234
			git_oid_cpy(oid, git_reflog_entry_id_new(entry));
235
			break;
236 237
		}

238 239
		if (i == numentries)
			goto notfound;
240
	}
241

242
	git_reflog_free(reflog);
243 244 245 246 247 248 249 250 251 252
	return 0;

notfound:
	giterr_set(
		GITERR_REFERENCE,
		"Reflog for '%s' has only %"PRIuZ" entries, asked for %"PRIuZ,
		git_reference_name(ref), numentries, identifier);

	git_reflog_free(reflog);
	return GIT_ENOTFOUND;
253
}
254

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

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

269
	if (position == 0) {
270
		error = git_object_lookup(out, repo, git_reference_target(ref), GIT_OBJ_ANY);
271 272
		goto cleanup;
	}
273

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

277 278 279 280 281 282 283 284 285 286 287 288 289
	error = git_object_lookup(out, repo, &oid, GIT_OBJ_ANY);

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) {
290
		if ((error = git_reference_dwim(&ref, repo, identifier)) < 0)
291 292 293 294
			return error;
	} else {
		ref = *base_ref;
		*base_ref = NULL;
295 296
	}

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

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

305 306
	*base_ref = tracking;

307
cleanup:
308 309 310 311
	git_reference_free(ref);
	return error;
}

312
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)
313 314
{
	bool is_numeric;
315
	int parsed = 0, error = -1;
316 317 318 319 320 321 322 323 324 325 326
	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)) {
327
		error = GIT_EINVALIDSPEC;
328 329 330 331 332
		goto cleanup;
	}

	if (is_numeric) {
		if (parsed < 0)
333
			error = retrieve_previously_checked_out_branch_or_revision(out, ref, repo, git_buf_cstr(&identifier), -parsed);
334 335 336 337 338 339 340 341 342 343 344 345 346 347 348
		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;

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

cleanup:
	git_buf_free(&identifier);
	return error;
354 355
}

356 357
static git_otype parse_obj_type(const char *str)
{
358 359 360 361 362
	if (!strcmp(str, "commit"))
		return GIT_OBJ_COMMIT;

	if (!strcmp(str, "tree"))
		return GIT_OBJ_TREE;
363

364 365 366 367 368 369
	if (!strcmp(str, "blob"))
		return GIT_OBJ_BLOB;

	if (!strcmp(str, "tag"))
		return GIT_OBJ_TAG;

370
	return GIT_OBJ_BAD;
371 372
}

373
static int dereference_to_non_tag(git_object **out, git_object *obj)
374
{
375 376
	if (git_object_type(obj) == GIT_OBJ_TAG)
		return git_tag_peel(out, (git_tag *)obj);
377

378
	return git_object_dup(out, obj);
379
}
380

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

386 387 388
	if ((error = git_object_peel(&temp_commit, obj, GIT_OBJ_COMMIT)) < 0)
		return (error == GIT_EAMBIGUOUS || error == GIT_ENOTFOUND) ?
			GIT_EINVALIDSPEC : error;
389 390

	if (n == 0) {
391
		*out = temp_commit;
392 393 394
		return 0;
	}

395
	error = git_commit_parent((git_commit **)out, (git_commit*)temp_commit, n - 1);
396

397 398
	git_object_free(temp_commit);
	return error;
399
}
400

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

406 407 408
	if ((error = git_object_peel(&temp_commit, obj, GIT_OBJ_COMMIT)) < 0)
		return (error == GIT_EAMBIGUOUS || error == GIT_ENOTFOUND) ?
			GIT_EINVALIDSPEC : error;
409

410
	error = git_commit_nth_gen_ancestor((git_commit **)out, (git_commit*)temp_commit, n);
411

412 413
	git_object_free(temp_commit);
	return error;
414 415
}

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

425 426
	if ((error = git_object_peel(&tree, obj, GIT_OBJ_TREE)) < 0)
		return error == GIT_ENOTFOUND ? GIT_EINVALIDSPEC : error;
427

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

433 434 435 436 437 438 439
	/*
	 * 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;

440
	error = git_tree_entry_to_object(out, git_object_owner(tree), entry);
441

442 443
cleanup:
	git_tree_entry_free(entry);
444
	git_object_free(tree);
445 446

	return error;
447 448
}

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

455
	while (!(error = git_revwalk_next(&oid, walk))) {
456

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

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

		git_object_free(obj);
467 468
	}

Russell Belfer committed
469
	if (error < 0 && error == GIT_ITEROVER)
470 471 472 473 474 475 476 477 478
		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;
479
	int error;
480

481 482
	if ((error = build_regex(&preg, pattern)) < 0)
		return error;
483

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

	git_revwalk_sorting(walk, GIT_SORT_TIME);

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

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

497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516
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)
{
	git_otype expected_type;

	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);

	if (expected_type == GIT_OBJ_BAD)
517
		return GIT_EINVALIDSPEC;
518

519
	return git_object_peel(out, obj, expected_type);
520 521
}

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

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

	(*pos)++;

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

	(*pos)++;

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

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

	(*pos)++;

	return 0;
}

547
static int extract_path(git_buf *buf, const char *spec, size_t *pos)
548 549 550 551 552 553 554 555 556 557 558 559 560 561 562
{
	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;
}

563
static int extract_how_many(int *n, const char *spec, size_t *pos)
564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579
{
	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])) {
580
			if (git__strtol32(&parsed, spec + *pos, &end_ptr, 10) < 0)
581
				return GIT_EINVALIDSPEC;
582 583 584

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

	} 	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;

602
	error = git_object_lookup(object, reference->db->repo, git_reference_target(resolved), GIT_OBJ_ANY);
603 604 605 606 607
	git_reference_free(resolved);

	return error;
}

608
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)
609 610 611 612 613 614 615
{
	int error;
	git_buf identifier = GIT_BUF_INIT;

	if (*object != NULL)
		return 0;

616 617
	if (*reference != NULL)
		return object_from_reference(object, *reference);
618

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

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

625
	error = revparse_lookup_object(object, reference, repo, git_buf_cstr(&identifier));
626 627 628 629 630
	git_buf_free(&identifier);

	return error;
}

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

636
	return GIT_EINVALIDSPEC;
637 638
}

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

	if (reference != NULL)
		return true;

	if (identifier_len > 0)
		return true;

	return false;
}

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

658
	return GIT_EINVALIDSPEC;
659 660
}

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

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

675 676
	bool should_return_reference = true;

677
	assert(object_out && reference_out && repo && spec);
678

679 680
	*object_out = NULL;
	*reference_out = NULL;
681

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

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

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

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

696 697 698 699 700
				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;
701
			} else {
702 703 704 705 706 707 708 709 710 711
				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;
712 713 714
			}
			break;

715 716 717 718
		case '~':
		{
			git_object *temp_object = NULL;

719 720
			should_return_reference = false;

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

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

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

			git_object_free(base_rev);
			base_rev = temp_object;
732
			break;
733
		}
734

735 736 737 738
		case ':':
		{
			git_object *temp_object = NULL;

739 740
			should_return_reference = false;

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

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

				if ((error = handle_colon_syntax(&temp_object, base_rev, git_buf_cstr(&buf))) < 0)
					goto cleanup;
750
			} else {
751 752 753 754 755 756 757 758 759 760 761 762 763
				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)
					 */
					giterr_set(GITERR_INVALID, "Unimplemented");
					error = GIT_ERROR;
					goto cleanup;
				}
764
			}
765 766 767

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

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

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

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

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

785 786 787 788 789 790
				if (temp_object != NULL)
					base_rev = temp_object;
				break;
			} else {
				/* Fall through */
			}
791 792
		}

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

			pos++;
			identifier_len++;
799
		}
800
	}
801

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

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

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

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

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

825 826
	git_buf_free(&buf);
	return error;
827
}
828

829 830 831 832 833 834
int git_revparse_ext(
	git_object **object_out,
	git_reference **reference_out,
	git_repository *repo,
	const char *spec)
{
Russell Belfer committed
835 836
	int error;
	size_t identifier_len;
837 838 839 840 841 842 843 844
	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
845
	GIT_UNUSED(identifier_len);
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 876

	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;
}
877 878

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

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

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

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

Vicent Marti committed
895
		lstr = git__substrdup(spec, dotdot - spec);
896 897
		rstr = dotdot + 2;
		if (dotdot[2] == '.') {
898
			revspec->flags |= GIT_REVPARSE_MERGE_BASE;
899 900 901
			rstr++;
		}

902
		error = git_revparse_single(&revspec->from, repo, lstr);
903
		if (!error)
904
			error = git_revparse_single(&revspec->to, repo, rstr);
905 906

		git__free((void*)lstr);
907
	} else {
908 909
		revspec->flags = GIT_REVPARSE_SINGLE;
		error = git_revparse_single(&revspec->from, repo, spec);
910 911 912 913
	}

	return error;
}