From patchwork Fri May 24 09:09:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Hughes X-Patchwork-Id: 13672894 Received: from gosford.compton.nu (gosford.compton.nu [217.169.17.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5E0DE12B14F for ; Fri, 24 May 2024 09:10:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.169.17.27 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716541806; cv=none; b=I+5TjLE9EOkPWcsqrJTaO+oYDT3Mcw5QR8YmFx1f7sUuC3RjXV3dutscZNCDx75OqWqVE0HBvFYdE5qgopb9oKnLPmc/LUoII5ifFE+Itsrvdb9DTt/3VR1/yjpwnk4uM0Q2pMORdF7K8emdjmsDJXTXNj2E2aRd9wy6l0aiiac= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716541806; c=relaxed/simple; bh=YSie66ZoRRdZgjZFuDXXlizBWRsqgqZQeW9rId5byZc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kjAz2pgz5WtiEZB6HK4no6p/95Narha0xiYFbeKpWyYhs/zW47nh7VEzkf/M3/5iDcZ3eFfTS4dmw/rK3dPVHqdAPmzQFE2djWBO/w6wjxFWGMXxZN8PC8vntQUeD9ezlcfMLI5Scx/JXTaoYBSbPuu1/MMNW4VzCcEdCCYI8Ns= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=compton.nu; spf=pass smtp.mailfrom=compton.nu; dkim=pass (2048-bit key) header.d=compton.nu header.i=tom@compton.nu header.b=nqZhkGlO; arc=none smtp.client-ip=217.169.17.27 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=compton.nu Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=compton.nu Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=compton.nu header.i=tom@compton.nu header.b="nqZhkGlO" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=compton.nu; s=20200130; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=ttp5Drw0KRY5NKOYULVV9liBRZsAJw8i7i1BbP4nwj0=; i=tom@compton.nu; t=1716541804; x=1717751404; b=nqZhkGlOuA7Qb5gIzSmDEF9pJL0u5/hGvjtzSOI1g2Mi+no sqpz4aTYIgHisyekQIov5Xl8XD0xj11GhboijyAlh8LktPLZ6RvzBKYzv+8F8SUTG4hSpTAs9Bl4Z x9gbg+mwpDHChSMvFGfA4WQ5UgQCvdLRUlSGBm7vQ/ifLvbPs8PeWXQ0RMG8Lkhr/3mkwq5iUXN7T 3OISLBxmCFD7pTIH41wib6wtNLQAyOtiW15Q427tTem6YWbZOUljDROPZLWnvHCsx7bQEFmaZujgM JPmitTl3HtSXHCc4nUie9hQmCNIYzDgvgWUF4e7/q4k2aRwgs4yXcUwsSd+ST+tA==; Authentication-Results: gosford.compton.nu; iprev=pass (bericote.compton.nu) smtp.remote-ip=2001:8b0:bd:1:1881:14ff:fe46:3cc7 Received: from bericote.compton.nu ([2001:8b0:bd:1:1881:14ff:fe46:3cc7]:51450) by gosford.compton.nu with esmtps (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.97.1) (envelope-from ) id 1sAQw0-000000095Vz-2UYx; Fri, 24 May 2024 10:10:00 +0100 Received: from tom by bericote.compton.nu with local (Exim 4.97.1) (envelope-from ) id 1sAQw0-0000000AGuI-20AA; Fri, 24 May 2024 10:09:56 +0100 From: Tom Hughes To: git@vger.kernel.org Cc: gitster@pobox.com, chriscool@tuxfamily.org, jonathantanmy@google.com, Tom Hughes Subject: [PATCH v2] promisor-remote: add promisor.quiet configuration option Date: Fri, 24 May 2024 10:09:37 +0100 Message-ID: <20240524090937.2448229-1-tom@compton.nu> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240523131926.1959245-1-tom@compton.nu> References: <20240523131926.1959245-1-tom@compton.nu> Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Add a configuration option to allow output from the promisor fetching objects to be suppressed. This allows us to stop commands like 'git blame' being swamped with progress messages and gc notifications from the promisor when used in a partial clone. Signed-off-by: Tom Hughes --- Documentation/config.txt | 2 ++ Documentation/config/promisor.txt | 3 +++ promisor-remote.c | 3 +++ t/t0410-partial-clone.sh | 37 +++++++++++++++++++++++++++++++ 4 files changed, 45 insertions(+) create mode 100644 Documentation/config/promisor.txt diff --git a/Documentation/config.txt b/Documentation/config.txt index 70b448b132..6cae835db9 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -487,6 +487,8 @@ include::config/pager.txt[] include::config/pretty.txt[] +include::config/promisor.txt[] + include::config/protocol.txt[] include::config/pull.txt[] diff --git a/Documentation/config/promisor.txt b/Documentation/config/promisor.txt new file mode 100644 index 0000000000..98c5cb2ec2 --- /dev/null +++ b/Documentation/config/promisor.txt @@ -0,0 +1,3 @@ +promisor.quiet:: + If set to "true" assume `--quiet` when fetching additional + objects for a partial clone. diff --git a/promisor-remote.c b/promisor-remote.c index b414922c44..2ca7c2ae48 100644 --- a/promisor-remote.c +++ b/promisor-remote.c @@ -23,6 +23,7 @@ static int fetch_objects(struct repository *repo, struct child_process child = CHILD_PROCESS_INIT; int i; FILE *child_in; + int quiet; if (git_env_bool(NO_LAZY_FETCH_ENVIRONMENT, 0)) { static int warning_shown; @@ -41,6 +42,8 @@ static int fetch_objects(struct repository *repo, "fetch", remote_name, "--no-tags", "--no-write-fetch-head", "--recurse-submodules=no", "--filter=blob:none", "--stdin", NULL); + if (!git_config_get_bool("promisor.quiet", &quiet) && quiet) + strvec_push(&child.args, "--quiet"); if (start_command(&child)) die(_("promisor-remote: unable to fork off fetch subprocess")); child_in = xfdopen(child.in, "w"); diff --git a/t/t0410-partial-clone.sh b/t/t0410-partial-clone.sh index 88a66f0904..2957160efa 100755 --- a/t/t0410-partial-clone.sh +++ b/t/t0410-partial-clone.sh @@ -3,6 +3,7 @@ test_description='partial clone' . ./test-lib.sh +. "$TEST_DIRECTORY"/lib-terminal.sh # missing promisor objects cause repacks which write bitmaps to fail GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP=0 @@ -689,6 +690,42 @@ test_expect_success 'lazy-fetch when accessing object not in the_repository' ' ! grep "[?]$FILE_HASH" out ' +test_expect_success TTY 'promisor.quiet=false shows progress messages' ' + rm -rf server repo && + test_create_repo server && + test_commit -C server foo && + git -C server rm foo.t && + git -C server commit -m remove && + git -C server config uploadpack.allowanysha1inwant 1 && + git -C server config uploadpack.allowfilter 1 && + + git clone --filter=blob:none "file://$(pwd)/server" repo && + git -C repo config promisor.quiet "false" && + + test_terminal git -C repo cat-file -p foo:foo.t 2>err && + + # Ensure that progress messages are written + grep "Receiving objects" err +' + +test_expect_success TTY 'promisor.quiet=true does not show progress messages' ' + rm -rf server repo && + test_create_repo server && + test_commit -C server foo && + git -C server rm foo.t && + git -C server commit -m remove && + git -C server config uploadpack.allowanysha1inwant 1 && + git -C server config uploadpack.allowfilter 1 && + + git clone --filter=blob:none "file://$(pwd)/server" repo && + git -C repo config promisor.quiet "true" && + + test_terminal git -C repo cat-file -p foo:foo.t 2>err && + + # Ensure that no progress messages are written + ! grep "Receiving objects" err +' + . "$TEST_DIRECTORY"/lib-httpd.sh start_httpd