From mboxrd@z Thu Jan 1 00:00:00 1970 From: Florian Achleitner Subject: [PATCH v6 06/16] Add documentation for the 'bidi-import' capability of remote-helpers Date: Wed, 22 Aug 2012 21:15:51 +0200 Message-ID: <1345662961-9587-7-git-send-email-florian.achleitner.2.6.31@gmail.com> References: <1345662961-9587-1-git-send-email-florian.achleitner.2.6.31@gmail.com> <1345662961-9587-2-git-send-email-florian.achleitner.2.6.31@gmail.com> <1345662961-9587-3-git-send-email-florian.achleitner.2.6.31@gmail.com> <1345662961-9587-4-git-send-email-florian.achleitner.2.6.31@gmail.com> <1345662961-9587-5-git-send-email-florian.achleitner.2.6.31@gmail.com> <1345662961-9587-6-git-send-email-florian.achleitner.2.6.31@gmail.com> Cc: Junio C Hamano , David Michael Barr , Jonathan Nieder , Florian Achleitner To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Wed Aug 22 21:17:32 2012 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 1T4GQl-0002J7-ID for gcvg-git-2@plane.gmane.org; Wed, 22 Aug 2012 21:17:32 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965073Ab2HVTRS (ORCPT ); Wed, 22 Aug 2012 15:17:18 -0400 Received: from mail-bk0-f46.google.com ([209.85.214.46]:46610 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965028Ab2HVTQl (ORCPT ); Wed, 22 Aug 2012 15:16:41 -0400 Received: by mail-bk0-f46.google.com with SMTP id j10so449679bkw.19 for ; Wed, 22 Aug 2012 12:16:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=vh4dlNy+nY9Pl3ZyyPrx9L+nGChyAd+TvlRlGuxc3QY=; b=ll+A1+skxYIm/SyNJRlag8525vMmqBavYNmkoDANG1+2bYxoVvktWUEneE+uh8zYP/ 8ImM2N8KrzkWxKk39k8jGBI3/SlVPohWrU02VpXBUml7SYjCz1Qjh0LvMhng9EluMo9x arFAQ/c7fiFfMk4xVp64+TiBclKY3ybOR37uN9ov66t0yXrH0bwCnyvftlVh0AKb0JF1 IKIn+rtHB9fT/P4FkQxIIAlRvZbPA6Sy32UgpR54ARlV3nlmg3hMbrhsvLENuvZpX2P7 yZacd0QgDmm+PLy9fxEW+weGgidsncTrKmxNccEWsslEJgAjZFe+yYdv6mKGSKfYv0B7 SXyg== Received: by 10.205.119.210 with SMTP id fv18mr6883633bkc.10.1345663000422; Wed, 22 Aug 2012 12:16:40 -0700 (PDT) Received: from localhost.localdomain (cm56-227-93.liwest.at. [86.56.227.93]) by mx.google.com with ESMTPS id ht18sm3346763bkc.16.2012.08.22.12.16.38 (version=SSLv3 cipher=OTHER); Wed, 22 Aug 2012 12:16:39 -0700 (PDT) X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1345662961-9587-6-git-send-email-florian.achleitner.2.6.31@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Signed-off-by: Florian Achleitner Signed-off-by: Junio C Hamano --- Documentation/git-remote-helpers.txt | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/Documentation/git-remote-helpers.txt b/Documentation/git-remote-helpers.txt index f5836e4..5ce4cda 100644 --- a/Documentation/git-remote-helpers.txt +++ b/Documentation/git-remote-helpers.txt @@ -98,6 +98,20 @@ advertised with this capability must cover all refs reported by the list command. If no 'refspec' capability is advertised, there is an implied `refspec *:*`. +'bidi-import':: + The fast-import commands 'cat-blob' and 'ls' can be used by remote-helpers + to retrieve information about blobs and trees that already exist in + fast-import's memory. This requires a channel from fast-import to the + remote-helper. + If it is advertised in addition to "import", git establishes a pipe from + fast-import to the remote-helper's stdin. + It follows that git and fast-import are both connected to the + remote-helper's stdin. Because git can send multiple commands to + the remote-helper it is required that helpers that use 'bidi-import' + buffer all 'import' commands of a batch before sending data to fast-import. + This is to prevent mixing commands and fast-import responses on the + helper's stdin. + Capabilities for Pushing ~~~~~~~~~~~~~~~~~~~~~~~~ 'connect':: @@ -286,7 +300,12 @@ terminated with a blank line. For each batch of 'import', the remote helper should produce a fast-import stream terminated by a 'done' command. + -Supported if the helper has the "import" capability. +Note that if the 'bidi-import' capability is used the complete batch +sequence has to be buffered before starting to send data to fast-import +to prevent mixing of commands and fast-import responses on the helper's +stdin. ++ +Supported if the helper has the 'import' capability. 'connect' :: Connects to given service. Standard input and standard output -- 1.7.9.5