From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.4 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 953221F404 for ; Wed, 14 Mar 2018 18:33:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752218AbeCNSdR (ORCPT ); Wed, 14 Mar 2018 14:33:17 -0400 Received: from mail-qt0-f202.google.com ([209.85.216.202]:42836 "EHLO mail-qt0-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752270AbeCNSdJ (ORCPT ); Wed, 14 Mar 2018 14:33:09 -0400 Received: by mail-qt0-f202.google.com with SMTP id n51so2722600qta.9 for ; Wed, 14 Mar 2018 11:33:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:date:in-reply-to:message-id:references:subject:from:to :cc; bh=z1wGl3UbC87JJW1KfvBvx2KAOZfMK/UXAquNniIOjqI=; b=sx/p0XhhiKhntJnjiT2xCknDXLNpeDt6q76EfhPuplJGojtrSuC/vrRfFj5dCCfm8D 7YFR/BOhwB3iFlfi7hBFFsTvZxjXA/7JRdLKdubfqJkeYibQTd3kKGCuKiVl7Vlur4pw ek5dwFhIGWR/JHJL65mutm75IG7oOLL1ZkBvrP0uHuyIukfTQEbYSLrct+l4y4HyDhMB O7Bmrg8p1/HwF/b/jCJTQRhDFUFdu9nNt8BUXofBhdDI3f2DVi+XkeeHaqGveEJdgmnB IntXz1YZL13r0hgUKsWJ5K4yha5Y//W+t2yuMHbCnie8hgNill18uD4APPQkWYnv4OnC fAOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:date:in-reply-to:message-id :references:subject:from:to:cc; bh=z1wGl3UbC87JJW1KfvBvx2KAOZfMK/UXAquNniIOjqI=; b=s5llrncaKwMaXpktdxtWsCMPI52BgwHqyxke59ucfu37S4V/7cyySeaheILME3wJlN /OL0yPZuMkmbJrjHdDcx4Y3vgNYnKP1Qrb85bjGkGmj2G7yFFBNGsDA/TbrI2NNxZYni 4qbkD8vLZ4E4VUbqkxhUIKhl2dBRi+1iFG4d9bLprEXrgrIdQVhoR949GvrOvMa05xA2 mtq/xrYgeL4yBnoW6EuL2doyXsL9RsgYoY2+/zMEDtsmBKcmif6JSqJS2AMhGSID4Xp4 f2FfdS84YfWq/nzPMfO/NbcUFAPhjzCJ2Ix1CdYVmzQhH6dWm1VXYX5zVi/5UvLIkiCG NQ8g== X-Gm-Message-State: AElRT7GOOzfJUh6QqleM+JLuBtc9FoHhyPW674kEzmWZnGpCxt9gvNis o1qR8gjOZBn6WH6mgbrU8u/+USj/VK3mTJzcji6XPaVgXdTuIQuRdJE2+wpHjX0ZC8NdsPWBI0/ xBI8ZE2EGxQuqoy1mNy71gctK7J3AhvIrGv4Xhw5QgVdd5ao3iYldk0Nm7w== X-Google-Smtp-Source: AG47ELvZ/doXcgfWsL39QBz8nmpq4bZcYcO/B77NE6UmiX9vGrekFmbfczKAQ3xqfqmFwX4yF8RzSG1Geo0= MIME-Version: 1.0 X-Received: by 10.55.103.132 with SMTP id b126mr1353857qkc.62.1521052388530; Wed, 14 Mar 2018 11:33:08 -0700 (PDT) Date: Wed, 14 Mar 2018 11:31:59 -0700 In-Reply-To: <20180314183213.223440-1-bmwill@google.com> Message-Id: <20180314183213.223440-23-bmwill@google.com> References: <20180314183213.223440-1-bmwill@google.com> X-Mailer: git-send-email 2.16.2.804.g6dcf76e118-goog Subject: [PATCH v5 22/35] fetch-pack: support shallow requests From: Brandon Williams To: git@vger.kernel.org Cc: git@jeffhostetler.com, gitster@pobox.com, jrnieder@gmail.com, pclouds@gmail.com, peff@peff.net, sbeller@google.com, stolee@gmail.com, jonathantanmy@google.com, Brandon Williams Content-Type: text/plain; charset="UTF-8" Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Enable shallow clones and deepen requests using protocol version 2 if the server 'fetch' command supports the 'shallow' feature. Signed-off-by: Brandon Williams --- connect.c | 22 ++++++++++++++++ connect.h | 2 ++ fetch-pack.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 94 insertions(+), 1 deletion(-) diff --git a/connect.c b/connect.c index e42d779f71..5bb9d34844 100644 --- a/connect.c +++ b/connect.c @@ -82,6 +82,28 @@ int server_supports_v2(const char *c, int die_on_error) return 0; } +int server_supports_feature(const char *c, const char *feature, + int die_on_error) +{ + int i; + + for (i = 0; i < server_capabilities_v2.argc; i++) { + const char *out; + if (skip_prefix(server_capabilities_v2.argv[i], c, &out) && + (!*out || *(out++) == '=')) { + if (parse_feature_request(out, feature)) + return 1; + else + break; + } + } + + if (die_on_error) + die("server doesn't support feature '%s'", feature); + + return 0; +} + static void process_capabilities_v2(struct packet_reader *reader) { while (packet_reader_read(reader) == PACKET_READ_NORMAL) diff --git a/connect.h b/connect.h index 8898d44952..0e69c6709c 100644 --- a/connect.h +++ b/connect.h @@ -17,5 +17,7 @@ struct packet_reader; extern enum protocol_version discover_version(struct packet_reader *reader); extern int server_supports_v2(const char *c, int die_on_error); +extern int server_supports_feature(const char *c, const char *feature, + int die_on_error); #endif diff --git a/fetch-pack.c b/fetch-pack.c index dffcfd66a5..837e1fd21d 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -1008,6 +1008,26 @@ static struct ref *do_fetch_pack(struct fetch_pack_args *args, return ref; } +static void add_shallow_requests(struct strbuf *req_buf, + const struct fetch_pack_args *args) +{ + if (is_repository_shallow()) + write_shallow_commits(req_buf, 1, NULL); + if (args->depth > 0) + packet_buf_write(req_buf, "deepen %d", args->depth); + if (args->deepen_since) { + timestamp_t max_age = approxidate(args->deepen_since); + packet_buf_write(req_buf, "deepen-since %"PRItime, max_age); + } + if (args->deepen_not) { + int i; + for (i = 0; i < args->deepen_not->nr; i++) { + struct string_list_item *s = args->deepen_not->items + i; + packet_buf_write(req_buf, "deepen-not %s", s->string); + } + } +} + static void add_wants(const struct ref *wants, struct strbuf *req_buf) { for ( ; wants ; wants = wants->next) { @@ -1093,6 +1113,12 @@ static int send_fetch_request(int fd_out, const struct fetch_pack_args *args, if (prefer_ofs_delta) packet_buf_write(&req_buf, "ofs-delta"); + /* Add shallow-info and deepen request */ + if (server_supports_feature("fetch", "shallow", 0)) + add_shallow_requests(&req_buf, args); + else if (is_repository_shallow() || args->deepen) + die(_("Server does not support shallow requests")); + /* add wants */ add_wants(wants, &req_buf); @@ -1122,7 +1148,7 @@ static int process_section_header(struct packet_reader *reader, int ret; if (packet_reader_peek(reader) != PACKET_READ_NORMAL) - die("error reading packet"); + die("error reading section header '%s'", section); ret = !strcmp(reader->line, section); @@ -1177,6 +1203,43 @@ static int process_acks(struct packet_reader *reader, struct oidset *common) return received_ready ? 2 : (received_ack ? 1 : 0); } +static void receive_shallow_info(struct fetch_pack_args *args, + struct packet_reader *reader) +{ + process_section_header(reader, "shallow-info", 0); + while (packet_reader_read(reader) == PACKET_READ_NORMAL) { + const char *arg; + struct object_id oid; + + if (skip_prefix(reader->line, "shallow ", &arg)) { + if (get_oid_hex(arg, &oid)) + die(_("invalid shallow line: %s"), reader->line); + register_shallow(&oid); + continue; + } + if (skip_prefix(reader->line, "unshallow ", &arg)) { + if (get_oid_hex(arg, &oid)) + die(_("invalid unshallow line: %s"), reader->line); + if (!lookup_object(oid.hash)) + die(_("object not found: %s"), reader->line); + /* make sure that it is parsed as shallow */ + if (!parse_object(&oid)) + die(_("error in object: %s"), reader->line); + if (unregister_shallow(&oid)) + die(_("no shallow found: %s"), reader->line); + continue; + } + die(_("expected shallow/unshallow, got %s"), reader->line); + } + + if (reader->status != PACKET_READ_FLUSH && + reader->status != PACKET_READ_DELIM) + die("error processing shallow info: %d", reader->status); + + setup_alternate_shallow(&shallow_lock, &alternate_shallow_file, NULL); + args->deepen = 1; +} + enum fetch_state { FETCH_CHECK_LOCAL = 0, FETCH_SEND_REQUEST, @@ -1209,6 +1272,8 @@ static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args, /* v2 supports these by default */ allow_unadvertised_object_request |= ALLOW_REACHABLE_SHA1; use_sideband = 2; + if (args->depth > 0 || args->deepen_since || args->deepen_not) + args->deepen = 1; if (marked) for_each_ref(clear_marks, NULL); @@ -1245,6 +1310,10 @@ static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args, } break; case FETCH_GET_PACK: + /* Check for shallow-info section */ + if (process_section_header(&reader, "shallow-info", 1)) + receive_shallow_info(args, &reader); + /* get the pack */ process_section_header(&reader, "packfile", 0); if (get_pack(args, fd, pack_lockfile)) -- 2.16.2.804.g6dcf76e118-goog