From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Eric Raymond <esr@snark.thyrsus.com>
Subject: Re: [PATCH 0/5] "status --ignored"
Date: Sat, 10 Apr 2010 03:44:30 -0400 [thread overview]
Message-ID: <20100410074430.GA12567@coredump.intra.peff.net> (raw)
In-Reply-To: <1270885256-31589-1-git-send-email-gitster@pobox.com>
On Sat, Apr 10, 2010 at 12:40:51AM -0700, Junio C Hamano wrote:
> > It wouldn't be too hard to add them in, and would look something like
> > the patch below.
>
> As I didn't see a patch, I did a rough outline just for fun.
Gah. Yours is undoubtedly less ugly, but here was mine for reference.
diff --git a/dir.c b/dir.c
index cb83332..deee7c8 100644
--- a/dir.c
+++ b/dir.c
@@ -619,7 +619,9 @@ static int exclude_matches_pathspec(const char *path, int len,
return 1;
}
}
- return 0;
+ /* ugh, I think this may be a long-standing bug, but
+ * this code was never reachable before. */
+ return 1;
}
static int get_index_dtype(const char *path, int len)
diff --git a/wt-status.c b/wt-status.c
index 8ca59a2..53a7a5a 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -366,6 +366,8 @@ static void wt_status_collect_untracked(struct wt_status *s)
if (!s->show_untracked_files)
return;
memset(&dir, 0, sizeof(dir));
+ /* should be conditional on s->show_ignored_files */
+ dir.flags |= DIR_COLLECT_IGNORED;
if (s->show_untracked_files != SHOW_ALL_UNTRACKED_FILES)
dir.flags |=
DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES;
@@ -381,6 +383,14 @@ static void wt_status_collect_untracked(struct wt_status *s)
s->workdir_untracked = 1;
string_list_insert(ent->name, &s->untracked);
}
+ for (i = 0; i < dir.ignored_nr; i++) {
+ struct dir_entry *ent = dir.ignored[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);
+ }
}
void wt_status_collect(struct wt_status *s)
@@ -707,15 +717,15 @@ static void wt_shortstatus_status(int null_termination, struct string_list_item
}
static void wt_shortstatus_untracked(int null_termination, struct string_list_item *it,
- struct wt_status *s)
+ struct wt_status *s, const char *marker)
{
if (null_termination) {
- fprintf(stdout, "?? %s%c", it->string, 0);
+ fprintf(stdout, "%s %s%c", marker, it->string, 0);
} else {
struct strbuf onebuf = STRBUF_INIT;
const char *one;
one = quote_path(it->string, -1, &onebuf, s->prefix);
- color_fprintf(s->fp, color(WT_STATUS_UNTRACKED, s), "??");
+ color_fprintf(s->fp, color(WT_STATUS_UNTRACKED, s), marker);
printf(" %s\n", one);
strbuf_release(&onebuf);
}
@@ -739,7 +749,11 @@ void wt_shortstatus_print(struct wt_status *s, int null_termination)
struct string_list_item *it;
it = &(s->untracked.items[i]);
- wt_shortstatus_untracked(null_termination, it, s);
+ wt_shortstatus_untracked(null_termination, it, s, "??");
+ }
+ for (i = 0; i < s->ignored.nr; i++) {
+ struct string_list_item *it = &(s->ignored.items[i]);
+ wt_shortstatus_untracked(null_termination, it, s, "II");
}
}
diff --git a/wt-status.h b/wt-status.h
index 9120673..0f5cf38 100644
--- a/wt-status.h
+++ b/wt-status.h
@@ -53,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);
next prev parent reply other threads:[~2010-04-10 7:45 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 ` [PATCH 3/5] wt-status: collect ignored files Junio C Hamano
2010-04-10 7:48 ` 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 ` Jeff King [this message]
2010-04-10 7:48 ` [PATCH 0/5] "status --ignored" 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=20100410074430.GA12567@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=esr@snark.thyrsus.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).