You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2017/10/10 10:28:48 UTC
svn commit: r1811662 - in /subversion/trunk/subversion: libsvn_client/diff.c
tests/cmdline/diff_tests.py tests/cmdline/svntest/verify.py
Author: julianfoad
Date: Tue Oct 10 10:28:48 2017
New Revision: 1811662
URL: http://svn.apache.org/viewvc?rev=1811662&view=rev
Log:
Fix issue #SVN-4689, "diff --git added/deleted filenames should not be /dev/null".
* subversion/tests/cmdline/diff_tests.py
(diff_git_empty_files): Tweak the unused destination label parameter to say
"nonexistent", for consistency with all other occurrences.
(diff_symlinks): Update test expectations.
* subversion/tests/cmdline/svntest/verify.py
(make_git_diff_header): Update test expectations.
* subversion/libssvn_client/diff.c
(print_git_diff_header): Print normal a/b labels for add and delete, never /dev/null.
Modified:
subversion/trunk/subversion/libsvn_client/diff.c
subversion/trunk/subversion/tests/cmdline/diff_tests.py
subversion/trunk/subversion/tests/cmdline/svntest/verify.py
Modified: subversion/trunk/subversion/libsvn_client/diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/diff.c?rev=1811662&r1=1811661&r2=1811662&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/diff.c Tue Oct 10 10:28:48 2017
@@ -422,7 +422,8 @@ print_git_diff_header(svn_stream_t *os,
scratch_pool));
*label1 = diff_label(apr_psprintf(scratch_pool, "a/%s", repos_relpath1),
rev1, scratch_pool);
- *label2 = diff_label("/dev/null", rev2, scratch_pool);
+ *label2 = diff_label(apr_psprintf(scratch_pool, "b/%s", repos_relpath2),
+ rev2, scratch_pool);
}
else if (operation == svn_diff_op_copied)
@@ -447,7 +448,8 @@ print_git_diff_header(svn_stream_t *os,
repos_relpath1, repos_relpath2,
exec_bit2, symlink_bit2,
scratch_pool));
- *label1 = diff_label("/dev/null", rev1, scratch_pool);
+ *label1 = diff_label(apr_psprintf(scratch_pool, "a/%s", repos_relpath1),
+ rev1, scratch_pool);
*label2 = diff_label(apr_psprintf(scratch_pool, "b/%s", repos_relpath2),
rev2, scratch_pool);
}
Modified: subversion/trunk/subversion/tests/cmdline/diff_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/diff_tests.py?rev=1811662&r1=1811661&r2=1811662&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/diff_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/diff_tests.py Tue Oct 10 10:28:48 2017
@@ -3531,7 +3531,7 @@ def diff_git_empty_files(sbox):
expected_output = make_git_diff_header(new_path, "new", "nonexistent",
"working copy",
add=True, text_changes=False) + [
- ] + make_git_diff_header(iota_path, "iota", "revision 2", "working copy",
+ ] + make_git_diff_header(iota_path, "iota", "revision 2", "nonexistent",
delete=True, text_changes=False)
# Two files in diff may be in any order.
@@ -5043,7 +5043,7 @@ def diff_symlinks(sbox):
'===================================================================\n',
'diff --git a/to-iota b/to-iota\n',
'new file mode 120644\n',
- '--- /dev/null\t(nonexistent)\n',
+ '--- a/to-iota\t(nonexistent)\n',
'+++ b/to-iota\t(working copy)\n',
'@@ -0,0 +1 @@\n',
'+iota\n',
Modified: subversion/trunk/subversion/tests/cmdline/svntest/verify.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/verify.py?rev=1811662&r1=1811661&r2=1811662&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/verify.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/verify.py Tue Oct 10 10:28:48 2017
@@ -860,7 +860,7 @@ def make_git_diff_header(target_path, re
])
if text_changes:
output.extend([
- "--- /dev/null\t(" + old_tag + ")\n",
+ "--- a/" + repos_relpath + src_label + "\t(" + old_tag + ")\n",
"+++ b/" + repos_relpath + dst_label + "\t(" + new_tag + ")\n"
])
elif delete:
@@ -871,7 +871,7 @@ def make_git_diff_header(target_path, re
if text_changes:
output.extend([
"--- a/" + repos_relpath + src_label + "\t(" + old_tag + ")\n",
- "+++ /dev/null\t(" + new_tag + ")\n"
+ "+++ b/" + repos_relpath + dst_label + "\t(" + new_tag + ")\n"
])
elif cp:
if copyfrom_rev: