From aaf9f71f082e04337f58adc656032b3ca5072e4f Mon Sep 17 00:00:00 2001 From: Georg Fischer Date: Sun, 3 May 2009 17:38:25 +0200 Subject: [PATCH] rebased and brought code up to speed with v1.6.2 code base (ie. where applicable did the same changes to enumfiles.c that have been done in builtin-ls-files.c) --- igit-enumfiles.c | 631 ++----------------------------------------------------- 1 file changed, 19 insertions(+), 612 deletions(-) diff --git a/igit-enumfiles.c b/igit-enumfiles.c index daf55054fc..2a7ac816f8 100644 --- a/igit-enumfiles.c +++ b/igit-enumfiles.c @@ -210,7 +210,7 @@ static void enum_unversioned(struct dir_entry **files, int nr, BOOL bIgnored) if (len >= ent->len) die("igit status: internal error - directory entry not superset of prefix"); - if (pathspec && !pathspec_match(pathspec, ps_matched, ent->name, len)) + if (pathspec && !match_pathspec(pathspec, ent->name, ent->len, len, ps_matched)) continue; LPCSTR sFileName; @@ -916,6 +916,9 @@ BOOL ig_enum_files(const char *pszProjectPath, const char *pszSubPath, const cha pathspec = get_pathspec(prefix, argv); + // TODO: in ls-files from v1.6.2 read_cache call was moved up here, not sure if that is needed or works correctly here + //read_cache(); + // Verify that the pathspec matches the prefix if (pathspec) prefix = verify_pathspec(prefix); @@ -1046,7 +1049,7 @@ BOOL ig_enum_files(const char *pszProjectPath, const char *pszSubPath, const cha int dtype = ce_to_dtype(ce); - if (excluded(dir, ce->name, &dtype) != dir->show_ignored) + if (excluded(dir, ce->name, &dtype) != !!(dir->flags & DIR_SHOW_IGNORED)) continue; if (ce->ce_flags & CE_UPDATE) continue; @@ -1055,7 +1058,7 @@ BOOL ig_enum_files(const char *pszProjectPath, const char *pszSubPath, const cha // this test was originally done in enum_ce_entry but in order to avoid unecessery lstat calls it was moved if (prefix_len >= ce_namelen(ce)) die("git ls-files: internal error - cache entry not superset of prefix"); - if (pathspec && !pathspec_match(pathspec, ps_matched, ce->name, prefix_len)) + if (pathspec && !match_pathspec(pathspec, ce->name, ce_namelen(ce), prefix_len, ps_matched)) continue; if (single_dir || (no_recurse && is_subpath(refpath, pathspec_len, ce->name))) @@ -1101,6 +1104,7 @@ BOOL ig_enum_files(const char *pszProjectPath, const char *pszSubPath, const cha if (!bIgnoreInitialized) { + exc_given = 1; setup_standard_excludes(dir); bIgnoreInitialized = TRUE; } @@ -1149,16 +1153,20 @@ BOOL ig_enum_files(const char *pszProjectPath, const char *pszSubPath, const cha if (!bIgnoreInitialized) { + exc_given = 1; setup_standard_excludes(dir); bIgnoreInitialized = TRUE; } - dir->collect_ignored = 1; - dir->show_ignored = 0; - dir->show_other_directories = 0; - dir->hide_empty_directories = 0; - dir->collect_all_ignored = 1; - dir->collect_directories = 1; - dir->no_recurse_readdir = no_recurse ? 1 : 0; + dir->flags |= DIR_COLLECT_IGNORED; + dir->flags &= ~DIR_SHOW_IGNORED; + dir->flags &= ~DIR_SHOW_OTHER_DIRECTORIES; + dir->flags &= ~DIR_HIDE_EMPTY_DIRECTORIES; + dir->flags |= DIR_COLLECT_ALL_IGNORED; + dir->flags |= DIR_COLLECT_DIRECTORIES; + if (no_recurse) + dir->flags |= DIR_NO_RECURSE_READDIR; + else + dir->flags &= ~DIR_NO_RECURSE_READDIR; read_directory(dir, path, base, baselen, pathspec); // if root dir is ignored, then all unversioned files under it are considered ignore @@ -1171,6 +1179,7 @@ BOOL ig_enum_files(const char *pszProjectPath, const char *pszSubPath, const cha if (!bIgnoreInitialized) { + exc_given = 1; setup_standard_excludes(dir); bIgnoreInitialized = TRUE; } @@ -1256,605 +1265,3 @@ BOOL ig_enum_files(const char *pszProjectPath, const char *pszSubPath, const cha return TRUE; } - - -#if 0 - -/* - * This merges the file listing in the directory cache index - * with the actual working directory list, and shows different - * combinations of the two. - * - * Copyright (C) Linus Torvalds, 2005 - */ -#include "cache.h" -#include "quote.h" -#include "dir.h" -#include "builtin.h" -#include "tree.h" - -static int abbrev; -static int show_deleted; -static int show_cached; -static int show_others; -static int show_stage; -static int show_unmerged; -static int show_modified; -static int show_killed; -static int show_valid_bit; -static int line_terminator = '\n'; - -static int prefix_len; -static int prefix_offset; -static const char **pathspec; -static int error_unmatch; -static char *ps_matched; -static const char *with_tree; - -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 = ""; - - -/* - * Match a pathspec against a filename. The first "skiplen" characters - * are the common prefix - */ -int pathspec_match(const char **spec, char *ps_matched, - const char *filename, int skiplen) -{ - const char *m; - - while ((m = *spec++) != NULL) { - int matchlen = strlen(m + skiplen); - - if (!matchlen) - goto matched; - if (!strncmp(m + skiplen, filename + skiplen, matchlen)) { - if (m[skiplen + matchlen - 1] == '/') - goto matched; - switch (filename[skiplen + matchlen]) { - case '/': case '\0': - goto matched; - } - } - if (!fnmatch(m + skiplen, filename + skiplen, 0)) - goto matched; - if (ps_matched) - ps_matched++; - continue; - matched: - if (ps_matched) - *ps_matched = 1; - return 1; - } - return 0; -} - -static void show_dir_entry(const char *tag, struct dir_entry *ent) -{ - 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 (pathspec && !pathspec_match(pathspec, ps_matched, ent->name, len)) - return; - - fputs(tag, stdout); - write_name_quoted(ent->name + offset, stdout, line_terminator); -} - -static void show_other_files(struct dir_struct *dir) -{ - int i; - - for (i = 0; i < dir->nr; i++) { - struct dir_entry *ent = dir->entries[i]; - if (!cache_name_is_other(ent->name, ent->len)) - continue; - show_dir_entry(tag_other, ent); - } -} - -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; - - 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) - show_dir_entry(tag_killed, dir->entries[i]); - } -} - -static void show_ce_entry(const char *tag, struct cache_entry *ce) -{ - 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"); - - if (pathspec && !pathspec_match(pathspec, ps_matched, ce->name, len)) - return; - - if (tag && *tag && show_valid_bit && - (ce->ce_flags & 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); - } else { - printf("%s%06o %s %d\t", - tag, - ce->ce_mode, - abbrev ? find_unique_abbrev(ce->sha1,abbrev) - : sha1_to_hex(ce->sha1), - ce_stage(ce)); - } - write_name_quoted(ce->name + offset, stdout, line_terminator); -} - -static void show_files(struct dir_struct *dir, const char *prefix) -{ - int i; - - /* For cached/deleted files we don't need to even do the readdir */ - if (show_others || show_killed) { - const char *path = ".", *base = ""; - int baselen = prefix_len; - - if (baselen) - path = base = prefix; - read_directory(dir, path, base, baselen, pathspec); - 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]; - int dtype = ce_to_dtype(ce); - if (excluded(dir, ce->name, &dtype) != dir->show_ignored) - continue; - if (show_unmerged && !ce_stage(ce)) - continue; - if (ce->ce_flags & CE_UPDATE) - continue; - show_ce_entry(ce_stage(ce) ? tag_unmerged : tag_cached, ce); - } - } - if (show_deleted | show_modified) { - for (i = 0; i < active_nr; i++) { - struct cache_entry *ce = active_cache[i]; - struct stat st; - int err; - int dtype = ce_to_dtype(ce); - if (excluded(dir, ce->name, &dtype) != dir->show_ignored) - continue; - if (ce->ce_flags & CE_UPDATE) - continue; - 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(const char *prefix) -{ - int pos = cache_name_pos(prefix, prefix_len); - unsigned int first, last; - - if (pos < 0) - pos = -pos-1; - memmove(active_cache, active_cache + pos, - (active_nr - pos) * sizeof(struct cache_entry *)); - 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 *verify_pathspec(const char *prefix) -{ - const char **p, *n, *prev; - 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 (prefix_offset > max || memcmp(prev, prefix, prefix_offset)) - die("git ls-files: cannot generate relative filenames containing '..'"); - - prefix_len = max; - return max ? xmemdupz(prev, max) : NULL; -} - -/* - * Read the tree specified with --with-tree option - * (typically, HEAD) into stage #1 and then - * squash them down to stage #0. This is used for - * --error-unmatch to list and check the path patterns - * that were given from the command line. We are not - * going to write this index out. - */ -void overlay_tree_on_cache(const char *tree_name, const char *prefix) -{ - struct tree *tree; - unsigned char sha1[20]; - const char **match; - struct cache_entry *last_stage0 = NULL; - int i; - - if (get_sha1(tree_name, sha1)) - die("tree-ish %s not found.", tree_name); - tree = parse_tree_indirect(sha1); - if (!tree) - die("bad tree-ish %s", tree_name); - - /* Hoist the unmerged entries up to stage #3 to make room */ - for (i = 0; i < active_nr; i++) { - struct cache_entry *ce = active_cache[i]; - if (!ce_stage(ce)) - continue; - ce->ce_flags |= CE_STAGEMASK; - } - - if (prefix) { - static const char *(matchbuf[2]); - matchbuf[0] = prefix; - matchbuf[1] = NULL; - match = matchbuf; - } else - match = NULL; - if (read_tree(tree, 1, match)) - die("unable to read tree entries %s", tree_name); - - for (i = 0; i < active_nr; i++) { - struct cache_entry *ce = active_cache[i]; - switch (ce_stage(ce)) { - case 0: - last_stage0 = ce; - /* fallthru */ - default: - continue; - case 1: - /* - * If there is stage #0 entry for this, we do not - * need to show it. We use CE_UPDATE bit to mark - * such an entry. - */ - if (last_stage0 && - !strcmp(last_stage0->name, ce->name)) - ce->ce_flags |= CE_UPDATE; - } - } -} - -int report_path_error(const char *ps_matched, const char **pathspec, int prefix_offset) -{ - /* - * Make sure all pathspec matched; otherwise it is an error. - */ - int num, errors = 0; - for (num = 0; pathspec[num]; num++) { - int other, found_dup; - - if (ps_matched[num]) - continue; - /* - * The caller might have fed identical pathspec - * twice. Do not barf on such a mistake. - */ - for (found_dup = other = 0; - !found_dup && pathspec[other]; - other++) { - if (other == num || !ps_matched[other]) - continue; - if (!strcmp(pathspec[other], pathspec[num])) - /* - * Ok, we have a match already. - */ - found_dup = 1; - } - if (found_dup) - continue; - - error("pathspec '%s' did not match any file(s) known to git.", - pathspec[num] + prefix_offset); - errors++; - } - return errors; -} - -static const char ls_files_usage[] = - "git ls-files [-z] [-t] [-v] (--[cached|deleted|others|stage|unmerged|killed|modified])* " - "[ --ignored ] [--exclude=] [--exclude-from=] " - "[ --exclude-per-directory= ] [--exclude-standard] " - "[--full-name] [--abbrev] [--] []*"; - -int cmd_ls_files(int argc, const char **argv, const char *prefix) -{ - int i; - int exc_given = 0, require_work_tree = 0; - struct dir_struct dir; - - memset(&dir, 0, sizeof(dir)); - if (prefix) - prefix_offset = strlen(prefix); - git_config(git_default_config, NULL); - - for (i = 1; i < argc; i++) { - const char *arg = argv[i]; - - if (!strcmp(arg, "--")) { - i++; - break; - } - if (!strcmp(arg, "-z")) { - line_terminator = 0; - 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; - continue; - } - if (!strcmp(arg, "-d") || !strcmp(arg, "--deleted")) { - show_deleted = 1; - continue; - } - if (!strcmp(arg, "-m") || !strcmp(arg, "--modified")) { - show_modified = 1; - require_work_tree = 1; - continue; - } - if (!strcmp(arg, "-o") || !strcmp(arg, "--others")) { - show_others = 1; - require_work_tree = 1; - continue; - } - if (!strcmp(arg, "-i") || !strcmp(arg, "--ignored")) { - dir.show_ignored = 1; - require_work_tree = 1; - continue; - } - if (!strcmp(arg, "-s") || !strcmp(arg, "--stage")) { - show_stage = 1; - continue; - } - if (!strcmp(arg, "-k") || !strcmp(arg, "--killed")) { - show_killed = 1; - require_work_tree = 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; - continue; - } - if (!strcmp(arg, "-x") && i+1 < argc) { - exc_given = 1; - add_exclude(argv[++i], "", 0, &dir.exclude_list[EXC_CMDL]); - continue; - } - if (!prefixcmp(arg, "--exclude=")) { - 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 (!prefixcmp(arg, "--exclude-from=")) { - exc_given = 1; - add_excludes_from_file(&dir, arg+15); - continue; - } - if (!prefixcmp(arg, "--exclude-per-directory=")) { - exc_given = 1; - dir.exclude_per_dir = arg + 24; - continue; - } - if (!strcmp(arg, "--exclude-standard")) { - exc_given = 1; - setup_standard_excludes(&dir); - continue; - } - if (!strcmp(arg, "--full-name")) { - prefix_offset = 0; - continue; - } - if (!strcmp(arg, "--error-unmatch")) { - error_unmatch = 1; - continue; - } - if (!prefixcmp(arg, "--with-tree=")) { - with_tree = arg + 12; - continue; - } - if (!prefixcmp(arg, "--abbrev=")) { - 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; - } - - if (require_work_tree && !is_inside_work_tree()) - setup_work_tree(); - - pathspec = get_pathspec(prefix, argv + i); - - /* Verify that the pathspec matches the prefix */ - if (pathspec) - prefix = verify_pathspec(prefix); - - /* Treat unmatching pathspec elements as errors */ - if (pathspec && error_unmatch) { - int num; - for (num = 0; pathspec[num]; num++) - ; - ps_matched = xcalloc(1, num); - } - - 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 | - show_killed | show_modified)) - show_cached = 1; - - read_cache(); - if (prefix) - prune_cache(prefix); - if (with_tree) { - /* - * Basic sanity check; show-stages and show-unmerged - * would not make any sense with this option. - */ - if (show_stage || show_unmerged) - die("ls-files --with-tree is incompatible with -s or -u"); - overlay_tree_on_cache(with_tree, prefix); - } - show_files(&dir, prefix); - - if (ps_matched) { - int bad; - bad = report_path_error(ps_matched, pathspec, prefix_offset); - if (bad) - fprintf(stderr, "Did you forget to 'git add'?\n"); - - return bad ? 1 : 0; - } - - return 0; -} - -#endif -- 2.11.4.GIT