proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-29 15:10:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implementing rev-parse's "ref~2" syntax.

Browse Source 
Also extended the test suite to include chaining
operators, e.g. "master^2~3^4".
This commit is contained in:
Ben Straub 2012-04-27 14:11:12 -07:00
parent e0887d8178
commit 38533d5acf
2 changed files with 71 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/revparse.c
View File

@ -260,6 +260,45 @@ static int handle_caret_syntax(git_object **out, git_object *obj, const char *mo
return 0; return 0;
} }
static int handle_linear_syntax(git_object **out, git_object *obj, const char *movement)
{
git_commit *commit1, *commit2;
int i, n;
/* Dereference until we reach a commit. */
if (dereference_to_type(&obj, obj, GIT_OBJ_COMMIT) < 0) {
/* Can't dereference to a commit; fail */
return GIT_ERROR;
}
/* "~" is the same as "~1" */
if (strlen(movement) == 0) {
n = 1;
} else {
git__strtol32(&n, movement, NULL, 0);
}
commit1 = (git_commit*)obj;
/* "~0" just returns the input */
if (n == 0) {
*out = obj;
return 0;
}
for (i=0; i<n; i++) {
if (git_commit_parent(&commit2, commit1, 0) < 0) {
return GIT_ERROR;
}
if (commit1 != (git_commit*)obj) {
git_commit_free(commit1);
}
commit1 = commit2;
}
*out = (git_object*)commit1;
return 0;
}
int git_revparse_single(git_object **out, git_repository *repo, const char *spec) int git_revparse_single(git_object **out, git_repository *repo, const char *spec)
{ {
revparse_state current_state = REVPARSE_STATE_INIT; revparse_state current_state = REVPARSE_STATE_INIT;
@ -327,8 +366,18 @@ int git_revparse_single(git_object **out, git_repository *repo, const char *spec
case REVPARSE_STATE_LINEAR: case REVPARSE_STATE_LINEAR:
if (!*spec_cur) { if (!*spec_cur) {
retcode = handle_linear_syntax(out, cur_obj, git_buf_cstr(&stepbuffer));
next_state = REVPARSE_STATE_DONE;
} else if (*spec_cur == '~') { } else if (*spec_cur == '~') {
retcode = handle_linear_syntax(&next_obj, cur_obj, git_buf_cstr(&stepbuffer));
git_buf_clear(&stepbuffer);
if (retcode < 0) {
next_state = REVPARSE_STATE_DONE;
}
} else if (*spec_cur == '^') { } else if (*spec_cur == '^') {
retcode = handle_linear_syntax(&next_obj, cur_obj, git_buf_cstr(&stepbuffer));
git_buf_clear(&stepbuffer);
next_state = !retcode ? REVPARSE_STATE_CARET : REVPARSE_STATE_DONE;
} else { } else {
git_buf_putc(&stepbuffer, *spec_cur); git_buf_putc(&stepbuffer, *spec_cur);
} }

22
tests-clar/refs/revparse.c
View File

@ -109,6 +109,28 @@ void test_refs_revparse__to_type(void)
cl_git_fail(git_revparse_single(&g_obj, g_repo, "wrapped_tag^{blob}")); cl_git_fail(git_revparse_single(&g_obj, g_repo, "wrapped_tag^{blob}"));
} }
void test_refs_revparse__linear_history(void)
{
cl_git_pass(git_revparse_single(&g_obj, g_repo, "master~0"));
oid_str_cmp(g_obj, "a65fedf39aefe402d3bb6e24df4d4f5fe4547750");
cl_git_pass(git_revparse_single(&g_obj, g_repo, "master~1"));
oid_str_cmp(g_obj, "be3563ae3f795b2b4353bcce3a527ad0a4f7f644");
cl_git_pass(git_revparse_single(&g_obj, g_repo, "master~2"));
oid_str_cmp(g_obj, "9fd738e8f7967c078dceed8190330fc8648ee56a");
cl_git_pass(git_revparse_single(&g_obj, g_repo, "master~1~1"));
oid_str_cmp(g_obj, "9fd738e8f7967c078dceed8190330fc8648ee56a");
}
void test_refs_revparse__chaining(void)
{
cl_git_pass(git_revparse_single(&g_obj, g_repo, "master~1^1"));
oid_str_cmp(g_obj, "9fd738e8f7967c078dceed8190330fc8648ee56a");
cl_git_pass(git_revparse_single(&g_obj, g_repo, "master~1^2"));
oid_str_cmp(g_obj, "c47800c7266a2be04c571c04d5a6614691ea99bd");
cl_git_pass(git_revparse_single(&g_obj, g_repo, "master^1^2~1"));
oid_str_cmp(g_obj, "5b5b025afb0b4c913b4c338a42934a3863bf3644");
}
void test_refs_revparse__reflog(void) void test_refs_revparse__reflog(void)
{ {
/* TODO: how to create a fixture for this? git_reflog_write? */ /* TODO: how to create a fixture for this? git_reflog_write? */