On the 1.7.x-svn-patch-eol-fixes branch, merge the following from trunk:
r1150344: Merged to avoid conflicts in diff parsing test.
r1158923: Adds a cmdline regression test for issue #3991.
r1158929: Adds a new C diff parsing regression test for issue #3991.
r1166267: Merged to prevent conflicts in diff_tests.py.
r1206576: Tweak 'svn diff' output for prop values not terminated with EOL.
r1206718: Fix issue #3814.
r1206719: Follow-up fix for JavaHL tests.
r1206724: Fix issue #3991.
r1206741: Fixes the #3991 C diff parsing test to make it PASS.
r1206748: Remove an obsolete comment.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-svn-patch-eol-fixes@1207512 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java b/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
index b5c9eca..2055526 100644
--- a/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
+++ b/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
@@ -2736,7 +2736,7 @@
"## -0,0 +1 ##" + NL +
"+Test property value." + NL;
- setprop(aPath, "testprop", "Test property value.");
+ setprop(aPath, "testprop", "Test property value." + NL);
client.diff(aPath, Revision.BASE, aPath, Revision.WORKING, wcPath,
diffOutput.getPath(), Depth.infinity, null, true, true,
false, false);
@@ -2754,7 +2754,7 @@
"## -0,0 +1 ##" + NL +
"+Test property value." + NL;
- setprop(aPath, "testprop", "Test property value.");
+ setprop(aPath, "testprop", "Test property value." + NL);
client.diff(aPath, Revision.BASE, aPath, Revision.WORKING, aPath,
diffOutput.getPath(), Depth.infinity, null, true, true,
false, false);
diff --git a/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java b/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
index e878538..5b7fcaf 100644
--- a/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
+++ b/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
@@ -2674,7 +2674,8 @@
"## -0,0 +1 ##" + NL +
"+Test property value." + NL;
- client.propertySet(aPath, "testprop", "Test property value.", false);
+ client.propertySet(aPath, "testprop", "Test property value." + NL,
+ false);
client.diff(aPath, Revision.BASE, aPath, Revision.WORKING, wcPath,
diffOutput.getPath(), Depth.infinity, null, true, true,
false);
@@ -2692,7 +2693,8 @@
"## -0,0 +1 ##" + NL +
"+Test property value." + NL;
- client.propertySet(aPath, "testprop", "Test property value.", false);
+ client.propertySet(aPath, "testprop", "Test property value." + NL,
+ false);
client.diff(aPath, Revision.BASE, aPath, Revision.WORKING, aPath,
diffOutput.getPath(), Depth.infinity, null, true, true,
false);
diff --git a/subversion/libsvn_client/diff.c b/subversion/libsvn_client/diff.c
index d01ac2d..da7f2b8 100644
--- a/subversion/libsvn_client/diff.c
+++ b/subversion/libsvn_client/diff.c
@@ -166,18 +166,25 @@
If TOKEN is empty, or is already terminated by an EOL marker,
return TOKEN unmodified. Else, return a new string consisting
of the concatenation of TOKEN and the system's default EOL marker.
- The new string is allocated from POOL. */
+ The new string is allocated from POOL.
+ If HAD_EOL is not NULL, indicate in *HAD_EOL if the token had a EOL. */
static const svn_string_t *
-maybe_append_eol(const svn_string_t *token, apr_pool_t *pool)
+maybe_append_eol(const svn_string_t *token, svn_boolean_t *had_eol,
+ apr_pool_t *pool)
{
const char *curp;
+ if (had_eol)
+ *had_eol = FALSE;
+
if (token->len == 0)
return token;
curp = token->data + token->len - 1;
if (*curp == '\r')
{
+ if (had_eol)
+ *had_eol = TRUE;
return token;
}
else if (*curp != '\n')
@@ -186,6 +193,8 @@
}
else
{
+ if (had_eol)
+ *had_eol = TRUE;
return token;
}
}
@@ -683,17 +692,18 @@
const svn_string_t *tmp;
const svn_string_t *orig;
const svn_string_t *val;
+ svn_boolean_t val_has_eol;
/* The last character in a property is often not a newline.
- Since the diff is not useful anyway for patching properties an
- eol character is appended when needed to remove those pescious
- ' \ No newline at end of file' lines. */
+ An eol character is appended to prevent the diff API to add a
+ ' \ No newline at end of file' line. We add
+ ' \ No newline at end of property' manually if needed. */
tmp = original_value ? original_value : svn_string_create("", pool);
- orig = maybe_append_eol(tmp, pool);
+ orig = maybe_append_eol(tmp, NULL, pool);
tmp = propchange->value ? propchange->value :
svn_string_create("", pool);
- val = maybe_append_eol(tmp, pool);
+ val = maybe_append_eol(tmp, &val_has_eol, pool);
SVN_ERR(svn_diff_mem_string_diff(&diff, orig, val, &options, pool));
@@ -709,7 +719,12 @@
svn_dirent_local_style(path, pool),
encoding, orig, val, pool));
SVN_ERR(svn_stream_close(os));
-
+ if (!val_has_eol)
+ {
+ const char *s = "\\ No newline at end of property" APR_EOL_STR;
+ apr_size_t len = strlen(s);
+ SVN_ERR(svn_stream_write(os, s, &len));
+ }
}
}
diff --git a/subversion/libsvn_client/patch.c b/subversion/libsvn_client/patch.c
index 1dd54af..18a2957 100644
--- a/subversion/libsvn_client/patch.c
+++ b/subversion/libsvn_client/patch.c
@@ -1677,7 +1677,7 @@
&eol_str, &eof,
iterpool, iterpool));
lines_read++;
- if (! eof && lines_read > hi->fuzz &&
+ if (lines_read > hi->fuzz &&
lines_read <= svn_diff_hunk_get_modified_length(hi->hunk) - hi->fuzz)
{
apr_size_t len;
diff --git a/subversion/libsvn_diff/parse-diff.c b/subversion/libsvn_diff/parse-diff.c
index cce851d..3ea1cae 100644
--- a/subversion/libsvn_diff/parse-diff.c
+++ b/subversion/libsvn_diff/parse-diff.c
@@ -631,17 +631,45 @@
SVN_ERR(readline(apr_file, &line, NULL, &eof, APR_SIZE_MAX,
iterpool, iterpool));
- if (! eof)
- {
- /* Update line offset for next iteration. */
- pos = 0;
- SVN_ERR(svn_io_file_seek(apr_file, APR_CUR, &pos, iterpool));
- }
+ /* Update line offset for next iteration. */
+ pos = 0;
+ SVN_ERR(svn_io_file_seek(apr_file, APR_CUR, &pos, iterpool));
/* Lines starting with a backslash are comments, such as
* "\ No newline at end of file". */
if (line->data[0] == '\\')
- continue;
+ {
+ if (in_hunk &&
+ ((!is_property &&
+ strcmp(line->data, "\\ No newline at end of file") == 0) ||
+ (is_property &&
+ strcmp(line->data, "\\ No newline at end of property") == 0)))
+ {
+ char eolbuf[2];
+ apr_size_t len;
+ apr_off_t off;
+
+ /* Comment terminates the hunk text and says the hunk text
+ * has no trailing EOL. Snip off trailing EOL which is part
+ * of the patch file but not part of the hunk text. */
+ off = last_line - 2;
+ SVN_ERR(svn_io_file_seek(apr_file, APR_SET, &off, iterpool));
+ len = sizeof(eolbuf);
+ SVN_ERR(svn_io_file_read_full2(apr_file, eolbuf, len, &len,
+ &eof, iterpool));
+ if (eolbuf[0] == '\r' && eolbuf[1] == '\n')
+ end = last_line - 2;
+ else if (eolbuf[1] == '\n')
+ end = last_line - 1;
+ else if (eolbuf[1] == '\r')
+ end = last_line - 1;
+ else
+ end = last_line;
+ break;
+ }
+
+ continue;
+ }
if (in_hunk)
{
@@ -701,9 +729,17 @@
}
else
{
- /* The start of the current line marks the first byte
- * after the hunk text. */
- end = last_line;
+ if (eof)
+ {
+ /* The hunk ends at EOF. */
+ end = pos;
+ }
+ else
+ {
+ /* The start of the current line marks the first byte
+ * after the hunk text. */
+ end = last_line;
+ }
break; /* Hunk was empty or has been read. */
}
diff --git a/subversion/svnlook/main.c b/subversion/svnlook/main.c
index 7fdbbae..8b36069 100644
--- a/subversion/svnlook/main.c
+++ b/subversion/svnlook/main.c
@@ -784,18 +784,25 @@
If TOKEN is empty, or is already terminated by an EOL marker,
return TOKEN unmodified. Else, return a new string consisting
of the concatenation of TOKEN and the system's default EOL marker.
- The new string is allocated from POOL. */
+ The new string is allocated from POOL.
+ If HAD_EOL is not NULL, indicate in *HAD_EOL if the token had a EOL. */
static const svn_string_t *
-maybe_append_eol(const svn_string_t *token, apr_pool_t *pool)
+maybe_append_eol(const svn_string_t *token, svn_boolean_t *had_eol,
+ apr_pool_t *pool)
{
const char *curp;
+ if (had_eol)
+ *had_eol = FALSE;
+
if (token->len == 0)
return token;
curp = token->data + token->len - 1;
if (*curp == '\r')
{
+ if (had_eol)
+ *had_eol = TRUE;
return token;
}
else if (*curp != '\n')
@@ -804,6 +811,8 @@
}
else
{
+ if (had_eol)
+ *had_eol = TRUE;
return token;
}
}
@@ -860,19 +869,20 @@
const svn_string_t *tmp;
const svn_string_t *orig;
const svn_string_t *val;
+ svn_boolean_t val_has_eol;
SVN_ERR(svn_stream_for_stdout(&out, pool));
/* The last character in a property is often not a newline.
- Since the diff is not useful anyway for patching properties an
- eol character is appended when needed to remove those pescious
- ' \ No newline at end of file' lines. */
+ An eol character is appended to prevent the diff API to add a
+ ' \ No newline at end of file' line. We add
+ ' \ No newline at end of property' manually if needed. */
tmp = orig_value ? orig_value : svn_string_create("", pool);
- orig = maybe_append_eol(tmp, pool);
+ orig = maybe_append_eol(tmp, NULL, pool);
tmp = pc->value ? pc->value :
svn_string_create("", pool);
- val = maybe_append_eol(tmp, pool);
+ val = maybe_append_eol(tmp, &val_has_eol, pool);
SVN_ERR(svn_diff_mem_string_diff(&diff, orig, val, &options, pool));
@@ -888,6 +898,12 @@
svn_dirent_local_style(path, pool),
svn_cmdline_output_encoding(pool),
orig, val, pool));
+ if (!val_has_eol)
+ {
+ const char *s = "\\ No newline at end of property" APR_EOL_STR;
+ apr_size_t len = strlen(s);
+ SVN_ERR(svn_stream_write(out, s, &len));
+ }
}
}
return svn_cmdline_fflush(stdout);
diff --git a/subversion/tests/cmdline/depth_tests.py b/subversion/tests/cmdline/depth_tests.py
index 3cce642..867ce0c 100755
--- a/subversion/tests/cmdline/depth_tests.py
+++ b/subversion/tests/cmdline/depth_tests.py
@@ -1076,7 +1076,8 @@
"___________________________________________________________________\n",
"Deleted: foo\n",
"## -1 +0,0 ##\n",
- "-foo-val\n"]
+ "-foo-val\n",
+ "\\ No newline at end of property\n"]
os.chdir(wc_empty)
diff --git a/subversion/tests/cmdline/diff_tests.py b/subversion/tests/cmdline/diff_tests.py
index c708b1d..4cb5c17 100755
--- a/subversion/tests/cmdline/diff_tests.py
+++ b/subversion/tests/cmdline/diff_tests.py
@@ -143,6 +143,47 @@
]
return output
+def make_diff_prop_header(path):
+ """Return a property diff sub-header, as a list of newline-terminated
+ strings."""
+ return [
+ "\n",
+ "Property changes on: " + path.replace('\\', '/') + "\n",
+ "___________________________________________________________________\n"
+ ]
+
+def make_diff_prop_val(plus_minus, pval):
+ "Return diff for prop value PVAL, with leading PLUS_MINUS (+ or -)."
+ if len(pval) > 0 and pval[-1] != '\n':
+ return [plus_minus + pval + "\n","\\ No newline at end of property\n"]
+ return [plus_minus + pval]
+
+def make_diff_prop_deleted(pname, pval):
+ """Return a property diff for deletion of property PNAME, old value PVAL.
+ PVAL is a single string with no embedded newlines. Return the result
+ as a list of newline-terminated strings."""
+ return [
+ "Deleted: " + pname + "\n",
+ "## -1 +0,0 ##\n"
+ ] + make_diff_prop_val("-", pval)
+
+def make_diff_prop_added(pname, pval):
+ """Return a property diff for addition of property PNAME, new value PVAL.
+ PVAL is a single string with no embedded newlines. Return the result
+ as a list of newline-terminated strings."""
+ return [
+ "Added: " + pname + "\n",
+ "## -0,0 +1 ##\n",
+ ] + make_diff_prop_val("+", pval)
+
+def make_diff_prop_modified(pname, pval1, pval2):
+ """Return a property diff for modification of property PNAME, old value
+ PVAL1, new value PVAL2. PVAL is a single string with no embedded
+ newlines. Return the result as a list of newline-terminated strings."""
+ return [
+ "Modified: " + pname + "\n",
+ "## -1 +1 ##\n",
+ ] + make_diff_prop_val("-", pval1) + make_diff_prop_val("+", pval2)
######################################################################
# Diff output checker
@@ -734,29 +775,20 @@
sbox.build()
wc_dir = sbox.wc_dir
- expected_output = [
- "Index: iota\n",
- "===================================================================\n",
- "--- iota\t(revision 1)\n",
- "+++ iota\t(revision 2)\n",
- "\n",
- "Property changes on: iota\n",
- "___________________________________________________________________\n",
- "Added: svn:eol-style\n",
- "## -0,0 +1 ##\n",
- "+native\n" ]
+ expected_output = \
+ make_diff_header("iota", "revision 1", "revision 2") + \
+ make_diff_prop_header("iota") + \
+ make_diff_prop_added("svn:eol-style", "native")
- expected_reverse_output = list(expected_output)
- expected_reverse_output[2] = expected_reverse_output[2].replace("1", "2")
- expected_reverse_output[3] = expected_reverse_output[3].replace("2", "1")
- expected_reverse_output[7] = expected_reverse_output[7].replace("Added",
- "Deleted")
- expected_reverse_output[8] = "## -1 +0,0 ##\n"
- expected_reverse_output[9] = "-native\n"
+ expected_reverse_output = \
+ make_diff_header("iota", "revision 2", "revision 1") + \
+ make_diff_prop_header("iota") + \
+ make_diff_prop_deleted("svn:eol-style", "native")
- expected_rev1_output = list(expected_output)
- expected_rev1_output[3] = expected_rev1_output[3].replace("revision 2",
- "working copy")
+ expected_rev1_output = \
+ make_diff_header("iota", "revision 1", "working copy") + \
+ make_diff_prop_header("iota") + \
+ make_diff_prop_added("svn:eol-style", "native")
os.chdir(sbox.wc_dir)
svntest.actions.run_and_verify_svn(None, None, [],
@@ -2015,33 +2047,17 @@
wc_dir = sbox.wc_dir
- add_diff = [
- "\n",
- "Property changes on: A\n",
- "___________________________________________________________________\n",
- "Added: dirprop\n",
- "## -0,0 +1 ##\n",
- "+r2value\n",
- "\n",
- "Property changes on: iota\n",
- "___________________________________________________________________\n",
- "Added: fileprop\n",
- "## -0,0 +1 ##\n",
- "+r2value\n"]
+ add_diff = \
+ make_diff_prop_header("A") + \
+ make_diff_prop_added("dirprop", "r2value") + \
+ make_diff_prop_header("iota") + \
+ make_diff_prop_added("fileprop", "r2value")
- del_diff = [
- "\n",
- "Property changes on: A\n",
- "___________________________________________________________________\n",
- "Deleted: dirprop\n",
- "## -1 +0,0 ##\n",
- "-r2value\n",
- "\n",
- "Property changes on: iota\n",
- "___________________________________________________________________\n",
- "Deleted: fileprop\n",
- "## -1 +0,0 ##\n",
- "-r2value\n"]
+ del_diff = \
+ make_diff_prop_header("A") + \
+ make_diff_prop_deleted("dirprop", "r2value") + \
+ make_diff_prop_header("iota") + \
+ make_diff_prop_deleted("fileprop", "r2value")
expected_output_r1_r2 = list(make_diff_header('A', 'revision 1', 'revision 2')
@@ -2277,35 +2293,15 @@
sbox.build()
- expected_output_r2_wc = [
- "Index: A\n",
- "===================================================================\n",
- "--- A\t(revision 2)\n",
- "+++ A\t(working copy)\n",
- "\n",
- "Property changes on: A\n",
- "___________________________________________________________________\n",
- "Modified: dirprop\n",
- "## -1 +1 ##\n",
- "-r2value\n",
- "+workingvalue\n",
- "Added: newdirprop\n",
- "## -0,0 +1 ##\n",
- "+newworkingvalue\n",
- "Index: iota\n",
- "===================================================================\n",
- "--- iota\t(revision 2)\n",
- "+++ iota\t(working copy)\n",
- "\n",
- "Property changes on: iota\n",
- "___________________________________________________________________\n",
- "Modified: fileprop\n",
- "## -1 +1 ##\n",
- "-r2value\n",
- "+workingvalue\n",
- "Added: newfileprop\n",
- "## -0,0 +1 ##\n",
- "+newworkingvalue\n" ]
+ expected_output_r2_wc = \
+ make_diff_header("A", "revision 2", "working copy") + \
+ make_diff_prop_header("A") + \
+ make_diff_prop_modified("dirprop", "r2value", "workingvalue") + \
+ make_diff_prop_added("newdirprop", "newworkingvalue") + \
+ make_diff_header("iota", "revision 2", "working copy") + \
+ make_diff_prop_header("iota") + \
+ make_diff_prop_modified("fileprop", "r2value", "workingvalue") + \
+ make_diff_prop_added("newfileprop", "newworkingvalue")
os.chdir(sbox.wc_dir)
@@ -2368,31 +2364,16 @@
diff_foo = [
"@@ -0,0 +1 @@\n",
"+content\n",
- "\n",
- "Property changes on: foo\n",
- "___________________________________________________________________\n",
- "Added: propname\n",
- "## -0,0 +1 ##\n",
- "+propvalue\n",
- ]
- diff_X = [
- "\n",
- "Property changes on: X\n",
- "___________________________________________________________________\n",
- "Added: propname\n",
- "## -0,0 +1 ##\n",
- "+propvalue\n",
- ]
+ ] + make_diff_prop_header("foo") + \
+ make_diff_prop_added("propname", "propvalue")
+ diff_X = \
+ make_diff_prop_header("X") + \
+ make_diff_prop_added("propname", "propvalue")
diff_X_bar = [
"@@ -0,0 +1 @@\n",
"+content\n",
- "\n",
- "Property changes on: X/bar\n",
- "___________________________________________________________________\n",
- "Added: propname\n",
- "## -0,0 +1 ##\n",
- "+propvalue\n",
- ]
+ ] + make_diff_prop_header("X/bar") + \
+ make_diff_prop_added("propname", "propvalue")
diff_X_r1_base = make_diff_header("X", "revision 1",
"working copy") + diff_X
@@ -2866,49 +2847,32 @@
sbox.build()
B_path = os.path.join('A', 'B')
- diff = [
- "\n",
- "Property changes on: .\n",
- "___________________________________________________________________\n",
- "Added: foo1\n",
- "## -0,0 +1 ##\n",
- "+bar1\n",
- "\n",
- "Property changes on: iota\n",
- "___________________________________________________________________\n",
- "Added: foo2\n",
- "## -0,0 +1 ##\n",
- "+bar2\n",
- "\n",
- "Property changes on: A\n",
- "___________________________________________________________________\n",
- "Added: foo3\n",
- "## -0,0 +1 ##\n",
- "+bar3\n",
- "\n",
- "Property changes on: A/B\n",
- "___________________________________________________________________\n",
- "Added: foo4\n",
- "## -0,0 +1 ##\n",
- "+bar4\n"]
+ diff = make_diff_prop_header(".") + \
+ make_diff_prop_added("foo1", "bar1") + \
+ make_diff_prop_header("iota") + \
+ make_diff_prop_added("foo2", "bar2") + \
+ make_diff_prop_header("A") + \
+ make_diff_prop_added("foo3", "bar3") + \
+ make_diff_prop_header("A/B") + \
+ make_diff_prop_added("foo4", "bar4")
dot_header = make_diff_header(".", "revision 1", "working copy")
iota_header = make_diff_header('iota', "revision 1", "working copy")
A_header = make_diff_header('A', "revision 1", "working copy")
B_header = make_diff_header(B_path, "revision 1", "working copy")
- expected_empty = svntest.verify.UnorderedOutput(dot_header + diff[:6])
- expected_files = svntest.verify.UnorderedOutput(dot_header + diff[:6]
- + iota_header + diff[7:12])
- expected_immediates = svntest.verify.UnorderedOutput(dot_header + diff[:6]
+ expected_empty = svntest.verify.UnorderedOutput(dot_header + diff[:7])
+ expected_files = svntest.verify.UnorderedOutput(dot_header + diff[:7]
+ + iota_header + diff[8:14])
+ expected_immediates = svntest.verify.UnorderedOutput(dot_header + diff[:7]
+ iota_header
- + diff[7:12]
- + A_header + diff[8:18])
- expected_infinity = svntest.verify.UnorderedOutput(dot_header + diff[:6]
+ + diff[8:14]
+ + A_header + diff[15:21])
+ expected_infinity = svntest.verify.UnorderedOutput(dot_header + diff[:7]
+ iota_header
- + diff[7:12]
- + A_header + diff[8:18]
- + B_header + diff[12:])
+ + diff[8:14]
+ + A_header + diff[15:21]
+ + B_header + diff[22:])
os.chdir(sbox.wc_dir)
@@ -2944,18 +2908,18 @@
A_header = make_diff_header('A', "revision 1", "revision 2")
B_header = make_diff_header(B_path, "revision 1", "revision 2")
- expected_empty = svntest.verify.UnorderedOutput(dot_header + diff[:6])
- expected_files = svntest.verify.UnorderedOutput(dot_header + diff[:6]
- + iota_header + diff[7:12])
- expected_immediates = svntest.verify.UnorderedOutput(dot_header + diff[:6]
+ expected_empty = svntest.verify.UnorderedOutput(dot_header + diff[:7])
+ expected_files = svntest.verify.UnorderedOutput(dot_header + diff[:7]
+ + iota_header + diff[8:14])
+ expected_immediates = svntest.verify.UnorderedOutput(dot_header + diff[:7]
+ iota_header
- + diff[7:12]
- + A_header + diff[8:18])
+ + diff[8:14]
+ + A_header + diff[15:21])
expected_infinity = svntest.verify.UnorderedOutput(dot_header + diff[:6]
+ iota_header
- + diff[7:12]
- + A_header + diff[8:18]
- + B_header + diff[12:])
+ + diff[8:14]
+ + A_header + diff[15:21]
+ + B_header + diff[22:])
# Test repos-repos diff.
svntest.actions.run_and_verify_svn(None, expected_empty, [],
@@ -2967,66 +2931,31 @@
svntest.actions.run_and_verify_svn(None, expected_infinity, [],
'diff', '-c2', '--depth', 'infinity')
- diff_wc_repos = [
- "Index: A/B\n",
- "===================================================================\n",
- "--- A/B\t(revision 2)\n",
- "+++ A/B\t(working copy)\n",
- "\n",
- "Property changes on: A/B\n",
- "___________________________________________________________________\n",
- "Modified: foo4\n",
- "## -1 +1 ##\n",
- "-bar4\n",
- "+baz4\n",
- "Index: A\n",
- "===================================================================\n",
- "--- A\t(revision 2)\n",
- "+++ A\t(working copy)\n",
- "\n",
- "Property changes on: A\n",
- "___________________________________________________________________\n",
- "Modified: foo3\n",
- "## -1 +1 ##\n",
- "-bar3\n",
- "+baz3\n",
- "Index: A/mu\n",
- "===================================================================\n",
- "--- A/mu\t(revision 1)\n",
- "+++ A/mu\t(working copy)\n",
+ diff_wc_repos = \
+ make_diff_header("A/B", "revision 2", "working copy") + \
+ make_diff_prop_header("A/B") + \
+ make_diff_prop_modified("foo4", "bar4", "baz4") + \
+ make_diff_header("A", "revision 2", "working copy") + \
+ make_diff_prop_header("A") + \
+ make_diff_prop_modified("foo3", "bar3", "baz3") + \
+ make_diff_header("A/mu", "revision 1", "working copy") + [
"@@ -1 +1,2 @@\n",
" This is the file 'mu'.\n",
"+new text\n",
- "Index: iota\n",
- "===================================================================\n",
- "--- iota\t(revision 2)\n",
- "+++ iota\t(working copy)\n",
+ ] + make_diff_header("iota", "revision 2", "working copy") + [
"@@ -1 +1,2 @@\n",
" This is the file 'iota'.\n",
"+new text\n",
- "\n",
- "Property changes on: iota\n",
- "___________________________________________________________________\n",
- "Modified: foo2\n",
- "## -1 +1 ##\n",
- "-bar2\n",
- "+baz2\n",
- "Index: .\n",
- "===================================================================\n",
- "--- .\t(revision 2)\n",
- "+++ .\t(working copy)\n",
- "\n",
- "Property changes on: .\n",
- "___________________________________________________________________\n",
- "Modified: foo1\n",
- "## -1 +1 ##\n",
- "-bar1\n",
- "+baz1\n" ]
+ ] + make_diff_prop_header("iota") + \
+ make_diff_prop_modified("foo2", "bar2", "baz2") + \
+ make_diff_header(".", "revision 2", "working copy") + \
+ make_diff_prop_header(".") + \
+ make_diff_prop_modified("foo1", "bar1", "baz1")
- expected_empty = svntest.verify.UnorderedOutput(diff_wc_repos[43:])
- expected_files = svntest.verify.UnorderedOutput(diff_wc_repos[29:])
- expected_immediates = svntest.verify.UnorderedOutput(diff_wc_repos[11:22]
- +diff_wc_repos[29:])
+ expected_empty = svntest.verify.UnorderedOutput(diff_wc_repos[49:])
+ expected_files = svntest.verify.UnorderedOutput(diff_wc_repos[33:])
+ expected_immediates = svntest.verify.UnorderedOutput(diff_wc_repos[13:26]
+ +diff_wc_repos[33:])
expected_infinity = svntest.verify.UnorderedOutput(diff_wc_repos[:])
svntest.actions.run_and_verify_svn(None, None, [],
@@ -3539,10 +3468,8 @@
svntest.main.run_svn(None,
"propset", "prop", prop_val, iota_path)
expected_output = make_diff_header(iota_path, 'revision 2',
- 'working copy') + [
- "\n",
- "Property changes on: %s\n" % iota_path.replace('\\', '/'),
- "___________________________________________________________________\n",
+ 'working copy') + \
+ make_diff_prop_header(iota_path) + [
"Modified: prop\n",
"## -1,7 +1,4 ##\n",
"-line 1\n",
@@ -3609,10 +3536,8 @@
svntest.main.run_svn(None,
"propset", "prop", prop_val, iota_path)
expected_output = make_diff_header(iota_path, 'revision 2',
- 'working copy') + [
- "\n",
- "Property changes on: %s\n" % iota_path.replace('\\', '/'),
- "___________________________________________________________________\n",
+ 'working copy') + \
+ make_diff_prop_header(iota_path) + [
"Modified: prop\n",
"## -1,6 +1,7 ##\n",
" line 1\n",
@@ -3694,24 +3619,16 @@
svntest.main.run_svn(None, 'propset', 'svn:eol-style', 'native', new_path)
svntest.main.run_svn(None, 'propset', 'svn:keywords', 'Id', iota_path)
- expected_output = make_git_diff_header(new_path, "new", "revision 0",
- "working copy",
- add=True, text_changes=False) + [
- "\n",
- "Property changes on: new\n",
- "___________________________________________________________________\n",
- "Added: svn:eol-style\n",
- "## -0,0 +1 ##\n",
- "+native\n",
- ] + make_git_diff_header(iota_path, "iota", "revision 1", "working copy",
- text_changes=False) + [
- "\n",
- "Property changes on: iota\n",
- "___________________________________________________________________\n",
- "Added: svn:keywords\n",
- "## -0,0 +1 ##\n",
- "+Id\n",
- ]
+ expected_output = make_git_diff_header(new_path, "new",
+ "revision 0", "working copy",
+ add=True, text_changes=False) + \
+ make_diff_prop_header("new") + \
+ make_diff_prop_added("svn:eol-style", "native") + \
+ make_git_diff_header(iota_path, "iota",
+ "revision 1", "working copy",
+ text_changes=False) + \
+ make_diff_prop_header("iota") + \
+ make_diff_prop_added("svn:keywords", "Id")
svntest.actions.run_and_verify_svn(None, expected_output, [], 'diff',
'--git', wc_dir)
@@ -3739,14 +3656,9 @@
os.chdir(wc_dir)
expected_output = make_git_diff_header(".", "", "revision 1",
"revision 2",
- add=False, text_changes=False) + [
- "\n",
- "Property changes on: \n",
- "___________________________________________________________________\n",
- "Added: a\n",
- "## -0,0 +1 ##\n",
- "+b\n",
- ]
+ add=False, text_changes=False) + \
+ make_diff_prop_header("") + \
+ make_diff_prop_added("a", "b")
svntest.actions.run_and_verify_svn(None, expected_output, [], 'diff',
'-c2', '--git')
diff --git a/subversion/tests/cmdline/patch_tests.py b/subversion/tests/cmdline/patch_tests.py
index a0500e3..26f4b7e 100755
--- a/subversion/tests/cmdline/patch_tests.py
+++ b/subversion/tests/cmdline/patch_tests.py
@@ -3427,7 +3427,6 @@
"patch --strip propchanges cwd"
return patch_one_property(sbox, True)
-@XFail()
@Issue(3814)
def patch_set_prop_no_eol(sbox):
"patch doesn't append newline to properties"
@@ -3805,6 +3804,59 @@
1, # check-props
1) # dry-run
+@Issue(3991)
+def patch_lacking_trailing_eol(sbox):
+ "patch file lacking trailing eol"
+ sbox.build(read_only = True)
+ wc_dir = sbox.wc_dir
+
+ patch_file_path = make_patch_path(sbox)
+ iota_path = os.path.join(wc_dir, 'iota')
+ mu_path = os.path.join(wc_dir, 'A', 'mu')
+
+ # Prepare
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
+
+ # Apply patch
+ unidiff_patch = [
+ "Index: iota\n",
+ "===================================================================\n",
+ "--- iota\t(revision 1)\n",
+ "+++ iota\t(working copy)\n",
+ # TODO: -1 +1
+ "@@ -1 +1,2 @@\n",
+ " This is the file 'iota'.\n",
+ "+Some more bytes", # No trailing \n on this line!
+ ]
+
+ svntest.main.file_write(patch_file_path, ''.join(unidiff_patch))
+
+ gamma_contents = "It is the file 'gamma'.\n"
+ iota_contents = "This is the file 'iota'.\n"
+ new_contents = "new\n"
+
+ expected_output = [
+ 'U %s\n' % os.path.join(wc_dir, 'iota'),
+ ]
+
+ # Expect a newline to be appended
+ expected_disk = svntest.main.greek_state.copy()
+ expected_disk.tweak('iota', contents=iota_contents + "Some more bytes")
+
+ expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
+ expected_status.tweak('iota', status='M ')
+
+ expected_skip = wc.State('', { })
+
+ svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
+ expected_output,
+ expected_disk,
+ expected_status,
+ expected_skip,
+ None, # expected err
+ 1, # check-props
+ 1) # dry-run
+
########################################################################
#Run the tests
@@ -3845,6 +3897,7 @@
patch_reversed_add_with_props2,
patch_dev_null,
patch_delete_and_skip,
+ patch_lacking_trailing_eol,
]
if __name__ == '__main__':
diff --git a/subversion/tests/cmdline/special_tests.py b/subversion/tests/cmdline/special_tests.py
index 94da518..6961dc3 100755
--- a/subversion/tests/cmdline/special_tests.py
+++ b/subversion/tests/cmdline/special_tests.py
@@ -551,7 +551,9 @@
"___________________________________________________________________\n",
"Added: svn:special\n",
"## -0,0 +1 ##\n",
- "+*\n" ]
+ "+*\n",
+ "\\ No newline at end of property\n"
+ ]
svntest.actions.run_and_verify_svn(None, expected_output, [], 'diff',
'.')
# We should get the same output if we the diff the symlink itself.
diff --git a/subversion/tests/libsvn_diff/parse-diff-test.c b/subversion/tests/libsvn_diff/parse-diff-test.c
index 94c9bdd..16fa0be 100644
--- a/subversion/tests/libsvn_diff/parse-diff-test.c
+++ b/subversion/tests/libsvn_diff/parse-diff-test.c
@@ -246,29 +246,38 @@
"diff --git a/ b/path 1 b/ b/path 1" NL
"new file mode 100644" NL;
+static const char *unidiff_lacking_trailing_eol =
+ "Index: A/C/gamma" NL
+ "===================================================================" NL
+ "--- A/C/gamma\t(revision 2)" NL
+ "+++ A/C/gamma\t(working copy)" NL
+ "@@ -1 +1,2 @@" NL
+ " This is the file 'gamma'." NL
+ "+some more bytes to 'gamma'"; /* Don't add NL after this line */
-/* Create a PATCH_FILE with name FNAME containing the contents of DIFF. */
+
+/* Create a PATCH_FILE containing the contents of DIFF. */
static svn_error_t *
-create_patch_file(svn_patch_file_t **patch_file, const char *fname,
+create_patch_file(svn_patch_file_t **patch_file,
const char *diff, apr_pool_t *pool)
{
+ apr_size_t bytes;
apr_size_t len;
- apr_status_t status;
+ const char *path;
apr_file_t *apr_file;
/* Create a patch file. */
- status = apr_file_open(&apr_file, fname,
- (APR_READ | APR_WRITE | APR_CREATE | APR_TRUNCATE |
- APR_DELONCLOSE), APR_OS_DEFAULT, pool);
- if (status != APR_SUCCESS)
- return svn_error_createf(SVN_ERR_TEST_FAILED, NULL, "Cannot open '%s'",
- fname);
- len = strlen(diff);
- status = apr_file_write_full(apr_file, diff, len, &len);
- if (status || len != strlen(diff))
+ SVN_ERR(svn_io_open_unique_file3(&apr_file, &path, NULL,
+ svn_io_file_del_on_pool_cleanup,
+ pool, pool));
+
+ bytes = strlen(diff);
+ SVN_ERR(svn_io_file_write_full(apr_file, diff, bytes, &len, pool));
+ if (len != bytes)
return svn_error_createf(SVN_ERR_TEST_FAILED, NULL,
- "Cannot write to '%s'", fname);
- SVN_ERR(svn_diff_open_patch_file(patch_file, fname, pool));
+ "Cannot write to '%s'", path);
+ SVN_ERR(svn_io_file_close(apr_file, pool));
+ SVN_ERR(svn_diff_open_patch_file(patch_file, path, pool));
return SVN_NO_ERROR;
}
@@ -305,7 +314,8 @@
SVN_TEST_STRING_ASSERT(exp_buf->data, hunk_buf->data);
}
- SVN_TEST_ASSERT(hunk_buf->len == 0);
+ if (!hunk_eof)
+ SVN_TEST_ASSERT(hunk_buf->len == 0);
return SVN_NO_ERROR;
}
@@ -314,7 +324,6 @@
test_parse_unidiff(apr_pool_t *pool)
{
svn_patch_file_t *patch_file;
- const char *fname = "test_parse_unidiff.patch";
svn_boolean_t reverse;
svn_boolean_t ignore_whitespace;
int i;
@@ -330,7 +339,7 @@
svn_pool_clear(iterpool);
- SVN_ERR(create_patch_file(&patch_file, fname, unidiff, pool));
+ SVN_ERR(create_patch_file(&patch_file, unidiff, pool));
/* We have two patches with one hunk each.
* Parse the first patch. */
@@ -393,9 +402,8 @@
svn_patch_file_t *patch_file;
svn_patch_t *patch;
svn_diff_hunk_t *hunk;
- const char *fname = "test_parse_git_diff.patch";
- SVN_ERR(create_patch_file(&patch_file, fname, git_unidiff, pool));
+ SVN_ERR(create_patch_file(&patch_file, git_unidiff, pool));
/* Parse a deleted empty file */
SVN_ERR(svn_diff_parse_next_patch(&patch, patch_file,
@@ -467,10 +475,8 @@
svn_patch_file_t *patch_file;
svn_patch_t *patch;
svn_diff_hunk_t *hunk;
- const char *fname = "test_parse_git_tree_and_text_diff.patch";
- SVN_ERR(create_patch_file(&patch_file, fname, git_tree_and_text_unidiff,
- pool));
+ SVN_ERR(create_patch_file(&patch_file, git_tree_and_text_unidiff, pool));
/* Parse a copied file with text modifications. */
SVN_ERR(svn_diff_parse_next_patch(&patch, patch_file,
@@ -567,10 +573,8 @@
svn_patch_file_t *patch_file;
svn_patch_t *patch;
svn_diff_hunk_t *hunk;
- const char *fname = "test_bad_git_diff_header.patch";
- SVN_ERR(create_patch_file(&patch_file, fname, bad_git_diff_header,
- pool));
+ SVN_ERR(create_patch_file(&patch_file, bad_git_diff_header, pool));
SVN_ERR(svn_diff_parse_next_patch(&patch, patch_file,
FALSE, /* reverse */
@@ -607,9 +611,8 @@
svn_prop_patch_t *prop_patch;
svn_diff_hunk_t *hunk;
apr_array_header_t *hunks;
- const char *fname = "test_parse_property_diff.patch";
- SVN_ERR(create_patch_file(&patch_file, fname, property_unidiff, pool));
+ SVN_ERR(create_patch_file(&patch_file, property_unidiff, pool));
SVN_ERR(svn_diff_parse_next_patch(&patch, patch_file,
FALSE, /* reverse */
@@ -710,10 +713,8 @@
svn_prop_patch_t *prop_patch;
svn_diff_hunk_t *hunk;
apr_array_header_t *hunks;
- const char *fname = "test_parse_property_and_text_diff.patch";
- SVN_ERR(create_patch_file(&patch_file, fname, property_and_text_unidiff,
- pool));
+ SVN_ERR(create_patch_file(&patch_file, property_and_text_unidiff, pool));
SVN_ERR(svn_diff_parse_next_patch(&patch, patch_file,
FALSE, /* reverse */
@@ -766,10 +767,8 @@
svn_prop_patch_t *prop_patch;
svn_diff_hunk_t *hunk;
apr_array_header_t *hunks;
- const char *fname = "test_parse_diff_symbols_in_prop_unidiff.patch";
- SVN_ERR(create_patch_file(&patch_file, fname, diff_symbols_in_prop_unidiff,
- pool));
+ SVN_ERR(create_patch_file(&patch_file, diff_symbols_in_prop_unidiff, pool));
SVN_ERR(svn_diff_parse_next_patch(&patch, patch_file,
FALSE, /* reverse */
@@ -865,10 +864,8 @@
{
svn_patch_file_t *patch_file;
svn_patch_t *patch;
- const char *fname = "test_git_diffs_with_spaces_diff.patch";
- SVN_ERR(create_patch_file(&patch_file, fname, path_with_spaces_unidiff,
- pool));
+ SVN_ERR(create_patch_file(&patch_file, path_with_spaces_unidiff, pool));
SVN_ERR(svn_diff_parse_next_patch(&patch, patch_file,
FALSE, /* reverse */
@@ -913,6 +910,55 @@
SVN_ERR(svn_diff_close_patch_file(patch_file, pool));
return SVN_NO_ERROR;
}
+
+static svn_error_t *
+test_parse_unidiff_lacking_trailing_eol(apr_pool_t *pool)
+{
+ svn_patch_file_t *patch_file;
+ svn_boolean_t reverse;
+ svn_boolean_t ignore_whitespace;
+ int i;
+ apr_pool_t *iterpool;
+
+ reverse = FALSE;
+ ignore_whitespace = FALSE;
+ iterpool = svn_pool_create(pool);
+ for (i = 0; i < 2; i++)
+ {
+ svn_patch_t *patch;
+ svn_diff_hunk_t *hunk;
+
+ svn_pool_clear(iterpool);
+
+ SVN_ERR(create_patch_file(&patch_file, unidiff_lacking_trailing_eol,
+ pool));
+
+ /* We have one patch with one hunk. Parse it. */
+ SVN_ERR(svn_diff_parse_next_patch(&patch, patch_file, reverse,
+ ignore_whitespace, iterpool,
+ iterpool));
+ SVN_TEST_ASSERT(patch);
+ SVN_TEST_STRING_ASSERT(patch->old_filename, "A/C/gamma");
+ SVN_TEST_STRING_ASSERT(patch->new_filename, "A/C/gamma");
+ SVN_TEST_ASSERT(patch->hunks->nelts == 1);
+
+ hunk = APR_ARRAY_IDX(patch->hunks, 0, svn_diff_hunk_t *);
+ SVN_ERR(check_content(hunk, ! reverse,
+ "This is the file 'gamma'." NL,
+ pool));
+
+ SVN_ERR(check_content(hunk, reverse,
+ "This is the file 'gamma'." NL
+ "some more bytes to 'gamma'",
+ pool));
+
+ reverse = !reverse;
+ SVN_ERR(svn_diff_close_patch_file(patch_file, pool));
+ }
+ svn_pool_destroy(iterpool);
+ return SVN_NO_ERROR;
+}
+
/* ========================================================================== */
struct svn_test_descriptor_t test_funcs[] =
@@ -934,5 +980,7 @@
"test property diffs with odd symbols"),
SVN_TEST_PASS2(test_git_diffs_with_spaces_diff,
"test git diffs with spaces in paths"),
+ SVN_TEST_PASS2(test_parse_unidiff_lacking_trailing_eol,
+ "test parsing unidiffs lacking trailing eol"),
SVN_TEST_NULL
};
