From patchwork Mon May 18 09:40:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Xin X-Patchwork-Id: 11555107 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2A27A912 for ; Mon, 18 May 2020 09:41:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 11A792067D for ; Mon, 18 May 2020 09:41:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KeTutA5z" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727033AbgERJlC (ORCPT ); Mon, 18 May 2020 05:41:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40766 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726040AbgERJk4 (ORCPT ); Mon, 18 May 2020 05:40:56 -0400 Received: from mail-pf1-x443.google.com (mail-pf1-x443.google.com [IPv6:2607:f8b0:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 46BC1C05BD0A for ; Mon, 18 May 2020 02:40:55 -0700 (PDT) Received: by mail-pf1-x443.google.com with SMTP id x15so4725306pfa.1 for ; Mon, 18 May 2020 02:40:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NgN08Y/WSi9FjGpomYVlS4LjrxrGYEcSKW7hYGM81OM=; b=KeTutA5zQm5sBBey6OvnxIh7pjz3vlxMjSE5Ly0T3wPR5752V+geue+1Lyo+I4uIIq sywWHGtxqGwJY0jM+l35He8voLGzXh84T4fZDl0iSoXxe3ErC0bGtKPSiNoymQtpFYpQ aMOgmTD6bfdgSeWz6HpUaM8BBxzJK3ZcymZenjiFAu0wE35X7y9upsTf0KlNplpX3Pna bRjBLUmnYSgeQ1R4MDE4/2/bg+lGLSNqjogHCnm/EgNkVHtUIsNXGF5xu7iJY8E6RecT KlRpynPANvcTIdBsjbW+v45o4xXXahJpOHFmSpbtoINdfQShuSBkHuRN7LD8ZB6pgpdC SrVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NgN08Y/WSi9FjGpomYVlS4LjrxrGYEcSKW7hYGM81OM=; b=eo3ieHhf4jarnhbPEPe9/thFdY2aJb8BJyYe0AYJ0MRHGwnT72+SpXqqPCS4bpuaJT ksC8Q6imwZLiBNcnyaxekQog1HLwUpjCAsdOBQlkiOy6xM3AfQTlDCYCtu2KwfA5hSft zLCLoftTUQZeoBHkb1bd7tZiHxIy3+LS7MDM8cyGdKx6Rc2ONZ3dgJFqSJnb5jzPbiN4 ax1qkgLSGR2gJiNcCXl0eh7w1tps51mLDaYkWCDkhySkkMagb3Zz1k1XN5nnsVg00AxI Z6XGrErzWlCajrLKxYi4ZkhXjR/IHcxtbMtP1O/cWIBVF2rlUj0Nhyd/i38si/oxypUv 010A== X-Gm-Message-State: AOAM533gabWtECyXcSS5PnVHf+G3/ug+r3W4EKZgyfKyAhM8AnNPT2qu bfvCe0glVzpjO7c4RUnZcCpJTxHM X-Google-Smtp-Source: ABdhPJwsw+R7HuqK7J8q7AiAPiKqBJWngTDinlMPzjH5xfoClkpNXrKIj0lRDgD1ZUniAUfPVTic8w== X-Received: by 2002:a62:b501:: with SMTP id y1mr16393554pfe.307.1589794854811; Mon, 18 May 2020 02:40:54 -0700 (PDT) Received: from tigtog.localdomain.localdomain ([144.34.163.219]) by smtp.gmail.com with ESMTPSA id e1sm8119867pjv.54.2020.05.18.02.40.54 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 May 2020 02:40:54 -0700 (PDT) From: Jiang Xin To: Junio C Hamano , Jeff King , Git List Cc: Jiang Xin Subject: [PATCH v16 05/11] doc: add document for capability report-status-v2 Date: Mon, 18 May 2020 05:40:33 -0400 Message-Id: <20200518094039.757-6-worldhello.net@gmail.com> X-Mailer: git-send-email 2.26.0.rc0 In-Reply-To: <20200507161057.12690-1-worldhello.net@gmail.com> References: <20200507161057.12690-1-worldhello.net@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Jiang Xin Add ABNF notation for capability 'report-status-v2' which extends capability 'report-status' by adding additional option lines. Signed-off-by: Jiang Xin --- Documentation/technical/pack-protocol.txt | 43 +++++++++++++++++-- .../technical/protocol-capabilities.txt | 17 ++++++-- 2 files changed, 54 insertions(+), 6 deletions(-) diff --git a/Documentation/technical/pack-protocol.txt b/Documentation/technical/pack-protocol.txt index d5ce4eea8a..7547b9ca89 100644 --- a/Documentation/technical/pack-protocol.txt +++ b/Documentation/technical/pack-protocol.txt @@ -503,8 +503,8 @@ The reference discovery phase is done nearly the same way as it is in the fetching protocol. Each reference obj-id and name on the server is sent in packet-line format to the client, followed by a flush-pkt. The only real difference is that the capability listing is different - the only -possible values are 'report-status', 'delete-refs', 'ofs-delta' and -'push-options'. +possible values are 'report-status', 'report-status-v2', 'delete-refs', +'ofs-delta', 'atomic' and 'push-options'. Reference Update Request and Packfile Transfer ---------------------------------------------- @@ -625,7 +625,7 @@ Report Status ------------- After receiving the pack data from the sender, the receiver sends a -report if 'report-status' capability is in effect. +report if 'report-status' or 'report-status-v2' capability is in effect. It is a short listing of what happened in that update. It will first list the status of the packfile unpacking as either 'unpack ok' or 'unpack [error]'. Then it will list the status for each of the references @@ -647,6 +647,43 @@ update was successful, or 'ng [refname] [error]' if the update was not. error-msg = 1*(OCTET) ; where not "ok" ---- +New capability "report-status-v2" extends the protocol by adding new option +lines in order to support reporting of reference rewritten by the +"proc-receive" hook. The "proc-receive" hook may handle a command for a +pseudo-reference which may create or update one or more references, and each +reference may have different name, different new-oid, and different old-oid. + +---- + report-status-v2 = unpack-status + 1*(command-status-v2) + flush-pkt + + unpack-status = PKT-LINE("unpack" SP unpack-result) + unpack-result = "ok" / error-msg + + command-status-v2 = command-ok-v2 / command-fail-v2 + command-ok-v2 = command-ok + *option-line + command-fail-v2 = command-fail + *option-line + + command-ok = PKT-LINE("ok" SP refname) + command-fail = PKT-LINE("ng" SP refname SP error-msg) + + error-msg = 1*(OCTET) ; where not "ok" + + option-line = *1(option-refname) + *1(option-old-oid) + *1(option-new-oid) + *1(option-forced-update) + + option-refname = PKT-LINE("option" SP "refname" SP refname) + option-old-oid = PKT-LINE("option" SP "old-oid" SP obj-id) + option-new-oid = PKT-LINE("option" SP "new-oid" SP obj-id) + option-force = PKT-LINE("option" SP "forced-update") + +---- + Updates can be unsuccessful for a number of reasons. The reference can have changed since the reference discovery phase was originally sent, meaning someone pushed in the meantime. The reference being pushed could be a diff --git a/Documentation/technical/protocol-capabilities.txt b/Documentation/technical/protocol-capabilities.txt index 2b267c0da6..91fd976094 100644 --- a/Documentation/technical/protocol-capabilities.txt +++ b/Documentation/technical/protocol-capabilities.txt @@ -22,9 +22,9 @@ was sent. Server MUST NOT ignore capabilities that client requested and server advertised. As a consequence of these rules, server MUST NOT advertise capabilities it does not understand. -The 'atomic', 'report-status', 'delete-refs', 'quiet', and 'push-cert' -capabilities are sent and recognized by the receive-pack (push to server) -process. +The 'atomic', 'report-status', 'report-status-v2', 'delete-refs', 'quiet', +and 'push-cert' capabilities are sent and recognized by the receive-pack +(push to server) process. The 'ofs-delta' and 'side-band-64k' capabilities are sent and recognized by both upload-pack and receive-pack protocols. The 'agent' capability @@ -269,6 +269,17 @@ each reference was updated successfully. If any of those were not successful, it will send back an error message. See pack-protocol.txt for example messages. +report-status-v2 +---------------- + +Capability 'report-status-v2' extends capability 'report-status' by +adding new option lines in order to support reference rewritten by +the"proc-receive" hook. The "proc-receive" hook may handle a command +for a pseudo-reference which may create or update a reference with +different name, new-oid, and old-oid. While the capability +"report-status" cannot report for such case. See pack-protocol.txt +for details. + delete-refs -----------