Patches to avoid reporting conversion changes.
v2 cover Patches to avoid reporting conversion changes.
This is the second go at having the git index keep track of the conversion mode and corresponding normalized blob sha1 for files.
Since last time the diff behaviour patch has been removed, and with it the need for storing of the normalized blob and thus the gc patch. Some basic test cases have been added.
Thanks to Junio C Hamano for the suggestion and some of the tests.
Henrik Grubbström (Grubba) (4):
sha1_file: Added index_blob().
cache: Added ce_norm_sha1() and related cache_entry fields.
cache: Added index extension "NORM".
t/t0021: Test that conversion changes are detected.
cache.h | 22 ++++++++++++++++ convert.c | 31 +++++++++++++++++++++++ read-cache.c | 66 +++++++++++++++++++++++++++++++++++++++++++------ sha1_file.c | 19 ++++++++++++++ t/t0021-conversion.sh | 50 +++++++++++++++++++++++++++++++++++++ 5 files changed, 180 insertions(+), 8 deletions(-)
RFC PATCH v2 1/4 sha1_file: Added index_blob().
When conversion attributes have changed, it
is useful to be able to easily reconvert an
existing blob.
Signed-off-by Henrik Grubbström <[email protected]>
---
No changes since v1.
cache.h | 1 + sha1_file.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 0 deletions(-)
cache.h +1 -0
@@ -494,6 +494,7 @@ extern int ie_match_stat(const struct index_state *, struct cache_entry *, strucextern int ie_modified (const struct index_state *,struct cache_entry *,struct stat *,unsigned int );extern int ce_path_match (const struct cache_entry *ce,const char **pathspec); +extern int index_blob (unsigned char *dst_sha1,const unsigned char *src_sha1,int write_object,const char *path);extern int index_fd (unsigned char *sha1,int fd,struct stat *st,int write_object,enum object_type type,const char *path);extern int index_path (unsigned char *sha1,const char *path,struct stat *st,int write_object);extern void fill_stat_cache_info (struct cache_entry *ce,struct stat *st);
sha1_file.c +19 -0
@@ -2434,6 +2434,25 @@ static int index_mem(unsigned char *sha1, void *buf, size_t size,#define SMALL_FILE_SIZE (32*1024) +int index_blob (unsigned char *dst_sha1,const unsigned char *src_sha1, +int write_object,const char *path) +{ +void *buf; +unsigned long buflen =0 ; +int ret; + +memcpy (dst_sha1, src_sha1,20 ); + buf =read_object_with_reference (src_sha1,typename (OBJ_BLOB ), + &buflen, dst_sha1); +if (!buf) +return 0 ; + + ret =index_mem (dst_sha1, buf, buflen, write_object,OBJ_BLOB , path); +free (buf); + +return ret; +} +int index_fd (unsigned char *sha1,int fd,struct stat *st,int write_object,enum object_type type,const char *path) {
Signature · 1 line
1.7.0.4.369.g81e89
RFC PATCH v2 2/4 cache: Added ce_norm_sha1() and related cache_entry fields.
In reply to Henrik Grubbström (Grubba)The index now keeps track of the conversion mode that was active when the entry was created. This can be used to detect the most common cases of when the conversion mode has changed.
Signed-off-by Henrik Grubbström <[email protected]>
---git_norm_flags has been extended with one flag (NORM_CONV_CRLF_WT) to be able to keep track of the working tree state as well as the repository state.
git_norm_flags() now takes account of the auto_crlf state.
ce_match_stat_basic() now knows that a normalization change may affect the working tree file size.
Updating of the normalization state is now done in ce_compare_data().
cache.h | 14 ++++++++++++++ convert.c | 31 +++++++++++++++++++++++++++++++ read-cache.c | 17 +++++++++++++++-- 3 files changed, 60 insertions(+), 2 deletions(-)
cache.h +14 -0
@@ -151,10 +151,18 @@ struct cache_entry {unsigned int ce_size;unsigned int ce_flags;unsigned char sha1[20 ]; +unsigned int norm_flags; +unsigned char norm_sha1[20 ];struct cache_entry *next;char name[FLEX_ARRAY ];/* more */ }; +#define NORM_CONV_CRLF_GIT 0x0001 +#define NORM_CONV_CRLF_WT 0x0002 +#define NORM_CONV_CRLF_GUESS 0x0004 +#define NORM_CONV_IDENT 0x0008 +#define NORM_CONV_FILT 0x0010 +#define CE_NAMEMASK (0x0fff)#define CE_STAGEMASK (0x3000)#define CE_EXTENDED (0x4000)
@@ -278,6 +286,11 @@ static inline int ce_to_dtype(const struct cache_entry *ce)else return DT_UNKNOWN ; } +static inline unsigned char *ce_norm_sha1 (struct cache_entry *ce) +{ +return ce->norm_flags?ce->norm_sha1:ce->sha1; +} +#define canon_mode (mode) \ (S_ISREG(mode) ? (S_IFREG | ce_permissions(mode)) : \ S_ISLNK(mode) ? S_IFLNK : S_ISDIR(mode) ? S_IFDIR : S_IFGITLINK)
@@ -1014,6 +1027,7 @@ extern void trace_argv_printf(const char **argv, const char *format, ...);/* convert.c */ /* returns 1 if *dst was used */ +extern unsigned int git_norm_flags (const char *path);extern int convert_to_git (const char *path,const char *src,size_t len,struct strbuf *dst,enum safe_crlf checksafe);extern int convert_to_working_tree (const char *path,const char *src,size_t len,struct strbuf *dst);
convert.c +31 -0
@@ -568,6 +568,37 @@ static int git_path_check_ident(const char *path, struct git_attr_check *check)return !!ATTR_TRUE (value); } +unsigned int git_norm_flags (const char *path) +{ +struct git_attr_check check[3 ]; +int crlf =CRLF_GUESS ; +int ident =0 ; +unsigned ret =0 ; +struct convert_driver *drv =NULL ; + +setup_convert_check (check); +if (!git_checkattr (path,ARRAY_SIZE (check), check)) { + crlf =git_path_check_crlf (path, check +0 ); + ident =git_path_check_ident (path, check +1 ); + drv =git_path_check_convert (path, check +2 ); + } + +if (auto_crlf && (crlf !=CRLF_BINARY )) { + ret |=NORM_CONV_CRLF_GIT ; +if (crlf !=CRLF_INPUT && auto_crlf >0 ) + ret |=NORM_CONV_CRLF_WT ; +if (crlf ==CRLF_GUESS ) + ret |=NORM_CONV_CRLF_GUESS ; + } +if (ident) { + ret |=NORM_CONV_IDENT ; + } +if (drv) { + ret |=NORM_CONV_FILT ; + } +return ret; +} +int convert_to_git (const char *path,const char *src,size_t len,struct strbuf *dst,enum safe_crlf checksafe) {
read-cache.c +15 -2
@@ -88,12 +88,20 @@ void fill_stat_cache_info(struct cache_entry *ce, struct stat *st)static int ce_compare_data (struct cache_entry *ce,struct stat *st) {int match =-1 ; -int fd =open (ce->name,O_RDONLY ); +int fd; +unsigned int norm_flags =git_norm_flags (ce->name); +if (norm_flags != ce->norm_flags) { + ce->norm_flags = norm_flags; +if (norm_flags) +index_blob (ce->norm_sha1, ce->sha1,0 , ce->name); + } + + fd =open (ce->name,O_RDONLY );if (fd >=0 ) {unsigned char sha1[20 ];if (!index_fd (sha1, fd, st,0 ,OBJ_BLOB , ce->name)) - match =hashcmp (sha1, ce->sha1); + match =hashcmp (sha1,ce_norm_sha1 (ce));/* index_fd() closed the file descriptor already */ }return match;
@@ -227,6 +235,11 @@ static int ce_match_stat_basic(struct cache_entry *ce, struct stat *st) changed |=INODE_CHANGED ;#endif +/* ce_size can not be trusted if the conversion mode has changed. */ +if ((ce->ce_mode &S_IFMT ) ==S_IFREG && + ce->norm_flags !=git_norm_flags (ce->name)) +return changed; +if (ce->ce_size != (unsigned int ) st->st_size) changed |=DATA_CHANGED ;
Signature · 1 line
1.7.0.4.369.g81e89
RFC PATCH v2 3/4 cache: Added index extension "NORM".
In reply to Henrik Grubbström (Grubba)The index can now store and retrieve the ce_norm_sha1 data.
Signed-off-by Henrik Grubbström <[email protected]>
---
Unchanged since v1.
cache.h | 7 +++++++ read-cache.c | 49 +++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 50 insertions(+), 6 deletions(-)
cache.h +7 -0
@@ -157,6 +157,13 @@ struct cache_entry {char name[FLEX_ARRAY ];/* more */ }; +struct ondisk_norm_sha1 { +unsigned int entry_no; +unsigned int norm_flags; +unsigned int norm_size; +unsigned char norm_sha1[20 ]; +}; +#define NORM_CONV_CRLF_GIT 0x0001#define NORM_CONV_CRLF_WT 0x0002#define NORM_CONV_CRLF_GUESS 0x0004
read-cache.c +43 -6
104 lines not on this page · raw message
Signature · 1 line
1.7.0.4.369.g81e89
RFC PATCH v2 4/4 t/t0021: Test that conversion changes are detected.
In reply to Henrik Grubbström (Grubba)Signed-off-by Henrik Grubbström <[email protected]>
---
Thanks to Junio C Hamano for some of the tests.
t/t0021-conversion.sh | 50 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 50 insertions(+), 0 deletions(-)
t/t0021-conversion.sh +50 -0
@@ -89,4 +89,54 @@ test_expect_success expanded_in_repo ' cmp expanded-keywords expected-output ' +# Check that files that have had their canonical representation +# changed since being checked in aren't reported as modified +# directly after being checked out. +test_expect_success keywords_not_modified ' + { + echo "File with foreign keywords" + echo "\$Id\$" + echo "\$Id: NoTerminatingSymbol" + echo "\$Id: Foreign Commit With Spaces \$" + echo "\$Id: GitCommitId \$" + echo "\$Id: NoTerminatingSymbolAtEOF" + } > expanded-keywords2 && + + git add expanded-keywords2 && + git commit -m "File with keywords expanded" && + + echo "expanded-keywords2 ident" >> .gitattributes && + + rm -f expanded-keywords2 && + git checkout -- expanded-keywords2 && + + test "x`git status --porcelain -- expanded-keywords2`" = x +' + +# Test detection of CRLF conversion changes CRLF ==> LF. +test_expect_success crlf_conversion_change_crlf_to_lf ' + # step 0. a blob with CRLF + git init one && cd one && + echo -e "a quick brown fox\015" >kuzu && + git add kuzu && git commit -m kuzu && + # step 1. you want CRLF in work area, LF in repository + git config core.autocrlf true && + # step 2. user edit and revert. + touch kuzu && + git update-index --refresh +' + +# Test detection of CRLF conversion changes LF ==> CRLF. +test_expect_success crlf_conversion_change_lf_to_crlf ' + # step 0 & 1. a project with LF ending + git init two && cd two && + echo a quick brown fox >kuzu && + git add kuzu && git commit -m kuzu && + # step 2. you want CRLF in your work area + echo -e "a quick brown fox\015" >kuzu && + git config core.autocrlf true && + # step 3. oops, refresh + git update-index --refresh +' + test_done
Signature · 1 line
1.7.0.4.369.g81e89