[PATCH] Add -B flag to diff-* brothers.
A new diffcore transformation, diffcore-break.c, is introduced.
When the -B flag is given, a patch that represents a complete
rewrite is broken into a deletion followed by a creation. This
makes it easier to review such a complete rewrite patch.
The -B flag takes the same syntax as the -M and -C flags to
specify the minimum amount of non-source material the resulting
file needs to have to be considered a complete rewrite, and
defaults to 99% if not specified.
As the new test t4008-diff-break-rewrite.sh demonstrates, if a
file is a complete rewrite, it is broken into a delete/create
pair, which can further be subjected to the usual rename
detection if -M or -C is used. For example, if file0 gets
completely rewritten to make it as if it were rather based on
file1 which itself disappeared, the following happens:
The original change looks like this:
file0 --> file0' (quite different from file0)
file1 --> /dev/null
After diffcore-break runs, it would become this:
file0 --> /dev/null
/dev/null --> file0'
file1 --> /dev/null
Then diffcore-rename matches them up:
file1 --> file0'
The internal score values are finer grained now. Earlier
maximum of 10000 has been raised to 60000; there is no user
visible changes but there is no reason to waste available bits.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-05-30 11:08:37 +04:00
|
|
|
#!/bin/sh
|
|
|
|
|
#
|
|
|
|
|
# Copyright (c) 2005 Junio C Hamano
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
test_description='Break and then rename
|
|
|
|
|
|
|
|
|
|
We have two very different files, file0 and file1, registered in a tree.
|
|
|
|
|
|
|
|
|
|
We update file1 so drastically that it is more similar to file0, and
|
|
|
|
|
then remove file0. With -B, changes to file1 should be broken into
|
|
|
|
|
separate delete and create, resulting in removal of file0, removal of
|
2015-02-15 23:42:59 +03:00
|
|
|
original file1 and creation of completely rewritten file1. The latter
|
|
|
|
|
two are then merged back into a single "complete rewrite".
|
[PATCH] Add -B flag to diff-* brothers.
A new diffcore transformation, diffcore-break.c, is introduced.
When the -B flag is given, a patch that represents a complete
rewrite is broken into a deletion followed by a creation. This
makes it easier to review such a complete rewrite patch.
The -B flag takes the same syntax as the -M and -C flags to
specify the minimum amount of non-source material the resulting
file needs to have to be considered a complete rewrite, and
defaults to 99% if not specified.
As the new test t4008-diff-break-rewrite.sh demonstrates, if a
file is a complete rewrite, it is broken into a delete/create
pair, which can further be subjected to the usual rename
detection if -M or -C is used. For example, if file0 gets
completely rewritten to make it as if it were rather based on
file1 which itself disappeared, the following happens:
The original change looks like this:
file0 --> file0' (quite different from file0)
file1 --> /dev/null
After diffcore-break runs, it would become this:
file0 --> /dev/null
/dev/null --> file0'
file1 --> /dev/null
Then diffcore-rename matches them up:
file1 --> file0'
The internal score values are finer grained now. Earlier
maximum of 10000 has been raised to 60000; there is no user
visible changes but there is no reason to waste available bits.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-05-30 11:08:37 +04:00
|
|
|
|
|
|
|
|
Further, with -B and -M together, these three modifications should
|
|
|
|
|
turn into rename-edit of file0 into file1.
|
|
|
|
|
|
|
|
|
|
Starting from the same two files in the tree, we swap file0 and file1.
|
2015-02-15 23:42:59 +03:00
|
|
|
With -B, this should be detected as two complete rewrites.
|
[PATCH] Add -B flag to diff-* brothers.
A new diffcore transformation, diffcore-break.c, is introduced.
When the -B flag is given, a patch that represents a complete
rewrite is broken into a deletion followed by a creation. This
makes it easier to review such a complete rewrite patch.
The -B flag takes the same syntax as the -M and -C flags to
specify the minimum amount of non-source material the resulting
file needs to have to be considered a complete rewrite, and
defaults to 99% if not specified.
As the new test t4008-diff-break-rewrite.sh demonstrates, if a
file is a complete rewrite, it is broken into a delete/create
pair, which can further be subjected to the usual rename
detection if -M or -C is used. For example, if file0 gets
completely rewritten to make it as if it were rather based on
file1 which itself disappeared, the following happens:
The original change looks like this:
file0 --> file0' (quite different from file0)
file1 --> /dev/null
After diffcore-break runs, it would become this:
file0 --> /dev/null
/dev/null --> file0'
file1 --> /dev/null
Then diffcore-rename matches them up:
file1 --> file0'
The internal score values are finer grained now. Earlier
maximum of 10000 has been raised to 60000; there is no user
visible changes but there is no reason to waste available bits.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-05-30 11:08:37 +04:00
|
|
|
|
|
|
|
|
Further, with -B and -M together, these should turn into two renames.
|
|
|
|
|
'
|
|
|
|
|
. ./test-lib.sh
|
2021-02-12 16:29:40 +03:00
|
|
|
. "$TEST_DIRECTORY"/lib-diff.sh ;# test-lib chdir's into trash
|
[PATCH] Add -B flag to diff-* brothers.
A new diffcore transformation, diffcore-break.c, is introduced.
When the -B flag is given, a patch that represents a complete
rewrite is broken into a deletion followed by a creation. This
makes it easier to review such a complete rewrite patch.
The -B flag takes the same syntax as the -M and -C flags to
specify the minimum amount of non-source material the resulting
file needs to have to be considered a complete rewrite, and
defaults to 99% if not specified.
As the new test t4008-diff-break-rewrite.sh demonstrates, if a
file is a complete rewrite, it is broken into a delete/create
pair, which can further be subjected to the usual rename
detection if -M or -C is used. For example, if file0 gets
completely rewritten to make it as if it were rather based on
file1 which itself disappeared, the following happens:
The original change looks like this:
file0 --> file0' (quite different from file0)
file1 --> /dev/null
After diffcore-break runs, it would become this:
file0 --> /dev/null
/dev/null --> file0'
file1 --> /dev/null
Then diffcore-rename matches them up:
file1 --> file0'
The internal score values are finer grained now. Earlier
maximum of 10000 has been raised to 60000; there is no user
visible changes but there is no reason to waste available bits.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-05-30 11:08:37 +04:00
|
|
|
|
2015-02-16 01:21:04 +03:00
|
|
|
test_expect_success setup '
|
2021-02-12 16:29:40 +03:00
|
|
|
cat "$TEST_DIRECTORY"/lib-diff/README >file0 &&
|
|
|
|
|
cat "$TEST_DIRECTORY"/lib-diff/COPYING >file1 &&
|
2018-05-21 05:01:35 +03:00
|
|
|
blob0_id=$(git hash-object file0) &&
|
|
|
|
|
blob1_id=$(git hash-object file1) &&
|
2015-02-16 01:21:04 +03:00
|
|
|
git update-index --add file0 file1 &&
|
|
|
|
|
git tag reference $(git write-tree)
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'change file1 with copy-edit of file0 and remove file0' '
|
|
|
|
|
sed -e "s/git/GIT/" file0 >file1 &&
|
2018-05-21 05:01:35 +03:00
|
|
|
blob2_id=$(git hash-object file1) &&
|
2015-02-16 01:21:04 +03:00
|
|
|
rm -f file0 &&
|
|
|
|
|
git update-index --remove file0 file1
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'run diff with -B (#1)' '
|
|
|
|
|
git diff-index -B --cached reference >current &&
|
2018-05-21 05:01:35 +03:00
|
|
|
cat >expect <<-EOF &&
|
|
|
|
|
:100644 000000 $blob0_id $ZERO_OID D file0
|
|
|
|
|
:100644 100644 $blob1_id $blob2_id M100 file1
|
2015-02-16 01:21:04 +03:00
|
|
|
EOF
|
|
|
|
|
compare_diff_raw expect current
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'run diff with -B and -M (#2)' '
|
|
|
|
|
git diff-index -B -M reference >current &&
|
2018-05-21 05:01:35 +03:00
|
|
|
cat >expect <<-EOF &&
|
|
|
|
|
:100644 100644 $blob0_id $blob2_id R100 file0 file1
|
2015-02-16 01:21:04 +03:00
|
|
|
EOF
|
|
|
|
|
compare_diff_raw expect current
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'swap file0 and file1' '
|
|
|
|
|
rm -f file0 file1 &&
|
|
|
|
|
git read-tree -m reference &&
|
|
|
|
|
git checkout-index -f -u -a &&
|
|
|
|
|
mv file0 tmp &&
|
|
|
|
|
mv file1 file0 &&
|
|
|
|
|
mv tmp file1 &&
|
|
|
|
|
git update-index file0 file1
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'run diff with -B (#3)' '
|
|
|
|
|
git diff-index -B reference >current &&
|
2018-05-21 05:01:35 +03:00
|
|
|
cat >expect <<-EOF &&
|
|
|
|
|
:100644 100644 $blob0_id $blob1_id M100 file0
|
|
|
|
|
:100644 100644 $blob1_id $blob0_id M100 file1
|
2015-02-16 01:21:04 +03:00
|
|
|
EOF
|
|
|
|
|
compare_diff_raw expect current
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'run diff with -B and -M (#4)' '
|
|
|
|
|
git diff-index -B -M reference >current &&
|
2018-05-21 05:01:35 +03:00
|
|
|
cat >expect <<-EOF &&
|
|
|
|
|
:100644 100644 $blob1_id $blob1_id R100 file1 file0
|
|
|
|
|
:100644 100644 $blob0_id $blob0_id R100 file0 file1
|
2015-02-16 01:21:04 +03:00
|
|
|
EOF
|
|
|
|
|
compare_diff_raw expect current
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'make file0 into something completely different' '
|
|
|
|
|
rm -f file0 &&
|
|
|
|
|
test_ln_s_add frotz file0 &&
|
2018-05-21 05:01:35 +03:00
|
|
|
slink_id=$(printf frotz | git hash-object --stdin) &&
|
2015-02-16 01:21:04 +03:00
|
|
|
git update-index file1
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'run diff with -B (#5)' '
|
|
|
|
|
git diff-index -B reference >current &&
|
2018-05-21 05:01:35 +03:00
|
|
|
cat >expect <<-EOF &&
|
|
|
|
|
:100644 120000 $blob0_id $slink_id T file0
|
|
|
|
|
:100644 100644 $blob1_id $blob0_id M100 file1
|
2015-02-16 01:21:04 +03:00
|
|
|
EOF
|
|
|
|
|
compare_diff_raw expect current
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'run diff with -B -M (#6)' '
|
|
|
|
|
git diff-index -B -M reference >current &&
|
|
|
|
|
|
|
|
|
|
# file0 changed from regular to symlink. file1 is the same as the preimage
|
|
|
|
|
# of file0. Because the change does not make file0 disappear, file1 is
|
|
|
|
|
# denoted as a copy of file0
|
2018-05-21 05:01:35 +03:00
|
|
|
cat >expect <<-EOF &&
|
|
|
|
|
:100644 120000 $blob0_id $slink_id T file0
|
|
|
|
|
:100644 100644 $blob0_id $blob0_id C file0 file1
|
2015-02-16 01:21:04 +03:00
|
|
|
EOF
|
|
|
|
|
compare_diff_raw expect current
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'run diff with -M (#7)' '
|
|
|
|
|
git diff-index -M reference >current &&
|
|
|
|
|
|
|
|
|
|
# This should not mistake file0 as the copy source of new file1
|
|
|
|
|
# due to type differences.
|
2018-05-21 05:01:35 +03:00
|
|
|
cat >expect <<-EOF &&
|
|
|
|
|
:100644 120000 $blob0_id $slink_id T file0
|
|
|
|
|
:100644 100644 $blob1_id $blob0_id M file1
|
2015-02-16 01:21:04 +03:00
|
|
|
EOF
|
|
|
|
|
compare_diff_raw expect current
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'file1 edited to look like file0 and file0 rename-edited to file2' '
|
|
|
|
|
rm -f file0 file1 &&
|
|
|
|
|
git read-tree -m reference &&
|
|
|
|
|
git checkout-index -f -u -a &&
|
|
|
|
|
sed -e "s/git/GIT/" file0 >file1 &&
|
|
|
|
|
sed -e "s/git/GET/" file0 >file2 &&
|
2018-05-21 05:01:35 +03:00
|
|
|
blob3_id=$(git hash-object file2) &&
|
2015-02-16 01:21:04 +03:00
|
|
|
rm -f file0 &&
|
|
|
|
|
git update-index --add --remove file0 file1 file2
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'run diff with -B (#8)' '
|
|
|
|
|
git diff-index -B reference >current &&
|
2018-05-21 05:01:35 +03:00
|
|
|
cat >expect <<-EOF &&
|
|
|
|
|
:100644 000000 $blob0_id $ZERO_OID D file0
|
|
|
|
|
:100644 100644 $blob1_id $blob2_id M100 file1
|
|
|
|
|
:000000 100644 $ZERO_OID $blob3_id A file2
|
2015-02-16 01:21:04 +03:00
|
|
|
EOF
|
|
|
|
|
compare_diff_raw expect current
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'run diff with -B -C (#9)' '
|
|
|
|
|
git diff-index -B -C reference >current &&
|
2018-05-21 05:01:35 +03:00
|
|
|
cat >expect <<-EOF &&
|
|
|
|
|
:100644 100644 $blob0_id $blob2_id C095 file0 file1
|
|
|
|
|
:100644 100644 $blob0_id $blob3_id R095 file0 file2
|
2015-02-16 01:21:04 +03:00
|
|
|
EOF
|
|
|
|
|
compare_diff_raw expect current
|
|
|
|
|
'
|
[PATCH] Add -B flag to diff-* brothers.
A new diffcore transformation, diffcore-break.c, is introduced.
When the -B flag is given, a patch that represents a complete
rewrite is broken into a deletion followed by a creation. This
makes it easier to review such a complete rewrite patch.
The -B flag takes the same syntax as the -M and -C flags to
specify the minimum amount of non-source material the resulting
file needs to have to be considered a complete rewrite, and
defaults to 99% if not specified.
As the new test t4008-diff-break-rewrite.sh demonstrates, if a
file is a complete rewrite, it is broken into a delete/create
pair, which can further be subjected to the usual rename
detection if -M or -C is used. For example, if file0 gets
completely rewritten to make it as if it were rather based on
file1 which itself disappeared, the following happens:
The original change looks like this:
file0 --> file0' (quite different from file0)
file1 --> /dev/null
After diffcore-break runs, it would become this:
file0 --> /dev/null
/dev/null --> file0'
file1 --> /dev/null
Then diffcore-rename matches them up:
file1 --> file0'
The internal score values are finer grained now. Earlier
maximum of 10000 has been raised to 60000; there is no user
visible changes but there is no reason to waste available bits.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-05-30 11:08:37 +04:00
|
|
|
|
|
|
|
|
test_done
|
