mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pathspec: allow querying for attributes

Browse Source 
The pathspec mechanism is extended via the new
":(attr:eol=input)pattern/to/match" syntax to filter paths so that it
requires paths to not just match the given pattern but also have the
specified attrs attached for them to be chosen.

Based on a patch by Stefan Beller <sbeller@google.com>
Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Brandon Williams
2017-03-13 11:23:21 -07:00
committed by Junio C Hamano
parent 625568cd88
commit b0db704652
7 changed files with 382 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
pathspec.c
View File

@ -1,6 +1,7 @@
#include "cache.h"
#include "dir.h"
#include "pathspec.h"
#include "attr.h"
/*
* Finds which of the given pathspecs match items in the index.
@ -72,6 +73,7 @@ static struct pathspec_magic {
{ PATHSPEC_GLOB, '\0', "glob" },
{ PATHSPEC_ICASE, '\0', "icase" },
{ PATHSPEC_EXCLUDE, '!', "exclude" },
{ PATHSPEC_ATTR, '\0', "attr" },
};
static void prefix_magic(struct strbuf *sb, int prefixlen, unsigned magic)
@ -87,6 +89,72 @@ static void prefix_magic(struct strbuf *sb, int prefixlen, unsigned magic)
strbuf_addf(sb, ",prefix:%d)", prefixlen);
}
static void parse_pathspec_attr_match(struct pathspec_item *item, const char *value)
{
struct string_list_item *si;
struct string_list list = STRING_LIST_INIT_DUP;
if (item->attr_check || item->attr_match)
die(_("Only one 'attr:' specification is allowed."));
if (!value || !*value)
die(_("attr spec must not be empty"));
string_list_split(&list, value, ' ', -1);
string_list_remove_empty_items(&list, 0);
item->attr_check = attr_check_alloc();
item->attr_match = xcalloc(list.nr, sizeof(struct attr_match));
for_each_string_list_item(si, &list) {
size_t attr_len;
char *attr_name;
const struct git_attr *a;
int j = item->attr_match_nr++;
const char *attr = si->string;
struct attr_match *am = &item->attr_match[j];
switch (*attr) {
case '!':
am->match_mode = MATCH_UNSPECIFIED;
attr++;
attr_len = strlen(attr);
break;
case '-':
am->match_mode = MATCH_UNSET;
attr++;
attr_len = strlen(attr);
break;
default:
attr_len = strcspn(attr, "=");
if (attr[attr_len] != '=')
am->match_mode = MATCH_SET;
else {
am->match_mode = MATCH_VALUE;
am->value = xstrdup(&attr[attr_len + 1]);
if (strchr(am->value, '\\'))
die(_("attr spec values must not contain backslashes"));
}
break;
}
attr_name = xmemdupz(attr, attr_len);
a = git_attr(attr_name);
if (!a)
die(_("invalid attribute name %s"), attr_name);
attr_check_append(item->attr_check, a);
free(attr_name);
}
if (item->attr_check->nr != item->attr_match_nr)
die("BUG: should have same number of entries");
string_list_clear(&list, 0);
}
static inline int get_literal_global(void)
{
static int literal = -1;
@ -164,6 +232,7 @@ static int get_global_magic(int element_magic)
* returns the position in 'elem' after all magic has been parsed
*/
static const char *parse_long_magic(unsigned *magic, int *prefix_len,
struct pathspec_item *item,
const char *elem)
{
const char *pos;
@ -189,6 +258,14 @@ static const char *parse_long_magic(unsigned *magic, int *prefix_len,
continue;
}
if (starts_with(pos, "attr:")) {
char *attr_body = xmemdupz(pos + 5, len - 5);
parse_pathspec_attr_match(item, attr_body);
*magic |= PATHSPEC_ATTR;
free(attr_body);
continue;
}
for (i = 0; i < ARRAY_SIZE(pathspec_magic); i++) {
if (strlen(pathspec_magic[i].name) == len &&
!strncmp(pathspec_magic[i].name, pos, len)) {
@ -252,13 +329,14 @@ static const char *parse_short_magic(unsigned *magic, const char *elem)
}
static const char *parse_element_magic(unsigned *magic, int *prefix_len,
struct pathspec_item *item,
const char *elem)
{
if (elem[0] != ':' || get_literal_global())
return elem; /* nothing to do */
else if (elem[1] == '(')
/* longhand */
return parse_long_magic(magic, prefix_len, elem);
return parse_long_magic(magic, prefix_len, item, elem);
else
/* shorthand */
return parse_short_magic(magic, elem);
@ -335,12 +413,17 @@ static void init_pathspec_item(struct pathspec_item *item, unsigned flags,
char *match;
int pathspec_prefix = -1;
item->attr_check = NULL;
item->attr_match = NULL;
item->attr_match_nr = 0;
/* PATHSPEC_LITERAL_PATH ignores magic */
if (flags & PATHSPEC_LITERAL_PATH) {
magic = PATHSPEC_LITERAL;
} else {
copyfrom = parse_element_magic(&element_magic,
&pathspec_prefix,
item,
elt);
magic |= element_magic;
magic |= get_global_magic(element_magic);
@ -565,26 +648,46 @@ void parse_pathspec(struct pathspec *pathspec,
void copy_pathspec(struct pathspec *dst, const struct pathspec *src)
{
int i;
int i, j;
*dst = *src;
ALLOC_ARRAY(dst->items, dst->nr);
COPY_ARRAY(dst->items, src->items, dst->nr);
for (i = 0; i < dst->nr; i++) {
dst->items[i].match = xstrdup(src->items[i].match);
dst->items[i].original = xstrdup(src->items[i].original);
struct pathspec_item *d = &dst->items[i];
struct pathspec_item *s = &src->items[i];
d->match = xstrdup(s->match);
d->original = xstrdup(s->original);
ALLOC_ARRAY(d->attr_match, d->attr_match_nr);
COPY_ARRAY(d->attr_match, s->attr_match, d->attr_match_nr);
for (j = 0; j < d->attr_match_nr; j++) {
const char *value = s->attr_match[j].value;
d->attr_match[j].value = xstrdup_or_null(value);
}
d->attr_check = attr_check_dup(s->attr_check);
}
}
void clear_pathspec(struct pathspec *pathspec)
{
int i;
int i, j;
for (i = 0; i < pathspec->nr; i++) {
free(pathspec->items[i].match);
free(pathspec->items[i].original);
for (j = 0; j < pathspec->items[j].attr_match_nr; j++)
free(pathspec->items[i].attr_match[j].value);
free(pathspec->items[i].attr_match);
if (pathspec->items[i].attr_check)
attr_check_free(pathspec->items[i].attr_check);
}
free(pathspec->items);
pathspec->items = NULL;
pathspec->nr = 0;