Define a new transaction update type, UPDATE_LOG, and a new function transaction_update_reflog. This function will lock the reflog and append an entry to it during transaction commit. Signed-off-by: Ronnie Sahlberg <sahlberg@xxxxxxxxxx> --- refs.c | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- refs.h | 12 ++++++++ 2 files changed, 112 insertions(+), 1 deletion(-) diff --git a/refs.c b/refs.c index e951f34..9db5896 100644 --- a/refs.c +++ b/refs.c @@ -3410,6 +3410,7 @@ int for_each_reflog(each_ref_fn fn, void *cb_data) enum transaction_update_type { UPDATE_SHA1 = 0, + UPDATE_LOG = 1, }; /** @@ -3427,6 +3428,12 @@ struct ref_update { struct ref_lock *lock; int type; char *msg; + + /* used by reflog updates */ + int reflog_fd; + struct lock_file reflog_lock; + char *committer; + const char refname[FLEX_ARRAY]; }; @@ -3476,6 +3483,7 @@ void transaction_free(struct ref_transaction *transaction) for (i = 0; i < transaction->nr; i++) { free(transaction->updates[i]->msg); + free(transaction->updates[i]->committer); free(transaction->updates[i]); } free(transaction->updates); @@ -3496,6 +3504,42 @@ static struct ref_update *add_update(struct ref_transaction *transaction, return update; } +int transaction_update_reflog(struct ref_transaction *transaction, + const char *refname, + const unsigned char *new_sha1, + const unsigned char *old_sha1, + const unsigned char *email, + unsigned long timestamp, int tz, + const char *msg, int flags, + struct strbuf *err) +{ + struct ref_update *update; + + if (transaction->state != REF_TRANSACTION_OPEN) + die("BUG: update_reflog called for transaction that is not " + "open"); + + update = add_update(transaction, refname, UPDATE_LOG); + hashcpy(update->new_sha1, new_sha1); + hashcpy(update->old_sha1, old_sha1); + update->reflog_fd = -1; + if (email) { + struct strbuf buf = STRBUF_INIT; + char sign = (tz < 0) ? '-' : '+'; + int zone = (tz < 0) ? (-tz) : tz; + + strbuf_addf(&buf, "%s %lu %c%04d", email, timestamp, sign, + zone); + update->committer = xstrdup(buf.buf); + strbuf_release(&buf); + } + if (msg) + update->msg = xstrdup(msg); + update->flags = flags; + + return 0; +} + int transaction_update_sha1(struct ref_transaction *transaction, const char *refname, const unsigned char *new_sha1, @@ -3662,7 +3706,28 @@ int transaction_commit(struct ref_transaction *transaction, } } - /* Perform updates first so live commits remain referenced */ + /* Lock all reflog files */ + for (i = 0; i < n; i++) { + struct ref_update *update = updates[i]; + + if (update->update_type != UPDATE_LOG) + continue; + update->reflog_fd = hold_lock_file_for_append( + &update->reflog_lock, + git_path("logs/%s", update->refname), + 0); + if (update->reflog_fd < 0) { + const char *str = "Cannot lock reflog for '%s'. %s"; + + ret = -1; + if (err) + strbuf_addf(err, str, update->refname, + strerror(errno)); + goto cleanup; + } + } + + /* Perform ref updates first so live commits remain referenced */ for (i = 0; i < n; i++) { struct ref_update *update = updates[i]; @@ -3698,6 +3763,40 @@ int transaction_commit(struct ref_transaction *transaction, } } + /* Update all reflog files */ + for (i = 0; i < n; i++) { + struct ref_update *update = updates[i]; + + if (update->update_type != UPDATE_LOG) + continue; + if (update->reflog_fd == -1) + continue; + + if (log_ref_write_fd(update->reflog_fd, update->old_sha1, + update->new_sha1, + update->committer, update->msg)) { + error("Could write to reflog: %s. %s", + update->refname, strerror(errno)); + rollback_lock_file(&update->reflog_lock); + update->reflog_fd = -1; + } + } + + /* Commit all reflog files */ + for (i = 0; i < n; i++) { + struct ref_update *update = updates[i]; + + if (update->update_type != UPDATE_LOG) + continue; + if (update->reflog_fd == -1) + continue; + if (commit_lock_file(&update->reflog_lock)) { + error("Could not commit reflog: %s. %s", + update->refname, strerror(errno)); + update->reflog_fd = -1; + } + } + if (repack_without_refs(delnames, delnum, err)) ret = -1; for (i = 0; i < delnum; i++) diff --git a/refs.h b/refs.h index 07bd621..5f4deef 100644 --- a/refs.h +++ b/refs.h @@ -327,6 +327,18 @@ int transaction_delete_sha1(struct ref_transaction *transaction, struct strbuf *err); /* + * Append a reflog entry for refname. + */ +int transaction_update_reflog(struct ref_transaction *transaction, + const char *refname, + const unsigned char *new_sha1, + const unsigned char *old_sha1, + const unsigned char *email, + unsigned long timestamp, int tz, + const char *msg, int flags, + struct strbuf *err); + +/* * Commit all of the changes that have been queued in transaction, as * atomically as possible. Return a nonzero value if there is a * problem. -- 2.0.0.770.gd892650.dirty -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html