mirror of
https://github.com/git/git
synced 2024-10-03 23:29:36 +00:00
git-check-attr: Add an --all option to show all attributes
Add new usage patterns git check-attr [-a | --all] [--] pathname... git check-attr --stdin [-a | --all] < <list-of-paths> which display all attributes associated with the specified file(s). Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
fdf6be8259
commit
4ca0f188f6
|
@ -9,8 +9,8 @@ git-check-attr - Display gitattributes information
|
||||||
SYNOPSIS
|
SYNOPSIS
|
||||||
--------
|
--------
|
||||||
[verse]
|
[verse]
|
||||||
'git check-attr' attr... [--] pathname...
|
'git check-attr' [-a | --all | attr...] [--] pathname...
|
||||||
'git check-attr' --stdin [-z] attr... < <list-of-paths>
|
'git check-attr' --stdin [-z] [-a | --all | attr...] < <list-of-paths>
|
||||||
|
|
||||||
DESCRIPTION
|
DESCRIPTION
|
||||||
-----------
|
-----------
|
||||||
|
@ -19,6 +19,11 @@ For every pathname, this command will list if each attribute is 'unspecified',
|
||||||
|
|
||||||
OPTIONS
|
OPTIONS
|
||||||
-------
|
-------
|
||||||
|
-a, --all::
|
||||||
|
List all attributes that are associated with the specified
|
||||||
|
paths. If this option is used, then 'unspecified' attributes
|
||||||
|
will not be included in the output.
|
||||||
|
|
||||||
--stdin::
|
--stdin::
|
||||||
Read file names from stdin instead of from the command-line.
|
Read file names from stdin instead of from the command-line.
|
||||||
|
|
||||||
|
@ -69,6 +74,13 @@ org/example/MyClass.java: diff: java
|
||||||
org/example/MyClass.java: myAttr: set
|
org/example/MyClass.java: myAttr: set
|
||||||
---------------
|
---------------
|
||||||
|
|
||||||
|
* Listing all attributes for a file:
|
||||||
|
---------------
|
||||||
|
$ git check-attr --all -- org/example/MyClass.java
|
||||||
|
org/example/MyClass.java: diff: java
|
||||||
|
org/example/MyClass.java: myAttr: set
|
||||||
|
---------------
|
||||||
|
|
||||||
* Listing an attribute for multiple files:
|
* Listing an attribute for multiple files:
|
||||||
---------------
|
---------------
|
||||||
$ git check-attr myAttr -- org/example/MyClass.java org/example/NoMyAttr.java
|
$ git check-attr myAttr -- org/example/MyClass.java org/example/NoMyAttr.java
|
||||||
|
|
|
@ -4,16 +4,18 @@
|
||||||
#include "quote.h"
|
#include "quote.h"
|
||||||
#include "parse-options.h"
|
#include "parse-options.h"
|
||||||
|
|
||||||
|
static int all_attrs;
|
||||||
static int stdin_paths;
|
static int stdin_paths;
|
||||||
static const char * const check_attr_usage[] = {
|
static const char * const check_attr_usage[] = {
|
||||||
"git check-attr attr... [--] pathname...",
|
"git check-attr [-a | --all | attr...] [--] pathname...",
|
||||||
"git check-attr --stdin attr... < <list-of-paths>",
|
"git check-attr --stdin [-a | --all | attr...] < <list-of-paths>",
|
||||||
NULL
|
NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
static int null_term_line;
|
static int null_term_line;
|
||||||
|
|
||||||
static const struct option check_attr_options[] = {
|
static const struct option check_attr_options[] = {
|
||||||
|
OPT_BOOLEAN('a', "all", &all_attrs, "report all attributes set on file"),
|
||||||
OPT_BOOLEAN(0 , "stdin", &stdin_paths, "read file names from stdin"),
|
OPT_BOOLEAN(0 , "stdin", &stdin_paths, "read file names from stdin"),
|
||||||
OPT_BOOLEAN('z', NULL, &null_term_line,
|
OPT_BOOLEAN('z', NULL, &null_term_line,
|
||||||
"input paths are terminated by a null character"),
|
"input paths are terminated by a null character"),
|
||||||
|
@ -42,9 +44,16 @@ static void output_attr(int cnt, struct git_attr_check *check,
|
||||||
static void check_attr(int cnt, struct git_attr_check *check,
|
static void check_attr(int cnt, struct git_attr_check *check,
|
||||||
const char *file)
|
const char *file)
|
||||||
{
|
{
|
||||||
if (git_checkattr(file, cnt, check))
|
if (check != NULL) {
|
||||||
die("git_checkattr died");
|
if (git_checkattr(file, cnt, check))
|
||||||
output_attr(cnt, check, file);
|
die("git_checkattr died");
|
||||||
|
output_attr(cnt, check, file);
|
||||||
|
} else {
|
||||||
|
if (git_all_attrs(file, &cnt, &check))
|
||||||
|
die("git_all_attrs died");
|
||||||
|
output_attr(cnt, check, file);
|
||||||
|
free(check);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void check_attr_stdin_paths(int cnt, struct git_attr_check *check)
|
static void check_attr_stdin_paths(int cnt, struct git_attr_check *check)
|
||||||
|
@ -92,8 +101,14 @@ int cmd_check_attr(int argc, const char **argv, const char *prefix)
|
||||||
doubledash = i;
|
doubledash = i;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Check attribute argument(s): */
|
/* Process --all and/or attribute arguments: */
|
||||||
if (doubledash == 0) {
|
if (all_attrs) {
|
||||||
|
if (doubledash >= 1)
|
||||||
|
error_with_usage("Attributes and --all both specified");
|
||||||
|
|
||||||
|
cnt = 0;
|
||||||
|
filei = doubledash + 1;
|
||||||
|
} else if (doubledash == 0) {
|
||||||
error_with_usage("No attribute specified");
|
error_with_usage("No attribute specified");
|
||||||
} else if (doubledash < 0) {
|
} else if (doubledash < 0) {
|
||||||
/*
|
/*
|
||||||
|
@ -119,15 +134,20 @@ int cmd_check_attr(int argc, const char **argv, const char *prefix)
|
||||||
error_with_usage("No file specified");
|
error_with_usage("No file specified");
|
||||||
}
|
}
|
||||||
|
|
||||||
check = xcalloc(cnt, sizeof(*check));
|
if (all_attrs) {
|
||||||
for (i = 0; i < cnt; i++) {
|
check = NULL;
|
||||||
const char *name;
|
} else {
|
||||||
struct git_attr *a;
|
check = xcalloc(cnt, sizeof(*check));
|
||||||
name = argv[i];
|
for (i = 0; i < cnt; i++) {
|
||||||
a = git_attr(name);
|
const char *name;
|
||||||
if (!a)
|
struct git_attr *a;
|
||||||
return error("%s: not a valid attribute name", name);
|
name = argv[i];
|
||||||
check[i].attr = a;
|
a = git_attr(name);
|
||||||
|
if (!a)
|
||||||
|
return error("%s: not a valid attribute name",
|
||||||
|
name);
|
||||||
|
check[i].attr = a;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stdin_paths)
|
if (stdin_paths)
|
||||||
|
|
|
@ -107,6 +107,30 @@ EOF
|
||||||
test_cmp expect actual
|
test_cmp expect actual
|
||||||
'
|
'
|
||||||
|
|
||||||
|
test_expect_success 'attribute test: --all option' '
|
||||||
|
|
||||||
|
cat <<EOF > all &&
|
||||||
|
f: test: f
|
||||||
|
a/f: test: f
|
||||||
|
a/c/f: test: f
|
||||||
|
a/g: test: a/g
|
||||||
|
a/b/g: test: a/b/g
|
||||||
|
b/g: test: unspecified
|
||||||
|
a/b/h: test: a/b/h
|
||||||
|
a/b/d/g: test: a/b/d/*
|
||||||
|
onoff: test: unset
|
||||||
|
offon: test: set
|
||||||
|
no: notest: set
|
||||||
|
a/b/d/no: test: a/b/d/*
|
||||||
|
a/b/d/no: notest: set
|
||||||
|
a/b/d/yes: notest: set
|
||||||
|
EOF
|
||||||
|
|
||||||
|
grep -v unspecified < all | sort > expect &&
|
||||||
|
sed -e "s/:.*//" < all | uniq | git check-attr --stdin --all | sort > actual &&
|
||||||
|
test_cmp expect actual
|
||||||
|
'
|
||||||
|
|
||||||
test_expect_success 'root subdir attribute test' '
|
test_expect_success 'root subdir attribute test' '
|
||||||
|
|
||||||
attr_check a/i a/i &&
|
attr_check a/i a/i &&
|
||||||
|
|
Loading…
Reference in a new issue