#!/bin/sh # # Copyright (c) 2005 Junio C Hamano # global test_description := ''Test rename detection in diff engine. '' source ./test-lib.sh source "$TEST_DIRECTORY"/diff-lib.sh test_expect_success 'setup' ' cat >path0 <<-\EOF && Line 1 Line 2 Line 3 Line 4 Line 5 Line 6 Line 7 Line 8 Line 9 Line 10 line 11 Line 12 Line 13 Line 14 Line 15 EOF cat >expected <<-\EOF && diff --git a/path0 b/path1 rename from path0 rename to path1 --- a/path0 +++ b/path1 @@ -8,7 +8,7 @@ Line 7 Line 8 Line 9 Line 10 -line 11 +Line 11 Line 12 Line 13 Line 14 EOF cat >no-rename <<-\EOF diff --git a/path0 b/path0 deleted file mode 100644 index fdbec44..0000000 --- a/path0 +++ /dev/null @@ -1,15 +0,0 @@ -Line 1 -Line 2 -Line 3 -Line 4 -Line 5 -Line 6 -Line 7 -Line 8 -Line 9 -Line 10 -line 11 -Line 12 -Line 13 -Line 14 -Line 15 diff --git a/path1 b/path1 new file mode 100644 index 0000000..752c50e --- /dev/null +++ b/path1 @@ -0,0 +1,15 @@ +Line 1 +Line 2 +Line 3 +Line 4 +Line 5 +Line 6 +Line 7 +Line 8 +Line 9 +Line 10 +Line 11 +Line 12 +Line 13 +Line 14 +Line 15 EOF ' test_expect_success \ 'update-index --add a file.' \ 'git update-index --add path0' test_expect_success \ 'write that tree.' \ 'tree=$(git write-tree) && echo $tree' sed -e 's/line/Line/' path1 rm -f path0 test_expect_success \ 'renamed and edited the file.' \ 'git update-index --add --remove path0 path1' test_expect_success \ 'git diff-index -p -M after rename and editing.' \ 'git diff-index -p -M $tree >current' test_expect_success \ 'validate the output.' \ 'compare_diff_patch current expected' test_expect_success 'test diff.renames=true' ' git -c diff.renames=true diff --cached $tree >current && compare_diff_patch current expected ' test_expect_success 'test diff.renames=false' ' git -c diff.renames=false diff --cached $tree >current && compare_diff_patch current no-rename ' test_expect_success 'test diff.renames unset' ' git diff --cached $tree >current && compare_diff_patch current expected ' test_expect_success 'favour same basenames over different ones' ' cp path1 another-path && git add another-path && git commit -m 1 && git rm path1 && mkdir subdir && git mv another-path subdir/path1 && git status | test_i18ngrep "renamed: .*path1 -> subdir/path1"' test_expect_success 'favour same basenames even with minor differences' ' git show HEAD:path1 | sed "s/15/16/" > subdir/path1 && git status | test_i18ngrep "renamed: .*path1 -> subdir/path1"' test_expect_success 'two files with same basename and same content' ' git reset --hard && mkdir -p dir/A dir/B && cp path1 dir/A/file && cp path1 dir/B/file && git add dir && git commit -m 2 && git mv dir other-dir && git status | test_i18ngrep "renamed: .*dir/A/file -> other-dir/A/file" ' test_expect_success 'setup for many rename source candidates' ' git reset --hard && for i in 0 1 2 3 4 5 6 7 8 9; do for j in 0 1 2 3 4 5 6 7 8 9; do echo "$i$j" >"path$i$j" done done && git add "path??" && test_tick && git commit -m "hundred" && (cat path1; echo new) >new-path && echo old >>path1 && git add new-path path1 && git diff -l 4 -C -C --cached --name-status >actual 2>actual.err && sed -e "s/^\([CM]\)[0-9]* /\1 /" actual >actual.munged && cat >expect <<-EOF && C path1 new-path M path1 EOF test_cmp expect actual.munged && grep warning actual.err ' test_expect_success 'rename pretty print with nothing in common' ' mkdir -p a/b/ && : >a/b/c && git add a/b/c && git commit -m "create a/b/c" && mkdir -p c/b/ && git mv a/b/c c/b/a && git commit -m "a/b/c -> c/b/a" && git diff -M --summary HEAD^ HEAD >output && test_i18ngrep " a/b/c => c/b/a " output && git diff -M --stat HEAD^ HEAD >output && test_i18ngrep " a/b/c => c/b/a " output ' test_expect_success 'rename pretty print with common prefix' ' mkdir -p c/d && git mv c/b/a c/d/e && git commit -m "c/b/a -> c/d/e" && git diff -M --summary HEAD^ HEAD >output && test_i18ngrep " c/{b/a => d/e} " output && git diff -M --stat HEAD^ HEAD >output && test_i18ngrep " c/{b/a => d/e} " output ' test_expect_success 'rename pretty print with common suffix' ' mkdir d && git mv c/d/e d/e && git commit -m "c/d/e -> d/e" && git diff -M --summary HEAD^ HEAD >output && test_i18ngrep " {c/d => d}/e " output && git diff -M --stat HEAD^ HEAD >output && test_i18ngrep " {c/d => d}/e " output ' test_expect_success 'rename pretty print with common prefix and suffix' ' mkdir d/f && git mv d/e d/f/e && git commit -m "d/e -> d/f/e" && git diff -M --summary HEAD^ HEAD >output && test_i18ngrep " d/{ => f}/e " output && git diff -M --stat HEAD^ HEAD >output && test_i18ngrep " d/{ => f}/e " output ' test_expect_success 'rename pretty print common prefix and suffix overlap' ' mkdir d/f/f && git mv d/f/e d/f/f/e && git commit -m "d/f/e d/f/f/e" && git diff -M --summary HEAD^ HEAD >output && test_i18ngrep " d/f/{ => f}/e " output && git diff -M --stat HEAD^ HEAD >output && test_i18ngrep " d/f/{ => f}/e " output ' test_done (CommandList children: [ (Assignment keyword: Assign_None pairs: [ (assign_pair lhs: (LhsName name:test_description) op: Equal rhs: {(SQ <"Test rename detection in diff engine.\n"> <"\n">)} spids: [13] ) ] spids: [13] ) (C {(.)} {(./test-lib.sh)}) (C {(.)} {(DQ ($ VSub_Name "$TEST_DIRECTORY")) (/diff-lib.sh)}) (C {(test_expect_success)} {(SQ )} { (SQ <"\n"> <"\tcat >path0 <<-\\EOF &&\n"> <"\tLine 1\n"> <"\tLine 2\n"> <"\tLine 3\n"> <"\tLine 4\n"> <"\tLine 5\n"> <"\tLine 6\n"> <"\tLine 7\n"> <"\tLine 8\n"> <"\tLine 9\n"> <"\tLine 10\n"> <"\tline 11\n"> <"\tLine 12\n"> <"\tLine 13\n"> <"\tLine 14\n"> <"\tLine 15\n"> <"\tEOF\n"> <"\tcat >expected <<-\\EOF &&\n"> <"\tdiff --git a/path0 b/path1\n"> <"\trename from path0\n"> <"\trename to path1\n"> <"\t--- a/path0\n"> <"\t+++ b/path1\n"> <"\t@@ -8,7 +8,7 @@ Line 7\n"> <"\t Line 8\n"> <"\t Line 9\n"> <"\t Line 10\n"> <"\t-line 11\n"> <"\t+Line 11\n"> <"\t Line 12\n"> <"\t Line 13\n"> <"\t Line 14\n"> <"\tEOF\n"> <"\tcat >no-rename <<-\\EOF\n"> <"\tdiff --git a/path0 b/path0\n"> <"\tdeleted file mode 100644\n"> <"\tindex fdbec44..0000000\n"> <"\t--- a/path0\n"> <"\t+++ /dev/null\n"> <"\t@@ -1,15 +0,0 @@\n"> <"\t-Line 1\n"> <"\t-Line 2\n"> <"\t-Line 3\n"> <"\t-Line 4\n"> <"\t-Line 5\n"> <"\t-Line 6\n"> <"\t-Line 7\n"> <"\t-Line 8\n"> <"\t-Line 9\n"> <"\t-Line 10\n"> <"\t-line 11\n"> <"\t-Line 12\n"> <"\t-Line 13\n"> <"\t-Line 14\n"> <"\t-Line 15\n"> <"\tdiff --git a/path1 b/path1\n"> <"\tnew file mode 100644\n"> <"\tindex 0000000..752c50e\n"> <"\t--- /dev/null\n"> <"\t+++ b/path1\n"> <"\t@@ -0,0 +1,15 @@\n"> <"\t+Line 1\n"> <"\t+Line 2\n"> <"\t+Line 3\n"> <"\t+Line 4\n"> <"\t+Line 5\n"> <"\t+Line 6\n"> <"\t+Line 7\n"> <"\t+Line 8\n"> <"\t+Line 9\n"> <"\t+Line 10\n"> <"\t+Line 11\n"> <"\t+Line 12\n"> <"\t+Line 13\n"> <"\t+Line 14\n"> <"\t+Line 15\n"> <"\tEOF\n"> ) } ) (C {(test_expect_success)} {(SQ <"update-index --add a file.">)} {(SQ <"git update-index --add path0">)} ) (C {(test_expect_success)} {(SQ <"write that tree.">)} {(SQ <"tree=$(git write-tree) && echo $tree">)} ) (SimpleCommand words: [{(sed)} {(-e)} {(SQ )}] redirects: [ (Redir op_id:Redir_Less fd:-1 arg_word:{(path0)} spids:[157]) (Redir op_id:Redir_Great fd:-1 arg_word:{(path1)} spids:[160]) ] ) (C {(rm)} {(-f)} {(path0)}) (C {(test_expect_success)} {(SQ <"renamed and edited the file.">)} {(SQ <"git update-index --add --remove path0 path1">)} ) (C {(test_expect_success)} {(SQ <"git diff-index -p -M after rename and editing.">)} {(SQ <"git diff-index -p -M $tree >current">)} ) (C {(test_expect_success)} {(SQ <"validate the output.">)} {(SQ <"compare_diff_patch current expected">)} ) (C {(test_expect_success)} {(SQ <"test diff.renames=true">)} { (SQ <"\n"> <"\tgit -c diff.renames=true diff --cached $tree >current &&\n"> <"\tcompare_diff_patch current expected\n"> ) } ) (C {(test_expect_success)} {(SQ <"test diff.renames=false">)} { (SQ <"\n"> <"\tgit -c diff.renames=false diff --cached $tree >current &&\n"> <"\tcompare_diff_patch current no-rename\n"> ) } ) (C {(test_expect_success)} {(SQ <"test diff.renames unset">)} { (SQ <"\n"> <"\tgit diff --cached $tree >current &&\n"> <"\tcompare_diff_patch current expected\n"> ) } ) (C {(test_expect_success)} {(SQ <"favour same basenames over different ones">)} { (SQ <"\n"> <"\tcp path1 another-path &&\n"> <"\tgit add another-path &&\n"> <"\tgit commit -m 1 &&\n"> <"\tgit rm path1 &&\n"> <"\tmkdir subdir &&\n"> <"\tgit mv another-path subdir/path1 &&\n"> <"\tgit status | test_i18ngrep \"renamed: .*path1 -> subdir/path1\""> ) } ) (C {(test_expect_success)} {(SQ <"favour same basenames even with minor differences">)} { (SQ <"\n"> <"\tgit show HEAD:path1 | sed \"s/15/16/\" > subdir/path1 &&\n"> <"\tgit status | test_i18ngrep \"renamed: .*path1 -> subdir/path1\""> ) } ) (C {(test_expect_success)} {(SQ <"two files with same basename and same content">)} { (SQ <"\n"> <"\tgit reset --hard &&\n"> <"\tmkdir -p dir/A dir/B &&\n"> <"\tcp path1 dir/A/file &&\n"> <"\tcp path1 dir/B/file &&\n"> <"\tgit add dir &&\n"> <"\tgit commit -m 2 &&\n"> <"\tgit mv dir other-dir &&\n"> <"\tgit status | test_i18ngrep \"renamed: .*dir/A/file -> other-dir/A/file\"\n"> ) } ) (C {(test_expect_success)} {(SQ <"setup for many rename source candidates">)} { (SQ <"\n"> <"\tgit reset --hard &&\n"> <"\tfor i in 0 1 2 3 4 5 6 7 8 9;\n"> <"\tdo\n"> <"\t\tfor j in 0 1 2 3 4 5 6 7 8 9;\n"> <"\t\tdo\n"> <"\t\t\techo \"$i$j\" >\"path$i$j\"\n"> <"\t\tdone\n"> <"\tdone &&\n"> <"\tgit add \"path??\" &&\n"> <"\ttest_tick &&\n"> <"\tgit commit -m \"hundred\" &&\n"> <"\t(cat path1; echo new) >new-path &&\n"> <"\techo old >>path1 &&\n"> <"\tgit add new-path path1 &&\n"> <"\tgit diff -l 4 -C -C --cached --name-status >actual 2>actual.err &&\n"> <"\tsed -e \"s/^\\([CM]\\)[0-9]*\t/\\1\t/\" actual >actual.munged &&\n"> <"\tcat >expect <<-EOF &&\n"> <"\tC\tpath1\tnew-path\n"> <"\tM\tpath1\n"> <"\tEOF\n"> <"\ttest_cmp expect actual.munged &&\n"> <"\tgrep warning actual.err\n"> ) } ) (C {(test_expect_success)} {(SQ <"rename pretty print with nothing in common">)} { (SQ <"\n"> <"\tmkdir -p a/b/ &&\n"> <"\t: >a/b/c &&\n"> <"\tgit add a/b/c &&\n"> <"\tgit commit -m \"create a/b/c\" &&\n"> <"\tmkdir -p c/b/ &&\n"> <"\tgit mv a/b/c c/b/a &&\n"> <"\tgit commit -m \"a/b/c -> c/b/a\" &&\n"> <"\tgit diff -M --summary HEAD^ HEAD >output &&\n"> <"\ttest_i18ngrep \" a/b/c => c/b/a \" output &&\n"> <"\tgit diff -M --stat HEAD^ HEAD >output &&\n"> <"\ttest_i18ngrep \" a/b/c => c/b/a \" output\n"> ) } ) (C {(test_expect_success)} {(SQ <"rename pretty print with common prefix">)} { (SQ <"\n"> <"\tmkdir -p c/d &&\n"> <"\tgit mv c/b/a c/d/e &&\n"> <"\tgit commit -m \"c/b/a -> c/d/e\" &&\n"> <"\tgit diff -M --summary HEAD^ HEAD >output &&\n"> <"\ttest_i18ngrep \" c/{b/a => d/e} \" output &&\n"> <"\tgit diff -M --stat HEAD^ HEAD >output &&\n"> <"\ttest_i18ngrep \" c/{b/a => d/e} \" output\n"> ) } ) (C {(test_expect_success)} {(SQ <"rename pretty print with common suffix">)} { (SQ <"\n"> <"\tmkdir d &&\n"> <"\tgit mv c/d/e d/e &&\n"> <"\tgit commit -m \"c/d/e -> d/e\" &&\n"> <"\tgit diff -M --summary HEAD^ HEAD >output &&\n"> <"\ttest_i18ngrep \" {c/d => d}/e \" output &&\n"> <"\tgit diff -M --stat HEAD^ HEAD >output &&\n"> <"\ttest_i18ngrep \" {c/d => d}/e \" output\n"> ) } ) (C {(test_expect_success)} {(SQ <"rename pretty print with common prefix and suffix">)} { (SQ <"\n"> <"\tmkdir d/f &&\n"> <"\tgit mv d/e d/f/e &&\n"> <"\tgit commit -m \"d/e -> d/f/e\" &&\n"> <"\tgit diff -M --summary HEAD^ HEAD >output &&\n"> <"\ttest_i18ngrep \" d/{ => f}/e \" output &&\n"> <"\tgit diff -M --stat HEAD^ HEAD >output &&\n"> <"\ttest_i18ngrep \" d/{ => f}/e \" output\n"> ) } ) (C {(test_expect_success)} {(SQ <"rename pretty print common prefix and suffix overlap">)} { (SQ <"\n"> <"\tmkdir d/f/f &&\n"> <"\tgit mv d/f/e d/f/f/e &&\n"> <"\tgit commit -m \"d/f/e d/f/f/e\" &&\n"> <"\tgit diff -M --summary HEAD^ HEAD >output &&\n"> <"\ttest_i18ngrep \" d/f/{ => f}/e \" output &&\n"> <"\tgit diff -M --stat HEAD^ HEAD >output &&\n"> <"\ttest_i18ngrep \" d/f/{ => f}/e \" output\n"> ) } ) (C {(test_done)}) ] )