From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefan Beller Subject: [PATCH v3 10/14] reflog.c: use a reflog transaction when writing during expire Date: Mon, 17 Nov 2014 17:35:46 -0800 Message-ID: <1416274550-2827-11-git-send-email-sbeller@google.com> References: <1416274550-2827-1-git-send-email-sbeller@google.com> Cc: Ronnie Sahlberg , Jonathan Nieder , Stefan Beller To: git@vger.kernel.org, gitster@pobox.com, mhagger@alum.mit.edu X-From: git-owner@vger.kernel.org Tue Nov 18 02:36:45 2014 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XqXim-0000S9-OK for gcvg-git-2@plane.gmane.org; Tue, 18 Nov 2014 02:36:45 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753567AbaKRBgg (ORCPT ); Mon, 17 Nov 2014 20:36:36 -0500 Received: from mail-ie0-f173.google.com ([209.85.223.173]:50214 "EHLO mail-ie0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753425AbaKRBgI (ORCPT ); Mon, 17 Nov 2014 20:36:08 -0500 Received: by mail-ie0-f173.google.com with SMTP id y20so6257958ier.4 for ; Mon, 17 Nov 2014 17:36:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=4AI1mmzToLTBkzA+VrN+krflYToI9nPnhjAFPP/8FS4=; b=bwsJOy7aaNBiNjoZ0UC3W8m0jkNvyTpBch3GC1Q4SJiW2XmMsmWt21ivhv76TzBi36 Al5MArY03IT5zDrdAM/rlCKat+9aYsgFCfrre7Yle8iaLKD0Rv7etzWEKWUBRsJcoYYZ wfoLQJcBKaH1NUG+3n1aA0CPg0noO7pGzoIFFnhWtkr7nT4bT4EWDvjJojeGDstBUEsP 0lOB89uQ6yfAdUD0EtdhM0G3DLUPRC+kRgnmifguYnKGGOsbrVboXPodQbVEEvTlzeDd 2dmdu9nxuwhW6rpS5JbNG1EOxNa4gtF0B/wJq1pTQyQKJxNQ3kl6dED5Mw6IaitHMnOU iR2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=4AI1mmzToLTBkzA+VrN+krflYToI9nPnhjAFPP/8FS4=; b=OZ2jI4tJ9zrTKZo2nDsxkDicUWtgETyQTmwCtZfmPVDuLAlTJwLVxya+BPyJ6xiruo aOlYmS9xiaef4HNyGOt2DPMs5NmpuOylogW8z2zoalVL21ErHIZNEAGF9uQ257KyFjx7 K3UZr/Pup621xODZZAO2VCIrdmoLWSYq8cNT4vkyux1quFvvm0Nx2EKvjXzxJnzepf9i 66KUDgyzguQGDsUbImikOjoAeCBDP5VfLBnX2yOXbovLrFGSgPZ2sgKUcI1E6hZNGr0O kP/BQPrEGs16gjujYc/R/Hc+XYy9MT5dE2vniwu+nEenBYKPECrEO6McWPPi/lIpScJk 3z6w== X-Gm-Message-State: ALoCoQlH1wKzOSuwe9fj0xvi7MC5NHd9csLgeGgxQbeg9NOagHEuBqk81VsdtthgxG8t9nqGdB7i X-Received: by 10.42.197.136 with SMTP id ek8mr31064987icb.41.1416274567444; Mon, 17 Nov 2014 17:36:07 -0800 (PST) Received: from localhost ([2620:0:1000:5b00:c9d9:b6de:cff4:3fc7]) by mx.google.com with ESMTPSA id i11sm6854973igf.21.2014.11.17.17.36.06 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 17 Nov 2014 17:36:06 -0800 (PST) X-Mailer: git-send-email 2.2.0.rc2.5.gf7b9fb2 In-Reply-To: <1416274550-2827-1-git-send-email-sbeller@google.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Ronnie Sahlberg Use a transaction for all updates during expire_reflog. Signed-off-by: Ronnie Sahlberg Signed-off-by: Jonathan Nieder Signed-off-by: Stefan Beller --- builtin/reflog.c | 85 ++++++++++++++++++++++++-------------------------------- refs.c | 4 +-- refs.h | 2 +- 3 files changed, 40 insertions(+), 51 deletions(-) diff --git a/builtin/reflog.c b/builtin/reflog.c index 2d85d26..6bb7454 100644 --- a/builtin/reflog.c +++ b/builtin/reflog.c @@ -32,8 +32,11 @@ struct cmd_reflog_expire_cb { int recno; }; +static struct strbuf err = STRBUF_INIT; + struct expire_reflog_cb { - FILE *newlog; + struct transaction *t; + const char *refname; enum { UE_NORMAL, UE_ALWAYS, @@ -316,20 +319,18 @@ static int expire_reflog_ent(unsigned char *osha1, unsigned char *nsha1, if (cb->cmd->recno && --(cb->cmd->recno) == 0) goto prune; - if (cb->newlog) { - char sign = (tz < 0) ? '-' : '+'; - int zone = (tz < 0) ? (-tz) : tz; - fprintf(cb->newlog, "%s %s %s %lu %c%04d\t%s", - sha1_to_hex(osha1), sha1_to_hex(nsha1), - email, timestamp, sign, zone, - message); + if (cb->t) { + if (transaction_update_reflog(cb->t, cb->refname, nsha1, osha1, + email, timestamp, tz, message, 0, + &err)) + return -1; hashcpy(cb->last_kept_sha1, nsha1); } if (cb->cmd->verbose) printf("keep %s", message); return 0; prune: - if (!cb->newlog) + if (!cb->t) printf("would prune %s", message); else if (cb->cmd->verbose) printf("prune %s", message); @@ -353,29 +354,26 @@ static int expire_reflog(const char *ref, const unsigned char *sha1, int unused, { struct cmd_reflog_expire_cb *cmd = cb_data; struct expire_reflog_cb cb; - struct ref_lock *lock; - char *log_file, *newlog_path = NULL; struct commit *tip_commit; struct commit_list *tips; int status = 0; memset(&cb, 0, sizeof(cb)); + cb.refname = ref; - /* - * we take the lock for the ref itself to prevent it from - * getting updated. - */ - lock = lock_any_ref_for_update(ref, sha1, 0, NULL); - if (!lock) - return error("cannot lock ref '%s'", ref); - log_file = git_pathdup("logs/%s", ref); if (!reflog_exists(ref)) goto finish; - if (!cmd->dry_run) { - newlog_path = git_pathdup("logs/%s.lock", ref); - cb.newlog = fopen(newlog_path, "w"); + cb.t = transaction_begin(&err); + if (!cb.t) { + status |= error("%s", err.buf); + goto cleanup; + } + if (transaction_update_reflog(cb.t, cb.refname, null_sha1, null_sha1, + NULL, 0, 0, NULL, REFLOG_TRUNCATE, + &err)) { + status |= error("%s", err.buf); + goto cleanup; } - cb.cmd = cmd; if (!cmd->expire_unreachable || !strcmp(ref, "HEAD")) { @@ -407,7 +405,10 @@ static int expire_reflog(const char *ref, const unsigned char *sha1, int unused, mark_reachable(&cb); } - for_each_reflog_ent(ref, expire_reflog_ent, &cb); + if (for_each_reflog_ent(ref, expire_reflog_ent, &cb)) { + status |= error("%s", err.buf); + goto cleanup; + } if (cb.unreachable_expire_kind != UE_ALWAYS) { if (cb.unreachable_expire_kind == UE_HEAD) { @@ -420,32 +421,20 @@ static int expire_reflog(const char *ref, const unsigned char *sha1, int unused, } } finish: - if (cb.newlog) { - if (fclose(cb.newlog)) { - status |= error("%s: %s", strerror(errno), - newlog_path); - unlink(newlog_path); - } else if (cmd->updateref && - (write_in_full(lock->lock_fd, - sha1_to_hex(cb.last_kept_sha1), 40) != 40 || - write_str_in_full(lock->lock_fd, "\n") != 1 || - close_ref(lock) < 0)) { - status |= error("Couldn't write %s", - lock->lk->filename.buf); - unlink(newlog_path); - } else if (rename(newlog_path, log_file)) { - status |= error("cannot rename %s to %s", - newlog_path, log_file); - unlink(newlog_path); - } else if (cmd->updateref && commit_ref(lock)) { - status |= error("Couldn't set %s", lock->ref_name); - } else { - adjust_shared_perm(log_file); + if (!cmd->dry_run) { + if (cmd->updateref && + transaction_update_ref(cb.t, cb.refname, + cb.last_kept_sha1, sha1, + 0, 1, NULL, &err)) { + status |= error("%s", err.buf); + goto cleanup; } + if (transaction_commit(cb.t, &err)) + status |= error("%s", err.buf); } - free(newlog_path); - free(log_file); - unlock_ref(lock); + cleanup: + transaction_free(cb.t); + strbuf_release(&err); return status; } diff --git a/refs.c b/refs.c index 0fb4196..1571fa5 100644 --- a/refs.c +++ b/refs.c @@ -3622,7 +3622,7 @@ int transaction_update_reflog(struct transaction *transaction, const char *refname, const unsigned char *new_sha1, const unsigned char *old_sha1, - const unsigned char *email, + const char *email, unsigned long timestamp, int tz, const char *msg, int flags, struct strbuf *err) @@ -3903,7 +3903,7 @@ int transaction_commit(struct transaction *transaction, /* * Update all reflog files - * We have already done all ref updates and deletes. + * We have already committed all ref updates and deletes. * There is not much we can do here if there are any reflog * update errors other than complain. */ diff --git a/refs.h b/refs.h index bf96b36..9f70b89 100644 --- a/refs.h +++ b/refs.h @@ -343,7 +343,7 @@ int transaction_update_reflog(struct transaction *transaction, const char *refname, const unsigned char *new_sha1, const unsigned char *old_sha1, - const unsigned char *email, + const char *email, unsigned long timestamp, int tz, const char *msg, int flags, struct strbuf *err); -- 2.2.0.rc2.5.gf7b9fb2