X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=ls-files.c;h=c6c32d94b0755550a97544708ce71885c02a4b68;hb=e0f0e891c1742c6ae22dbc648a1000ad8655ff34;hp=58b5aee94ee76c9201c580d271fcb6aaf20d421f;hpb=8ae0a8c514dc492de8aadf3ca6bb4ad55e33960e;p=git.git diff --git a/ls-files.c b/ls-files.c index 58b5aee9..c6c32d94 100644 --- a/ls-files.c +++ b/ls-files.c @@ -16,8 +16,15 @@ static int show_others = 0; static int show_ignored = 0; static int show_stage = 0; static int show_unmerged = 0; +static int show_killed = 0; static int line_terminator = '\n'; +static const char *tag_cached = ""; +static const char *tag_unmerged = ""; +static const char *tag_removed = ""; +static const char *tag_other = ""; +static const char *tag_killed = ""; + static int nr_excludes; static const char **excludes; static int excludes_alloc; @@ -82,30 +89,37 @@ static int excluded(const char *pathname) return 0; } -static const char **dir; +struct nond_on_fs { + int len; + char name[0]; +}; + +static struct nond_on_fs **dir; static int nr_dir; static int dir_alloc; static void add_name(const char *pathname, int len) { - char *name; + struct nond_on_fs *ent; if (cache_name_pos(pathname, len) >= 0) return; if (nr_dir == dir_alloc) { dir_alloc = alloc_nr(dir_alloc); - dir = xrealloc(dir, dir_alloc*sizeof(char *)); + dir = xrealloc(dir, dir_alloc*sizeof(ent)); } - name = xmalloc(len + 1); - memcpy(name, pathname, len + 1); - dir[nr_dir++] = name; + ent = xmalloc(sizeof(*ent) + len + 1); + ent->len = len; + memcpy(ent->name, pathname, len); + dir[nr_dir++] = ent; } /* * Read a directory tree. We currently ignore anything but - * directories and regular files. That's because git doesn't - * handle them at all yet. Maybe that will change some day. + * directories, regular files and symlinks. That's because git + * doesn't handle them at all yet. Maybe that will change some + * day. * * Also, we currently ignore all names starting with a dot. * That likely will not change. @@ -122,7 +136,10 @@ static void read_directory(const char *path, const char *base, int baselen) while ((de = readdir(dir)) != NULL) { int len; - if (de->d_name[0] == '.') + if ((de->d_name[0] == '.') && + (de->d_name[1] == 0 || + !strcmp(de->d_name + 1, ".") || + !strcmp(de->d_name + 1, "git"))) continue; if (excluded(de->d_name) != show_ignored) continue; @@ -136,16 +153,18 @@ static void read_directory(const char *path, const char *base, int baselen) case DT_UNKNOWN: if (lstat(fullname, &st)) continue; - if (S_ISREG(st.st_mode)) + if (S_ISREG(st.st_mode) || S_ISLNK(st.st_mode)) break; if (!S_ISDIR(st.st_mode)) continue; /* fallthrough */ case DT_DIR: memcpy(fullname + baselen + len, "/", 2); - read_directory(fullname, fullname, baselen + len + 1); + read_directory(fullname, fullname, + baselen + len + 1); continue; case DT_REG: + case DT_LNK: break; } add_name(fullname, baselen + len); @@ -156,11 +175,62 @@ static void read_directory(const char *path, const char *base, int baselen) static int cmp_name(const void *p1, const void *p2) { - const char *n1 = *(const char **)p1; - const char *n2 = *(const char **)p2; - int l1 = strlen(n1), l2 = strlen(n2); + const struct nond_on_fs *e1 = *(const struct nond_on_fs **)p1; + const struct nond_on_fs *e2 = *(const struct nond_on_fs **)p2; + + return cache_name_compare(e1->name, e1->len, + e2->name, e2->len); +} + +static void show_killed_files(void) +{ + int i; + for (i = 0; i < nr_dir; i++) { + struct nond_on_fs *ent = dir[i]; + char *cp, *sp; + int pos, len, killed = 0; - return cache_name_compare(n1, l1, n2, l2); + for (cp = ent->name; cp - ent->name < ent->len; cp = sp + 1) { + sp = strchr(cp, '/'); + if (!sp) { + /* If ent->name is prefix of an entry in the + * cache, it will be killed. + */ + pos = cache_name_pos(ent->name, ent->len); + if (0 <= pos) + die("bug in show-killed-files"); + pos = -pos - 1; + while (pos < active_nr && + ce_stage(active_cache[pos])) + pos++; /* skip unmerged */ + if (active_nr <= pos) + break; + /* pos points at a name immediately after + * ent->name in the cache. Does it expect + * ent->name to be a directory? + */ + len = ce_namelen(active_cache[pos]); + if ((ent->len < len) && + !strncmp(active_cache[pos]->name, + ent->name, ent->len) && + active_cache[pos]->name[ent->len] == '/') + killed = 1; + break; + } + if (0 <= cache_name_pos(ent->name, sp - ent->name)) { + /* If any of the leading directories in + * ent->name is registered in the cache, + * ent->name will be killed. + */ + killed = 1; + break; + } + } + if (killed) + printf("%s%.*s%c", tag_killed, + dir[i]->len, dir[i]->name, + line_terminator); + } } static void show_files(void) @@ -168,11 +238,16 @@ static void show_files(void) int i; /* For cached/deleted files we don't need to even do the readdir */ - if (show_others) { + if (show_others || show_killed) { read_directory(".", "", 0); - qsort(dir, nr_dir, sizeof(char *), cmp_name); - for (i = 0; i < nr_dir; i++) - printf("%s%c", dir[i], line_terminator); + qsort(dir, nr_dir, sizeof(struct nond_on_fs *), cmp_name); + if (show_others) + for (i = 0; i < nr_dir; i++) + printf("%s%.*s%c", tag_other, + dir[i]->len, dir[i]->name, + line_terminator); + if (show_killed) + show_killed_files(); } if (show_cached | show_stage) { for (i = 0; i < active_nr; i++) { @@ -182,14 +257,17 @@ static void show_files(void) if (show_unmerged && !ce_stage(ce)) continue; if (!show_stage) - printf("%s%c", ce->name, line_terminator); + printf("%s%s%c", + ce_stage(ce) ? tag_unmerged : + tag_cached, + ce->name, line_terminator); else - printf(/* "%06o %s %d %10d %s%c", */ - "%06o %s %d %s%c", + printf("%s%06o %s %d\t%s%c", + ce_stage(ce) ? tag_unmerged : + tag_cached, ntohl(ce->ce_mode), sha1_to_hex(ce->sha1), ce_stage(ce), - /* ntohl(ce->ce_size), */ ce->name, line_terminator); } } @@ -201,13 +279,14 @@ static void show_files(void) continue; if (!lstat(ce->name, &st)) continue; - printf("%s%c", ce->name, line_terminator); + printf("%s%s%c", tag_removed, ce->name, + line_terminator); } } } static const char *ls_files_usage = - "ls-files [-z] (--[cached|deleted|others|stage|unmerged])* " + "git-ls-files [-z] [-t] (--[cached|deleted|others|stage|unmerged|killed])* " "[ --ignored [--exclude=] [--exclude-from=) ]"; int main(int argc, char **argv) @@ -219,6 +298,12 @@ int main(int argc, char **argv) if (!strcmp(arg, "-z")) { line_terminator = 0; + } else if (!strcmp(arg, "-t")) { + tag_cached = "H "; + tag_unmerged = "M "; + tag_removed = "R "; + tag_other = "? "; + tag_killed = "K "; } else if (!strcmp(arg, "-c") || !strcmp(arg, "--cached")) { show_cached = 1; } else if (!strcmp(arg, "-d") || !strcmp(arg, "--deleted")) { @@ -229,8 +314,12 @@ int main(int argc, char **argv) show_ignored = 1; } else if (!strcmp(arg, "-s") || !strcmp(arg, "--stage")) { show_stage = 1; + } else if (!strcmp(arg, "-k") || !strcmp(arg, "--killed")) { + show_killed = 1; } else if (!strcmp(arg, "-u") || !strcmp(arg, "--unmerged")) { - // There's no point in showing unmerged unless you also show the stage information + /* There's no point in showing unmerged unless + * you also show the stage information. + */ show_stage = 1; show_unmerged = 1; } else if (!strcmp(arg, "-x") && i+1 < argc) { @@ -246,12 +335,13 @@ int main(int argc, char **argv) } if (show_ignored && !nr_excludes) { - fprintf(stderr, "%s: --ignored needs some exclude pattern\n", argv[0]); + fprintf(stderr, "%s: --ignored needs some exclude pattern\n", + argv[0]); exit(1); } /* With no flags, we default to showing the cached files */ - if (!(show_stage | show_deleted | show_others | show_unmerged)) + if (!(show_stage | show_deleted | show_others | show_unmerged | show_killed)) show_cached = 1; read_cache();