From a212716fc3ab684c67e1a1c8c45dc3e88f87b0a1 Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Tue, 3 Mar 2015 18:19:42 -0500 Subject: [PATCH 1/2] diff_tform: don't compare empty hashsig_heaps Don't try to compare two empty hashsig_heaps. --- src/hashsig.c | 3 +++ tests/diff/rename.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/src/hashsig.c b/src/hashsig.c index 0ddfed902..cbe56e7cd 100644 --- a/src/hashsig.c +++ b/src/hashsig.c @@ -314,6 +314,9 @@ static int hashsig_heap_compare(const hashsig_heap *a, const hashsig_heap *b) assert(a->cmp == b->cmp); + if (a->size + b->size == 0) + return 0; + /* hash heaps are sorted - just look for overlap vs total */ for (i = 0, j = 0; i < a->size && j < b->size; ) { diff --git a/tests/diff/rename.c b/tests/diff/rename.c index fe31a4128..6592446e3 100644 --- a/tests/diff/rename.c +++ b/tests/diff/rename.c @@ -1602,3 +1602,41 @@ void test_diff_rename__by_config_doesnt_mess_with_whitespace_settings(void) git_tree_free(tree1); git_tree_free(tree2); } + +/* test some variations on empty files */ +void test_diff_rename__empty_files(void) +{ + git_index *index; + git_diff *diff = NULL; + diff_expects exp; + git_diff_options diffopts = GIT_DIFF_OPTIONS_INIT; + git_diff_find_options findopts = GIT_DIFF_FIND_OPTIONS_INIT; + + diffopts.flags = GIT_DIFF_INCLUDE_UNTRACKED; + + findopts.flags = GIT_DIFF_FIND_FOR_UNTRACKED | + GIT_DIFF_FIND_AND_BREAK_REWRITES | + GIT_DIFF_FIND_RENAMES_FROM_REWRITES; + + cl_git_pass(git_repository_index(&index, g_repo)); + + cl_git_rewritefile("renames/ikeepsix.txt", ""); + cl_git_pass(git_index_add_bypath(index, "ikeepsix.txt")); + + cl_git_rmfile("renames/ikeepsix.txt"); + cl_git_rewritefile("renames/ikeepsix2.txt", "\n\n\n"); + + cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, index, &diffopts)); + cl_git_pass(git_diff_find_similar(diff, &findopts)); + + memset(&exp, 0, sizeof(exp)); + + cl_git_pass(git_diff_foreach( + diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp)); + cl_assert_equal_i(2, exp.files); + cl_assert_equal_i(1, exp.file_status[GIT_DELTA_DELETED]); + cl_assert_equal_i(1, exp.file_status[GIT_DELTA_UNTRACKED]); + + git_diff_free(diff); + git_index_free(index); +} From f78d9b6cfe721539b4ecf0ae6d01367b13959a45 Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Tue, 3 Mar 2015 23:56:54 -0500 Subject: [PATCH 2/2] diff_tform: account for whitespace options When comparing seemingly blank files, take whitespace options into account. --- src/hashsig.c | 20 +++++++++--- tests/diff/rename.c | 74 +++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 84 insertions(+), 10 deletions(-) diff --git a/src/hashsig.c b/src/hashsig.c index cbe56e7cd..e99637d8b 100644 --- a/src/hashsig.c +++ b/src/hashsig.c @@ -34,6 +34,7 @@ typedef struct { struct git_hashsig { hashsig_heap mins; hashsig_heap maxs; + size_t lines; git_hashsig_option_t opt; }; @@ -185,8 +186,10 @@ static int hashsig_add_hashes( ++scan; /* check run terminator */ - if (ch == '\n' || ch == '\0') + if (ch == '\n' || ch == '\0') { + sig->lines++; break; + } ++len; HASHSIG_HASH_MIX(state, ch); @@ -314,9 +317,6 @@ static int hashsig_heap_compare(const hashsig_heap *a, const hashsig_heap *b) assert(a->cmp == b->cmp); - if (a->size + b->size == 0) - return 0; - /* hash heaps are sorted - just look for overlap vs total */ for (i = 0, j = 0; i < a->size && j < b->size; ) { @@ -336,6 +336,18 @@ static int hashsig_heap_compare(const hashsig_heap *a, const hashsig_heap *b) int git_hashsig_compare(const git_hashsig *a, const git_hashsig *b) { + /* if we have no elements in either file then each file is either + * empty or blank. if we're ignoring whitespace then the files are + * similar, otherwise they're dissimilar. + */ + if (a->mins.size == 0 && b->mins.size == 0) { + if ((!a->lines && !b->lines) || + (a->opt & GIT_HASHSIG_IGNORE_WHITESPACE)) + return HASHSIG_SCALE; + else + return 0; + } + /* if we have fewer than the maximum number of elements, then just use * one array since the two arrays will be the same */ diff --git a/tests/diff/rename.c b/tests/diff/rename.c index 6592446e3..8a327f035 100644 --- a/tests/diff/rename.c +++ b/tests/diff/rename.c @@ -1603,8 +1603,63 @@ void test_diff_rename__by_config_doesnt_mess_with_whitespace_settings(void) git_tree_free(tree2); } -/* test some variations on empty files */ -void test_diff_rename__empty_files(void) +static void expect_files_renamed(const char *one, const char *two, uint32_t whitespace_flags) +{ + git_index *index; + git_diff *diff = NULL; + diff_expects exp; + git_diff_options diffopts = GIT_DIFF_OPTIONS_INIT; + git_diff_find_options findopts = GIT_DIFF_FIND_OPTIONS_INIT; + + diffopts.flags = GIT_DIFF_INCLUDE_UNTRACKED; + findopts.flags = GIT_DIFF_FIND_FOR_UNTRACKED | + GIT_DIFF_FIND_AND_BREAK_REWRITES | + GIT_DIFF_FIND_RENAMES_FROM_REWRITES | + whitespace_flags; + + cl_git_pass(git_repository_index(&index, g_repo)); + + cl_git_rewritefile("renames/ikeepsix.txt", one); + cl_git_pass(git_index_add_bypath(index, "ikeepsix.txt")); + + cl_git_rmfile("renames/ikeepsix.txt"); + cl_git_rewritefile("renames/ikeepsix2.txt", two); + + cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, index, &diffopts)); + cl_git_pass(git_diff_find_similar(diff, &findopts)); + + memset(&exp, 0, sizeof(exp)); + + cl_git_pass(git_diff_foreach( + diff, diff_file_cb, diff_hunk_cb, diff_line_cb, &exp)); + cl_assert_equal_i(1, exp.files); + cl_assert_equal_i(1, exp.file_status[GIT_DELTA_RENAMED]); + + git_diff_free(diff); + git_index_free(index); +} + +/* test some variations on empty and blank files */ +void test_diff_rename__empty_files_renamed(void) +{ + /* empty files are identical when ignoring whitespace or not */ + expect_files_renamed("", "", GIT_DIFF_FIND_DONT_IGNORE_WHITESPACE); + expect_files_renamed("", "", GIT_DIFF_FIND_IGNORE_WHITESPACE); +} + +/* test that blank files are similar when ignoring whitespace */ +void test_diff_rename__blank_files_renamed_when_ignoring_whitespace(void) +{ + expect_files_renamed("", "\n\n", GIT_DIFF_FIND_IGNORE_WHITESPACE); + expect_files_renamed("", "\r\n\r\n", GIT_DIFF_FIND_IGNORE_WHITESPACE); + expect_files_renamed("\r\n\r\n", "\n\n\n", GIT_DIFF_FIND_IGNORE_WHITESPACE); + + expect_files_renamed(" ", "\n\n", GIT_DIFF_FIND_IGNORE_WHITESPACE); + expect_files_renamed(" \n \n", "\n\n", GIT_DIFF_FIND_IGNORE_WHITESPACE); +} + +/* blank files are not similar when whitespace is not ignored */ +static void expect_files_not_renamed(const char *one, const char *two, uint32_t whitespace_flags) { git_index *index; git_diff *diff = NULL; @@ -1615,16 +1670,15 @@ void test_diff_rename__empty_files(void) diffopts.flags = GIT_DIFF_INCLUDE_UNTRACKED; findopts.flags = GIT_DIFF_FIND_FOR_UNTRACKED | - GIT_DIFF_FIND_AND_BREAK_REWRITES | - GIT_DIFF_FIND_RENAMES_FROM_REWRITES; + whitespace_flags; cl_git_pass(git_repository_index(&index, g_repo)); - cl_git_rewritefile("renames/ikeepsix.txt", ""); + cl_git_rewritefile("renames/ikeepsix.txt", one); cl_git_pass(git_index_add_bypath(index, "ikeepsix.txt")); cl_git_rmfile("renames/ikeepsix.txt"); - cl_git_rewritefile("renames/ikeepsix2.txt", "\n\n\n"); + cl_git_rewritefile("renames/ikeepsix2.txt", two); cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, index, &diffopts)); cl_git_pass(git_diff_find_similar(diff, &findopts)); @@ -1640,3 +1694,11 @@ void test_diff_rename__empty_files(void) git_diff_free(diff); git_index_free(index); } + +/* test that blank files are similar when ignoring renames */ +void test_diff_rename__blank_files_not_renamed_when_not_ignoring_whitespace(void) +{ + expect_files_not_renamed("", "\r\n\r\n\r\n", GIT_DIFF_FIND_DONT_IGNORE_WHITESPACE); + expect_files_not_renamed("", "\n\n\n\n", GIT_DIFF_FIND_DONT_IGNORE_WHITESPACE); + expect_files_not_renamed("\n\n\n\n", "\r\n\r\n\r\n", GIT_DIFF_FIND_DONT_IGNORE_WHITESPACE); +}