*
* Copyright (C) Linus Torvalds, 2005
*/
-#include <dirent.h>
#include <fnmatch.h>
#include "cache.h"
+#include "quote.h"
+#include "dir.h"
+static int abbrev = 0;
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 show_unmerged = 0;
+static int show_modified = 0;
+static int show_killed = 0;
+static int show_valid_bit = 0;
static int line_terminator = '\n';
-static int nr_excludes;
-static const char **excludes;
-static int excludes_alloc;
+static int prefix_len = 0, prefix_offset = 0;
+static const char *prefix = NULL;
+static const char **pathspec = NULL;
+static int error_unmatch = 0;
+static char *ps_matched = 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 void add_exclude(const char *string)
-{
- if (nr_excludes == excludes_alloc) {
- excludes_alloc = alloc_nr(excludes_alloc);
- excludes = realloc(excludes, excludes_alloc*sizeof(char *));
- }
- excludes[nr_excludes++] = string;
-}
-static void add_excludes_from_file(const char *fname)
+/*
+ * Match a pathspec against a filename. The first "len" characters
+ * are the common prefix
+ */
+static int match(const char **spec, char *ps_matched,
+ const char *filename, int len)
{
- int fd, i;
- long size;
- char *buf, *entry;
-
- fd = open(fname, O_RDONLY);
- if (fd < 0)
- goto err;
- size = lseek(fd, 0, SEEK_END);
- if (size < 0)
- goto err;
- lseek(fd, 0, SEEK_SET);
- if (size == 0) {
- close(fd);
- return;
- }
- buf = xmalloc(size);
- if (read(fd, buf, size) != size)
- goto err;
- close(fd);
-
- entry = buf;
- for (i = 0; i < size; i++) {
- if (buf[i] == '\n') {
- if (entry != buf + i) {
- buf[i] = 0;
- add_exclude(entry);
- }
- entry = buf + i + 1;
- }
- }
- return;
+ const char *m;
-err: perror(fname);
- exit(1);
-}
+ while ((m = *spec++) != NULL) {
+ int matchlen = strlen(m + len);
-static int excluded(const char *pathname)
-{
- int i;
- if (nr_excludes) {
- const char *basename = strrchr(pathname, '/');
- basename = (basename) ? basename+1 : pathname;
- for (i = 0; i < nr_excludes; i++)
- if (fnmatch(excludes[i], basename, 0) == 0)
- return 1;
+ if (!matchlen)
+ goto matched;
+ if (!strncmp(m + len, filename + len, matchlen)) {
+ if (m[len + matchlen - 1] == '/')
+ goto matched;
+ switch (filename[len + matchlen]) {
+ case '/': case '\0':
+ goto matched;
+ }
+ }
+ if (!fnmatch(m + len, filename + len, 0))
+ goto matched;
+ if (ps_matched)
+ ps_matched++;
+ continue;
+ matched:
+ if (ps_matched)
+ *ps_matched = 1;
+ return 1;
}
return 0;
}
-static const char **dir;
-static int nr_dir;
-static int dir_alloc;
-
-static void add_name(const char *pathname, int len)
+static void show_dir_entry(const char *tag, struct dir_entry *ent)
{
- char *name;
+ int len = prefix_len;
+ int offset = prefix_offset;
+
+ if (len >= ent->len)
+ die("git-ls-files: internal error - directory entry not superset of prefix");
- if (cache_name_pos(pathname, len) >= 0)
+ if (pathspec && !match(pathspec, ps_matched, ent->name, len))
return;
- if (nr_dir == dir_alloc) {
- dir_alloc = alloc_nr(dir_alloc);
- dir = xrealloc(dir, dir_alloc*sizeof(char *));
- }
- name = xmalloc(len + 1);
- memcpy(name, pathname, len + 1);
- dir[nr_dir++] = name;
+ fputs(tag, stdout);
+ write_name_quoted("", 0, ent->name + offset, line_terminator, stdout);
+ putchar(line_terminator);
}
-/*
- * 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.
- *
- * Also, we currently ignore all names starting with a dot.
- * That likely will not change.
- */
-static void read_directory(const char *path, const char *base, int baselen)
+static void show_other_files(struct dir_struct *dir)
{
- DIR *dir = opendir(path);
-
- if (dir) {
- struct dirent *de;
- char fullname[MAXPATHLEN + 1];
- memcpy(fullname, base, baselen);
-
- while ((de = readdir(dir)) != NULL) {
- int len;
+ int i;
+ for (i = 0; i < dir->nr; i++) {
+ /* We should not have a matching entry, but we
+ * may have an unmerged entry for this path.
+ */
+ struct dir_entry *ent = dir->entries[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);
+ }
+}
- if (de->d_name[0] == '.')
- continue;
- if (excluded(de->d_name) != show_ignored)
- continue;
- len = strlen(de->d_name);
- memcpy(fullname + baselen, de->d_name, len+1);
+static void show_killed_files(struct dir_struct *dir)
+{
+ int i;
+ for (i = 0; i < dir->nr; i++) {
+ struct dir_entry *ent = dir->entries[i];
+ char *cp, *sp;
+ int pos, len, killed = 0;
- switch (DTYPE(de)) {
- struct stat st;
- default:
- continue;
- case DT_UNKNOWN:
- if (lstat(fullname, &st))
- continue;
- if (S_ISREG(st.st_mode))
+ 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;
- if (!S_ISDIR(st.st_mode))
- continue;
- /* fallthrough */
- case DT_DIR:
- memcpy(fullname + baselen + len, "/", 2);
- read_directory(fullname, fullname, baselen + len + 1);
- continue;
- case DT_REG:
+ /* 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;
}
- add_name(fullname, baselen + len);
}
- closedir(dir);
+ if (killed)
+ show_dir_entry(tag_killed, dir->entries[i]);
}
}
-static int cmp_name(const void *p1, const void *p2)
+static void show_ce_entry(const char *tag, struct cache_entry *ce)
{
- const char *n1 = *(const char **)p1;
- const char *n2 = *(const char **)p2;
- int l1 = strlen(n1), l2 = strlen(n2);
+ int len = prefix_len;
+ int offset = prefix_offset;
+
+ if (len >= ce_namelen(ce))
+ die("git-ls-files: internal error - cache entry not superset of prefix");
- return cache_name_compare(n1, l1, n2, l2);
+ if (pathspec && !match(pathspec, ps_matched, ce->name, len))
+ return;
+
+ if (tag && *tag && show_valid_bit &&
+ (ce->ce_flags & htons(CE_VALID))) {
+ static char alttag[4];
+ memcpy(alttag, tag, 3);
+ if (isalpha(tag[0]))
+ alttag[0] = tolower(tag[0]);
+ else if (tag[0] == '?')
+ alttag[0] = '!';
+ else {
+ alttag[0] = 'v';
+ alttag[1] = tag[0];
+ alttag[2] = ' ';
+ alttag[3] = 0;
+ }
+ tag = alttag;
+ }
+
+ if (!show_stage) {
+ fputs(tag, stdout);
+ write_name_quoted("", 0, ce->name + offset,
+ line_terminator, stdout);
+ putchar(line_terminator);
+ }
+ else {
+ printf("%s%06o %s %d\t",
+ tag,
+ ntohl(ce->ce_mode),
+ abbrev ? find_unique_abbrev(ce->sha1,abbrev)
+ : sha1_to_hex(ce->sha1),
+ ce_stage(ce));
+ write_name_quoted("", 0, ce->name + offset,
+ line_terminator, stdout);
+ putchar(line_terminator);
+ }
}
-static void show_files(void)
+static void show_files(struct dir_struct *dir)
{
int i;
/* For cached/deleted files we don't need to even do the readdir */
- if (show_others) {
- 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);
+ if (show_others || show_killed) {
+ const char *path = ".", *base = "";
+ int baselen = prefix_len;
+
+ if (baselen)
+ path = base = prefix;
+ read_directory(dir, path, base, baselen);
+ if (show_others)
+ show_other_files(dir);
+ if (show_killed)
+ show_killed_files(dir);
}
if (show_cached | show_stage) {
for (i = 0; i < active_nr; i++) {
struct cache_entry *ce = active_cache[i];
- if (excluded(ce->name) != show_ignored)
+ if (excluded(dir, ce->name) != dir->show_ignored)
continue;
if (show_unmerged && !ce_stage(ce))
continue;
- 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);
+ 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;
- if (excluded(ce->name) != show_ignored)
- continue;
- if (!stat(ce->name, &st))
+ int err;
+ if (excluded(dir, ce->name) != dir->show_ignored)
continue;
- printf("%s%c", ce->name, line_terminator);
+ err = lstat(ce->name, &st);
+ if (show_deleted && err)
+ show_ce_entry(tag_removed, ce);
+ if (show_modified && ce_modified(ce, &st, 0))
+ show_ce_entry(tag_modified, ce);
+ }
+ }
+}
+
+/*
+ * Prune the index to only contain stuff starting with "prefix"
+ */
+static void prune_cache(void)
+{
+ int pos = cache_name_pos(prefix, prefix_len);
+ unsigned int first, last;
+
+ if (pos < 0)
+ pos = -pos-1;
+ active_cache += pos;
+ active_nr -= pos;
+ first = 0;
+ last = active_nr;
+ while (last > first) {
+ int next = (last + first) >> 1;
+ struct cache_entry *ce = active_cache[next];
+ if (!strncmp(ce->name, prefix, prefix_len)) {
+ first = next+1;
+ continue;
}
+ last = next;
}
+ active_nr = last;
}
-static const char *ls_files_usage =
- "ls-files [-z] (--[cached|deleted|others|stage|unmerged])* "
- "[ --ignored [--exclude=<pattern>] [--exclude-from=<file>) ]";
+static void verify_pathspec(void)
+{
+ 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;
+ }
+ }
-int main(int argc, char **argv)
+ 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] [-v] (--[cached|deleted|others|stage|unmerged|killed|modified])* "
+ "[ --ignored ] [--exclude=<pattern>] [--exclude-from=<file>] "
+ "[ --exclude-per-directory=<filename> ] [--full-name] [--abbrev] "
+ "[--] [<file>]*";
+
+int main(int argc, const char **argv)
{
int i;
+ int exc_given = 0;
+ struct dir_struct dir;
+
+ memset(&dir, 0, sizeof(dir));
+ prefix = setup_git_directory();
+ if (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;
- } else if (!strcmp(arg, "-c") || !strcmp(arg, "--cached")) {
+ continue;
+ }
+ if (!strcmp(arg, "-t") || !strcmp(arg, "-v")) {
+ tag_cached = "H ";
+ tag_unmerged = "M ";
+ tag_removed = "R ";
+ tag_modified = "C ";
+ tag_other = "? ";
+ tag_killed = "K ";
+ if (arg[1] == 'v')
+ show_valid_bit = 1;
+ continue;
+ }
+ if (!strcmp(arg, "-c") || !strcmp(arg, "--cached")) {
show_cached = 1;
- } else if (!strcmp(arg, "-d") || !strcmp(arg, "--deleted")) {
+ continue;
+ }
+ if (!strcmp(arg, "-d") || !strcmp(arg, "--deleted")) {
show_deleted = 1;
- } else if (!strcmp(arg, "-o") || !strcmp(arg, "--others")) {
+ continue;
+ }
+ if (!strcmp(arg, "-m") || !strcmp(arg, "--modified")) {
+ show_modified = 1;
+ continue;
+ }
+ if (!strcmp(arg, "-o") || !strcmp(arg, "--others")) {
show_others = 1;
- } else if (!strcmp(arg, "-i") || !strcmp(arg, "--ignored")) {
- show_ignored = 1;
- } else if (!strcmp(arg, "-s") || !strcmp(arg, "--stage")) {
+ continue;
+ }
+ if (!strcmp(arg, "-i") || !strcmp(arg, "--ignored")) {
+ dir.show_ignored = 1;
+ continue;
+ }
+ if (!strcmp(arg, "-s") || !strcmp(arg, "--stage")) {
show_stage = 1;
- } else if (!strcmp(arg, "-u") || !strcmp(arg, "--unmerged")) {
- // There's no point in showing unmerged unless you also show the stage information
+ continue;
+ }
+ if (!strcmp(arg, "-k") || !strcmp(arg, "--killed")) {
+ show_killed = 1;
+ continue;
+ }
+ if (!strcmp(arg, "--directory")) {
+ dir.show_other_directories = 1;
+ continue;
+ }
+ if (!strcmp(arg, "--no-empty-directory")) {
+ dir.hide_empty_directories = 1;
+ continue;
+ }
+ if (!strcmp(arg, "-u") || !strcmp(arg, "--unmerged")) {
+ /* 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) {
- add_exclude(argv[++i]);
- } else if (!strncmp(arg, "--exclude=", 10)) {
- add_exclude(arg+10);
- } else if (!strcmp(arg, "-X") && i+1 < argc) {
- add_excludes_from_file(argv[++i]);
- } else if (!strncmp(arg, "--exclude-from=", 15)) {
- add_excludes_from_file(arg+15);
- } else
+ continue;
+ }
+ if (!strcmp(arg, "-x") && i+1 < argc) {
+ exc_given = 1;
+ add_exclude(argv[++i], "", 0, &dir.exclude_list[EXC_CMDL]);
+ continue;
+ }
+ if (!strncmp(arg, "--exclude=", 10)) {
+ exc_given = 1;
+ add_exclude(arg+10, "", 0, &dir.exclude_list[EXC_CMDL]);
+ continue;
+ }
+ if (!strcmp(arg, "-X") && i+1 < argc) {
+ exc_given = 1;
+ add_excludes_from_file(&dir, argv[++i]);
+ continue;
+ }
+ if (!strncmp(arg, "--exclude-from=", 15)) {
+ exc_given = 1;
+ add_excludes_from_file(&dir, arg+15);
+ continue;
+ }
+ if (!strncmp(arg, "--exclude-per-directory=", 24)) {
+ exc_given = 1;
+ dir.exclude_per_dir = arg + 24;
+ continue;
+ }
+ if (!strcmp(arg, "--full-name")) {
+ prefix_offset = 0;
+ continue;
+ }
+ if (!strcmp(arg, "--error-unmatch")) {
+ error_unmatch = 1;
+ continue;
+ }
+ if (!strncmp(arg, "--abbrev=", 9)) {
+ abbrev = strtoul(arg+9, NULL, 10);
+ if (abbrev && abbrev < MINIMUM_ABBREV)
+ abbrev = MINIMUM_ABBREV;
+ else if (abbrev > 40)
+ abbrev = 40;
+ continue;
+ }
+ if (!strcmp(arg, "--abbrev")) {
+ abbrev = DEFAULT_ABBREV;
+ continue;
+ }
+ if (*arg == '-')
usage(ls_files_usage);
+ break;
+ }
+
+ pathspec = get_pathspec(prefix, argv + i);
+
+ /* Verify that the pathspec matches the prefix */
+ if (pathspec)
+ verify_pathspec();
+
+ /* Treat unmatching pathspec elements as errors */
+ if (pathspec && error_unmatch) {
+ int num;
+ for (num = 0; pathspec[num]; num++)
+ ;
+ ps_matched = xcalloc(1, num);
}
- if (show_ignored && !nr_excludes) {
- fprintf(stderr, "%s: --ignored needs some exclude pattern\n", argv[0]);
+ if (dir.show_ignored && !exc_given) {
+ 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_modified))
show_cached = 1;
read_cache();
- show_files();
+ if (prefix)
+ prune_cache();
+ show_files(&dir);
+
+ if (ps_matched) {
+ /* We need to make sure all pathspec matched otherwise
+ * it is an error.
+ */
+ int num, errors = 0;
+ for (num = 0; pathspec[num]; num++) {
+ if (ps_matched[num])
+ continue;
+ error("pathspec '%s' did not match any.",
+ pathspec[num] + prefix_offset);
+ errors++;
+ }
+ return errors ? 1 : 0;
+ }
+
return 0;
}