@matheusbsbs / matheus-bagliano / commits / 6629ea2d4a

receive-pack.c: use a reference transaction for updating the refs

Wrap all the ref updates inside a transaction. In the new API there is no distinction between failure to lock and failure to write a ref. Both can be permanent (e.g., a ref "refs/heads/topic" is blocking creation of the lock file "refs/heads/topic/1.lock") or transient (e.g., file system full) and there's no clear difference in how the client should respond, so replace the two statuses "failed to lock" and "failed to write" with a single status "failed to update ref". In both cases a more detailed message is sent by sideband to diagnose the problem. Example, before: error: there are still refs under 'refs/heads/topic' remote: error: failed to lock refs/heads/topic To foo ! [remote rejected] HEAD -> topic (failed to lock) After: error: there are still refs under 'refs/heads/topic' remote: error: Cannot lock the ref 'refs/heads/topic'. To foo ! [remote rejected] HEAD -> topic (failed to update ref) Signed-off-by: Ronnie Sahlberg <sahlberg@google.com> Reviewed-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Ronnie Sahlberg committed Apr 28, 2014 at 14:36 UTC 6629ea2d4a5faa0a84367f6d4aedba53cb0f26b4

1 file changed +16 -9

builtin/receive-pack.c

+16 -9

@@ -475,7 +475,6 @@ static const char *update(struct command *cmd, struct shallow_info *si)

475 const char *namespaced_name;

476 unsigned char *old_sha1 = cmd->old_sha1;

477 unsigned char *new_sha1 = cmd->new_sha1;

478 - struct ref_lock *lock;

478

479 /* only refs/... are allowed */

480 if (!starts_with(name, "refs/") || check_refname_format(name + 5, 0)) {

@@ -576,19 +575,27 @@ static const char *update(struct command *cmd, struct shallow_info *si)

575 return NULL; /* good */

576 }

577 else {

578 + struct strbuf err = STRBUF_INIT;

579 + struct ref_transaction *transaction;

580 +

581 if (shallow_update && si->shallow_ref[cmd->index] &&

582 update_shallow_ref(cmd, si))

583 return "shallow error";

584

583 - lock = lock_any_ref_for_update(namespaced_name, old_sha1,

584 - 0, NULL);

585 - if (!lock) {

586 - rp_error("failed to lock %s", name);

587 - return "failed to lock";

588 - }

589 - if (write_ref_sha1(lock, new_sha1, "push")) {

590 - return "failed to write"; /* error() already called */

585 + transaction = ref_transaction_begin(&err);

586 + if (!transaction ||

587 + ref_transaction_update(transaction, namespaced_name,

588 + new_sha1, old_sha1, 0, 1, &err) ||

589 + ref_transaction_commit(transaction, "push", &err)) {

590 + ref_transaction_free(transaction);

591 +

592 + rp_error("%s", err.buf);

593 + strbuf_release(&err);

594 + return "failed to update ref";

595 }

596 +

597 + ref_transaction_free(transaction);

598 + strbuf_release(&err);

599 return NULL; /* good */

600 }

601 }