From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D9133C433F5 for ; Mon, 22 Nov 2021 22:42:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235054AbhKVWp5 (ORCPT ); Mon, 22 Nov 2021 17:45:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46008 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234577AbhKVWpv (ORCPT ); Mon, 22 Nov 2021 17:45:51 -0500 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6715FC061574 for ; Mon, 22 Nov 2021 14:42:44 -0800 (PST) Received: by mail-wr1-x430.google.com with SMTP id u18so35488393wrg.5 for ; Mon, 22 Nov 2021 14:42:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=5jghPv6mZTLzD8nplFijSKzie4N/s+bO9wMTV4qDxlw=; b=ZuN2r1lBJRc04pOsJiUNvrQV9c7IR4wyTtjKBQeL5i4texrlk5OHsazViMOFt+4oTm 3mnUfLZxROBhovTHerIcZKMjzk9PaeKaN7Php9FQ6RTcISqRPVhPu03s7+2q51g5l4lt m7gF80Out+ihGFOXsyoqByvEqOhHCrRC08pWPGYTTdly96oWyEZOidSj3lNy2TGl1nEq QdxivQMlGbosOh4659gZDs/JoyoBySZm/Q1J62//+oRQJqHjJnlMeYBfEk3BcyplPrep ok3NXFkR24OIzeQwDF7ESHGErgUR8PFhLZMnPtJvVkMrCPgyUogALriY2KySJUSre88O CM8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=5jghPv6mZTLzD8nplFijSKzie4N/s+bO9wMTV4qDxlw=; b=Jst9th0qqcbFylLPfgwd7i+pbOmO6h25eBMXRh6esMVkuG3HaKJuNBofkW7ArcUDmC lOR1poEFJG+39GhStL+dRjrgesWxfIcPBp36B4++48OhrbIaTa5H9vy+lCKPToHhxHWX uqr3fkHzuP3WJViLes84MQBCtwoZZAo6KGFZmRLzaPgpEjFa4Fmbx/HN2QJ6PtWzqLkk Ji+tKearyaZJ9MdAHl1TVKao8LATmtgidhGvDe9QMFIicq/jz8QCw0E++gAfxpnECitu 026Tie0S2+s0SCAToIFnpTbkW6x4nA5GzLuQpkWssmbKCc+0v6lL4uo1ZfvRpLWmmZnV 4GzQ== X-Gm-Message-State: AOAM533I3or7O8wNnFNtQN+xobcFdGwwj5U9YIaeuIVVmLdFIiJDf52l x9GIgBwktXVnN/thwZKvRsygyu1bzfY= X-Google-Smtp-Source: ABdhPJymmIsnPhy/MLLS2bFl6GEP2pn0kTVrFla8fo2BLaY4yvbTNDSahVx09JQ4bSkzodhuH2eC/Q== X-Received: by 2002:a05:6000:1201:: with SMTP id e1mr1057080wrx.298.1637620962872; Mon, 22 Nov 2021 14:42:42 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id k8sm9893171wrn.91.2021.11.22.14.42.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Nov 2021 14:42:42 -0800 (PST) Message-Id: <273ee16b74ed4b36ffba5762fa892410317ea02b.1637620958.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Lessley Dennington via GitGitGadget" Date: Mon, 22 Nov 2021 22:42:37 +0000 Subject: [PATCH v4 3/4] diff: enable and test the sparse index Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: stolee@gmail.com, gitster@pobox.com, newren@gmail.com, Taylor Blau , Lessley Dennington , Lessley Dennington Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Lessley Dennington Enable the sparse index within the 'git diff' command. Its implementation already safely integrates with the sparse index because it shares code with the 'git status' and 'git checkout' commands that were already integrated. For more details see: d76723e (status: use sparse-index throughout, 2021-07-14) 1ba5f45 (checkout: stop expanding sparse indexes, 2021-06-29) The most interesting thing to do is to add tests that verify that 'git diff' behaves correctly when the sparse index is enabled. These cases are: 1. The index is not expanded for 'diff' and 'diff --staged' 2. 'diff' and 'diff --staged' behave the same in full checkout, sparse checkout, and sparse index repositories in the following partially-staged scenarios (i.e. the index, HEAD, and working directory differ at a given path): 1. Path is within sparse-checkout cone 2. Path is outside sparse-checkout cone 3. A merge conflict exists for paths outside sparse-checkout cone The `p2000` tests demonstrate a ~44% execution time reduction for 'git diff' and a ~86% execution time reduction for 'git diff --staged' using a sparse index: Test before after ------------------------------------------------------------- 2000.30: git diff (full-v3) 0.33 0.34 +3.0% 2000.31: git diff (full-v4) 0.33 0.35 +6.1% 2000.32: git diff (sparse-v3) 0.53 0.31 -41.5% 2000.33: git diff (sparse-v4) 0.54 0.29 -46.3% 2000.34: git diff --cached (full-v3) 0.07 0.07 +0.0% 2000.35: git diff --cached (full-v4) 0.07 0.08 +14.3% 2000.36: git diff --cached (sparse-v3) 0.28 0.04 -85.7% 2000.37: git diff --cached (sparse-v4) 0.23 0.03 -87.0% Co-authored-by: Derrick Stolee Signed-off-by: Derrick Stolee Signed-off-by: Lessley Dennington --- builtin/diff.c | 5 +++ t/perf/p2000-sparse-operations.sh | 2 ++ t/t1092-sparse-checkout-compatibility.sh | 46 ++++++++++++++++++++++++ 3 files changed, 53 insertions(+) diff --git a/builtin/diff.c b/builtin/diff.c index dd8ce688ba7..fa4683377eb 100644 --- a/builtin/diff.c +++ b/builtin/diff.c @@ -437,6 +437,11 @@ int cmd_diff(int argc, const char **argv, const char *prefix) prefix = setup_git_directory_gently(&nongit); + if (!nongit) { + prepare_repo_settings(the_repository); + the_repository->settings.command_requires_full_index = 0; + } + if (!no_index) { /* * Treat git diff with at least one path outside of the diff --git a/t/perf/p2000-sparse-operations.sh b/t/perf/p2000-sparse-operations.sh index bfd332120c8..5cf94627383 100755 --- a/t/perf/p2000-sparse-operations.sh +++ b/t/perf/p2000-sparse-operations.sh @@ -113,5 +113,7 @@ test_perf_on_all git checkout -f - test_perf_on_all git reset test_perf_on_all git reset --hard test_perf_on_all git reset -- does-not-exist +test_perf_on_all git diff +test_perf_on_all git diff --cached test_done diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh index 44d5e11c762..53524660759 100755 --- a/t/t1092-sparse-checkout-compatibility.sh +++ b/t/t1092-sparse-checkout-compatibility.sh @@ -832,6 +832,52 @@ test_expect_success 'sparse-index is not expanded: merge conflict in cone' ' ) ' +test_expect_success 'sparse index is not expanded: diff' ' + init_repos && + + write_script edit-contents <<-\EOF && + echo text >>$1 + EOF + + # Add file within cone + test_sparse_match git sparse-checkout set deep && + run_on_all ../edit-contents deep/testfile && + test_all_match git add deep/testfile && + run_on_all ../edit-contents deep/testfile && + + test_all_match git diff && + test_all_match git diff --staged && + ensure_not_expanded diff && + ensure_not_expanded diff --staged && + + # Add file outside cone + test_all_match git reset --hard && + run_on_all mkdir newdirectory && + run_on_all ../edit-contents newdirectory/testfile && + test_sparse_match git sparse-checkout set newdirectory && + test_all_match git add newdirectory/testfile && + run_on_all ../edit-contents newdirectory/testfile && + test_sparse_match git sparse-checkout set && + + test_all_match git diff && + test_all_match git diff --staged && + ensure_not_expanded diff && + ensure_not_expanded diff --staged && + + # Merge conflict outside cone + # The sparse checkout will report a warning that is not in the + # full checkout, so we use `run_on_all` instead of + # `test_all_match` + run_on_all git reset --hard && + test_all_match git checkout merge-left && + test_all_match test_must_fail git merge merge-right && + + test_all_match git diff && + test_all_match git diff --staged && + ensure_not_expanded diff && + ensure_not_expanded diff --staged +' + # NEEDSWORK: a sparse-checkout behaves differently from a full checkout # in this scenario, but it shouldn't. test_expect_success 'reset mixed and checkout orphan' ' -- gitgitgadget