From patchwork Tue Jul 27 00:41:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12401139 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BA9EDC432BE for ; Tue, 27 Jul 2021 00:42:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A4BBB60F93 for ; Tue, 27 Jul 2021 00:42:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234863AbhG0ABe (ORCPT ); Mon, 26 Jul 2021 20:01:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57912 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234786AbhG0ABW (ORCPT ); Mon, 26 Jul 2021 20:01:22 -0400 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1F20CC0613C1 for ; Mon, 26 Jul 2021 17:41:50 -0700 (PDT) Received: by mail-wm1-x32c.google.com with SMTP id u15-20020a05600c19cfb02902501bdb23cdso664192wmq.0 for ; Mon, 26 Jul 2021 17:41:50 -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=OGAju0jmn6Wk/whAvtdtn6iHkdPg4/dJ0aKJA+dE2D4=; b=GxaKVhdP1dIvF/w8LwnrHeGpXKwfOF53RlGi3s8TvVK2gum6NSiZLreQ9GW/t1Kc6x l/JWpdODGcMwmNON+Z18jSeT+9IpC/wDbpNlgfl9N4ZN3TF/+7HvGBvjA2ELm6YbgtVz EVj24zRRwm5b0/lbTW7el896+GHTrg7L0/UZ26QeQwZ4gFTKegrvpt7AE84ah48KJ1Am 6ebuQhVfFRSTWcEsIN7EBx8xD+BaLW/wR/cRC4nZlTxTJ+SZCoqS0JAfK/DODtIVzXbF HpuDaBfasuKxEU1Xf9M8guKLSJSjjNhQvcYk13i5cyeX0EYSfcMwcyjjYcEOU6tPURIr Iz2A== 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=OGAju0jmn6Wk/whAvtdtn6iHkdPg4/dJ0aKJA+dE2D4=; b=mmndhFdDKo5srqHUEnQtU7NehwqWtScwcKqEaRJ++l4/SLSHBTde3JJDb/N5wCm+ei W6O1+jA9DyzzIRciDO1K0N0p/YfHgDmbeWs2ecz5VGJTXi7qvC3fUZpyKzzlV+3Woa8/ YooxPdYZTGXgAuKjnSkT09Xzu6ZkWHK792FJnt4Nz/D4UhozsQcywO+QJCazzMWfZvxq oWCP/JnJAExAvZcym+LgZ3PKd1y9Vpnzxm/7SLLqKsMXXSUSDJLBpkMiVK0k9/AiL9Pg +HhCPpy+FZUuMrPFmyFCPRnLEPqVUPqa42JEvGMrOz7yqlU8HF1VEKm1JNj/swnphM5r zMSw== X-Gm-Message-State: AOAM530XUqYrliezpRwuI+QlHHsxfDReGV5jmL0o48uQt9WLaFWDj/Yf ISZoTc+KUPj4DvaObeSb4fyOGal6FWJzwg== X-Google-Smtp-Source: ABdhPJwlwTfgG6Ll/9Ff4ofBc3L/PpE0yI85YrWbMaLUz24ue/cxKy96hlJKLuLGg6rigtMY+kTT6A== X-Received: by 2002:a05:600c:3593:: with SMTP id p19mr19019731wmq.33.1627346508561; Mon, 26 Jul 2021 17:41:48 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id c16sm1254377wru.82.2021.07.26.17.41.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jul 2021 17:41:47 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBC?= =?utf-8?b?amFybWFzb24=?= Subject: [PATCH 1/4] bundle API: start writing API documentation Date: Tue, 27 Jul 2021 02:41:39 +0200 Message-Id: X-Mailer: git-send-email 2.32.0.988.g189fd9ae38 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org There are no other API docs in bundle.h, but this is at least a start. We'll add a parameter to this function in a subsequent commit, but let's start by documenting it. Signed-off-by: Ævar Arnfjörð Bjarmason --- bundle.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/bundle.h b/bundle.h index 1927d8cd6a..84a6df1b65 100644 --- a/bundle.h +++ b/bundle.h @@ -27,6 +27,13 @@ int create_bundle(struct repository *r, const char *path, int version); int verify_bundle(struct repository *r, struct bundle_header *header, int verbose); #define BUNDLE_VERBOSE 1 + +/** + * Unbundle after reading the header with read_bundle_header(). + * + * We'll invoke "git index-pack --stdin --fix-thin" for you on the + * provided `bundle_fd` from read_bundle_header(). + */ int unbundle(struct repository *r, struct bundle_header *header, int bundle_fd, int flags); int list_bundle_refs(struct bundle_header *header, From patchwork Tue Jul 27 00:41:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12401137 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 99C59C4338F for ; Tue, 27 Jul 2021 00:42:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8462C60F55 for ; Tue, 27 Jul 2021 00:42:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234836AbhG0ABd (ORCPT ); Mon, 26 Jul 2021 20:01:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57864 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234797AbhG0ABX (ORCPT ); Mon, 26 Jul 2021 20:01:23 -0400 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E1CC8C061757 for ; Mon, 26 Jul 2021 17:41:50 -0700 (PDT) Received: by mail-wr1-x433.google.com with SMTP id b7so13104595wri.8 for ; Mon, 26 Jul 2021 17:41:50 -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=qju1N6ujA/tOv7FCsDwQaEoFADjZPcei2gPCJuLcKNk=; b=e97imJnpb78YYqPbTz8U9swYT5XU5by+1y007228RB/R8zceYTr0NwEqIm5Dz09Fmk jOm6mFLFqR7i4rOPZv9efFQlJ8Y7iRfVJx1wY/6WjY6GBEdJUksJbYP4J14HtzfQWbiY s+zbh0RZNdlN7DevrR0GawnJKFmg0Lwx7T/jEcYujJZcRvsaD33hZx1XqGF1JMtmZwb3 xA78f5TECPbXjwLqSDqC4B9TpiW7hmnA99TKXb5abBo+40lgy+wAppILZI+9gIVY0nep UL2WIKjK0HeW0OewQa0sLq9DJyLUMFuVJ1OrY/9NGDgWWbzz5dxxqKIN7e3urrOaChh+ dOTg== 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=qju1N6ujA/tOv7FCsDwQaEoFADjZPcei2gPCJuLcKNk=; b=FPsWFvcz+Y3uusFhqsfasPNQm4fD+/3Ej0HsWNy0XFD5NEJEVoOlPCX5y3Oj3yVi7o ap58fg9wYub6/rmoIRJrQQSzhVXXlmt/m0D9arIZmuqRV3lzoZvq5PG/3rKObrbf9zaD PbNMcwawzyXJ4yO77FAl8U4u2OQ32z+1WjjRf5sNMz/CiHRTvetoFBcqzNCnFu31NEOg 4ZjfVyOTgNTajQAde7pjbHvg19R5tzVt0XVbnjtkpDKCv0a6cijkXS0HbDJ+ZLHMcOMA vknUw8U+cofcESLBZu6mg7mUhG6qni/Ienp9oS7jWNLBagbEN/bIWD1IWD3KjDKgF0ve /ORg== X-Gm-Message-State: AOAM530DlZyyEN683U3thHP0IZv+yaC1uBB1Bahp7d8D2qkB0JkTsbO3 ZXfW/HKkQeCKa6d3gDCEn5kZ01BVyQh+eg== X-Google-Smtp-Source: ABdhPJxnQCpCwsAN4TikyjWYcwcY7aMRHm0ZWlPxulPyt/QBbDdlHbGKiaHvkKZTSYm7GvchvClDOQ== X-Received: by 2002:a05:6000:52:: with SMTP id k18mr21111373wrx.270.1627346509305; Mon, 26 Jul 2021 17:41:49 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id c16sm1254377wru.82.2021.07.26.17.41.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jul 2021 17:41:48 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBC?= =?utf-8?b?amFybWFzb24=?= Subject: [PATCH 2/4] bundle API: change "flags" to be "extra_index_pack_args" Date: Tue, 27 Jul 2021 02:41:40 +0200 Message-Id: X-Mailer: git-send-email 2.32.0.988.g189fd9ae38 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Since the "flags" parameter was added in be042aff24c (Teach progress eye-candy to fetch_refs_from_bundle(), 2011-09-18) there's never been more than the one flag: BUNDLE_VERBOSE. Let's have the only caller who cares about that pass "-v" itself instead through new "extra_index_pack_args" parameter. The flexibility of being able to pass arbitrary arguments to "unbundle" will be used in a subsequent commit. We could pass NULL explicitly in cmd_bundle_unbundle(), but let's instead initialize an empty strvec and pass it, in anticipation of a subsequent commit wanting to add arguments to it. Signed-off-by: Ævar Arnfjörð Bjarmason --- builtin/bundle.c | 5 +++-- bundle.c | 17 +++++++++++------ bundle.h | 8 ++++++-- transport.c | 5 ++++- 4 files changed, 24 insertions(+), 11 deletions(-) diff --git a/builtin/bundle.c b/builtin/bundle.c index 053a51bea1..10f6f45770 100644 --- a/builtin/bundle.c +++ b/builtin/bundle.c @@ -165,7 +165,8 @@ static int cmd_bundle_unbundle(int argc, const char **argv, const char *prefix) struct option options[] = { OPT_END() }; - char *bundle_file; + char* bundle_file; + struct strvec extra_args = STRVEC_INIT; argc = parse_options_cmd_bundle(argc, argv, prefix, builtin_bundle_unbundle_usage, options, &bundle_file); @@ -177,7 +178,7 @@ static int cmd_bundle_unbundle(int argc, const char **argv, const char *prefix) } if (!startup_info->have_repository) die(_("Need a repository to unbundle.")); - ret = !!unbundle(the_repository, &header, bundle_fd, 0) || + ret = !!unbundle(the_repository, &header, bundle_fd, &extra_args) || list_bundle_refs(&header, argc, argv); bundle_header_release(&header); cleanup: diff --git a/bundle.c b/bundle.c index 15ce62285c..f2b28a2092 100644 --- a/bundle.c +++ b/bundle.c @@ -733,18 +733,23 @@ int create_bundle(struct repository *r, const char *path, } int unbundle(struct repository *r, struct bundle_header *header, - int bundle_fd, int flags) + int bundle_fd, struct strvec *extra_index_pack_args) { - const char *argv_index_pack[] = {"index-pack", - "--fix-thin", "--stdin", NULL, NULL}; struct child_process ip = CHILD_PROCESS_INIT; + int i; - if (flags & BUNDLE_VERBOSE) - argv_index_pack[3] = "-v"; + strvec_push(&ip.args, "index-pack"); + strvec_push(&ip.args, "--fix-thin"); + strvec_push(&ip.args, "--stdin"); + if (extra_index_pack_args) { + struct strvec *extra = extra_index_pack_args; + for (i = 0; i < extra->nr; i++) + strvec_push(&ip.args, extra->v[i]); + strvec_clear(extra_index_pack_args); + } if (verify_bundle(r, header, 0)) return -1; - ip.argv = argv_index_pack; ip.in = bundle_fd; ip.no_stdout = 1; ip.git_cmd = 1; diff --git a/bundle.h b/bundle.h index 84a6df1b65..d47a7a3c69 100644 --- a/bundle.h +++ b/bundle.h @@ -26,16 +26,20 @@ int create_bundle(struct repository *r, const char *path, int argc, const char **argv, struct strvec *pack_options, int version); int verify_bundle(struct repository *r, struct bundle_header *header, int verbose); -#define BUNDLE_VERBOSE 1 /** * Unbundle after reading the header with read_bundle_header(). * * We'll invoke "git index-pack --stdin --fix-thin" for you on the * provided `bundle_fd` from read_bundle_header(). + * + * Provide extra_index_pack_args to pass any extra arguments + * (e.g. "-v" for verbose/progress), NULL otherwise. The provided + * extra_index_pack_args (if any) will be strvec_clear()'d for you + * (like the run-command.h API itself does). */ int unbundle(struct repository *r, struct bundle_header *header, - int bundle_fd, int flags); + int bundle_fd, struct strvec *extra_index_pack_args); int list_bundle_refs(struct bundle_header *header, int argc, const char **argv); diff --git a/transport.c b/transport.c index 7f3d0d46b3..8781186cf1 100644 --- a/transport.c +++ b/transport.c @@ -163,12 +163,15 @@ static int fetch_refs_from_bundle(struct transport *transport, int nr_heads, struct ref **to_fetch) { struct bundle_transport_data *data = transport->data; + struct strvec extra_index_pack_args = STRVEC_INIT; int ret; + strvec_push(&extra_index_pack_args, "-v"); + if (!data->get_refs_from_bundle_called) get_refs_from_bundle(transport, 0, NULL); ret = unbundle(the_repository, &data->header, data->fd, - transport->progress ? BUNDLE_VERBOSE : 0); + &extra_index_pack_args); transport->hash_algo = data->header.hash_algo; return ret; } From patchwork Tue Jul 27 00:41:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12401141 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C6088C4338F for ; Tue, 27 Jul 2021 00:42:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B2A8660F93 for ; Tue, 27 Jul 2021 00:42:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234895AbhG0ABg (ORCPT ); Mon, 26 Jul 2021 20:01:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57986 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234798AbhG0ABY (ORCPT ); Mon, 26 Jul 2021 20:01:24 -0400 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AEE9DC061764 for ; Mon, 26 Jul 2021 17:41:51 -0700 (PDT) Received: by mail-wr1-x42b.google.com with SMTP id g15so13131210wrd.3 for ; Mon, 26 Jul 2021 17:41:51 -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=/traU91cDrNFT3hGuPII7AHre5vT/tFNS+On9oA60+A=; b=ujotQc+l3Cg/uO6uLjqN+XwKDeIJ3tRA4Vlc3yiDchvSukMtWe3Z4IapB6Q2kBl+zb 6yT0xvGfSuERggxDVusskYrvGpI1WgERy9KDjRBR8wVH38iVFTBMV0ORy+siDBbBTN1+ 5U301yz+GbOnSVYx2ws5d9mXWNRz8bkmBL1niS7zxRe6Fv5jRAjlSke8bVVnI4so+Pzt VADnpoMBxivE1JxNDFyjGTaK8/J/l0l2ptqm+uPfQ+JkPpuFJTPM99X56XdiWEX+jdR+ Z0ZRCn9aQW+bhfw2UwhD/nwRJloUUKoNGUAcZWHQtq/tNMzL3Klnb9/py7fLVaNHKVco XR4g== 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=/traU91cDrNFT3hGuPII7AHre5vT/tFNS+On9oA60+A=; b=X6+/WNBiL4/6wnGMa9uwlAp9QXBZxW54Ugl9/L2jfgw3r8ywC2k74+dKQkp4fJckge DpptN26MmTaLqIzAyEdtcF4g+S4LtTA5FVLpcQVQf9kljWRFRtsHAZG+ROqsRYOvKSVw xOKPBaEUvQn7U2H1ZsVA/yfOXSRo6dba0wWVYr3zVlDL7u4Rtza+kQIFlkV7nsYkZg5H hu5WmzoP4qPFN8Wdm4AG9CWO1TA6V5DX6bXmxSHCNcpnHF3xheXYfSvvmVSfHYaTkKOX 3mJIeQR4zpzIagIxU6R8vaZRuvdz+9/Fi4NH9b29AIiK33w9l4G8TY2Mh1ltyIuBKxmK LUxA== X-Gm-Message-State: AOAM5310sY3yleT8ndnosG7wXASJ0wHngTVkQ2GlDqciRLJgZmyfOztz 3ehKuv+KouDIDJ4Ap++2NmwwWRhI1JKZ7g== X-Google-Smtp-Source: ABdhPJzQPAOtfmHlnPde6AYGiafsZNXfX4WiKj171MAQOqhek+/SNUjDqJbynvrjQ8zk5Wc05+A8bA== X-Received: by 2002:a05:6000:1b0c:: with SMTP id f12mr21710670wrz.225.1627346510133; Mon, 26 Jul 2021 17:41:50 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id c16sm1254377wru.82.2021.07.26.17.41.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jul 2021 17:41:49 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBC?= =?utf-8?b?amFybWFzb24=?= Subject: [PATCH 3/4] index-pack: add --progress-title option Date: Tue, 27 Jul 2021 02:41:41 +0200 Message-Id: X-Mailer: git-send-email 2.32.0.988.g189fd9ae38 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Add a --progress-title option to index-pack, when data is piped into index-pack its progress is a proxy for whatever's feeding it data. This option will allow us to set a more relevant progress bar title. Signed-off-by: Ævar Arnfjörð Bjarmason --- Documentation/git-index-pack.txt | 6 ++++++ builtin/index-pack.c | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/Documentation/git-index-pack.txt b/Documentation/git-index-pack.txt index 7fa74b9e79..9fd5d8a2d4 100644 --- a/Documentation/git-index-pack.txt +++ b/Documentation/git-index-pack.txt @@ -82,6 +82,12 @@ OPTIONS --strict:: Die, if the pack contains broken objects or links. +--progress-title:: + For internal use only. ++ +Set the title of the "Receiving objects" progress bar (it's "Indexing +objects" under `--stdin`). + --check-self-contained-and-connected:: Die if the pack contains broken links. For internal use only. diff --git a/builtin/index-pack.c b/builtin/index-pack.c index 3fbc5d7077..0237623943 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -122,6 +122,7 @@ static int strict; static int do_fsck_object; static struct fsck_options fsck_options = FSCK_OPTIONS_MISSING_GITMODULES; static int verbose; +static const char *progress_title; static int show_resolving_progress; static int show_stat; static int check_self_contained_and_connected; @@ -1159,6 +1160,7 @@ static void parse_pack_objects(unsigned char *hash) if (verbose) progress = start_progress( + progress_title ? progress_title : from_stdin ? _("Receiving objects") : _("Indexing objects"), nr_objects); for (i = 0; i < nr_objects; i++) { @@ -1808,6 +1810,10 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix) input_len = sizeof(*hdr); } else if (!strcmp(arg, "-v")) { verbose = 1; + } else if (!strcmp(arg, "--progress-title")) { + if (progress_title || (i+1) >= argc) + usage(index_pack_usage); + progress_title = argv[++i]; } else if (!strcmp(arg, "--show-resolving-progress")) { show_resolving_progress = 1; } else if (!strcmp(arg, "--report-end-of-input")) { From patchwork Tue Jul 27 00:41:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12401143 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93E5AC4338F for ; Tue, 27 Jul 2021 00:42:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7BFD160F55 for ; Tue, 27 Jul 2021 00:42:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234925AbhG0ABi (ORCPT ); Mon, 26 Jul 2021 20:01:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57992 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234724AbhG0ABZ (ORCPT ); Mon, 26 Jul 2021 20:01:25 -0400 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 82F77C0613CF for ; Mon, 26 Jul 2021 17:41:52 -0700 (PDT) Received: by mail-wm1-x32e.google.com with SMTP id u15-20020a05600c19cfb02902501bdb23cdso664228wmq.0 for ; Mon, 26 Jul 2021 17:41:52 -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=RIH9xwMS/wVvgBREhMzvZdnz1R+SporpNqyLTVV/JZM=; b=Dv9q9M1wVQl1E8isutzG4tToeX7BLBrDVf8CN/OxwlpUai1MkdqebQatD+7aXFJCyS Rtqu6SBg5bu7NIavMYGQZ2OLb2UtSlPX5wCcJ7MBR99MdfBZylRfoSgjuep8DvuX9fJ8 KolEExyB3xmyUqoOtNh91Bw42j4UP8ViAuGVuLMDhDvaO6yAwAPBsMSCpVhK5ssIQPs6 QH6e8GEE3x8EeOGvTJXxK23Fsa4BjP/wO/L7mbL/OmumYvwISU/5RLsVWO9EqPaU/OJg um3aG7DvqCIqbwi1p9OpLhFPS+0l7dqaUOWAAYfQAZs0psa6XlpE5Tr8H/Y2SFHYP9LA 7ZYg== 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=RIH9xwMS/wVvgBREhMzvZdnz1R+SporpNqyLTVV/JZM=; b=kp2wt07AV4tf8fQiMAMJCQ11jt3pR/j5yeCuVW4VNTj6BEdaTDfa7Rx1NiW5rmfRzx /2+Gzk8It89FQCHjg5U9DEYTlRw01fx4+JxgrrS6OoqV+PrGKbtwe4ROenhHkyCYDKhs H69rStuTx/XS+NGjvEo5rsKcXvwkxFgRy2i6LrHjHL39XipQYiZJitGhiv21nIxGOI2H dSzBJ5svv+6LMcdqxidFedQHPBl4Wfs1Gc0FWRQdmRhUwLYR2n/3i6HLo4RSXW0d6Now bhalMUUuOb2NoKB/taQCIW1U6a29MZmEPjXARBsjw4fjjY6e4MNscCHaNubcuUO/W99T 82gg== X-Gm-Message-State: AOAM533KJsAkUvQRVb5As/lVFAF7YZtOju+YfKP7M3UWTojaaj0hFwcX IPhXCHx4UC9qNu+lxCxEy+oOForuXiYBGw== X-Google-Smtp-Source: ABdhPJzMGKaswNlJXu0jC1yFUZidfnwIYvNb1ZXIv84l1WIGC5i8TMMMBcJEkArxgC1plgo7qwIR9g== X-Received: by 2002:a1c:790e:: with SMTP id l14mr1306644wme.119.1627346510889; Mon, 26 Jul 2021 17:41:50 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id c16sm1254377wru.82.2021.07.26.17.41.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jul 2021 17:41:50 -0700 (PDT) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBC?= =?utf-8?b?amFybWFzb24=?= Subject: [PATCH 4/4] bundle: show progress on "unbundle" Date: Tue, 27 Jul 2021 02:41:42 +0200 Message-Id: X-Mailer: git-send-email 2.32.0.988.g189fd9ae38 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org The "unbundle" command added in 2e0afafebd8 (Add git-bundle: move objects and references by archive, 2007-02-22) did not show progress output, even though the underlying API learned how to show progress in be042aff24c (Teach progress eye-candy to fetch_refs_from_bundle(), 2011-09-18). Now we'll show "Unbundling objects" using the new --progress-title option to "git index-pack", to go with its existing "Receiving objects" and "Indexing objects" (which it shows when invoked with "--stdin", and with a pack file, respectively). Signed-off-by: Ævar Arnfjörð Bjarmason --- builtin/bundle.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/builtin/bundle.c b/builtin/bundle.c index 10f6f45770..f027cce3fe 100644 --- a/builtin/bundle.c +++ b/builtin/bundle.c @@ -162,7 +162,11 @@ static int cmd_bundle_unbundle(int argc, const char **argv, const char *prefix) struct bundle_header header = BUNDLE_HEADER_INIT; int bundle_fd = -1; int ret; + int progress = isatty(2); + struct option options[] = { + OPT_BOOL(0, "progress", &progress, + N_("show progress meter")), OPT_END() }; char* bundle_file; @@ -178,6 +182,13 @@ static int cmd_bundle_unbundle(int argc, const char **argv, const char *prefix) } if (!startup_info->have_repository) die(_("Need a repository to unbundle.")); + + if (progress) { + strvec_push(&extra_args, "-v"); + strvec_push(&extra_args, "--progress-title"); + strvec_push(&extra_args, _("Unbundling objects")); + } + ret = !!unbundle(the_repository, &header, bundle_fd, &extra_args) || list_bundle_refs(&header, argc, argv); bundle_header_release(&header);