mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

receive-pack.c: move transaction handling in a central place

Browse Source 
This moves all code related to transactions into the
execute_commands_non_atomic function. This includes
beginning and committing the transaction as well as
dealing with the errors which may occur during the
begin and commit phase of a transaction.

No functional changes intended.

Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Stefan Beller
2015-01-07 19:23:18 -08:00
committed by Junio C Hamano
parent a1a261457c
commit 222368c645
1 changed files with 37 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
builtin/receive-pack.c
View File

@ -66,6 +66,7 @@ static const char *NONCE_SLOP = "SLOP";
static const char *nonce_status; static const char *nonce_status;
static long nonce_stamp_slop; static long nonce_stamp_slop;
static unsigned long nonce_stamp_slop_limit; static unsigned long nonce_stamp_slop_limit;
static struct ref_transaction *transaction;
static enum deny_action parse_deny_action(const char *var, const char *value) static enum deny_action parse_deny_action(const char *var, const char *value)
{ {
@ -821,6 +822,7 @@ static const char *update(struct command *cmd, struct shallow_info *si)
} }
if (is_null_sha1(new_sha1)) { if (is_null_sha1(new_sha1)) {
struct strbuf err = STRBUF_INIT;
if (!parse_object(old_sha1)) { if (!parse_object(old_sha1)) {
old_sha1 = NULL; old_sha1 = NULL;
if (ref_exists(name)) { if (ref_exists(name)) {
@ -830,35 +832,36 @@ static const char *update(struct command *cmd, struct shallow_info *si)
cmd->did_not_exist = 1; cmd->did_not_exist = 1;
} }
} }
if (delete_ref(namespaced_name, old_sha1, 0)) { if (ref_transaction_delete(transaction,
rp_error("failed to delete %s", name); namespaced_name,
old_sha1,
0, old_sha1 != NULL,
"push", &err)) {
rp_error("%s", err.buf);
strbuf_release(&err);
return "failed to delete"; return "failed to delete";
} }
strbuf_release(&err);
return NULL; /* good */ return NULL; /* good */
} }
else { else {
struct strbuf err = STRBUF_INIT; struct strbuf err = STRBUF_INIT;
struct ref_transaction *transaction;
if (shallow_update && si->shallow_ref[cmd->index] && if (shallow_update && si->shallow_ref[cmd->index] &&
update_shallow_ref(cmd, si)) update_shallow_ref(cmd, si))
return "shallow error"; return "shallow error";
transaction = ref_transaction_begin(&err); if (ref_transaction_update(transaction,
if (!transaction || namespaced_name,
ref_transaction_update(transaction, namespaced_name, new_sha1, old_sha1,
new_sha1, old_sha1, 0, 1, "push", 0, 1, "push",
&err) || &err)) {
ref_transaction_commit(transaction, &err)) {
ref_transaction_free(transaction);
rp_error("%s", err.buf); rp_error("%s", err.buf);
strbuf_release(&err); strbuf_release(&err);
return "failed to update ref"; return "failed to update ref";
} }
ref_transaction_free(transaction);
strbuf_release(&err); strbuf_release(&err);
return NULL; /* good */ return NULL; /* good */
} }
} }
@ -1068,12 +1071,32 @@ static void execute_commands_non_atomic(struct command *commands,
struct shallow_info *si) struct shallow_info *si)
{ {
struct command *cmd; struct command *cmd;
struct strbuf err = STRBUF_INIT;
for (cmd = commands; cmd; cmd = cmd->next) { for (cmd = commands; cmd; cmd = cmd->next) {
if (!should_process_cmd(cmd)) if (!should_process_cmd(cmd))
continue; continue;
transaction = ref_transaction_begin(&err);
if (!transaction) {
rp_error("%s", err.buf);
strbuf_reset(&err);
cmd->error_string = "transaction failed to start";
continue;
}
cmd->error_string = update(cmd, si); cmd->error_string = update(cmd, si);
if (!cmd->error_string
&& ref_transaction_commit(transaction, &err)) {
rp_error("%s", err.buf);
strbuf_reset(&err);
cmd->error_string = "failed to update ref";
}
ref_transaction_free(transaction);
} }
strbuf_release(&err);
} }
static void execute_commands(struct command *commands, static void execute_commands(struct command *commands,