summaryrefslogtreecommitdiff
path: root/show-files.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-04-16 15:33:23 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-16 15:33:23 (GMT)
commitaee461985f52857fa04999b2a988986dd8c84aba (patch)
treeb474d669fad6d037c18c0d232aef579a65ae101b /show-files.c
parentfcf712e60e3221a7971cb2ad89e61c565172f524 (diff)
downloadgit-aee461985f52857fa04999b2a988986dd8c84aba.zip
git-aee461985f52857fa04999b2a988986dd8c84aba.tar.gz
git-aee461985f52857fa04999b2a988986dd8c84aba.tar.bz2
[PATCH] Add --stage to show-files for new stage dircache.
This adds --stage option to show-files command. It shows file-mode, SHA1, stage and pathname. Record separator follows the usual convention of -z option as before. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'show-files.c')
-rw-r--r--show-files.c22
1 files changed, 18 insertions, 4 deletions
diff --git a/show-files.c b/show-files.c
index c9027cc..0ecb2bd 100644
--- a/show-files.c
+++ b/show-files.c
@@ -14,6 +14,7 @@ static int show_deleted = 0;
static int show_cached = 0;
static int show_others = 0;
static int show_ignored = 0;
+static int show_stage = 0;
static int line_terminator = '\n';
static const char **dir;
@@ -108,10 +109,19 @@ static void show_files(void)
for (i = 0; i < nr_dir; i++)
printf("%s%c", dir[i], line_terminator);
}
- if (show_cached) {
+ if (show_cached | show_stage) {
for (i = 0; i < active_nr; i++) {
struct cache_entry *ce = active_cache[i];
- printf("%s%c", ce->name, line_terminator);
+ if (!show_stage)
+ printf("%s%c", ce->name, line_terminator);
+ else
+ printf(/* "%06o %s %d %10d %s%c", */
+ "%06o %s %d %s%c",
+ ntohl(ce->ce_mode),
+ sha1_to_hex(ce->sha1),
+ ce_stage(ce),
+ /* ntohl(ce->ce_size), */
+ ce->name, line_terminator);
}
}
if (show_deleted) {
@@ -156,12 +166,16 @@ int main(int argc, char **argv)
show_ignored = 1;
continue;
}
+ if (!strcmp(arg, "--stage")) {
+ show_stage = 1;
+ continue;
+ }
- usage("show-files (--[cached|deleted|others|ignored])*");
+ usage("show-files [-z] (--[cached|deleted|others|ignored|stage])*");
}
/* With no flags, we default to showing the cached files */
- if (!(show_cached | show_deleted | show_others | show_ignored))
+ if (!(show_stage | show_deleted | show_others | show_ignored))
show_cached = 1;
read_cache();