Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
git2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lvzhengyang
git2
Commits
37e4c1ba
Unverified
Commit
37e4c1ba
authored
5 years ago
by
Edward Thomson
Committed by
GitHub
5 years ago
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #5119 from libgit2/ethomson/attr
attr: rename constants and macros for consistency
parents
c3bbbcf5
91a300b7
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
113 additions
and
91 deletions
+113
-91
include/git2/attr.h
+10
-10
include/git2/deprecated.h
+22
-0
src/attr.c
+5
-5
src/crlf.c
+4
-4
src/diff_driver.c
+3
-3
src/filter.c
+2
-2
src/merge_driver.c
+4
-4
tests/attr/attr_expect.h
+3
-3
tests/attr/file.c
+9
-9
tests/attr/flags.c
+7
-7
tests/attr/lookup.c
+1
-1
tests/attr/repo.c
+43
-43
No files found.
include/git2/attr.h
View file @
37e4c1ba
...
@@ -30,7 +30,7 @@ GIT_BEGIN_DECL
...
@@ -30,7 +30,7 @@ GIT_BEGIN_DECL
* Then for file `xyz.c` looking up attribute "foo" gives a value for
* Then for file `xyz.c` looking up attribute "foo" gives a value for
* which `GIT_ATTR_TRUE(value)` is true.
* which `GIT_ATTR_TRUE(value)` is true.
*/
*/
#define GIT_ATTR_
TRUE(attr) (git_attr_value(attr) == GIT_ATTR_TRUE_T
)
#define GIT_ATTR_
IS_TRUE(attr) (git_attr_value(attr) == GIT_ATTR_VALUE_TRUE
)
/**
/**
* GIT_ATTR_FALSE checks if an attribute is set off. In core git
* GIT_ATTR_FALSE checks if an attribute is set off. In core git
...
@@ -44,7 +44,7 @@ GIT_BEGIN_DECL
...
@@ -44,7 +44,7 @@ GIT_BEGIN_DECL
* Then for file `zyx.h` looking up attribute "foo" gives a value for
* Then for file `zyx.h` looking up attribute "foo" gives a value for
* which `GIT_ATTR_FALSE(value)` is true.
* which `GIT_ATTR_FALSE(value)` is true.
*/
*/
#define GIT_ATTR_
FALSE(attr) (git_attr_value(attr) == GIT_ATTR_FALSE_T
)
#define GIT_ATTR_
IS_FALSE(attr) (git_attr_value(attr) == GIT_ATTR_VALUE_FALSE
)
/**
/**
* GIT_ATTR_UNSPECIFIED checks if an attribute is unspecified. This
* GIT_ATTR_UNSPECIFIED checks if an attribute is unspecified. This
...
@@ -62,7 +62,7 @@ GIT_BEGIN_DECL
...
@@ -62,7 +62,7 @@ GIT_BEGIN_DECL
* file `onefile.rb` or looking up "bar" on any file will all give
* file `onefile.rb` or looking up "bar" on any file will all give
* `GIT_ATTR_UNSPECIFIED(value)` of true.
* `GIT_ATTR_UNSPECIFIED(value)` of true.
*/
*/
#define GIT_ATTR_
UNSPECIFIED(attr) (git_attr_value(attr) == GIT_ATTR_UNSPECIFIED_T
)
#define GIT_ATTR_
IS_UNSPECIFIED(attr) (git_attr_value(attr) == GIT_ATTR_VALUE_UNSPECIFIED
)
/**
/**
* GIT_ATTR_HAS_VALUE checks if an attribute is set to a value (as
* GIT_ATTR_HAS_VALUE checks if an attribute is set to a value (as
...
@@ -74,17 +74,17 @@ GIT_BEGIN_DECL
...
@@ -74,17 +74,17 @@ GIT_BEGIN_DECL
* Given this, looking up "eol" for `onefile.txt` will give back the
* Given this, looking up "eol" for `onefile.txt` will give back the
* string "lf" and `GIT_ATTR_SET_TO_VALUE(attr)` will return true.
* string "lf" and `GIT_ATTR_SET_TO_VALUE(attr)` will return true.
*/
*/
#define GIT_ATTR_HAS_VALUE(attr) (git_attr_value(attr) == GIT_ATTR_VALUE_
T
)
#define GIT_ATTR_HAS_VALUE(attr) (git_attr_value(attr) == GIT_ATTR_VALUE_
STRING
)
/**
/**
* Possible states for an attribute
* Possible states for an attribute
*/
*/
typedef
enum
{
typedef
enum
{
GIT_ATTR_
UNSPECIFIED_T
=
0
,
/**< The attribute has been left unspecified */
GIT_ATTR_
VALUE_UNSPECIFIED
=
0
,
/**< The attribute has been left unspecified */
GIT_ATTR_
TRUE_T
,
/**< The attribute has been set */
GIT_ATTR_
VALUE_TRUE
,
/**< The attribute has been set */
GIT_ATTR_
FALSE_T
,
/**< The attribute has been unset */
GIT_ATTR_
VALUE_FALSE
,
/**< The attribute has been unset */
GIT_ATTR_VALUE_
T
,
/**< This attribute has a value */
GIT_ATTR_VALUE_
STRING
,
/**< This attribute has a value */
}
git_attr_t
;
}
git_attr_
value_
t
;
/**
/**
* Return the value type for a given attribute.
* Return the value type for a given attribute.
...
@@ -99,7 +99,7 @@ typedef enum {
...
@@ -99,7 +99,7 @@ typedef enum {
* @param attr The attribute
* @param attr The attribute
* @return the value type for the attribute
* @return the value type for the attribute
*/
*/
GIT_EXTERN
(
git_attr_t
)
git_attr_value
(
const
char
*
attr
);
GIT_EXTERN
(
git_attr_
value_
t
)
git_attr_value
(
const
char
*
attr
);
/**
/**
* Check attribute flags: Reading values from index and working directory.
* Check attribute flags: Reading values from index and working directory.
...
...
This diff is collapsed.
Click to expand it.
include/git2/deprecated.h
View file @
37e4c1ba
...
@@ -45,6 +45,28 @@
...
@@ -45,6 +45,28 @@
*/
*/
GIT_BEGIN_DECL
GIT_BEGIN_DECL
/** @name Deprecated Attribute Constants
*
* These enumeration values are retained for backward compatibility.
* The newer versions of these functions should be preferred in all
* new code.
*
* There is no plan to remove these backward compatibility values at
* this time.
*/
/**@{*/
#define GIT_ATTR_UNSPECIFIED_T GIT_ATTR_VALUE_UNSPECIFIED
#define GIT_ATTR_TRUE_T GIT_ATTR_VALUE_TRUE
#define GIT_ATTR_FALSE_T GIT_ATTR_VALUE_FALSE
#define GIT_ATTR_VALUE_T GIT_ATTR_VALUE_STRING
#define GIT_ATTR_TRUE(attr) GIT_ATTR_IS_TRUE(attr)
#define GIT_ATTR_FALSE(attr) GIT_ATTR_IS_FALSE(attr)
#define GIT_ATTR_UNSPECIFIED(attr) GIT_ATTR_IS_UNSPECIFIED(attr)
/**@}*/
/** @name Deprecated Blob Functions
/** @name Deprecated Blob Functions
*
*
* These functions are retained for backward compatibility. The newer
* These functions are retained for backward compatibility. The newer
...
...
This diff is collapsed.
Click to expand it.
src/attr.c
View file @
37e4c1ba
...
@@ -19,18 +19,18 @@ const char *git_attr__true = "[internal]__TRUE__";
...
@@ -19,18 +19,18 @@ const char *git_attr__true = "[internal]__TRUE__";
const
char
*
git_attr__false
=
"[internal]__FALSE__"
;
const
char
*
git_attr__false
=
"[internal]__FALSE__"
;
const
char
*
git_attr__unset
=
"[internal]__UNSET__"
;
const
char
*
git_attr__unset
=
"[internal]__UNSET__"
;
git_attr_t
git_attr_value
(
const
char
*
attr
)
git_attr_
value_
t
git_attr_value
(
const
char
*
attr
)
{
{
if
(
attr
==
NULL
||
attr
==
git_attr__unset
)
if
(
attr
==
NULL
||
attr
==
git_attr__unset
)
return
GIT_ATTR_
UNSPECIFIED_T
;
return
GIT_ATTR_
VALUE_UNSPECIFIED
;
if
(
attr
==
git_attr__true
)
if
(
attr
==
git_attr__true
)
return
GIT_ATTR_
TRUE_T
;
return
GIT_ATTR_
VALUE_TRUE
;
if
(
attr
==
git_attr__false
)
if
(
attr
==
git_attr__false
)
return
GIT_ATTR_
FALSE_T
;
return
GIT_ATTR_
VALUE_FALSE
;
return
GIT_ATTR_VALUE_
T
;
return
GIT_ATTR_VALUE_
STRING
;
}
}
static
int
collect_attr_files
(
static
int
collect_attr_files
(
...
...
This diff is collapsed.
Click to expand it.
src/crlf.c
View file @
37e4c1ba
...
@@ -44,11 +44,11 @@ struct crlf_filter {
...
@@ -44,11 +44,11 @@ struct crlf_filter {
static
git_crlf_t
check_crlf
(
const
char
*
value
)
static
git_crlf_t
check_crlf
(
const
char
*
value
)
{
{
if
(
GIT_ATTR_TRUE
(
value
))
if
(
GIT_ATTR_
IS_
TRUE
(
value
))
return
GIT_CRLF_TEXT
;
return
GIT_CRLF_TEXT
;
else
if
(
GIT_ATTR_FALSE
(
value
))
else
if
(
GIT_ATTR_
IS_
FALSE
(
value
))
return
GIT_CRLF_BINARY
;
return
GIT_CRLF_BINARY
;
else
if
(
GIT_ATTR_UNSPECIFIED
(
value
))
else
if
(
GIT_ATTR_
IS_
UNSPECIFIED
(
value
))
;
;
else
if
(
strcmp
(
value
,
"input"
)
==
0
)
else
if
(
strcmp
(
value
,
"input"
)
==
0
)
return
GIT_CRLF_TEXT_INPUT
;
return
GIT_CRLF_TEXT_INPUT
;
...
@@ -60,7 +60,7 @@ static git_crlf_t check_crlf(const char *value)
...
@@ -60,7 +60,7 @@ static git_crlf_t check_crlf(const char *value)
static
git_cvar_value
check_eol
(
const
char
*
value
)
static
git_cvar_value
check_eol
(
const
char
*
value
)
{
{
if
(
GIT_ATTR_UNSPECIFIED
(
value
))
if
(
GIT_ATTR_
IS_
UNSPECIFIED
(
value
))
;
;
else
if
(
strcmp
(
value
,
"lf"
)
==
0
)
else
if
(
strcmp
(
value
,
"lf"
)
==
0
)
return
GIT_EOL_LF
;
return
GIT_EOL_LF
;
...
...
This diff is collapsed.
Click to expand it.
src/diff_driver.c
View file @
37e4c1ba
...
@@ -371,11 +371,11 @@ int git_diff_driver_lookup(
...
@@ -371,11 +371,11 @@ int git_diff_driver_lookup(
attrsession
,
0
,
path
,
1
,
attrs
))
<
0
)
attrsession
,
0
,
path
,
1
,
attrs
))
<
0
)
/* return error below */
;
/* return error below */
;
else
if
(
GIT_ATTR_UNSPECIFIED
(
values
[
0
]))
else
if
(
GIT_ATTR_
IS_
UNSPECIFIED
(
values
[
0
]))
/* just use the auto value */
;
/* just use the auto value */
;
else
if
(
GIT_ATTR_FALSE
(
values
[
0
]))
else
if
(
GIT_ATTR_
IS_
FALSE
(
values
[
0
]))
*
out
=
&
global_drivers
[
DIFF_DRIVER_BINARY
];
*
out
=
&
global_drivers
[
DIFF_DRIVER_BINARY
];
else
if
(
GIT_ATTR_TRUE
(
values
[
0
]))
else
if
(
GIT_ATTR_
IS_
TRUE
(
values
[
0
]))
*
out
=
&
global_drivers
[
DIFF_DRIVER_TEXT
];
*
out
=
&
global_drivers
[
DIFF_DRIVER_TEXT
];
/* otherwise look for driver information in config and build driver */
/* otherwise look for driver information in config and build driver */
...
...
This diff is collapsed.
Click to expand it.
src/filter.c
View file @
37e4c1ba
...
@@ -445,7 +445,7 @@ static int filter_list_check_attributes(
...
@@ -445,7 +445,7 @@ static int filter_list_check_attributes(
for
(
i
=
0
;
!
error
&&
i
<
fdef
->
nattrs
;
++
i
)
{
for
(
i
=
0
;
!
error
&&
i
<
fdef
->
nattrs
;
++
i
)
{
const
char
*
want
=
fdef
->
attrs
[
fdef
->
nattrs
+
i
];
const
char
*
want
=
fdef
->
attrs
[
fdef
->
nattrs
+
i
];
git_attr_t
want_type
,
found_type
;
git_attr_
value_
t
want_type
,
found_type
;
if
(
!
want
)
if
(
!
want
)
continue
;
continue
;
...
@@ -455,7 +455,7 @@ static int filter_list_check_attributes(
...
@@ -455,7 +455,7 @@ static int filter_list_check_attributes(
if
(
want_type
!=
found_type
)
if
(
want_type
!=
found_type
)
error
=
GIT_ENOTFOUND
;
error
=
GIT_ENOTFOUND
;
else
if
(
want_type
==
GIT_ATTR_VALUE_
T
&&
else
if
(
want_type
==
GIT_ATTR_VALUE_
STRING
&&
strcmp
(
want
,
strs
[
i
])
&&
strcmp
(
want
,
strs
[
i
])
&&
strcmp
(
want
,
"*"
))
strcmp
(
want
,
"*"
))
error
=
GIT_ENOTFOUND
;
error
=
GIT_ENOTFOUND
;
...
...
This diff is collapsed.
Click to expand it.
src/merge_driver.c
View file @
37e4c1ba
...
@@ -371,17 +371,17 @@ static int merge_driver_name_for_path(
...
@@ -371,17 +371,17 @@ static int merge_driver_name_for_path(
return
error
;
return
error
;
/* set: use the built-in 3-way merge driver ("text") */
/* set: use the built-in 3-way merge driver ("text") */
if
(
GIT_ATTR_TRUE
(
value
))
if
(
GIT_ATTR_
IS_
TRUE
(
value
))
*
out
=
merge_driver_name__text
;
*
out
=
merge_driver_name__text
;
/* unset: do not merge ("binary") */
/* unset: do not merge ("binary") */
else
if
(
GIT_ATTR_FALSE
(
value
))
else
if
(
GIT_ATTR_
IS_
FALSE
(
value
))
*
out
=
merge_driver_name__binary
;
*
out
=
merge_driver_name__binary
;
else
if
(
GIT_ATTR_UNSPECIFIED
(
value
)
&&
default_driver
)
else
if
(
GIT_ATTR_
IS_
UNSPECIFIED
(
value
)
&&
default_driver
)
*
out
=
default_driver
;
*
out
=
default_driver
;
else
if
(
GIT_ATTR_UNSPECIFIED
(
value
))
else
if
(
GIT_ATTR_
IS_
UNSPECIFIED
(
value
))
*
out
=
merge_driver_name__text
;
*
out
=
merge_driver_name__text
;
else
else
...
...
This diff is collapsed.
Click to expand it.
tests/attr/attr_expect.h
View file @
37e4c1ba
...
@@ -23,15 +23,15 @@ GIT_INLINE(void) attr_check_expected(
...
@@ -23,15 +23,15 @@ GIT_INLINE(void) attr_check_expected(
{
{
switch
(
expected
)
{
switch
(
expected
)
{
case
EXPECT_TRUE
:
case
EXPECT_TRUE
:
cl_assert_
(
GIT_ATTR_TRUE
(
value
),
name
);
cl_assert_
(
GIT_ATTR_
IS_
TRUE
(
value
),
name
);
break
;
break
;
case
EXPECT_FALSE
:
case
EXPECT_FALSE
:
cl_assert_
(
GIT_ATTR_FALSE
(
value
),
name
);
cl_assert_
(
GIT_ATTR_
IS_
FALSE
(
value
),
name
);
break
;
break
;
case
EXPECT_UNDEFINED
:
case
EXPECT_UNDEFINED
:
cl_assert_
(
GIT_ATTR_UNSPECIFIED
(
value
),
name
);
cl_assert_
(
GIT_ATTR_
IS_
UNSPECIFIED
(
value
),
name
);
break
;
break
;
case
EXPECT_STRING
:
case
EXPECT_STRING
:
...
...
This diff is collapsed.
Click to expand it.
tests/attr/file.c
View file @
37e4c1ba
...
@@ -26,7 +26,7 @@ void test_attr_file__simple_read(void)
...
@@ -26,7 +26,7 @@ void test_attr_file__simple_read(void)
assign
=
get_assign
(
rule
,
0
);
assign
=
get_assign
(
rule
,
0
);
cl_assert
(
assign
!=
NULL
);
cl_assert
(
assign
!=
NULL
);
cl_assert_equal_s
(
"binary"
,
assign
->
name
);
cl_assert_equal_s
(
"binary"
,
assign
->
name
);
cl_assert
(
GIT_ATTR_TRUE
(
assign
->
value
));
cl_assert
(
GIT_ATTR_
IS_
TRUE
(
assign
->
value
));
git_attr_file__free
(
file
);
git_attr_file__free
(
file
);
}
}
...
@@ -53,7 +53,7 @@ void test_attr_file__match_variants(void)
...
@@ -53,7 +53,7 @@ void test_attr_file__match_variants(void)
assign
=
get_assign
(
rule
,
0
);
assign
=
get_assign
(
rule
,
0
);
cl_assert_equal_s
(
"attr0"
,
assign
->
name
);
cl_assert_equal_s
(
"attr0"
,
assign
->
name
);
cl_assert
(
assign
->
name_hash
==
git_attr_file__name_hash
(
assign
->
name
));
cl_assert
(
assign
->
name_hash
==
git_attr_file__name_hash
(
assign
->
name
));
cl_assert
(
GIT_ATTR_TRUE
(
assign
->
value
));
cl_assert
(
GIT_ATTR_
IS_
TRUE
(
assign
->
value
));
rule
=
get_rule
(
1
);
rule
=
get_rule
(
1
);
cl_assert_equal_s
(
"pat1"
,
rule
->
match
.
pattern
);
cl_assert_equal_s
(
"pat1"
,
rule
->
match
.
pattern
);
...
@@ -83,7 +83,7 @@ void test_attr_file__match_variants(void)
...
@@ -83,7 +83,7 @@ void test_attr_file__match_variants(void)
cl_assert
((
rule
->
match
.
flags
&
GIT_ATTR_FNMATCH_HASWILD
)
!=
0
);
cl_assert
((
rule
->
match
.
flags
&
GIT_ATTR_FNMATCH_HASWILD
)
!=
0
);
assign
=
get_assign
(
rule
,
0
);
assign
=
get_assign
(
rule
,
0
);
cl_assert_equal_s
(
"attr7"
,
assign
->
name
);
cl_assert_equal_s
(
"attr7"
,
assign
->
name
);
cl_assert
(
GIT_ATTR_TRUE
(
assign
->
value
));
cl_assert
(
GIT_ATTR_
IS_
TRUE
(
assign
->
value
));
rule
=
get_rule
(
8
);
rule
=
get_rule
(
8
);
cl_assert_equal_s
(
"pat8 with spaces"
,
rule
->
match
.
pattern
);
cl_assert_equal_s
(
"pat8 with spaces"
,
rule
->
match
.
pattern
);
...
@@ -144,11 +144,11 @@ void test_attr_file__assign_variants(void)
...
@@ -144,11 +144,11 @@ void test_attr_file__assign_variants(void)
assign
=
git_attr_rule__lookup_assignment
(
rule
,
"multiple"
);
assign
=
git_attr_rule__lookup_assignment
(
rule
,
"multiple"
);
cl_assert
(
assign
);
cl_assert
(
assign
);
cl_assert_equal_s
(
"multiple"
,
assign
->
name
);
cl_assert_equal_s
(
"multiple"
,
assign
->
name
);
cl_assert
(
GIT_ATTR_TRUE
(
assign
->
value
));
cl_assert
(
GIT_ATTR_
IS_
TRUE
(
assign
->
value
));
assign
=
git_attr_rule__lookup_assignment
(
rule
,
"single"
);
assign
=
git_attr_rule__lookup_assignment
(
rule
,
"single"
);
cl_assert
(
assign
);
cl_assert
(
assign
);
cl_assert_equal_s
(
"single"
,
assign
->
name
);
cl_assert_equal_s
(
"single"
,
assign
->
name
);
cl_assert
(
GIT_ATTR_FALSE
(
assign
->
value
));
cl_assert
(
GIT_ATTR_
IS_
FALSE
(
assign
->
value
));
assign
=
git_attr_rule__lookup_assignment
(
rule
,
"values"
);
assign
=
git_attr_rule__lookup_assignment
(
rule
,
"values"
);
cl_assert
(
assign
);
cl_assert
(
assign
);
cl_assert_equal_s
(
"values"
,
assign
->
name
);
cl_assert_equal_s
(
"values"
,
assign
->
name
);
...
@@ -170,7 +170,7 @@ void test_attr_file__assign_variants(void)
...
@@ -170,7 +170,7 @@ void test_attr_file__assign_variants(void)
assign
=
git_attr_rule__lookup_assignment
(
rule
,
"again"
);
assign
=
git_attr_rule__lookup_assignment
(
rule
,
"again"
);
cl_assert
(
assign
);
cl_assert
(
assign
);
cl_assert_equal_s
(
"again"
,
assign
->
name
);
cl_assert_equal_s
(
"again"
,
assign
->
name
);
cl_assert
(
GIT_ATTR_TRUE
(
assign
->
value
));
cl_assert
(
GIT_ATTR_
IS_
TRUE
(
assign
->
value
));
assign
=
git_attr_rule__lookup_assignment
(
rule
,
"another"
);
assign
=
git_attr_rule__lookup_assignment
(
rule
,
"another"
);
cl_assert
(
assign
);
cl_assert
(
assign
);
cl_assert_equal_s
(
"another"
,
assign
->
name
);
cl_assert_equal_s
(
"another"
,
assign
->
name
);
...
@@ -194,10 +194,10 @@ static void assert_examples(git_attr_file *file)
...
@@ -194,10 +194,10 @@ static void assert_examples(git_attr_file *file)
cl_assert_equal_s
(
"java"
,
assign
->
value
);
cl_assert_equal_s
(
"java"
,
assign
->
value
);
assign
=
git_attr_rule__lookup_assignment
(
rule
,
"crlf"
);
assign
=
git_attr_rule__lookup_assignment
(
rule
,
"crlf"
);
cl_assert_equal_s
(
"crlf"
,
assign
->
name
);
cl_assert_equal_s
(
"crlf"
,
assign
->
name
);
cl_assert
(
GIT_ATTR_FALSE
(
assign
->
value
));
cl_assert
(
GIT_ATTR_
IS_
FALSE
(
assign
->
value
));
assign
=
git_attr_rule__lookup_assignment
(
rule
,
"myAttr"
);
assign
=
git_attr_rule__lookup_assignment
(
rule
,
"myAttr"
);
cl_assert_equal_s
(
"myAttr"
,
assign
->
name
);
cl_assert_equal_s
(
"myAttr"
,
assign
->
name
);
cl_assert
(
GIT_ATTR_TRUE
(
assign
->
value
));
cl_assert
(
GIT_ATTR_
IS_
TRUE
(
assign
->
value
));
assign
=
git_attr_rule__lookup_assignment
(
rule
,
"missing"
);
assign
=
git_attr_rule__lookup_assignment
(
rule
,
"missing"
);
cl_assert
(
assign
==
NULL
);
cl_assert
(
assign
==
NULL
);
...
@@ -206,7 +206,7 @@ static void assert_examples(git_attr_file *file)
...
@@ -206,7 +206,7 @@ static void assert_examples(git_attr_file *file)
cl_assert
(
rule
->
assigns
.
length
==
1
);
cl_assert
(
rule
->
assigns
.
length
==
1
);
assign
=
get_assign
(
rule
,
0
);
assign
=
get_assign
(
rule
,
0
);
cl_assert_equal_s
(
"myAttr"
,
assign
->
name
);
cl_assert_equal_s
(
"myAttr"
,
assign
->
name
);
cl_assert
(
GIT_ATTR_UNSPECIFIED
(
assign
->
value
));
cl_assert
(
GIT_ATTR_
IS_
UNSPECIFIED
(
assign
->
value
));
rule
=
get_rule
(
2
);
rule
=
get_rule
(
2
);
cl_assert_equal_s
(
"README"
,
rule
->
match
.
pattern
);
cl_assert_equal_s
(
"README"
,
rule
->
match
.
pattern
);
...
...
This diff is collapsed.
Click to expand it.
tests/attr/flags.c
View file @
37e4c1ba
...
@@ -15,7 +15,7 @@ void test_attr_flags__bare(void)
...
@@ -15,7 +15,7 @@ void test_attr_flags__bare(void)
cl_git_pass
(
git_attr_get
(
cl_git_pass
(
git_attr_get
(
&
value
,
repo
,
GIT_ATTR_CHECK_NO_SYSTEM
,
"README.md"
,
"diff"
));
&
value
,
repo
,
GIT_ATTR_CHECK_NO_SYSTEM
,
"README.md"
,
"diff"
));
cl_assert
(
GIT_ATTR_UNSPECIFIED
(
value
));
cl_assert
(
GIT_ATTR_
IS_
UNSPECIFIED
(
value
));
}
}
void
test_attr_flags__index_vs_workdir
(
void
)
void
test_attr_flags__index_vs_workdir
(
void
)
...
@@ -29,7 +29,7 @@ void test_attr_flags__index_vs_workdir(void)
...
@@ -29,7 +29,7 @@ void test_attr_flags__index_vs_workdir(void)
cl_git_pass
(
git_attr_get
(
cl_git_pass
(
git_attr_get
(
&
value
,
repo
,
GIT_ATTR_CHECK_NO_SYSTEM
|
GIT_ATTR_CHECK_FILE_THEN_INDEX
,
&
value
,
repo
,
GIT_ATTR_CHECK_NO_SYSTEM
|
GIT_ATTR_CHECK_FILE_THEN_INDEX
,
"README.md"
,
"bar"
));
"README.md"
,
"bar"
));
cl_assert
(
GIT_ATTR_FALSE
(
value
));
cl_assert
(
GIT_ATTR_
IS_
FALSE
(
value
));
cl_git_pass
(
git_attr_get
(
cl_git_pass
(
git_attr_get
(
&
value
,
repo
,
GIT_ATTR_CHECK_NO_SYSTEM
|
GIT_ATTR_CHECK_FILE_THEN_INDEX
,
&
value
,
repo
,
GIT_ATTR_CHECK_NO_SYSTEM
|
GIT_ATTR_CHECK_FILE_THEN_INDEX
,
...
@@ -39,13 +39,13 @@ void test_attr_flags__index_vs_workdir(void)
...
@@ -39,13 +39,13 @@ void test_attr_flags__index_vs_workdir(void)
cl_git_pass
(
git_attr_get
(
cl_git_pass
(
git_attr_get
(
&
value
,
repo
,
GIT_ATTR_CHECK_NO_SYSTEM
|
GIT_ATTR_CHECK_FILE_THEN_INDEX
,
&
value
,
repo
,
GIT_ATTR_CHECK_NO_SYSTEM
|
GIT_ATTR_CHECK_FILE_THEN_INDEX
,
"README.txt"
,
"foo"
));
"README.txt"
,
"foo"
));
cl_assert
(
GIT_ATTR_FALSE
(
value
));
cl_assert
(
GIT_ATTR_
IS_
FALSE
(
value
));
/* index then wd */
/* index then wd */
cl_git_pass
(
git_attr_get
(
cl_git_pass
(
git_attr_get
(
&
value
,
repo
,
GIT_ATTR_CHECK_NO_SYSTEM
|
GIT_ATTR_CHECK_INDEX_THEN_FILE
,
&
value
,
repo
,
GIT_ATTR_CHECK_NO_SYSTEM
|
GIT_ATTR_CHECK_INDEX_THEN_FILE
,
"README.md"
,
"bar"
));
"README.md"
,
"bar"
));
cl_assert
(
GIT_ATTR_TRUE
(
value
));
cl_assert
(
GIT_ATTR_
IS_
TRUE
(
value
));
cl_git_pass
(
git_attr_get
(
cl_git_pass
(
git_attr_get
(
&
value
,
repo
,
GIT_ATTR_CHECK_NO_SYSTEM
|
GIT_ATTR_CHECK_INDEX_THEN_FILE
,
&
value
,
repo
,
GIT_ATTR_CHECK_NO_SYSTEM
|
GIT_ATTR_CHECK_INDEX_THEN_FILE
,
...
@@ -55,7 +55,7 @@ void test_attr_flags__index_vs_workdir(void)
...
@@ -55,7 +55,7 @@ void test_attr_flags__index_vs_workdir(void)
cl_git_pass
(
git_attr_get
(
cl_git_pass
(
git_attr_get
(
&
value
,
repo
,
GIT_ATTR_CHECK_NO_SYSTEM
|
GIT_ATTR_CHECK_INDEX_THEN_FILE
,
&
value
,
repo
,
GIT_ATTR_CHECK_NO_SYSTEM
|
GIT_ATTR_CHECK_INDEX_THEN_FILE
,
"README.txt"
,
"foo"
));
"README.txt"
,
"foo"
));
cl_assert
(
GIT_ATTR_TRUE
(
value
));
cl_assert
(
GIT_ATTR_
IS_
TRUE
(
value
));
}
}
void
test_attr_flags__subdir
(
void
)
void
test_attr_flags__subdir
(
void
)
...
@@ -77,7 +77,7 @@ void test_attr_flags__subdir(void)
...
@@ -77,7 +77,7 @@ void test_attr_flags__subdir(void)
cl_git_pass
(
git_attr_get
(
cl_git_pass
(
git_attr_get
(
&
value
,
repo
,
GIT_ATTR_CHECK_NO_SYSTEM
|
GIT_ATTR_CHECK_FILE_THEN_INDEX
,
&
value
,
repo
,
GIT_ATTR_CHECK_NO_SYSTEM
|
GIT_ATTR_CHECK_FILE_THEN_INDEX
,
"sub/sub/README.txt"
,
"again"
));
"sub/sub/README.txt"
,
"again"
));
cl_assert
(
GIT_ATTR_TRUE
(
value
));
cl_assert
(
GIT_ATTR_
IS_
TRUE
(
value
));
cl_git_pass
(
git_attr_get
(
cl_git_pass
(
git_attr_get
(
&
value
,
repo
,
GIT_ATTR_CHECK_NO_SYSTEM
|
GIT_ATTR_CHECK_FILE_THEN_INDEX
,
&
value
,
repo
,
GIT_ATTR_CHECK_NO_SYSTEM
|
GIT_ATTR_CHECK_FILE_THEN_INDEX
,
...
@@ -98,7 +98,7 @@ void test_attr_flags__subdir(void)
...
@@ -98,7 +98,7 @@ void test_attr_flags__subdir(void)
cl_git_pass
(
git_attr_get
(
cl_git_pass
(
git_attr_get
(
&
value
,
repo
,
GIT_ATTR_CHECK_NO_SYSTEM
|
GIT_ATTR_CHECK_INDEX_THEN_FILE
,
&
value
,
repo
,
GIT_ATTR_CHECK_NO_SYSTEM
|
GIT_ATTR_CHECK_INDEX_THEN_FILE
,
"sub/sub/README.txt"
,
"again"
));
"sub/sub/README.txt"
,
"again"
));
cl_assert
(
GIT_ATTR_TRUE
(
value
));
cl_assert
(
GIT_ATTR_
IS_
TRUE
(
value
));
cl_git_pass
(
git_attr_get
(
cl_git_pass
(
git_attr_get
(
&
value
,
repo
,
GIT_ATTR_CHECK_NO_SYSTEM
|
GIT_ATTR_CHECK_INDEX_THEN_FILE
,
&
value
,
repo
,
GIT_ATTR_CHECK_NO_SYSTEM
|
GIT_ATTR_CHECK_INDEX_THEN_FILE
,
...
...
This diff is collapsed.
Click to expand it.
tests/attr/lookup.c
View file @
37e4c1ba
...
@@ -19,7 +19,7 @@ void test_attr_lookup__simple(void)
...
@@ -19,7 +19,7 @@ void test_attr_lookup__simple(void)
cl_assert
(
!
path
.
is_dir
);
cl_assert
(
!
path
.
is_dir
);
cl_git_pass
(
git_attr_file__lookup_one
(
file
,
&
path
,
"binary"
,
&
value
));
cl_git_pass
(
git_attr_file__lookup_one
(
file
,
&
path
,
"binary"
,
&
value
));
cl_assert
(
GIT_ATTR_TRUE
(
value
));
cl_assert
(
GIT_ATTR_
IS_
TRUE
(
value
));
cl_git_pass
(
git_attr_file__lookup_one
(
file
,
&
path
,
"missing"
,
&
value
));
cl_git_pass
(
git_attr_file__lookup_one
(
file
,
&
path
,
"missing"
,
&
value
));
cl_assert
(
!
value
);
cl_assert
(
!
value
);
...
...
This diff is collapsed.
Click to expand it.
tests/attr/repo.c
View file @
37e4c1ba
...
@@ -104,23 +104,23 @@ void test_attr_repo__get_many(void)
...
@@ -104,23 +104,23 @@ void test_attr_repo__get_many(void)
cl_git_pass
(
git_attr_get_many
(
values
,
g_repo
,
0
,
"root_test1"
,
4
,
names
));
cl_git_pass
(
git_attr_get_many
(
values
,
g_repo
,
0
,
"root_test1"
,
4
,
names
));
cl_assert
(
GIT_ATTR_TRUE
(
values
[
0
]));
cl_assert
(
GIT_ATTR_
IS_
TRUE
(
values
[
0
]));
cl_assert
(
GIT_ATTR_TRUE
(
values
[
1
]));
cl_assert
(
GIT_ATTR_
IS_
TRUE
(
values
[
1
]));
cl_assert
(
GIT_ATTR_UNSPECIFIED
(
values
[
2
]));
cl_assert
(
GIT_ATTR_
IS_
UNSPECIFIED
(
values
[
2
]));
cl_assert
(
GIT_ATTR_UNSPECIFIED
(
values
[
3
]));
cl_assert
(
GIT_ATTR_
IS_
UNSPECIFIED
(
values
[
3
]));
cl_git_pass
(
git_attr_get_many
(
values
,
g_repo
,
0
,
"root_test2"
,
4
,
names
));
cl_git_pass
(
git_attr_get_many
(
values
,
g_repo
,
0
,
"root_test2"
,
4
,
names
));
cl_assert
(
GIT_ATTR_TRUE
(
values
[
0
]));
cl_assert
(
GIT_ATTR_
IS_
TRUE
(
values
[
0
]));
cl_assert
(
GIT_ATTR_FALSE
(
values
[
1
]));
cl_assert
(
GIT_ATTR_
IS_
FALSE
(
values
[
1
]));
cl_assert
(
GIT_ATTR_UNSPECIFIED
(
values
[
2
]));
cl_assert
(
GIT_ATTR_
IS_
UNSPECIFIED
(
values
[
2
]));
cl_assert
(
GIT_ATTR_UNSPECIFIED
(
values
[
3
]));
cl_assert
(
GIT_ATTR_
IS_
UNSPECIFIED
(
values
[
3
]));
cl_git_pass
(
git_attr_get_many
(
values
,
g_repo
,
0
,
"sub/subdir_test1"
,
4
,
names
));
cl_git_pass
(
git_attr_get_many
(
values
,
g_repo
,
0
,
"sub/subdir_test1"
,
4
,
names
));
cl_assert
(
GIT_ATTR_TRUE
(
values
[
0
]));
cl_assert
(
GIT_ATTR_
IS_
TRUE
(
values
[
0
]));
cl_assert
(
GIT_ATTR_TRUE
(
values
[
1
]));
cl_assert
(
GIT_ATTR_
IS_
TRUE
(
values
[
1
]));
cl_assert
(
GIT_ATTR_UNSPECIFIED
(
values
[
2
]));
cl_assert
(
GIT_ATTR_
IS_
UNSPECIFIED
(
values
[
2
]));
cl_assert_equal_s
(
"yes"
,
values
[
3
]);
cl_assert_equal_s
(
"yes"
,
values
[
3
]);
}
}
...
@@ -134,9 +134,9 @@ void test_attr_repo__get_many_in_place(void)
...
@@ -134,9 +134,9 @@ void test_attr_repo__get_many_in_place(void)
cl_git_pass
(
git_attr_get_many
(
vals
,
g_repo
,
0
,
"sub/subdir_test1"
,
4
,
vals
));
cl_git_pass
(
git_attr_get_many
(
vals
,
g_repo
,
0
,
"sub/subdir_test1"
,
4
,
vals
));
cl_assert
(
GIT_ATTR_TRUE
(
vals
[
0
]));
cl_assert
(
GIT_ATTR_
IS_
TRUE
(
vals
[
0
]));
cl_assert
(
GIT_ATTR_TRUE
(
vals
[
1
]));
cl_assert
(
GIT_ATTR_
IS_
TRUE
(
vals
[
1
]));
cl_assert
(
GIT_ATTR_UNSPECIFIED
(
vals
[
2
]));
cl_assert
(
GIT_ATTR_
IS_
UNSPECIFIED
(
vals
[
2
]));
cl_assert_equal_s
(
"yes"
,
vals
[
3
]);
cl_assert_equal_s
(
"yes"
,
vals
[
3
]);
}
}
...
@@ -202,19 +202,19 @@ void test_attr_repo__manpage_example(void)
...
@@ -202,19 +202,19 @@ void test_attr_repo__manpage_example(void)
const
char
*
value
;
const
char
*
value
;
cl_git_pass
(
git_attr_get
(
&
value
,
g_repo
,
0
,
"sub/abc"
,
"foo"
));
cl_git_pass
(
git_attr_get
(
&
value
,
g_repo
,
0
,
"sub/abc"
,
"foo"
));
cl_assert
(
GIT_ATTR_TRUE
(
value
));
cl_assert
(
GIT_ATTR_
IS_
TRUE
(
value
));
cl_git_pass
(
git_attr_get
(
&
value
,
g_repo
,
0
,
"sub/abc"
,
"bar"
));
cl_git_pass
(
git_attr_get
(
&
value
,
g_repo
,
0
,
"sub/abc"
,
"bar"
));
cl_assert
(
GIT_ATTR_UNSPECIFIED
(
value
));
cl_assert
(
GIT_ATTR_
IS_
UNSPECIFIED
(
value
));
cl_git_pass
(
git_attr_get
(
&
value
,
g_repo
,
0
,
"sub/abc"
,
"baz"
));
cl_git_pass
(
git_attr_get
(
&
value
,
g_repo
,
0
,
"sub/abc"
,
"baz"
));
cl_assert
(
GIT_ATTR_FALSE
(
value
));
cl_assert
(
GIT_ATTR_
IS_
FALSE
(
value
));
cl_git_pass
(
git_attr_get
(
&
value
,
g_repo
,
0
,
"sub/abc"
,
"merge"
));
cl_git_pass
(
git_attr_get
(
&
value
,
g_repo
,
0
,
"sub/abc"
,
"merge"
));
cl_assert_equal_s
(
"filfre"
,
value
);
cl_assert_equal_s
(
"filfre"
,
value
);
cl_git_pass
(
git_attr_get
(
&
value
,
g_repo
,
0
,
"sub/abc"
,
"frotz"
));
cl_git_pass
(
git_attr_get
(
&
value
,
g_repo
,
0
,
"sub/abc"
,
"frotz"
));
cl_assert
(
GIT_ATTR_UNSPECIFIED
(
value
));
cl_assert
(
GIT_ATTR_
IS_
UNSPECIFIED
(
value
));
}
}
void
test_attr_repo__macros
(
void
)
void
test_attr_repo__macros
(
void
)
...
@@ -226,24 +226,24 @@ void test_attr_repo__macros(void)
...
@@ -226,24 +226,24 @@ void test_attr_repo__macros(void)
cl_git_pass
(
git_attr_get_many
(
values
,
g_repo
,
0
,
"binfile"
,
5
,
names
));
cl_git_pass
(
git_attr_get_many
(
values
,
g_repo
,
0
,
"binfile"
,
5
,
names
));
cl_assert
(
GIT_ATTR_TRUE
(
values
[
0
]));
cl_assert
(
GIT_ATTR_
IS_
TRUE
(
values
[
0
]));
cl_assert
(
GIT_ATTR_TRUE
(
values
[
1
]));
cl_assert
(
GIT_ATTR_
IS_
TRUE
(
values
[
1
]));
cl_assert
(
GIT_ATTR_FALSE
(
values
[
2
]));
cl_assert
(
GIT_ATTR_
IS_
FALSE
(
values
[
2
]));
cl_assert
(
GIT_ATTR_FALSE
(
values
[
3
]));
cl_assert
(
GIT_ATTR_
IS_
FALSE
(
values
[
3
]));
cl_assert
(
GIT_ATTR_UNSPECIFIED
(
values
[
4
]));
cl_assert
(
GIT_ATTR_
IS_
UNSPECIFIED
(
values
[
4
]));
cl_git_pass
(
git_attr_get_many
(
values
,
g_repo
,
0
,
"macro_test"
,
5
,
names2
));
cl_git_pass
(
git_attr_get_many
(
values
,
g_repo
,
0
,
"macro_test"
,
5
,
names2
));
cl_assert
(
GIT_ATTR_TRUE
(
values
[
0
]));
cl_assert
(
GIT_ATTR_
IS_
TRUE
(
values
[
0
]));
cl_assert
(
GIT_ATTR_TRUE
(
values
[
1
]));
cl_assert
(
GIT_ATTR_
IS_
TRUE
(
values
[
1
]));
cl_assert
(
GIT_ATTR_FALSE
(
values
[
2
]));
cl_assert
(
GIT_ATTR_
IS_
FALSE
(
values
[
2
]));
cl_assert
(
GIT_ATTR_UNSPECIFIED
(
values
[
3
]));
cl_assert
(
GIT_ATTR_
IS_
UNSPECIFIED
(
values
[
3
]));
cl_assert_equal_s
(
"77"
,
values
[
4
]);
cl_assert_equal_s
(
"77"
,
values
[
4
]);
cl_git_pass
(
git_attr_get_many
(
values
,
g_repo
,
0
,
"macro_test"
,
3
,
names3
));
cl_git_pass
(
git_attr_get_many
(
values
,
g_repo
,
0
,
"macro_test"
,
3
,
names3
));
cl_assert
(
GIT_ATTR_TRUE
(
values
[
0
]));
cl_assert
(
GIT_ATTR_
IS_
TRUE
(
values
[
0
]));
cl_assert
(
GIT_ATTR_FALSE
(
values
[
1
]));
cl_assert
(
GIT_ATTR_
IS_
FALSE
(
values
[
1
]));
cl_assert_equal_s
(
"answer"
,
values
[
2
]);
cl_assert_equal_s
(
"answer"
,
values
[
2
]);
}
}
...
@@ -256,9 +256,9 @@ void test_attr_repo__bad_macros(void)
...
@@ -256,9 +256,9 @@ void test_attr_repo__bad_macros(void)
cl_git_pass
(
git_attr_get_many
(
values
,
g_repo
,
0
,
"macro_bad"
,
6
,
names
));
cl_git_pass
(
git_attr_get_many
(
values
,
g_repo
,
0
,
"macro_bad"
,
6
,
names
));
/* these three just confirm that the "mymacro" rule ran */
/* these three just confirm that the "mymacro" rule ran */
cl_assert
(
GIT_ATTR_UNSPECIFIED
(
values
[
0
]));
cl_assert
(
GIT_ATTR_
IS_
UNSPECIFIED
(
values
[
0
]));
cl_assert
(
GIT_ATTR_TRUE
(
values
[
1
]));
cl_assert
(
GIT_ATTR_
IS_
TRUE
(
values
[
1
]));
cl_assert
(
GIT_ATTR_FALSE
(
values
[
2
]));
cl_assert
(
GIT_ATTR_
IS_
FALSE
(
values
[
2
]));
/* file contains:
/* file contains:
* # let's try some malicious macro defs
* # let's try some malicious macro defs
...
@@ -282,9 +282,9 @@ void test_attr_repo__bad_macros(void)
...
@@ -282,9 +282,9 @@ void test_attr_repo__bad_macros(void)
* so summary results should be:
* so summary results should be:
* -firstmacro secondmacro="hahaha" thirdmacro
* -firstmacro secondmacro="hahaha" thirdmacro
*/
*/
cl_assert
(
GIT_ATTR_FALSE
(
values
[
3
]));
cl_assert
(
GIT_ATTR_
IS_
FALSE
(
values
[
3
]));
cl_assert_equal_s
(
"hahaha"
,
values
[
4
]);
cl_assert_equal_s
(
"hahaha"
,
values
[
4
]);
cl_assert
(
GIT_ATTR_TRUE
(
values
[
5
]));
cl_assert
(
GIT_ATTR_
IS_
TRUE
(
values
[
5
]));
}
}
#define CONTENT "I'm going to be dynamically processed\r\n" \
#define CONTENT "I'm going to be dynamically processed\r\n" \
...
@@ -357,22 +357,22 @@ void test_attr_repo__bare_repo_with_index(void)
...
@@ -357,22 +357,22 @@ void test_attr_repo__bare_repo_with_index(void)
cl_git_pass
(
git_attr_get_many
(
values
,
g_repo
,
0
,
"file.txt"
,
4
,
names
));
cl_git_pass
(
git_attr_get_many
(
values
,
g_repo
,
0
,
"file.txt"
,
4
,
names
));
cl_assert
(
GIT_ATTR_TRUE
(
values
[
0
]));
cl_assert
(
GIT_ATTR_
IS_
TRUE
(
values
[
0
]));
cl_assert_equal_s
(
"foobar"
,
values
[
1
]);
cl_assert_equal_s
(
"foobar"
,
values
[
1
]);
cl_assert
(
GIT_ATTR_FALSE
(
values
[
2
]));
cl_assert
(
GIT_ATTR_
IS_
FALSE
(
values
[
2
]));
cl_assert
(
GIT_ATTR_UNSPECIFIED
(
values
[
3
]));
cl_assert
(
GIT_ATTR_
IS_
UNSPECIFIED
(
values
[
3
]));
cl_git_pass
(
git_attr_get_many
(
values
,
g_repo
,
0
,
"trial.txt"
,
4
,
names
));
cl_git_pass
(
git_attr_get_many
(
values
,
g_repo
,
0
,
"trial.txt"
,
4
,
names
));
cl_assert
(
GIT_ATTR_FALSE
(
values
[
0
]));
cl_assert
(
GIT_ATTR_
IS_
FALSE
(
values
[
0
]));
cl_assert_equal_s
(
"barfoo"
,
values
[
1
]);
cl_assert_equal_s
(
"barfoo"
,
values
[
1
]);
cl_assert
(
GIT_ATTR_UNSPECIFIED
(
values
[
2
]));
cl_assert
(
GIT_ATTR_
IS_
UNSPECIFIED
(
values
[
2
]));
cl_assert
(
GIT_ATTR_TRUE
(
values
[
3
]));
cl_assert
(
GIT_ATTR_
IS_
TRUE
(
values
[
3
]));
cl_git_pass
(
git_attr_get_many
(
values
,
g_repo
,
0
,
"sub/sub/subdir.txt"
,
4
,
names
));
cl_git_pass
(
git_attr_get_many
(
values
,
g_repo
,
0
,
"sub/sub/subdir.txt"
,
4
,
names
));
cl_assert
(
GIT_ATTR_TRUE
(
values
[
0
]));
cl_assert
(
GIT_ATTR_
IS_
TRUE
(
values
[
0
]));
cl_assert_equal_s
(
"foobar"
,
values
[
1
]);
cl_assert_equal_s
(
"foobar"
,
values
[
1
]);
cl_assert
(
GIT_ATTR_FALSE
(
values
[
2
]));
cl_assert
(
GIT_ATTR_
IS_
FALSE
(
values
[
2
]));
cl_assert
(
GIT_ATTR_UNSPECIFIED
(
values
[
3
]));
cl_assert
(
GIT_ATTR_
IS_
UNSPECIFIED
(
values
[
3
]));
}
}
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment