From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: 1425896314-10941-1-git-send-email-pclouds@gmail.com,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 09/25] list-files: add --max-depth, -R and default to --max-depth=0
Date: Mon, 6 Apr 2015 20:52:18 +0700 [thread overview]
Message-ID: <1428328354-14897-10-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1428328354-14897-1-git-send-email-pclouds@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
builtin/list-files.c | 9 ++++++++-
t/t7013-list-files.sh | 40 ++++++++++++++++++++++++++++++++--------
2 files changed, 40 insertions(+), 9 deletions(-)
diff --git a/builtin/list-files.c b/builtin/list-files.c
index 8913770..4599cf0 100644
--- a/builtin/list-files.c
+++ b/builtin/list-files.c
@@ -28,6 +28,7 @@ static const char *prefix;
static int prefix_length;
static int show_tag = -1;
static unsigned int colopts;
+static int max_depth;
static const char * const ls_usage[] = {
N_("git list-files [options] [<pathspec>...]"),
@@ -39,6 +40,11 @@ struct option ls_options[] = {
OPT_COLUMN('C', "column", &colopts, N_("show files in columns")),
OPT_SET_INT('1', NULL, &colopts,
N_("shortcut for --no-column"), COL_PARSEOPT),
+ { OPTION_INTEGER, 0, "max-depth", &max_depth, N_("depth"),
+ N_("descend at most <depth> levels"), PARSE_OPT_NONEG,
+ NULL, 1 },
+ OPT_SET_INT('R', "recursive", &max_depth,
+ N_("shortcut for --max-depth=-1"), -1),
OPT_END()
};
@@ -178,9 +184,10 @@ int cmd_list_files(int argc, const char **argv, const char *cmd_prefix)
parse_pathspec(&pathspec, 0,
PATHSPEC_PREFER_CWD |
+ (max_depth != -1 ? PATHSPEC_MAXDEPTH_VALID : 0) |
PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP,
cmd_prefix, argv);
- pathspec.max_depth = 0;
+ pathspec.max_depth = max_depth;
pathspec.recursive = 1;
finalize_colopts(&colopts, -1);
diff --git a/t/t7013-list-files.sh b/t/t7013-list-files.sh
index b43245c..89930c7 100755
--- a/t/t7013-list-files.sh
+++ b/t/t7013-list-files.sh
@@ -10,8 +10,8 @@ test_expect_success 'setup' '
git add .
'
-test_expect_success 'list-files from index' '
- git list-files >actual &&
+test_expect_success 'list-files -R from index' '
+ git list-files -R >actual &&
cat >expect <<-\EOF &&
a
b
@@ -23,22 +23,34 @@ test_expect_success 'list-files from index' '
test_cmp expect actual
'
+test_expect_success 'list-files from index' '
+ git list-files --max-depth=0 >actual &&
+ cat >expect <<-\EOF &&
+ a
+ b
+ c
+ EOF
+ test_cmp expect actual &&
+ git list-files >actual &&
+ test_cmp expect actual
+'
+
test_expect_success 'column output' '
- COLUMNS=20 git list-files --column=always >actual &&
+ COLUMNS=20 git list-files -R --column=always >actual &&
cat >expected <<-\EOF &&
a sa/a
b sa/sb/b
c sc/c
EOF
test_cmp expected actual &&
- COLUMNS=20 git -c column.listfiles=always list-files >actual &&
+ COLUMNS=20 git -c column.listfiles=always list-files -R >actual &&
cat >expected <<-\EOF &&
a sa/a
b sa/sb/b
c sc/c
EOF
test_cmp expected actual &&
- COLUMNS=20 git -c column.listfiles=always list-files -1 >actual &&
+ COLUMNS=20 git -c column.listfiles=always list-files -1R >actual &&
cat >expected <<-\EOF &&
a
b
@@ -51,7 +63,7 @@ test_expect_success 'column output' '
'
test_expect_success 'list-files selectively from index' '
- git list-files "*a" >actual &&
+ git list-files -R "*a" >actual &&
cat >expect <<-\EOF &&
a
sa/a
@@ -59,10 +71,22 @@ test_expect_success 'list-files selectively from index' '
test_cmp expect actual
'
+test_expect_success '--max-depth' '
+ git list-files --max-depth=1 >actual &&
+ cat >expected <<-\EOF &&
+ a
+ b
+ c
+ sa/a
+ sc/c
+ EOF
+ test_cmp expected actual
+'
+
test_expect_success 'list-files from subdir ' '
(
cd sa &&
- git list-files >actual &&
+ git list-files -R >actual &&
cat >expect <<-\EOF &&
a
sb/b
@@ -74,7 +98,7 @@ test_expect_success 'list-files from subdir ' '
test_expect_success 'list-files from subdir (2)' '
(
cd sa &&
- git list-files ../a sb >actual &&
+ git list-files -R ../a sb >actual &&
cat >expect <<-\EOF &&
../a
sb/b
--
2.3.0.rc1.137.g477eb31
next prev parent reply other threads:[~2015-04-06 13:53 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-06 13:52 [PATCH v2 00/25] list-files redesign Nguyễn Thái Ngọc Duy
2015-04-06 13:52 ` [PATCH 01/25] ls_colors.c: add $LS_COLORS parsing code Nguyễn Thái Ngọc Duy
2015-04-06 13:52 ` [PATCH 02/25] ls_colors.c: parse color.ls.* from config file Nguyễn Thái Ngọc Duy
2015-04-06 13:52 ` [PATCH 03/25] ls_colors.c: add a function to color a file name Nguyễn Thái Ngọc Duy
2015-04-06 13:52 ` [PATCH 04/25] ls_colors.c: highlight submodules like directories Nguyễn Thái Ngọc Duy
2015-04-06 13:52 ` [PATCH 05/25] list-files: command skeleton Nguyễn Thái Ngọc Duy
2015-04-06 13:52 ` [PATCH 06/25] list-files: show paths relative to cwd Nguyễn Thái Ngọc Duy
2015-04-06 13:52 ` [PATCH 07/25] list-files: add tag to each entry, filter duplicate tags Nguyễn Thái Ngọc Duy
2015-04-06 21:32 ` Eric Sunshine
2015-04-06 13:52 ` [PATCH 08/25] list-files: add --[no-]column, -C and -1 Nguyễn Thái Ngọc Duy
2015-04-06 13:52 ` Nguyễn Thái Ngọc Duy [this message]
2015-04-06 13:52 ` [PATCH 10/25] list-files: show directories as well as files Nguyễn Thái Ngọc Duy
2015-04-06 13:52 ` [PATCH 11/25] list-files: add --color Nguyễn Thái Ngọc Duy
2015-04-06 21:33 ` Eric Sunshine
2015-04-06 13:52 ` [PATCH 12/25] list-files: add -F/--classify Nguyễn Thái Ngọc Duy
2015-04-06 13:52 ` [PATCH 13/25] list-files: new indicator '&' for submodules when -F is used Nguyễn Thái Ngọc Duy
2015-04-06 13:52 ` [PATCH 14/25] list-files: add --cached and --others Nguyễn Thái Ngọc Duy
2015-04-06 13:52 ` [PATCH 15/25] list-files: add --ignored Nguyễn Thái Ngọc Duy
2015-04-06 21:34 ` Eric Sunshine
2015-04-06 13:52 ` [PATCH 16/25] list-files: add --unmerged Nguyễn Thái Ngọc Duy
2015-04-06 21:34 ` Eric Sunshine
2015-04-06 13:52 ` [PATCH 17/25] list-files: add file modification options -[admADM] Nguyễn Thái Ngọc Duy
2015-04-06 21:34 ` Eric Sunshine
2015-04-06 13:52 ` [PATCH 18/25] list-files: delete redundant cached entries Nguyễn Thái Ngọc Duy
2015-04-06 21:35 ` Eric Sunshine
2015-04-08 2:39 ` Junio C Hamano
2015-04-06 13:52 ` [PATCH 19/25] list-files: make alias 'ls' default to 'list-files' Nguyễn Thái Ngọc Duy
2015-04-06 13:52 ` [PATCH 20/25] list-files: preload index Nguyễn Thái Ngọc Duy
2015-04-06 21:35 ` Eric Sunshine
2015-04-06 13:52 ` [PATCH 21/25] list-files: reduce match_pathspec calls in matched() Nguyễn Thái Ngọc Duy
2015-04-06 13:52 ` [PATCH 22/25] list-files: only do diff that is actually useful Nguyễn Thái Ngọc Duy
2015-04-06 13:52 ` [PATCH 23/25] pathspec: move getenv() code out of prefix_pathspec() Nguyễn Thái Ngọc Duy
2015-04-06 13:52 ` [PATCH 24/25] list-files: make :(glob) pathspec default Nguyễn Thái Ngọc Duy
2015-04-06 13:52 ` [PATCH 25/25] list-files: documentation Nguyễn Thái Ngọc Duy
2015-04-06 21:37 ` Eric Sunshine
2015-04-06 13:58 ` [PATCH v2 00/25] list-files redesign Duy Nguyen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1428328354-14897-10-git-send-email-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=1425896314-10941-1-git-send-email-pclouds@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).