X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=ls-files.c;h=db2288aeee61bf64f30fdcc4b11e91c0cd3038a0;hb=942c1f53aef03cb3d8b5c39b38997a379c3fad20;hp=c76e30e990c929bc381e5d022675f068a7650210;hpb=5be4efbefafcd5b81fe3d97e8395da1887b4902a;p=git.git diff --git a/ls-files.c b/ls-files.c index c76e30e9..db2288ae 100644 --- a/ls-files.c +++ b/ls-files.c @@ -9,6 +9,7 @@ #include #include "cache.h" +#include "quote.h" static int show_deleted = 0; static int show_cached = 0; @@ -16,20 +17,22 @@ static int show_others = 0; static int show_ignored = 0; static int show_stage = 0; static int show_unmerged = 0; +static int show_modified = 0; static int show_killed = 0; static int line_terminator = '\n'; static int prefix_len = 0, prefix_offset = 0; static const char *prefix = NULL; -static const char *glob = NULL; +static const char **pathspec = NULL; 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 const char *tag_modified = ""; -static char *exclude_per_dir = NULL; +static const char *exclude_per_dir = NULL; /* We maintain three exclude pattern lists: * EXC_CMDL lists patterns explicitly given on the command line. @@ -94,7 +97,7 @@ static int add_excludes_from_file_1(const char *fname, for (i = 0; i < size; i++) { if (buf[i] == '\n') { if (entry != buf + i && entry[0] != '#') { - buf[i] = 0; + buf[i - (i && buf[i-1] == '\r')] = 0; add_exclude(entry, base, baselen, which); } entry = buf + i + 1; @@ -302,6 +305,33 @@ static int cmp_name(const void *p1, const void *p2) e2->name, e2->len); } +/* + * Match a pathspec against a filename. The first "len" characters + * are the common prefix + */ +static int match(const char **spec, const char *filename, int len) +{ + const char *m; + + while ((m = *spec++) != NULL) { + int matchlen = strlen(m + len); + + if (!matchlen) + return 1; + if (!strncmp(m + len, filename + len, matchlen)) { + if (m[len + matchlen - 1] == '/') + return 1; + switch (filename[len + matchlen]) { + case '/': case '\0': + return 1; + } + } + if (!fnmatch(m + len, filename + len, 0)) + return 1; + } + return 0; +} + static void show_dir_entry(const char *tag, struct nond_on_fs *ent) { int len = prefix_len; @@ -310,10 +340,35 @@ static void show_dir_entry(const char *tag, struct nond_on_fs *ent) if (len >= ent->len) die("git-ls-files: internal error - directory entry not superset of prefix"); - if (glob && fnmatch(glob, ent->name + len, 0)) + if (pathspec && !match(pathspec, ent->name, len)) return; - printf("%s%s%c", tag, ent->name + offset, line_terminator); + fputs(tag, stdout); + write_name_quoted("", ent->name + offset, line_terminator, stdout); + putchar(line_terminator); +} + +static void show_other_files(void) +{ + int i; + for (i = 0; i < nr_dir; i++) { + /* We should not have a matching entry, but we + * may have an unmerged entry for this path. + */ + struct nond_on_fs *ent = dir[i]; + int pos = cache_name_pos(ent->name, ent->len); + struct cache_entry *ce; + if (0 <= pos) + die("bug in show-other-files"); + pos = -pos - 1; + if (pos < active_nr) { + ce = active_cache[pos]; + if (ce_namelen(ce) == ent->len && + !memcmp(ce->name, ent->name, ent->len)) + continue; /* Yup, this one exists unmerged */ + } + show_dir_entry(tag_other, ent); + } } static void show_killed_files(void) @@ -373,18 +428,23 @@ static void show_ce_entry(const char *tag, struct cache_entry *ce) if (len >= ce_namelen(ce)) die("git-ls-files: internal error - cache entry not superset of prefix"); - if (glob && fnmatch(glob, ce->name + len, 0)) + if (pathspec && !match(pathspec, ce->name, len)) return; - if (!show_stage) - printf("%s%s%c", tag, ce->name + offset, line_terminator); - else - printf("%s%06o %s %d\t%s%c", + if (!show_stage) { + fputs(tag, stdout); + write_name_quoted("", ce->name + offset, line_terminator, stdout); + putchar(line_terminator); + } + else { + printf("%s%06o %s %d\t", tag, ntohl(ce->ce_mode), sha1_to_hex(ce->sha1), - ce_stage(ce), - ce->name + offset, line_terminator); + ce_stage(ce)); + write_name_quoted("", ce->name + offset, line_terminator, stdout); + putchar(line_terminator); + } } static void show_files(void) @@ -401,8 +461,7 @@ static void show_files(void) read_directory(path, base, baselen); qsort(dir, nr_dir, sizeof(struct nond_on_fs *), cmp_name); if (show_others) - for (i = 0; i < nr_dir; i++) - show_dir_entry(tag_other, dir[i]); + show_other_files(); if (show_killed) show_killed_files(); } @@ -416,15 +475,18 @@ static void show_files(void) show_ce_entry(ce_stage(ce) ? tag_unmerged : tag_cached, ce); } } - if (show_deleted) { + if (show_deleted | show_modified) { for (i = 0; i < active_nr; i++) { struct cache_entry *ce = active_cache[i]; struct stat st; + int err; if (excluded(ce->name) != show_ignored) continue; - if (!lstat(ce->name, &st)) - continue; - show_ce_entry(tag_removed, ce); + err = lstat(ce->name, &st); + if (show_deleted && err) + show_ce_entry(tag_removed, ce); + if (show_modified && ce_modified(ce, &st)) + show_ce_entry(tag_modified, ce); } } } @@ -455,55 +517,68 @@ static void prune_cache(void) active_nr = last; } -/* - * If the glob starts with a subdirectory, append it to - * the prefix instead, for more efficient operation. - * - * But we do not update the "prefix_offset", which tells - * how much of the name to ignore at printout. - */ -static void extend_prefix(void) +static void verify_pathspec(void) { - const char *p, *slash; - char c; - - p = glob; - slash = NULL; - while ((c = *p++) != '\0') { - if (c == '*') - break; - if (c == '/') - slash = p; + const char **p, *n, *prev; + char *real_prefix; + unsigned long max; + + prev = NULL; + max = PATH_MAX; + for (p = pathspec; (n = *p) != NULL; p++) { + int i, len = 0; + for (i = 0; i < max; i++) { + char c = n[i]; + if (prev && prev[i] != c) + break; + if (!c || c == '*' || c == '?') + break; + if (c == '/') + len = i+1; + } + prev = n; + if (len < max) { + max = len; + if (!max) + break; + } } - if (slash) { - int len = slash - glob; - char *newprefix = xmalloc(len + prefix_len + 1); - memcpy(newprefix, prefix, prefix_len); - memcpy(newprefix + prefix_len, glob, len); - prefix_len += len; - newprefix[prefix_len] = 0; - prefix = newprefix; - glob = *slash ? slash : NULL; + + if (prefix_offset > max || memcmp(prev, prefix, prefix_offset)) + die("git-ls-files: cannot generate relative filenames containing '..'"); + + real_prefix = NULL; + prefix_len = max; + if (max) { + real_prefix = xmalloc(max + 1); + memcpy(real_prefix, prev, max); + real_prefix[max] = 0; } + prefix = real_prefix; } static const char ls_files_usage[] = - "git-ls-files [-z] [-t] (--[cached|deleted|others|stage|unmerged|killed])* " + "git-ls-files [-z] [-t] (--[cached|deleted|others|stage|unmerged|killed|modified])* " "[ --ignored ] [--exclude=] [--exclude-from=] " - "[ --exclude-per-directory= ]"; + "[ --exclude-per-directory= ] [--] []*"; -int main(int argc, char **argv) +int main(int argc, const char **argv) { int i; int exc_given = 0; prefix = setup_git_directory(); if (prefix) - prefix_offset = prefix_len = strlen(prefix); + prefix_offset = strlen(prefix); + git_config(git_default_config); for (i = 1; i < argc; i++) { - char *arg = argv[i]; + const char *arg = argv[i]; + if (!strcmp(arg, "--")) { + i++; + break; + } if (!strcmp(arg, "-z")) { line_terminator = 0; continue; @@ -512,6 +587,7 @@ int main(int argc, char **argv) tag_cached = "H "; tag_unmerged = "M "; tag_removed = "R "; + tag_modified = "C "; tag_other = "? "; tag_killed = "K "; continue; @@ -524,6 +600,10 @@ int main(int argc, char **argv) show_deleted = 1; continue; } + if (!strcmp(arg, "-m") || !strcmp(arg, "--modified")) { + show_modified = 1; + continue; + } if (!strcmp(arg, "-o") || !strcmp(arg, "--others")) { show_others = 1; continue; @@ -577,13 +657,16 @@ int main(int argc, char **argv) prefix_offset = 0; continue; } - if (glob || *arg == '-') + if (*arg == '-') usage(ls_files_usage); - glob = arg; + break; } - if (glob) - extend_prefix(); + pathspec = get_pathspec(prefix, argv + i); + + /* Verify that the pathspec matches the prefix */ + if (pathspec) + verify_pathspec(); if (show_ignored && !exc_given) { fprintf(stderr, "%s: --ignored needs some exclude pattern\n", @@ -592,7 +675,8 @@ int main(int argc, char **argv) } /* With no flags, we default to showing the cached files */ - if (!(show_stage | show_deleted | show_others | show_unmerged | show_killed)) + if (!(show_stage | show_deleted | show_others | show_unmerged | + show_killed | show_modified)) show_cached = 1; read_cache();