From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ronnie Sahlberg Subject: [PATCH v7 03/42] refs.c: add a strbuf argument to ref_transaction_commit for error logging Date: Wed, 14 May 2014 14:16:37 -0700 Message-ID: <1400102236-30082-4-git-send-email-sahlberg@google.com> References: <1400102236-30082-1-git-send-email-sahlberg@google.com> Cc: mhagger@alum.mit.edu, Ronnie Sahlberg To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Wed May 14 23:21:42 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 1WkgcO-00024e-Ti for gcvg-git-2@plane.gmane.org; Wed, 14 May 2014 23:21:41 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753801AbaENVVa (ORCPT ); Wed, 14 May 2014 17:21:30 -0400 Received: from mail-ie0-f201.google.com ([209.85.223.201]:47197 "EHLO mail-ie0-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752775AbaENVRU (ORCPT ); Wed, 14 May 2014 17:17:20 -0400 Received: by mail-ie0-f201.google.com with SMTP id rp18so41003iec.2 for ; Wed, 14 May 2014 14:17:20 -0700 (PDT) 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=JIZIebmZS6T7EMJeUIfTcEs6iJpgG9mk5jCnBxW82ko=; b=hYrDYYZyUkJ51nOULdJVK6bOPDCe6ElkQ+k42OzChKVlGRY+Caa60tCO+vht+1jPka cVOGLzOkfTMKfmVKfdaEjIELsccmbFeQISlxClYOjurv9rWrEn3Rw/9CBUhQYPFK9Ooi g4Ko3eoCTmGB9T570zPgG44dhuRZpDHXKPYXJ7buKSfoegiK028fp0fudPQFWPEKzsWQ /7htZo4yYausWZ8N4d7kJDOug3G5/JyYemrwOrHzllPX7KEKXXRjc2ZdDgbEruwNln5U YDI0D8+qLZX7yw4i273NyoPFZki/P/ygFhrByLk6yEyg1Sx4EbcjPH6llwCu73tWfwlB xyVg== 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=JIZIebmZS6T7EMJeUIfTcEs6iJpgG9mk5jCnBxW82ko=; b=TNXI5yh55M7x/XYcfbWBvrgrrpla+mLobZujQqHEhhtQky8208+TsVZAlEzVrldi4U t2PIP9UHLfZY8kklKZzjXMhzbA92c+drCfI/1tUvUlZmuMkMAMhu5mycQGy10LLANqA4 cyMzVc/1OB08UdD44ws8JKggrXhAkKhqpWLz753j9mxoq5+nYUpnGkCwxvv631kJGQJA wBlvy9n39xi/n7tJLv5YHurBQDK8gXWS/kAEcA5gEi+d8+6DS8BMCIS4IqUVkPYKHOzz 52XQDsxmK1nEmKnuOTJjhUH4QIFuZh+5GGY5uiwGWBKjhvE+FXD4zSTLQdYlMl3yMQuw PPrg== X-Gm-Message-State: ALoCoQkLnCoFrRxXmo1VC6uZD9aM/zdBDS2/38AJjuxeiwSOp4bYoyFOU+cSEiC/R+J3xx5WO8Mp X-Received: by 10.42.50.9 with SMTP id y9mr2259064icf.1.1400102240355; Wed, 14 May 2014 14:17:20 -0700 (PDT) Received: from corp2gmr1-2.hot.corp.google.com (corp2gmr1-2.hot.corp.google.com [172.24.189.93]) by gmr-mx.google.com with ESMTPS id a44si144557yhb.6.2014.05.14.14.17.20 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 14 May 2014 14:17:20 -0700 (PDT) Received: from sahlberg1.mtv.corp.google.com (sahlberg1.mtv.corp.google.com [172.27.69.52]) by corp2gmr1-2.hot.corp.google.com (Postfix) with ESMTP id 2A0FC5A4292; Wed, 14 May 2014 14:17:20 -0700 (PDT) Received: by sahlberg1.mtv.corp.google.com (Postfix, from userid 177442) id E1D73E0973; Wed, 14 May 2014 14:17:19 -0700 (PDT) X-Mailer: git-send-email 2.0.0.rc3.471.g2055d11.dirty In-Reply-To: <1400102236-30082-1-git-send-email-sahlberg@google.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Add a strbuf argument to _commit so that we can pass an error string back to the caller. So that we can do error logging from the caller instead of from _commit. Longer term plan is to first convert all callers to use onerr==QUIET_ON_ERR and craft any log messages from the callers themselves and finally remove the onerr argument completely. Reviewed-by: Jonathan Nieder Signed-off-by: Ronnie Sahlberg --- builtin/update-ref.c | 2 +- refs.c | 6 +++++- refs.h | 5 ++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/builtin/update-ref.c b/builtin/update-ref.c index 405267f..aaa06aa 100644 --- a/builtin/update-ref.c +++ b/builtin/update-ref.c @@ -367,7 +367,7 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix) if (end_null) line_termination = '\0'; update_refs_stdin(); - ret = ref_transaction_commit(transaction, msg, + ret = ref_transaction_commit(transaction, msg, NULL, UPDATE_REFS_DIE_ON_ERR); return ret; } diff --git a/refs.c b/refs.c index 88d73c8..1a7f9d9 100644 --- a/refs.c +++ b/refs.c @@ -3423,7 +3423,8 @@ static int ref_update_reject_duplicates(struct ref_update **updates, int n, } int ref_transaction_commit(struct ref_transaction *transaction, - const char *msg, enum action_on_err onerr) + const char *msg, struct strbuf *err, + enum action_on_err onerr) { int ret = 0, delnum = 0, i; const char **delnames; @@ -3452,6 +3453,9 @@ int ref_transaction_commit(struct ref_transaction *transaction, update->flags, &update->type, onerr); if (!update->lock) { + if (err) + strbuf_addf(err, "Cannot lock the ref '%s'.", + update->refname); ret = 1; goto cleanup; } diff --git a/refs.h b/refs.h index 6d97700..25ae110 100644 --- a/refs.h +++ b/refs.h @@ -274,9 +274,12 @@ void ref_transaction_delete(struct ref_transaction *transaction, * Commit all of the changes that have been queued in transaction, as * atomically as possible. Return a nonzero value if there is a * problem. The ref_transaction is freed by this function. + * If err is non-NULL we will add an error string to it to explain why + * the transaction failed. The string does not end in newline. */ int ref_transaction_commit(struct ref_transaction *transaction, - const char *msg, enum action_on_err onerr); + const char *msg, struct strbuf *err, + enum action_on_err onerr); /** Lock a ref and then write its file */ int update_ref(const char *action, const char *refname, -- 2.0.0.rc3.471.g2055d11.dirty