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 14/25] list-files: add --cached and --others
Date: Mon, 6 Apr 2015 20:52:23 +0700 [thread overview]
Message-ID: <1428328354-14897-15-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1428328354-14897-1-git-send-email-pclouds@gmail.com>
If no filter options are specified, --cached is the default.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
builtin/list-files.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++-
t/t7013-list-files.sh | 38 ++++++++++++++++++++++++-
2 files changed, 115 insertions(+), 2 deletions(-)
diff --git a/builtin/list-files.c b/builtin/list-files.c
index 7c18848..3cbd30d 100644
--- a/builtin/list-files.c
+++ b/builtin/list-files.c
@@ -6,9 +6,11 @@
#include "quote.h"
#include "column.h"
#include "color.h"
+#include "wt-status.h"
enum item_type {
FROM_INDEX,
+ FROM_WORKTREE,
IS_DIR
};
@@ -17,6 +19,7 @@ struct item {
const char *path;
char tag[2];
const struct cache_entry *ce;
+ struct stat st;
};
struct item_list {
@@ -35,6 +38,7 @@ static int max_depth;
static int show_dirs;
static int use_color = -1;
static int show_indicator;
+static int show_cached, show_untracked;
static const char * const ls_usage[] = {
N_("git list-files [options] [<pathspec>...]"),
@@ -42,6 +46,13 @@ static const char * const ls_usage[] = {
};
struct option ls_options[] = {
+ OPT_GROUP(N_("Filter options")),
+ OPT_BOOL('c', "cached", &show_cached,
+ N_("show cached files (default)")),
+ OPT_BOOL('o', "others", &show_untracked,
+ N_("show untracked files")),
+
+ OPT_GROUP(N_("Other")),
OPT_BOOL(0, "tag", &show_tag, N_("show tags")),
OPT_COLUMN('C', "column", &colopts, N_("show files in columns")),
OPT_SET_INT('1', NULL, &colopts,
@@ -82,6 +93,8 @@ static mode_t get_mode(const struct item *item)
return S_IFDIR;
case FROM_INDEX:
return item->ce->ce_mode;
+ case FROM_WORKTREE:
+ return item->st.st_mode;
}
return S_IFREG;
}
@@ -148,6 +161,9 @@ static void populate_cached_entries(struct item_list *result,
{
int i;
+ if (!show_cached)
+ return;
+
for (i = 0; i < istate->cache_nr; i++) {
const struct cache_entry *ce = istate->cache[i];
struct item *item;
@@ -169,6 +185,63 @@ static void populate_cached_entries(struct item_list *result,
remove_duplicates(result);
}
+static void add_wt_item(struct item_list *result,
+ enum item_type type,
+ const char *path,
+ const char *tag,
+ const struct stat *st)
+{
+ struct item *item;
+
+ ALLOC_GROW(result->items, result->nr + 1, result->alloc);
+ item = result->items + result->nr++;
+ item->type = type;
+ item->path = path;
+ memcpy(item->tag, tag, sizeof(item->tag));
+ memcpy(&item->st, &st, sizeof(st));
+}
+
+static void populate_untracked(struct item_list *result,
+ const struct string_list *untracked)
+{
+ int i;
+
+ for (i = 0; i < untracked->nr; i++) {
+ const char *name = untracked->items[i].string;
+ struct stat st;
+
+ if (lstat(name, &st))
+ /* color_filename() treats this as an orphan file */
+ st.st_mode = 0;
+
+ if (!matched(result, name, st.st_mode))
+ continue;
+
+ add_wt_item(result, FROM_WORKTREE, name, "??", &st);
+ }
+}
+
+static void wt_status_populate(struct item_list *result,
+ struct index_state *istate)
+{
+ struct wt_status ws;
+
+ if (!show_untracked)
+ return;
+
+ wt_status_prepare(&ws);
+ copy_pathspec(&ws.pathspec, &recursive_pathspec);
+ ws.relative_paths = 0;
+ ws.use_color = 0;
+ ws.fp = NULL;
+ wt_status_collect(&ws);
+
+ if (show_untracked)
+ populate_untracked(result, &ws.untracked);
+
+ remove_duplicates(result);
+}
+
static void cleanup_tags(struct item_list *result)
{
int i, same_1 = 1, same_2 = 1;
@@ -178,7 +251,7 @@ static void cleanup_tags(struct item_list *result)
result->tag_len = 0;
return;
}
- if (show_tag > 0) {
+ if (show_tag > 0 || show_cached + show_untracked > 1) {
result->tag_pos = 0;
result->tag_len = 2;
return;
@@ -315,6 +388,9 @@ int cmd_list_files(int argc, const char **argv, const char *cmd_prefix)
argc = parse_options(argc, argv, prefix, ls_options, ls_usage, 0);
+ if (!show_cached && !show_untracked)
+ show_cached = 1;
+
if (want_color(use_color))
parse_ls_color();
@@ -335,6 +411,7 @@ int cmd_list_files(int argc, const char **argv, const char *cmd_prefix)
memset(&result, 0, sizeof(result));
populate_cached_entries(&result, &the_index);
+ wt_status_populate(&result, &the_index);
cleanup_tags(&result);
display(&result);
/* free-ing result seems unnecessary */
diff --git a/t/t7013-list-files.sh b/t/t7013-list-files.sh
index 37dd403..53dc745 100755
--- a/t/t7013-list-files.sh
+++ b/t/t7013-list-files.sh
@@ -7,7 +7,41 @@ test_description='list-files'
test_expect_success 'setup' '
mkdir sa sa/sb sc &&
touch a b c sa/a sa/sb/b sc/c &&
- git add .
+ git add a sa/a &&
+ git commit -m initial &&
+ git add . &&
+ echo foo >.git/info/exclude &&
+ touch foo bar sa/foo sa/bar
+'
+
+test_expect_success 'list-files --others' '
+ git list-files --others >actual &&
+ cat >expect <<-\EOF &&
+ ?? actual
+ ?? bar
+ sa
+ EOF
+ test_cmp expect actual &&
+ git list-files --others --cached >actual &&
+ cat >expect <<-\EOF &&
+ a
+ ?? actual
+ b
+ ?? bar
+ c
+ ?? expect
+ sa
+ sc
+ EOF
+ test_cmp expect actual &&
+ git list-files --others -R >actual &&
+ cat >expect <<-\EOF &&
+ actual
+ bar
+ expect
+ sa/bar
+ EOF
+ test_cmp expect actual
'
test_expect_success 'list-files -R from index' '
@@ -34,6 +68,8 @@ test_expect_success 'list-files from index' '
EOF
test_cmp expect actual &&
git list-files >actual &&
+ test_cmp expect actual &&
+ git list-files --cached >actual &&
test_cmp expect actual
'
--
2.3.0.rc1.137.g477eb31
next prev parent reply other threads:[~2015-04-06 13:54 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 ` [PATCH 09/25] list-files: add --max-depth, -R and default to --max-depth=0 Nguyễn Thái Ngọc Duy
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 ` Nguyễn Thái Ngọc Duy [this message]
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-15-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).