From patchwork Tue Dec 10 20:00:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver via GitGitGadget X-Patchwork-Id: 11283167 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E9B6F138C for ; Tue, 10 Dec 2019 20:00:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C779D2077B for ; Tue, 10 Dec 2019 20:00:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="QX3Q/3ik" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727109AbfLJUAl (ORCPT ); Tue, 10 Dec 2019 15:00:41 -0500 Received: from mail-wr1-f65.google.com ([209.85.221.65]:36713 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726100AbfLJUAf (ORCPT ); Tue, 10 Dec 2019 15:00:35 -0500 Received: by mail-wr1-f65.google.com with SMTP id z3so21550327wru.3 for ; Tue, 10 Dec 2019 12:00:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=+CgvyKrM09apU1qkOsJft1P4o4wqjmDRS+ywvTmG7xU=; b=QX3Q/3ikcZVVB3OiemY1ggPzZ1sIEnyUMW+gm9MGMn6b2epSo2Sf/crBZN7znIehhy pfRXSA5V9tqc0DPaoWf2QXuVVm2UzBOjF6AqcU+840kgj+kYUBBpPmnTAOC8g9YkwD9h uwLRcMv9rlpexjRL37mSySsIwNtJOLYTvHW5W6iRFiBQ3jONI9eWBNJTAgzE3xkA/LPj g3UyVy1AOiw2XXlLYuykvdlbT4sWPPxElZ6fc9849LVZ1zoDRlWESkzTir1VMDLDnP8Z R5T3e59hLNDHoto9RhcijTZl3R33SdoXhUA4C+2G7QzsfRzGrqcPG066U76BD8Ya4WI9 9fZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=+CgvyKrM09apU1qkOsJft1P4o4wqjmDRS+ywvTmG7xU=; b=mcAgc5OYjlW9axlU+sLLaGknP8HoJeB5A/QzTaD8TW4IYKSwjRAk/9zewUk3g/ffvI HKZpD8faD4b4I6FfaZ0wvbMEztB3eXlygbafKEkqHf7944OZ9QbmZjwn2CMHvEp/lSeH J7PyBC8RdEl+oTeGClAjMWJUqFBh0zQhJELWsKTBJtL+GxkhJ5am9DpB9tfR2IqqrbIC auzkYPIKzSLvMXG1/e/mCc/PsNcURikI3/VuAx/q3F67WmXWmL/SaflGaIdmWVSDzmm9 xHEAZvfc2yBmsmuhj6gpnzLqcwJZW/samtyClIbCvPLRPgWvhTyHkUNq+dKl/xz0g2/1 gRIw== X-Gm-Message-State: APjAAAX+jpxNG6xIkkz25r3O+muT+cFcSH1eYbCmQVPCO3DQr+px0AVu A2fVxdpEXt+mAoje4de+rcEH9KXF X-Google-Smtp-Source: APXvYqzb/fOTEoyxzqOF+5uAeoMivyYMl+SN5B0bYF9MxmRYlcnsI7E9WpMbo5865xb52v4ayUFarg== X-Received: by 2002:adf:c54e:: with SMTP id s14mr5496353wrf.385.1576008033399; Tue, 10 Dec 2019 12:00:33 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id z189sm4559344wmc.2.2019.12.10.12.00.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Dec 2019 12:00:33 -0800 (PST) Message-Id: In-Reply-To: References: From: "Elijah Newren via GitGitGadget" Date: Tue, 10 Dec 2019 20:00:24 +0000 Subject: [PATCH v2 5/8] dir: break part of read_directory_recursive() out for reuse Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: blees@dcon.de, gitster@pobox.com, kyle@kyleam.com, sxlijin@gmail.com, Junio C Hamano , Elijah Newren Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Elijah Newren Create an add_path_to_appropriate_result_list() function from the code at the end of read_directory_recursive() so we can use it elsewhere. Signed-off-by: Elijah Newren --- dir.c | 60 ++++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 37 insertions(+), 23 deletions(-) diff --git a/dir.c b/dir.c index 517a569e10..645b44ea64 100644 --- a/dir.c +++ b/dir.c @@ -1932,6 +1932,40 @@ static void close_cached_dir(struct cached_dir *cdir) } } +static void add_path_to_appropriate_result_list(struct dir_struct *dir, + struct untracked_cache_dir *untracked, + struct cached_dir *cdir, + struct index_state *istate, + struct strbuf *path, + int baselen, + const struct pathspec *pathspec, + enum path_treatment state) +{ + /* add the path to the appropriate result list */ + switch (state) { + case path_excluded: + if (dir->flags & DIR_SHOW_IGNORED) + dir_add_name(dir, istate, path->buf, path->len); + else if ((dir->flags & DIR_SHOW_IGNORED_TOO) || + ((dir->flags & DIR_COLLECT_IGNORED) && + exclude_matches_pathspec(path->buf, path->len, + pathspec))) + dir_add_ignored(dir, istate, path->buf, path->len); + break; + + case path_untracked: + if (dir->flags & DIR_SHOW_IGNORED) + break; + dir_add_name(dir, istate, path->buf, path->len); + if (cdir->fdir) + add_untracked(untracked, path->buf + baselen); + break; + + default: + break; + } +} + /* * Read a directory tree. We currently ignore anything but * directories, regular files and symlinks. That's because git @@ -2035,29 +2069,9 @@ static enum path_treatment read_directory_recursive(struct dir_struct *dir, continue; } - /* add the path to the appropriate result list */ - switch (state) { - case path_excluded: - if (dir->flags & DIR_SHOW_IGNORED) - dir_add_name(dir, istate, path.buf, path.len); - else if ((dir->flags & DIR_SHOW_IGNORED_TOO) || - ((dir->flags & DIR_COLLECT_IGNORED) && - exclude_matches_pathspec(path.buf, path.len, - pathspec))) - dir_add_ignored(dir, istate, path.buf, path.len); - break; - - case path_untracked: - if (dir->flags & DIR_SHOW_IGNORED) - break; - dir_add_name(dir, istate, path.buf, path.len); - if (cdir.fdir) - add_untracked(untracked, path.buf + baselen); - break; - - default: - break; - } + add_path_to_appropriate_result_list(dir, untracked, &cdir, + istate, &path, baselen, + pathspec, state); } close_cached_dir(&cdir); out: