From patchwork Fri Dec 10 15:13:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derrick Stolee X-Patchwork-Id: 12669747 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 D55AEC433F5 for ; Fri, 10 Dec 2021 15:13:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242584AbhLJPQx (ORCPT ); Fri, 10 Dec 2021 10:16:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37912 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242452AbhLJPQw (ORCPT ); Fri, 10 Dec 2021 10:16:52 -0500 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 15796C061746 for ; Fri, 10 Dec 2021 07:13:17 -0800 (PST) Received: by mail-wm1-x32b.google.com with SMTP id i8-20020a7bc948000000b0030db7b70b6bso9261851wml.1 for ; Fri, 10 Dec 2021 07:13:17 -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=e7joETFF8NerTgaM+WI6cDtVJOVrVnPxu1yMnUGHR3w=; b=lo5ZqXe8C1nkLHqPTpHEuqgVntsnbNioSOQBgSa7MptDBCSNqhUG6ZxJfQH4RH1h9n sfusrrmE6uT0xDD6yaBYJzlkB4rWWJuW5jSLe/w0hzEFHjHbHQZcQ1A7X1whC+54Fwxp 6ATTO0aaC07Y5Mf+QhVLJtcySibqezz+mpLBsSBo6V2YJaCibI+uyD/ymJQNWG5tl3nd zgMwmrUpDmf22olllXgg+UtXLc03ttKlldWAHmRw/fTcocPO0MNhT/9N7ARa8kRNKRtK 2a3ZEb3QE8RqrBpZESopuVIrAesgGr6VDSyqEDhH+GEL0sClI2Wa6M7doQ2WF/MJGTZi /2fQ== 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=e7joETFF8NerTgaM+WI6cDtVJOVrVnPxu1yMnUGHR3w=; b=MxQviMvB3ieeuP80O+yDxVxDYGlVbJcJ8V4/6FsslR2p1NVA6IeqPI7sJSR3kumAdD d2SiEYmdGn+azCITvfgkdqvc+ZOOVNb6ofkehijfTyJFXdnXemGZCsVJ+K02dgMkU3bJ Sq7hZG5qWjxW2MSc5ayYt3BPpUnJn/jvngANI+bFG5THNkkt9wlyqAshi0zlLIo+d8Ct c13HX3JVKS0rdwKxinClXaGHKsTfzRmxFN/T+LBx7odC58sPJuVmBdRUds4TLIsaseOO k/jXSkfcg27EMR1plu9p5qPAXnHNg3jpbVtFXp94YOlWPjmbUAm29SpHz/n8Dfmu5ulr M5Sw== X-Gm-Message-State: AOAM533ZqdKrcdfQEQvHq2H0iJQUsd8p3mWwCcALn8RWxXpRXOwrCkom OjRKGjGrijmRqOTLQ59yK4j/xi2/2/M= X-Google-Smtp-Source: ABdhPJwdKrGL2f/lUV/tKA1CPqNYxYEcDk/vYBekm7N/l0gNQ2gaWL8nV+aIwNZx/x4ZzXnMpXe8Fg== X-Received: by 2002:a05:600c:6022:: with SMTP id az34mr17321806wmb.22.1639149195340; Fri, 10 Dec 2021 07:13:15 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id d1sm2614510wrz.92.2021.12.10.07.13.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Dec 2021 07:13:14 -0800 (PST) Message-Id: In-Reply-To: References: Date: Fri, 10 Dec 2021 15:13:09 +0000 Subject: [PATCH v3 2/5] ls-files: add --sparse option Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: gitster@pobox.com, newren@gmail.com, vdye@github.com, Derrick Stolee , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsA==?= Bjarmason , Derrick Stolee , Derrick Stolee Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Derrick Stolee From: Derrick Stolee Existing callers to 'git ls-files' are expecting file names, not directories. It is best to expand a sparse index to show all of the contained files in this case. However, expert users may want to inspect the contents of the index itself including which directories are sparse. Add a --sparse option to allow users to request this information. During testing, I noticed that options such as --modified did not affect the output when the files in question were outside the sparse-checkout definition. Tests are added to document this preexisting behavior and how it remains unchanged with the sparse index and the --sparse option. Signed-off-by: Derrick Stolee --- Documentation/git-ls-files.txt | 4 + builtin/ls-files.c | 12 ++- t/t1092-sparse-checkout-compatibility.sh | 96 ++++++++++++++++++++++++ 3 files changed, 110 insertions(+), 2 deletions(-) diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt index 6d11ab506b7..1c5d5f85ec5 100644 --- a/Documentation/git-ls-files.txt +++ b/Documentation/git-ls-files.txt @@ -187,6 +187,10 @@ Both the in the index ("i/") and in the working tree ("w/") are shown for regular files, followed by the ("attr/"). +--sparse:: + If the index is sparse, show the sparse directories without expanding + to the contained files. + \--:: Do not interpret any more arguments as options. diff --git a/builtin/ls-files.c b/builtin/ls-files.c index 031fef1bcaa..c151eb1fb77 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -37,6 +37,7 @@ static int debug_mode; static int show_eol; static int recurse_submodules; static int skipping_duplicates; +static int show_sparse_dirs; static const char *prefix; static int max_prefix_len; @@ -315,8 +316,10 @@ static void show_files(struct repository *repo, struct dir_struct *dir) if (!(show_cached || show_stage || show_deleted || show_modified)) return; - /* TODO: audit for interaction with sparse-index. */ - ensure_full_index(repo->index); + + if (!show_sparse_dirs) + ensure_full_index(repo->index); + for (i = 0; i < repo->index->cache_nr; i++) { const struct cache_entry *ce = repo->index->cache[i]; struct stat st; @@ -670,6 +673,8 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) OPT_BOOL(0, "debug", &debug_mode, N_("show debugging data")), OPT_BOOL(0, "deduplicate", &skipping_duplicates, N_("suppress duplicate entries")), + OPT_BOOL(0, "sparse", &show_sparse_dirs, + N_("show sparse directories in the presence of a sparse index")), OPT_END() }; int ret = 0; @@ -677,6 +682,9 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) if (argc == 2 && !strcmp(argv[1], "-h")) usage_with_options(ls_files_usage, builtin_ls_files_options); + prepare_repo_settings(the_repository); + the_repository->settings.command_requires_full_index = 0; + prefix = cmd_prefix; if (prefix) prefix_len = strlen(prefix); diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh index 3ba19ba1c14..29b97667378 100755 --- a/t/t1092-sparse-checkout-compatibility.sh +++ b/t/t1092-sparse-checkout-compatibility.sh @@ -802,6 +802,12 @@ test_expect_success 'sparse-index is expanded and converted back' ' GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \ git -C sparse-index reset -- folder1/a && test_region index convert_to_sparse trace2.txt && + test_region index ensure_full_index trace2.txt && + + # ls-files expands on read, but does not write. + rm trace2.txt && + GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \ + git -C sparse-index ls-files && test_region index ensure_full_index trace2.txt ' @@ -826,6 +832,7 @@ test_expect_success 'sparse-index is not expanded' ' init_repos && ensure_not_expanded status && + ensure_not_expanded ls-files --sparse && ensure_not_expanded commit --allow-empty -m empty && echo >>sparse-index/a && ensure_not_expanded commit -a -m a && @@ -974,6 +981,95 @@ test_expect_success 'sparse index is not expanded: fetch/pull' ' ensure_not_expanded pull full base ' +test_expect_success 'ls-files' ' + init_repos && + + # Behavior agrees by default. Sparse index is expanded. + test_all_match git ls-files && + + # With --sparse, the sparse index data changes behavior. + git -C sparse-index ls-files >dense && + git -C sparse-index ls-files --sparse >sparse && + + cat >expect <<-\EOF && + @@ -13,13 +13,9 @@ + e + folder1- + folder1.x + -folder1/0/0/0 + -folder1/0/1 + -folder1/a + +folder1/ + folder10 + -folder2/0/0/0 + -folder2/0/1 + -folder2/a + +folder2/ + g + -x/a + +x/ + z + EOF + + diff -u dense sparse | tail -n +3 >actual && + test_cmp expect actual && + + # With --sparse and no sparse index, nothing changes. + git -C sparse-checkout ls-files >dense && + git -C sparse-checkout ls-files --sparse >sparse && + test_cmp dense sparse && + + # Set up a strange condition of having a file edit + # outside of the sparse-checkout cone. This is just + # to verify that sparse-checkout and sparse-index + # behave the same in this case. + write_script edit-content <<-\EOF && + mkdir folder1 && + echo content >>folder1/a + EOF + run_on_sparse ../edit-content && + + # ls-files does not currently notice modified files whose + # cache entries are marked SKIP_WORKTREE. This may change + # in the future, but here we test that sparse index does + # not accidentally create a change of behavior. + test_sparse_match git ls-files --modified && + test_must_be_empty sparse-checkout-out && + test_must_be_empty sparse-index-out && + + git -C sparse-index ls-files --sparse --modified >sparse-index-out && + test_must_be_empty sparse-index-out && + + # Add folder1 to the sparse-checkout cone and + # check that ls-files shows the expanded files. + test_sparse_match git sparse-checkout add folder1 && + test_sparse_match git ls-files --modified && + + git -C sparse-index ls-files >dense && + git -C sparse-index ls-files --sparse >sparse && + + cat >expect <<-\EOF && + @@ -17,9 +17,7 @@ + folder1/0/1 + folder1/a + folder10 + -folder2/0/0/0 + -folder2/0/1 + -folder2/a + +folder2/ + g + -x/a + +x/ + z + EOF + + diff -u dense sparse | tail -n +3 >actual && + test_cmp expect actual && + + # Double-check index expansion is avoided + ensure_not_expanded ls-files --sparse +' + # 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' '