From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 29 Aug 2011 04:19:12 +0000 (-0700)
Subject: Merge branch 'mh/attr'
X-Git-Tag: v1.7.7-rc1~40
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e5cfcb04e0acc5f3b51e6d69487028315b33e4c9?hp=-c

Merge branch 'mh/attr'

* mh/attr:
Unroll the loop over passes
Change while loop into for loop
Determine the start of the states outside of the pass loop
Change parse_attr() to take a pointer to struct attr_state
Increment num_attr in parse_attr_line(), not parse_attr()
Document struct match_attr
Add a file comment
---

e5cfcb04e0acc5f3b51e6d69487028315b33e4c9
diff --combined attr.c
index da29c8eb45,6abaaece32..33cb4e4d11
--- a/attr.c
+++ b/attr.c
@@@ -1,3 -1,12 +1,12 @@@
+ /*
+  * Handle git attributes.  See gitattributes(5) for a description of
+  * the file syntax, and Documentation/technical/api-gitattributes.txt
+  * for a description of the API.
+  *
+  * One basic design decision here is that we are not going to support
+  * an insanely large number of attributes.
+  */
+ 
  #define NO_THE_INDEX_COMPATIBILITY_MACROS
  #include "cache.h"
  #include "exec_cmd.h"
@@@ -13,12 -22,7 +22,7 @@@ static const char git_attr__unknown[] 
  
  static const char *attributes_file;
  
- /*
-  * The basic design decision here is that we are not going to have
-  * insanely large number of attributes.
-  *
-  * This is a randomly chosen prime.
-  */
+ /* This is a randomly chosen prime. */
  #define HASHSIZE 257
  
  #ifndef DEBUG_ATTR
@@@ -36,11 -40,6 +40,11 @@@ static int attr_nr
  static struct git_attr_check *check_all_attr;
  static struct git_attr *(git_attr_hash[HASHSIZE]);
  
 +char *git_attr_name(struct git_attr *attr)
 +{
 +	return attr->name;
 +}
 +
  static unsigned hash_name(const char *name, int namelen)
  {
  	unsigned val = 0, c;
@@@ -55,10 -54,12 +59,10 @@@
  static int invalid_attr_name(const char *name, int namelen)
  {
  	/*
 -	 * Attribute name cannot begin with '-' and from
 -	 * [-A-Za-z0-9_.].  We'd specifically exclude '=' for now,
 -	 * as we might later want to allow non-binary value for
 -	 * attributes, e.g. "*.svg	merge=special-merge-program-for-svg"
 +	 * Attribute name cannot begin with '-' and must consist of
 +	 * characters from [-A-Za-z0-9_.].
  	 */
 -	if (*name == '-')
 +	if (namelen <= 0 || *name == '-')
  		return -1;
  	while (namelen--) {
  		char ch = *name++;
@@@ -106,22 -107,26 +110,26 @@@ struct git_attr *git_attr(const char *n
  	return git_attr_internal(name, strlen(name));
  }
  
- /*
-  * .gitattributes file is one line per record, each of which is
-  *
-  * (1) glob pattern.
-  * (2) whitespace
-  * (3) whitespace separated list of attribute names, each of which
-  *     could be prefixed with '-' to mean "set to false", '!' to mean
-  *     "unset".
-  */
- 
  /* What does a matched pattern decide? */
  struct attr_state {
  	struct git_attr *attr;
  	const char *setto;
  };
  
+ /*
+  * One rule, as from a .gitattributes file.
+  *
+  * If is_macro is true, then u.attr is a pointer to the git_attr being
+  * defined.
+  *
+  * If is_macro is false, then u.pattern points at the filename pattern
+  * to which the rule applies.  (The memory pointed to is part of the
+  * memory block allocated for the match_attr instance.)
+  *
+  * In either case, num_attr is the number of attributes affected by
+  * this rule, and state is an array listing them.  The attributes are
+  * listed as they appear in the file (macros unexpanded).
+  */
  struct match_attr {
  	union {
  		char *pattern;
@@@ -134,8 -139,15 +142,15 @@@
  
  static const char blank[] = " \t\r\n";
  
+ /*
+  * Parse a whitespace-delimited attribute state (i.e., "attr",
+  * "-attr", "!attr", or "attr=value") from the string starting at src.
+  * If e is not NULL, write the results to *e.  Return a pointer to the
+  * remainder of the string (with leading whitespace removed), or NULL
+  * if there was an error.
+  */
  static const char *parse_attr(const char *src, int lineno, const char *cp,
- 			      int *num_attr, struct match_attr *res)
+ 			      struct attr_state *e)
  {
  	const char *ep, *equals;
  	int len;
@@@ -148,7 -160,7 +163,7 @@@
  		len = equals - cp;
  	else
  		len = ep - cp;
- 	if (!res) {
+ 	if (!e) {
  		if (*cp == '-' || *cp == '!') {
  			cp++;
  			len--;
@@@ -160,9 -172,6 +175,6 @@@
  			return NULL;
  		}
  	} else {
- 		struct attr_state *e;
- 
- 		e = &(res->state[*num_attr]);
  		if (*cp == '-' || *cp == '!') {
  			e->setto = (*cp == '-') ? ATTR__FALSE : ATTR__UNSET;
  			cp++;
@@@ -175,7 -184,6 +187,6 @@@
  		}
  		e->attr = git_attr_internal(cp, len);
  	}
- 	(*num_attr)++;
  	return ep + strspn(ep, blank);
  }
  
@@@ -183,10 -191,9 +194,9 @@@ static struct match_attr *parse_attr_li
  					  int lineno, int macro_ok)
  {
  	int namelen;
- 	int num_attr;
- 	const char *cp, *name;
+ 	int num_attr, i;
+ 	const char *cp, *name, *states;
  	struct match_attr *res = NULL;
- 	int pass;
  	int is_macro;
  
  	cp = line + strspn(line, blank);
@@@ -215,32 -222,35 +225,35 @@@
  	else
  		is_macro = 0;
  
- 	for (pass = 0; pass < 2; pass++) {
- 		/* pass 0 counts and allocates, pass 1 fills */
- 		num_attr = 0;
- 		cp = name + namelen;
- 		cp = cp + strspn(cp, blank);
- 		while (*cp) {
- 			cp = parse_attr(src, lineno, cp, &num_attr, res);
- 			if (!cp)
- 				return NULL;
- 		}
- 		if (pass)
- 			break;
- 		res = xcalloc(1,
- 			      sizeof(*res) +
- 			      sizeof(struct attr_state) * num_attr +
- 			      (is_macro ? 0 : namelen + 1));
- 		if (is_macro)
- 			res->u.attr = git_attr_internal(name, namelen);
- 		else {
- 			res->u.pattern = (char *)&(res->state[num_attr]);
- 			memcpy(res->u.pattern, name, namelen);
- 			res->u.pattern[namelen] = 0;
- 		}
- 		res->is_macro = is_macro;
- 		res->num_attr = num_attr;
+ 	states = name + namelen;
+ 	states += strspn(states, blank);
+ 
+ 	/* First pass to count the attr_states */
+ 	for (cp = states, num_attr = 0; *cp; num_attr++) {
+ 		cp = parse_attr(src, lineno, cp, NULL);
+ 		if (!cp)
+ 			return NULL;
+ 	}
+ 
+ 	res = xcalloc(1,
+ 		      sizeof(*res) +
+ 		      sizeof(struct attr_state) * num_attr +
+ 		      (is_macro ? 0 : namelen + 1));
+ 	if (is_macro)
+ 		res->u.attr = git_attr_internal(name, namelen);
+ 	else {
+ 		res->u.pattern = (char *)&(res->state[num_attr]);
+ 		memcpy(res->u.pattern, name, namelen);
+ 		res->u.pattern[namelen] = 0;
  	}
+ 	res->is_macro = is_macro;
+ 	res->num_attr = num_attr;
+ 
+ 	/* Second pass to fill the attr_states */
+ 	for (cp = states, i = 0; *cp; i++) {
+ 		cp = parse_attr(src, lineno, cp, &(res->state[i]));
+ 	}
+ 
  	return res;
  }
  
@@@ -535,18 -545,11 +548,18 @@@ static void bootstrap_attr_stack(void
  	}
  }
  
 -static void prepare_attr_stack(const char *path, int dirlen)
 +static void prepare_attr_stack(const char *path)
  {
  	struct attr_stack *elem, *info;
 -	int len;
 +	int dirlen, len;
  	struct strbuf pathbuf;
 +	const char *cp;
 +
 +	cp = strrchr(path, '/');
 +	if (!cp)
 +		dirlen = 0;
 +	else
 +		dirlen = cp - path;
  
  	strbuf_init(&pathbuf, dirlen+2+strlen(GITATTRIBUTES_FILE));
  
@@@ -565,7 -568,8 +578,7 @@@
  	 * .gitattributes in deeper directories to shallower ones,
  	 * and finally use the built-in set as the default.
  	 */
 -	if (!attr_stack)
 -		bootstrap_attr_stack();
 +	bootstrap_attr_stack();
  
  	/*
  	 * Pop the "info" one that is always at the top of the stack.
@@@ -712,30 -716,26 +725,30 @@@ static int macroexpand_one(int attr_nr
  	return rem;
  }
  
 -int git_checkattr(const char *path, int num, struct git_attr_check *check)
 +/*
 + * Collect all attributes for path into the array pointed to by
 + * check_all_attr.
 + */
 +static void collect_all_attrs(const char *path)
  {
  	struct attr_stack *stk;
 -	const char *cp;
 -	int dirlen, pathlen, i, rem;
 +	int i, pathlen, rem;
  
 -	bootstrap_attr_stack();
 +	prepare_attr_stack(path);
  	for (i = 0; i < attr_nr; i++)
  		check_all_attr[i].value = ATTR__UNKNOWN;
  
  	pathlen = strlen(path);
 -	cp = strrchr(path, '/');
 -	if (!cp)
 -		dirlen = 0;
 -	else
 -		dirlen = cp - path;
 -	prepare_attr_stack(path, dirlen);
  	rem = attr_nr;
  	for (stk = attr_stack; 0 < rem && stk; stk = stk->prev)
  		rem = fill(path, pathlen, stk, rem);
 +}
 +
 +int git_check_attr(const char *path, int num, struct git_attr_check *check)
 +{
 +	int i;
 +
 +	collect_all_attrs(path);
  
  	for (i = 0; i < num; i++) {
  		const char *value = check_all_attr[check[i].attr->attr_nr].value;
@@@ -747,34 -747,6 +760,34 @@@
  	return 0;
  }
  
 +int git_all_attrs(const char *path, int *num, struct git_attr_check **check)
 +{
 +	int i, count, j;
 +
 +	collect_all_attrs(path);
 +
 +	/* Count the number of attributes that are set. */
 +	count = 0;
 +	for (i = 0; i < attr_nr; i++) {
 +		const char *value = check_all_attr[i].value;
 +		if (value != ATTR__UNSET && value != ATTR__UNKNOWN)
 +			++count;
 +	}
 +	*num = count;
 +	*check = xmalloc(sizeof(**check) * count);
 +	j = 0;
 +	for (i = 0; i < attr_nr; i++) {
 +		const char *value = check_all_attr[i].value;
 +		if (value != ATTR__UNSET && value != ATTR__UNKNOWN) {
 +			(*check)[j].attr = check_all_attr[i].attr;
 +			(*check)[j].value = value;
 +			++j;
 +		}
 +	}
 +
 +	return 0;
 +}
 +
  void git_attr_set_direction(enum git_attr_direction new, struct index_state *istate)
  {
  	enum git_attr_direction old = direction;