From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH 3/5] wt-status: collect ignored files
Date: Sat, 10 Apr 2010 00:40:54 -0700 [thread overview]
Message-ID: <1270885256-31589-4-git-send-email-gitster@pobox.com> (raw)
In-Reply-To: <1270885256-31589-1-git-send-email-gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
wt-status.c | 16 ++++++++++++++++
wt-status.h | 2 ++
2 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/wt-status.c b/wt-status.c
index c88159a..f13c7da 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -42,6 +42,7 @@ void wt_status_prepare(struct wt_status *s)
s->index_file = get_index_file();
s->change.strdup_strings = 1;
s->untracked.strdup_strings = 1;
+ s->ignored.strdup_strings = 1;
}
static void wt_status_print_unmerged_header(struct wt_status *s)
@@ -382,6 +383,21 @@ static void wt_status_collect_untracked(struct wt_status *s)
free(ent);
}
+ if (s->show_ignored_files) {
+ dir.nr = 0;
+ dir.flags = DIR_SHOW_IGNORED | DIR_SHOW_OTHER_DIRECTORIES;
+ fill_directory(&dir, s->pathspec);
+ for (i = 0; i < dir.nr; i++) {
+ struct dir_entry *ent = dir.entries[i];
+ if (!cache_name_is_other(ent->name, ent->len))
+ continue;
+ if (!match_pathspec(s->pathspec, ent->name, ent->len, 0, NULL))
+ continue;
+ string_list_insert(ent->name, &s->ignored);
+ free(ent);
+ }
+ }
+
free(dir.entries);
}
diff --git a/wt-status.h b/wt-status.h
index 2c49f46..1093e65 100644
--- a/wt-status.h
+++ b/wt-status.h
@@ -41,6 +41,7 @@ struct wt_status {
int use_color;
int relative_paths;
int submodule_summary;
+ int show_ignored_files;
enum untracked_status_type show_untracked_files;
char color_palette[WT_STATUS_UNMERGED+1][COLOR_MAXLEN];
@@ -52,6 +53,7 @@ struct wt_status {
const char *prefix;
struct string_list change;
struct string_list untracked;
+ struct string_list ignored;
};
void wt_status_prepare(struct wt_status *s);
--
1.7.1.rc0.264.g94f6e
next prev parent reply other threads:[~2010-04-10 7:41 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-09 18:46 git status --porcelain is a mess that needs fixing Eric Raymond
2010-04-09 20:30 ` Junio C Hamano
2010-04-10 4:09 ` Jeff King
2010-04-10 5:46 ` Jonathan Nieder
2010-04-10 5:51 ` Jonathan Nieder
2010-04-10 6:03 ` Jeff King
2010-04-10 6:12 ` Jonathan Nieder
2010-04-10 6:32 ` Jeff King
2010-04-10 5:59 ` Eric Raymond
2010-04-10 7:40 ` [PATCH 0/5] "status --ignored" Junio C Hamano
2010-04-10 7:40 ` [PATCH 1/5] wt-status: remove unused workdir_untracked field Junio C Hamano
2010-04-10 7:40 ` [PATCH 2/5] wt-status: plug memory leak while collecting untracked files Junio C Hamano
2010-04-10 7:40 ` Junio C Hamano [this message]
2010-04-10 7:48 ` [PATCH 3/5] wt-status: collect ignored files Jeff King
2010-04-10 7:40 ` [PATCH 4/5] wt-status: rename and restructure status-print-untracked Junio C Hamano
2010-04-10 7:40 ` [PATCH 5/5] status: --ignored option shows ignored files Junio C Hamano
2010-04-10 7:44 ` [PATCH 0/5] "status --ignored" Jeff King
2010-04-10 7:48 ` Junio C Hamano
2010-04-10 8:40 ` Jeff King
2010-04-10 14:41 ` Eric Raymond
2010-04-10 18:27 ` Junio C Hamano
2010-04-10 19:20 ` Jakub Narebski
2010-04-11 10:35 ` Jeff King
2010-04-10 13:35 ` git status --porcelain is a mess that needs fixing Julian Phillips
2010-04-10 14:43 ` Eric Raymond
2010-04-10 14:56 ` Jon Seymour
2010-04-10 15:50 ` Julian Phillips
2010-04-10 23:33 ` Jon Seymour
2010-04-10 19:25 ` [RFC/PATCH] status: Add a new NUL separated output format Julian Phillips
2010-04-10 19:50 ` Eric Raymond
2010-04-10 20:34 ` Julian Phillips
2010-04-10 21:12 ` Eric Raymond
2010-04-10 23:03 ` [RFC/PATCH] status: Add json " Julian Phillips
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=1270885256-31589-4-git-send-email-gitster@pobox.com \
--to=gitster@pobox.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).