2013-01-06 17:58:08 +01:00
|
|
|
#include "cache.h"
|
|
|
|
#include "dir.h"
|
|
|
|
#include "pathspec.h"
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Finds which of the given pathspecs match items in the index.
|
|
|
|
*
|
|
|
|
* For each pathspec, sets the corresponding entry in the seen[] array
|
|
|
|
* (which should be specs items long, i.e. the same size as pathspec)
|
|
|
|
* to the nature of the "closest" (i.e. most specific) match found for
|
|
|
|
* that pathspec in the index, if it was a closer type of match than
|
|
|
|
* the existing entry. As an optimization, matching is skipped
|
|
|
|
* altogether if seen[] already only contains non-zero entries.
|
|
|
|
*
|
|
|
|
* If seen[] has not already been written to, it may make sense
|
2013-01-06 17:58:09 +01:00
|
|
|
* to use find_pathspecs_matching_against_index() instead.
|
2013-01-06 17:58:08 +01:00
|
|
|
*/
|
2013-01-06 17:58:09 +01:00
|
|
|
void add_pathspec_matches_against_index(const char **pathspec,
|
|
|
|
char *seen, int specs)
|
2013-01-06 17:58:08 +01:00
|
|
|
{
|
|
|
|
int num_unmatched = 0, i;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Since we are walking the index as if we were walking the directory,
|
|
|
|
* we have to mark the matched pathspec as seen; otherwise we will
|
|
|
|
* mistakenly think that the user gave a pathspec that did not match
|
|
|
|
* anything.
|
|
|
|
*/
|
|
|
|
for (i = 0; i < specs; i++)
|
|
|
|
if (!seen[i])
|
|
|
|
num_unmatched++;
|
|
|
|
if (!num_unmatched)
|
|
|
|
return;
|
|
|
|
for (i = 0; i < active_nr; i++) {
|
|
|
|
struct cache_entry *ce = active_cache[i];
|
|
|
|
match_pathspec(pathspec, ce->name, ce_namelen(ce), 0, seen);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Finds which of the given pathspecs match items in the index.
|
|
|
|
*
|
2013-01-06 17:58:09 +01:00
|
|
|
* This is a one-shot wrapper around add_pathspec_matches_against_index()
|
|
|
|
* which allocates, populates, and returns a seen[] array indicating the
|
|
|
|
* nature of the "closest" (i.e. most specific) matches which each of the
|
|
|
|
* given pathspecs achieves against all items in the index.
|
2013-01-06 17:58:08 +01:00
|
|
|
*/
|
2013-01-06 17:58:09 +01:00
|
|
|
char *find_pathspecs_matching_against_index(const char **pathspec)
|
2013-01-06 17:58:08 +01:00
|
|
|
{
|
|
|
|
char *seen;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; pathspec[i]; i++)
|
|
|
|
; /* just counting */
|
|
|
|
seen = xcalloc(i, 1);
|
2013-01-06 17:58:09 +01:00
|
|
|
add_pathspec_matches_against_index(pathspec, seen, i);
|
2013-01-06 17:58:08 +01:00
|
|
|
return seen;
|
|
|
|
}
|
2013-01-06 17:58:10 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Check the index to see whether path refers to a submodule, or
|
|
|
|
* something inside a submodule. If the former, returns the path with
|
|
|
|
* any trailing slash stripped. If the latter, dies with an error
|
|
|
|
* message.
|
|
|
|
*/
|
|
|
|
const char *check_path_for_gitlink(const char *path)
|
|
|
|
{
|
|
|
|
int i, path_len = strlen(path);
|
|
|
|
for (i = 0; i < active_nr; i++) {
|
|
|
|
struct cache_entry *ce = active_cache[i];
|
|
|
|
if (S_ISGITLINK(ce->ce_mode)) {
|
|
|
|
int ce_len = ce_namelen(ce);
|
|
|
|
if (path_len <= ce_len || path[ce_len] != '/' ||
|
|
|
|
memcmp(ce->name, path, ce_len))
|
|
|
|
/* path does not refer to this
|
|
|
|
* submodule or anything inside it */
|
|
|
|
continue;
|
|
|
|
if (path_len == ce_len + 1) {
|
|
|
|
/* path refers to submodule;
|
|
|
|
* strip trailing slash */
|
|
|
|
return xstrndup(ce->name, ce_len);
|
|
|
|
} else {
|
|
|
|
die (_("Path '%s' is in submodule '%.*s'"),
|
|
|
|
path, ce_len, ce->name);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return path;
|
|
|
|
}
|
2013-01-06 17:58:11 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Dies if the given path refers to a file inside a symlinked
|
|
|
|
* directory in the index.
|
|
|
|
*/
|
|
|
|
void die_if_path_beyond_symlink(const char *path, const char *prefix)
|
|
|
|
{
|
|
|
|
if (has_symlink_leading_path(path, strlen(path))) {
|
|
|
|
int len = prefix ? strlen(prefix) : 0;
|
|
|
|
die(_("'%s' is beyond a symbolic link"), path + len);
|
|
|
|
}
|
|
|
|
}
|
2013-07-14 10:35:25 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Magic pathspec
|
|
|
|
*
|
|
|
|
* Possible future magic semantics include stuff like:
|
|
|
|
*
|
|
|
|
* { PATHSPEC_NOGLOB, '!', "noglob" },
|
|
|
|
* { PATHSPEC_ICASE, '\0', "icase" },
|
|
|
|
* { PATHSPEC_RECURSIVE, '*', "recursive" },
|
|
|
|
* { PATHSPEC_REGEXP, '\0', "regexp" },
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
static struct pathspec_magic {
|
|
|
|
unsigned bit;
|
|
|
|
char mnemonic; /* this cannot be ':'! */
|
|
|
|
const char *name;
|
|
|
|
} pathspec_magic[] = {
|
|
|
|
{ PATHSPEC_FROMTOP, '/', "top" },
|
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Take an element of a pathspec and check for magic signatures.
|
2013-07-14 10:35:28 +02:00
|
|
|
* Append the result to the prefix. Return the magic bitmap.
|
2013-07-14 10:35:25 +02:00
|
|
|
*
|
|
|
|
* For now, we only parse the syntax and throw out anything other than
|
|
|
|
* "top" magic.
|
|
|
|
*
|
|
|
|
* NEEDSWORK: This needs to be rewritten when we start migrating
|
|
|
|
* get_pathspec() users to use the "struct pathspec" interface. For
|
|
|
|
* example, a pathspec element may be marked as case-insensitive, but
|
|
|
|
* the prefix part must always match literally, and a single stupid
|
|
|
|
* string cannot express such a case.
|
|
|
|
*/
|
2013-07-14 10:35:28 +02:00
|
|
|
static unsigned prefix_pathspec(struct pathspec_item *item,
|
|
|
|
unsigned *p_short_magic,
|
|
|
|
const char **raw, unsigned flags,
|
|
|
|
const char *prefix, int prefixlen,
|
|
|
|
const char *elt)
|
2013-07-14 10:35:25 +02:00
|
|
|
{
|
2013-07-14 10:35:28 +02:00
|
|
|
unsigned magic = 0, short_magic = 0;
|
2013-07-14 10:35:25 +02:00
|
|
|
const char *copyfrom = elt;
|
2013-07-14 10:35:28 +02:00
|
|
|
char *match;
|
2013-07-14 10:35:25 +02:00
|
|
|
int i;
|
|
|
|
|
|
|
|
if (elt[0] != ':') {
|
|
|
|
; /* nothing to do */
|
|
|
|
} else if (elt[1] == '(') {
|
|
|
|
/* longhand */
|
|
|
|
const char *nextat;
|
|
|
|
for (copyfrom = elt + 2;
|
|
|
|
*copyfrom && *copyfrom != ')';
|
|
|
|
copyfrom = nextat) {
|
|
|
|
size_t len = strcspn(copyfrom, ",)");
|
|
|
|
if (copyfrom[len] == ',')
|
|
|
|
nextat = copyfrom + len + 1;
|
|
|
|
else
|
|
|
|
/* handle ')' and '\0' */
|
|
|
|
nextat = copyfrom + len;
|
|
|
|
if (!len)
|
|
|
|
continue;
|
|
|
|
for (i = 0; i < ARRAY_SIZE(pathspec_magic); i++)
|
|
|
|
if (strlen(pathspec_magic[i].name) == len &&
|
|
|
|
!strncmp(pathspec_magic[i].name, copyfrom, len)) {
|
|
|
|
magic |= pathspec_magic[i].bit;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (ARRAY_SIZE(pathspec_magic) <= i)
|
2013-07-14 10:35:26 +02:00
|
|
|
die(_("Invalid pathspec magic '%.*s' in '%s'"),
|
2013-07-14 10:35:25 +02:00
|
|
|
(int) len, copyfrom, elt);
|
|
|
|
}
|
|
|
|
if (*copyfrom != ')')
|
2013-07-14 10:35:26 +02:00
|
|
|
die(_("Missing ')' at the end of pathspec magic in '%s'"), elt);
|
2013-07-14 10:35:25 +02:00
|
|
|
copyfrom++;
|
|
|
|
} else {
|
|
|
|
/* shorthand */
|
|
|
|
for (copyfrom = elt + 1;
|
|
|
|
*copyfrom && *copyfrom != ':';
|
|
|
|
copyfrom++) {
|
|
|
|
char ch = *copyfrom;
|
|
|
|
|
|
|
|
if (!is_pathspec_magic(ch))
|
|
|
|
break;
|
|
|
|
for (i = 0; i < ARRAY_SIZE(pathspec_magic); i++)
|
|
|
|
if (pathspec_magic[i].mnemonic == ch) {
|
2013-07-14 10:35:28 +02:00
|
|
|
short_magic |= pathspec_magic[i].bit;
|
2013-07-14 10:35:25 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (ARRAY_SIZE(pathspec_magic) <= i)
|
2013-07-14 10:35:26 +02:00
|
|
|
die(_("Unimplemented pathspec magic '%c' in '%s'"),
|
2013-07-14 10:35:25 +02:00
|
|
|
ch, elt);
|
|
|
|
}
|
|
|
|
if (*copyfrom == ':')
|
|
|
|
copyfrom++;
|
|
|
|
}
|
|
|
|
|
2013-07-14 10:35:28 +02:00
|
|
|
magic |= short_magic;
|
|
|
|
*p_short_magic = short_magic;
|
|
|
|
|
2013-07-14 10:35:25 +02:00
|
|
|
if (magic & PATHSPEC_FROMTOP)
|
2013-07-14 10:35:28 +02:00
|
|
|
match = xstrdup(copyfrom);
|
2013-07-14 10:35:25 +02:00
|
|
|
else
|
2013-07-14 10:35:28 +02:00
|
|
|
match = prefix_path(prefix, prefixlen, copyfrom);
|
|
|
|
*raw = item->match = match;
|
2013-07-14 10:35:29 +02:00
|
|
|
item->original = elt;
|
2013-07-14 10:35:28 +02:00
|
|
|
item->len = strlen(item->match);
|
2013-07-14 10:35:33 +02:00
|
|
|
|
|
|
|
if ((flags & PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP) &&
|
|
|
|
(item->len >= 1 && item->match[item->len - 1] == '/') &&
|
|
|
|
(i = cache_name_pos(item->match, item->len - 1)) >= 0 &&
|
|
|
|
S_ISGITLINK(active_cache[i]->ce_mode)) {
|
|
|
|
item->len--;
|
|
|
|
match[item->len] = '\0';
|
|
|
|
}
|
|
|
|
|
2013-07-14 10:35:34 +02:00
|
|
|
if (flags & PATHSPEC_STRIP_SUBMODULE_SLASH_EXPENSIVE)
|
|
|
|
for (i = 0; i < active_nr; i++) {
|
|
|
|
struct cache_entry *ce = active_cache[i];
|
|
|
|
int ce_len = ce_namelen(ce);
|
|
|
|
|
|
|
|
if (!S_ISGITLINK(ce->ce_mode))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (item->len <= ce_len || match[ce_len] != '/' ||
|
|
|
|
memcmp(ce->name, match, ce_len))
|
|
|
|
continue;
|
|
|
|
if (item->len == ce_len + 1) {
|
|
|
|
/* strip trailing slash */
|
|
|
|
item->len--;
|
|
|
|
match[item->len] = '\0';
|
|
|
|
} else
|
|
|
|
die (_("Pathspec '%s' is in submodule '%.*s'"),
|
|
|
|
elt, ce_len, ce->name);
|
|
|
|
}
|
|
|
|
|
2013-07-14 10:35:28 +02:00
|
|
|
if (limit_pathspec_to_literal())
|
|
|
|
item->nowildcard_len = item->len;
|
|
|
|
else
|
|
|
|
item->nowildcard_len = simple_length(item->match);
|
|
|
|
item->flags = 0;
|
|
|
|
if (item->nowildcard_len < item->len &&
|
|
|
|
item->match[item->nowildcard_len] == '*' &&
|
|
|
|
no_wildcard(item->match + item->nowildcard_len + 1))
|
|
|
|
item->flags |= PATHSPEC_ONESTAR;
|
|
|
|
return magic;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int pathspec_item_cmp(const void *a_, const void *b_)
|
|
|
|
{
|
|
|
|
struct pathspec_item *a, *b;
|
|
|
|
|
|
|
|
a = (struct pathspec_item *)a_;
|
|
|
|
b = (struct pathspec_item *)b_;
|
|
|
|
return strcmp(a->match, b->match);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void NORETURN unsupported_magic(const char *pattern,
|
|
|
|
unsigned magic,
|
|
|
|
unsigned short_magic)
|
|
|
|
{
|
|
|
|
struct strbuf sb = STRBUF_INIT;
|
|
|
|
int i, n;
|
|
|
|
for (n = i = 0; i < ARRAY_SIZE(pathspec_magic); i++) {
|
|
|
|
const struct pathspec_magic *m = pathspec_magic + i;
|
|
|
|
if (!(magic & m->bit))
|
|
|
|
continue;
|
|
|
|
if (sb.len)
|
|
|
|
strbuf_addstr(&sb, " ");
|
|
|
|
if (short_magic & m->bit)
|
|
|
|
strbuf_addf(&sb, "'%c'", m->mnemonic);
|
|
|
|
else
|
|
|
|
strbuf_addf(&sb, "'%s'", m->name);
|
|
|
|
n++;
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
* We may want to substitute "this command" with a command
|
|
|
|
* name. E.g. when add--interactive dies when running
|
|
|
|
* "checkout -p"
|
|
|
|
*/
|
|
|
|
die(_("%s: pathspec magic not supported by this command: %s"),
|
|
|
|
pattern, sb.buf);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Given command line arguments and a prefix, convert the input to
|
|
|
|
* pathspec. die() if any magic in magic_mask is used.
|
|
|
|
*/
|
|
|
|
void parse_pathspec(struct pathspec *pathspec,
|
|
|
|
unsigned magic_mask, unsigned flags,
|
|
|
|
const char *prefix, const char **argv)
|
|
|
|
{
|
|
|
|
struct pathspec_item *item;
|
|
|
|
const char *entry = argv ? *argv : NULL;
|
|
|
|
int i, n, prefixlen;
|
|
|
|
|
|
|
|
memset(pathspec, 0, sizeof(*pathspec));
|
|
|
|
|
2013-07-14 10:35:32 +02:00
|
|
|
if (flags & PATHSPEC_MAXDEPTH_VALID)
|
|
|
|
pathspec->magic |= PATHSPEC_MAXDEPTH;
|
|
|
|
|
2013-07-14 10:35:28 +02:00
|
|
|
/* No arguments, no prefix -> no pathspec */
|
|
|
|
if (!entry && !prefix)
|
|
|
|
return;
|
|
|
|
|
2013-07-14 10:35:30 +02:00
|
|
|
if ((flags & PATHSPEC_PREFER_CWD) &&
|
|
|
|
(flags & PATHSPEC_PREFER_FULL))
|
|
|
|
die("BUG: PATHSPEC_PREFER_CWD and PATHSPEC_PREFER_FULL are incompatible");
|
|
|
|
|
2013-07-14 10:35:28 +02:00
|
|
|
/* No arguments with prefix -> prefix pathspec */
|
|
|
|
if (!entry) {
|
|
|
|
static const char *raw[2];
|
|
|
|
|
2013-07-14 10:35:30 +02:00
|
|
|
if (flags & PATHSPEC_PREFER_FULL)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (!(flags & PATHSPEC_PREFER_CWD))
|
|
|
|
die("BUG: PATHSPEC_PREFER_CWD requires arguments");
|
|
|
|
|
2013-07-14 10:35:28 +02:00
|
|
|
pathspec->items = item = xmalloc(sizeof(*item));
|
|
|
|
memset(item, 0, sizeof(*item));
|
|
|
|
item->match = prefix;
|
2013-07-14 10:35:29 +02:00
|
|
|
item->original = prefix;
|
2013-07-14 10:35:28 +02:00
|
|
|
item->nowildcard_len = item->len = strlen(prefix);
|
|
|
|
raw[0] = prefix;
|
|
|
|
raw[1] = NULL;
|
|
|
|
pathspec->nr = 1;
|
|
|
|
pathspec->raw = raw;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
n = 0;
|
|
|
|
while (argv[n])
|
|
|
|
n++;
|
|
|
|
|
|
|
|
pathspec->nr = n;
|
|
|
|
pathspec->items = item = xmalloc(sizeof(*item) * n);
|
|
|
|
pathspec->raw = argv;
|
|
|
|
prefixlen = prefix ? strlen(prefix) : 0;
|
|
|
|
|
|
|
|
for (i = 0; i < n; i++) {
|
|
|
|
unsigned short_magic;
|
|
|
|
entry = argv[i];
|
|
|
|
|
|
|
|
item[i].magic = prefix_pathspec(item + i, &short_magic,
|
|
|
|
argv + i, flags,
|
|
|
|
prefix, prefixlen, entry);
|
|
|
|
if (item[i].magic & magic_mask)
|
|
|
|
unsupported_magic(entry,
|
|
|
|
item[i].magic & magic_mask,
|
|
|
|
short_magic);
|
2013-07-14 10:35:34 +02:00
|
|
|
|
|
|
|
if ((flags & PATHSPEC_SYMLINK_LEADING_PATH) &&
|
|
|
|
has_symlink_leading_path(item[i].match, item[i].len)) {
|
|
|
|
die(_("pathspec '%s' is beyond a symbolic link"), entry);
|
|
|
|
}
|
|
|
|
|
2013-07-14 10:35:28 +02:00
|
|
|
if (item[i].nowildcard_len < item[i].len)
|
|
|
|
pathspec->has_wildcard = 1;
|
|
|
|
pathspec->magic |= item[i].magic;
|
|
|
|
}
|
|
|
|
|
2013-07-14 10:35:32 +02:00
|
|
|
if (pathspec->magic & PATHSPEC_MAXDEPTH)
|
|
|
|
qsort(pathspec->items, pathspec->nr,
|
|
|
|
sizeof(struct pathspec_item), pathspec_item_cmp);
|
2013-07-14 10:35:25 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* N.B. get_pathspec() is deprecated in favor of the "struct pathspec"
|
2013-07-14 10:35:28 +02:00
|
|
|
* based interface - see pathspec.c:parse_pathspec().
|
2013-07-14 10:35:25 +02:00
|
|
|
*
|
|
|
|
* Arguments:
|
|
|
|
* - prefix - a path relative to the root of the working tree
|
|
|
|
* - pathspec - a list of paths underneath the prefix path
|
|
|
|
*
|
|
|
|
* Iterates over pathspec, prepending each path with prefix,
|
|
|
|
* and return the resulting list.
|
|
|
|
*
|
|
|
|
* If pathspec is empty, return a singleton list containing prefix.
|
|
|
|
*
|
|
|
|
* If pathspec and prefix are both empty, return an empty list.
|
|
|
|
*
|
|
|
|
* This is typically used by built-in commands such as add.c, in order
|
|
|
|
* to normalize argv arguments provided to the built-in into a list of
|
|
|
|
* paths to process, all relative to the root of the working tree.
|
|
|
|
*/
|
|
|
|
const char **get_pathspec(const char *prefix, const char **pathspec)
|
|
|
|
{
|
2013-07-14 10:35:28 +02:00
|
|
|
struct pathspec ps;
|
|
|
|
parse_pathspec(&ps,
|
|
|
|
PATHSPEC_ALL_MAGIC & ~PATHSPEC_FROMTOP,
|
2013-07-14 10:35:30 +02:00
|
|
|
PATHSPEC_PREFER_CWD,
|
|
|
|
prefix, pathspec);
|
2013-07-14 10:35:28 +02:00
|
|
|
return ps.raw;
|
2013-07-14 10:35:25 +02:00
|
|
|
}
|
2013-07-14 10:35:27 +02:00
|
|
|
|
|
|
|
void copy_pathspec(struct pathspec *dst, const struct pathspec *src)
|
|
|
|
{
|
|
|
|
*dst = *src;
|
|
|
|
dst->items = xmalloc(sizeof(struct pathspec_item) * dst->nr);
|
|
|
|
memcpy(dst->items, src->items,
|
|
|
|
sizeof(struct pathspec_item) * dst->nr);
|
|
|
|
}
|