Commit c327d5db8b62e42f62a0b9e54b61b5f857036ca5
2014-10-09T16:29:30
transaction: rename lock() to lock_ref() This leaves space for future expansion to locking other resources without having to change the API for references.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99
diff --git a/include/git2/transaction.h b/include/git2/transaction.h
index d5d7cb4..64abb0c 100644
--- a/include/git2/transaction.h
+++ b/include/git2/transaction.h
@@ -32,7 +32,7 @@ GIT_EXTERN(int) git_transaction_new(git_transaction **out, git_repository *repo)
* @param refname the reference to lock
* @return 0 or an error message
*/
-GIT_EXTERN(int) git_transaction_lock(git_transaction *tx, const char *refname);
+GIT_EXTERN(int) git_transaction_lock_ref(git_transaction *tx, const char *refname);
/**
* Set the target of a reference
diff --git a/src/stash.c b/src/stash.c
index ea4ba1a..cad87d1 100644
--- a/src/stash.c
+++ b/src/stash.c
@@ -611,7 +611,7 @@ int git_stash_drop(
if ((error = git_transaction_new(&tx, repo)) < 0)
return error;
- if ((error = git_transaction_lock(tx, GIT_REFS_STASH_FILE)) < 0)
+ if ((error = git_transaction_lock_ref(tx, GIT_REFS_STASH_FILE)) < 0)
goto cleanup;
if ((error = git_reference_lookup(&stash, repo, GIT_REFS_STASH_FILE)) < 0)
diff --git a/src/transaction.c b/src/transaction.c
index b515dea..ebb943c 100644
--- a/src/transaction.c
+++ b/src/transaction.c
@@ -80,7 +80,7 @@ on_error:
return error;
}
-int git_transaction_lock(git_transaction *tx, const char *refname)
+int git_transaction_lock_ref(git_transaction *tx, const char *refname)
{
int error;
transaction_node *node;
diff --git a/tests/refs/transactions.c b/tests/refs/transactions.c
index 5284ea8..39ea1ca 100644
--- a/tests/refs/transactions.c
+++ b/tests/refs/transactions.c
@@ -23,7 +23,7 @@ void test_refs_transactions__single_ref_oid(void)
git_oid_fromstr(&id, "a65fedf39aefe402d3bb6e24df4d4f5fe4547750");
- cl_git_pass(git_transaction_lock(g_tx, "refs/heads/master"));
+ cl_git_pass(git_transaction_lock_ref(g_tx, "refs/heads/master"));
cl_git_pass(git_transaction_set_target(g_tx, "refs/heads/master", &id, NULL, NULL));
cl_git_pass(git_transaction_commit(g_tx));
@@ -37,7 +37,7 @@ void test_refs_transactions__single_ref_symbolic(void)
{
git_reference *ref;
- cl_git_pass(git_transaction_lock(g_tx, "HEAD"));
+ cl_git_pass(git_transaction_lock_ref(g_tx, "HEAD"));
cl_git_pass(git_transaction_set_symbolic_target(g_tx, "HEAD", "refs/heads/foo", NULL, NULL));
cl_git_pass(git_transaction_commit(g_tx));
@@ -54,8 +54,8 @@ void test_refs_transactions__single_ref_mix_types(void)
git_oid_fromstr(&id, "a65fedf39aefe402d3bb6e24df4d4f5fe4547750");
- cl_git_pass(git_transaction_lock(g_tx, "refs/heads/master"));
- cl_git_pass(git_transaction_lock(g_tx, "HEAD"));
+ cl_git_pass(git_transaction_lock_ref(g_tx, "refs/heads/master"));
+ cl_git_pass(git_transaction_lock_ref(g_tx, "HEAD"));
cl_git_pass(git_transaction_set_symbolic_target(g_tx, "refs/heads/master", "refs/heads/foo", NULL, NULL));
cl_git_pass(git_transaction_set_target(g_tx, "HEAD", &id, NULL, NULL));
cl_git_pass(git_transaction_commit(g_tx));
@@ -73,7 +73,7 @@ void test_refs_transactions__single_ref_delete(void)
{
git_reference *ref;
- cl_git_pass(git_transaction_lock(g_tx, "refs/heads/master"));
+ cl_git_pass(git_transaction_lock_ref(g_tx, "refs/heads/master"));
cl_git_pass(git_transaction_remove(g_tx, "refs/heads/master"));
cl_git_pass(git_transaction_commit(g_tx));
@@ -88,7 +88,7 @@ void test_refs_transactions__single_create(void)
cl_git_fail_with(GIT_ENOTFOUND, git_reference_lookup(&ref, g_repo, name));
- cl_git_pass(git_transaction_lock(g_tx, name));
+ cl_git_pass(git_transaction_lock_ref(g_tx, name));
git_oid_fromstr(&id, "a65fedf39aefe402d3bb6e24df4d4f5fe4547750");
cl_git_pass(git_transaction_set_target(g_tx, name, &id, NULL, NULL));
@@ -103,7 +103,7 @@ void test_refs_transactions__unlocked_set(void)
{
git_oid id;
- cl_git_pass(git_transaction_lock(g_tx, "refs/heads/master"));
+ cl_git_pass(git_transaction_lock_ref(g_tx, "refs/heads/master"));
git_oid_fromstr(&id, "a65fedf39aefe402d3bb6e24df4d4f5fe4547750");
cl_git_fail_with(GIT_ENOTFOUND, git_transaction_set_target(g_tx, "refs/heads/foo", &id, NULL, NULL));
cl_git_pass(git_transaction_commit(g_tx));