You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2015/10/03 17:57:56 UTC
svn commit: r1706604 - in /subversion/branches/1.9.x-patch-fixes: ./
subversion/libsvn_client/patch.c subversion/tests/cmdline/patch_tests.py
Author: rhuijben
Date: Sat Oct 3 15:57:56 2015
New Revision: 1706604
URL: http://svn.apache.org/viewvc?rev=1706604&view=rev
Log:
On the patch fixes branch: Merge r1706598-1706600 from trunk.
Modified:
subversion/branches/1.9.x-patch-fixes/ (props changed)
subversion/branches/1.9.x-patch-fixes/subversion/libsvn_client/patch.c
subversion/branches/1.9.x-patch-fixes/subversion/tests/cmdline/patch_tests.py
Propchange: subversion/branches/1.9.x-patch-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 3 15:57:56 2015
@@ -94,4 +94,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663338,1663347,1663355,1663374,1663450,1663530,1663671,1663697,1663706,1663738,1663749,1663791,1663991,1664035,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664489-1664490,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664593-1664594,1664596,1664653,1664664,1664672,1664674,1664684,1664927,1664938-1664940,1664978,1664984,1664997,1665164,1665195,1665213,1665259,1665318,1665437-1665438,1665609,1665611-1665612,1665845,1665850,1665852,1665886,1665894,1665896,1666096,1666258,1666270,1666272,1666379,1666449,1666690,1666832,1666851,1666965,1667101,1667106-1667107,1667120,1667228,1667233-1667235,1667249-1667250,1667258,1667290,1667301,1667471,1667691-1667693,1667699-1667700,1667715,1667941,1667976,1668320,1668598-1668600,1668602-1668603,1668607-1668608,1668618,1669743,1669746,1669749,1669945,1670139,1670149,1670152,1670329,1670337,167
0347,1670353,1671164,1671388,1672295,1672311,1672372,1672404,1672511-1672512,1672578,1672728,1673044,1673062-1673063,1673065,1673153,1673170,1673172,1673197,1673202,1673204,1673228,1673282,1673445,1673691-1673692,1673746,1673785,1673803,1674015,1674032,1674170,1674301,1674305,1674308,1674339-1674340,1674406,1674415,1674455-1674456,1674475,1674487,1674522,1674580,1674626-1674627,1674785,1674891,1675771,1675774,1676526,1676535,1676538,1676555,1676564,1676570,1676665,1676667,1676769,1677003,1677191,1677267,1677440,1678147,1678149,1678494,1678571,1678734,1678742,1678745-1678746,1678755,1678839,1678846,1678894,1678950,1678963,1679166,1679169,1679228,1679230,1679240,1679287,1679864,1679866,1679909,1680242,1680264,1680495,1680705,1680819,1681317,1682472,1682714,1682854,1683071,1683126,1683135,1683290,1683303,1683311,1683378,1683387,1684034,1684077,1684322,1684325,1684344,1684412,1684940,1685034,1685085,1686175,1686239,1686478,1686541,1686543,1686554,1686557,1686802,1686888,1686984,1687029,
1687304,1687389,1687769,1687776,1688258,1688273,1688395,1689214,1689216,1689721,1689729,1691712-1691713,1691924,1691928,1692091,1692093,1692098,1692448,1692469-1692470,1692798-1692799,1693135,1693138,1693159,1693886,1694023,1694026,1694194,1694481,1694929,1695022,1695600,1695606,1695681,1696222,1696225,1696387,1696695,1697381,1697384,1697387,1697664,1697824,1697835,1697845,1697914,1697967,1698106,1698312,1700215,1700219-1700220,1700740,1700951,1701064,1701206,1701270,1701298,1701633,1701638,1701736,1701792,1701797,1701838,1701997,1702198,1702200,1702203,1702218,1702231,1702237-1702239,1702247,1702288,1702299-1702300,1702310,1702397,1702407,1702467,1702472,1702474,1702478,1702533,1702549,1702553,1702565,1702891,1702974,1702991,1703675,1703740,1704635,1704648,1704854,1704883,1704888,1705038,1705079-1705080,1705102,1705121,1705328,1705692,1705698,1705702,1705710,1705733,1705856,1705869,1705872,1706005,1706020,1706091,1706213,1706217,1706221-1706222,1706401,1706403,1706415,1706460-17064
61,1706493
+/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663338,1663347,1663355,1663374,1663450,1663530,1663671,1663697,1663706,1663738,1663749,1663791,1663991,1664035,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664489-1664490,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664593-1664594,1664596,1664653,1664664,1664672,1664674,1664684,1664927,1664938-1664940,1664978,1664984,1664997,1665164,1665195,1665213,1665259,1665318,1665437-1665438,1665609,1665611-1665612,1665845,1665850,1665852,1665886,1665894,1665896,1666096,1666258,1666270,1666272,1666379,1666449,1666690,1666832,1666851,1666965,1667101,1667106-1667107,1667120,1667228,1667233-1667235,1667249-1667250,1667258,1667290,1667301,1667471,1667691-1667693,1667699-1667700,1667715,1667941,1667976,1668320,1668598-1668600,1668602-1668603,1668607-1668608,1668618,1669743,1669746,1669749,1669945,1670139,1670149,1670152,1670329,1670337,167
0347,1670353,1671164,1671388,1672295,1672311,1672372,1672404,1672511-1672512,1672578,1672728,1673044,1673062-1673063,1673065,1673153,1673170,1673172,1673197,1673202,1673204,1673228,1673282,1673445,1673691-1673692,1673746,1673785,1673803,1674015,1674032,1674170,1674301,1674305,1674308,1674339-1674340,1674406,1674415,1674455-1674456,1674475,1674487,1674522,1674580,1674626-1674627,1674785,1674891,1675771,1675774,1676526,1676535,1676538,1676555,1676564,1676570,1676665,1676667,1676769,1677003,1677191,1677267,1677440,1678147,1678149,1678494,1678571,1678734,1678742,1678745-1678746,1678755,1678839,1678846,1678894,1678950,1678963,1679166,1679169,1679228,1679230,1679240,1679287,1679864,1679866,1679909,1680242,1680264,1680495,1680705,1680819,1681317,1682472,1682714,1682854,1683071,1683126,1683135,1683290,1683303,1683311,1683378,1683387,1684034,1684077,1684322,1684325,1684344,1684412,1684940,1685034,1685085,1686175,1686239,1686478,1686541,1686543,1686554,1686557,1686802,1686888,1686984,1687029,
1687304,1687389,1687769,1687776,1688258,1688273,1688395,1689214,1689216,1689721,1689729,1691712-1691713,1691924,1691928,1692091,1692093,1692098,1692448,1692469-1692470,1692798-1692799,1693135,1693138,1693159,1693886,1694023,1694026,1694194,1694481,1694929,1695022,1695600,1695606,1695681,1696222,1696225,1696387,1696695,1697381,1697384,1697387,1697664,1697824,1697835,1697845,1697914,1697967,1698106,1698312,1700215,1700219-1700220,1700740,1700951,1701064,1701206,1701270,1701298,1701633,1701638,1701736,1701792,1701797,1701838,1701997,1702198,1702200,1702203,1702218,1702231,1702237-1702239,1702247,1702288,1702299-1702300,1702310,1702397,1702407,1702467,1702472,1702474,1702478,1702533,1702549,1702553,1702565,1702891,1702974,1702991,1703675,1703740,1704635,1704648,1704854,1704883,1704888,1705038,1705079-1705080,1705102,1705121,1705328,1705692,1705698,1705702,1705710,1705733,1705856,1705869,1705872,1706005,1706020,1706091,1706213,1706217,1706221-1706222,1706401,1706403,1706415,1706460-17064
61,1706493,1706598-1706600
Modified: subversion/branches/1.9.x-patch-fixes/subversion/libsvn_client/patch.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x-patch-fixes/subversion/libsvn_client/patch.c?rev=1706604&r1=1706603&r2=1706604&view=diff
==============================================================================
--- subversion/branches/1.9.x-patch-fixes/subversion/libsvn_client/patch.c (original)
+++ subversion/branches/1.9.x-patch-fixes/subversion/libsvn_client/patch.c Sat Oct 3 15:57:56 2015
@@ -193,8 +193,8 @@ typedef struct patch_target_t {
/* Path to the patched file. */
const char *patched_path;
- /* Hunks that are rejected will be written to this file. */
- apr_file_t *reject_file;
+ /* Hunks that are rejected will be written to this stream. */
+ svn_stream_t *reject_stream;
/* Path to the reject file. */
const char *reject_path;
@@ -1042,9 +1042,6 @@ init_patch_target(patch_target_t **patch
*patch_target = target;
if (! target->skipped)
{
- const char *diff_header;
- apr_size_t len;
-
/* Create a temporary file to write the patched result to.
* Also grab various bits of information about the file. */
if (target->is_symlink)
@@ -1166,23 +1163,20 @@ init_patch_target(patch_target_t **patch
content->write = write_file;
content->write_baton = target->patched_file;
- /* Open a temporary file to write rejected hunks to. */
- SVN_ERR(svn_io_open_unique_file3(&target->reject_file,
- &target->reject_path, NULL,
- remove_tempfiles ?
+ /* Open a temporary stream to write rejected hunks to. */
+ SVN_ERR(svn_stream_open_unique(&target->reject_stream,
+ &target->reject_path, NULL,
+ remove_tempfiles ?
svn_io_file_del_on_pool_cleanup :
svn_io_file_del_none,
- result_pool, scratch_pool));
+ result_pool, scratch_pool));
/* The reject file needs a diff header. */
- diff_header = apr_psprintf(scratch_pool, "--- %s%s+++ %s%s",
- target->canon_path_from_patchfile,
- APR_EOL_STR,
+ SVN_ERR(svn_stream_printf(target->reject_stream, scratch_pool,
+ "--- %s" APR_EOL_STR
+ "+++ %s" APR_EOL_STR,
target->canon_path_from_patchfile,
- APR_EOL_STR);
- len = strlen(diff_header);
- SVN_ERR(svn_io_file_write_full(target->reject_file, diff_header, len,
- &len, scratch_pool));
+ target->canon_path_from_patchfile));
/* Handle properties. */
if (! target->skipped)
@@ -1873,8 +1867,6 @@ reject_hunk(patch_target_t *target, targ
svn_diff_hunk_t *hunk, const char *prop_name,
apr_pool_t *pool)
{
- const char *hunk_header;
- apr_size_t len;
svn_boolean_t eof;
static const char * const text_atat = "@@";
static const char * const prop_atat = "##";
@@ -1883,14 +1875,9 @@ reject_hunk(patch_target_t *target, targ
if (prop_name)
{
- const char *prop_header;
-
- /* ### Print 'Added', 'Deleted' or 'Modified' instead of 'Property'.
- */
- prop_header = apr_psprintf(pool, "Property: %s\n", prop_name);
- len = strlen(prop_header);
- SVN_ERR(svn_io_file_write_full(target->reject_file, prop_header,
- len, &len, pool));
+ /* ### Print 'Added', 'Deleted' or 'Modified' instead of 'Property'. */
+ svn_stream_printf(target->reject_stream,
+ pool, "Property: %s" APR_EOL_STR, prop_name);
atat = prop_atat;
}
else
@@ -1898,17 +1885,14 @@ reject_hunk(patch_target_t *target, targ
atat = text_atat;
}
- hunk_header = apr_psprintf(pool, "%s -%lu,%lu +%lu,%lu %s%s",
- atat,
- svn_diff_hunk_get_original_start(hunk),
- svn_diff_hunk_get_original_length(hunk),
- svn_diff_hunk_get_modified_start(hunk),
- svn_diff_hunk_get_modified_length(hunk),
- atat,
- APR_EOL_STR);
- len = strlen(hunk_header);
- SVN_ERR(svn_io_file_write_full(target->reject_file, hunk_header, len,
- &len, pool));
+ SVN_ERR(svn_stream_printf(target->reject_stream, pool,
+ "%s -%lu,%lu +%lu,%lu %s" APR_EOL_STR,
+ atat,
+ svn_diff_hunk_get_original_start(hunk),
+ svn_diff_hunk_get_original_length(hunk),
+ svn_diff_hunk_get_modified_start(hunk),
+ svn_diff_hunk_get_modified_length(hunk),
+ atat));
iterpool = svn_pool_create(pool);
do
@@ -1924,17 +1908,15 @@ reject_hunk(patch_target_t *target, targ
{
if (hunk_line->len >= 1)
{
- len = hunk_line->len;
- SVN_ERR(svn_io_file_write_full(target->reject_file,
- hunk_line->data, len, &len,
- iterpool));
+ apr_size_t len = hunk_line->len;
+
+ SVN_ERR(svn_stream_write(target->reject_stream,
+ hunk_line->data, &len));
}
if (eol_str)
{
- len = strlen(eol_str);
- SVN_ERR(svn_io_file_write_full(target->reject_file, eol_str,
- len, &len, iterpool));
+ SVN_ERR(svn_stream_puts(target->reject_stream, eol_str));
}
}
}
@@ -2481,9 +2463,9 @@ apply_one_patch(patch_target_t **patch_t
if (! prop_target->content->eof)
{
/* We could not copy the entire target property to the
- * temporary file, and would truncate the target if we
- * copied the temporary file on top of it. Skip this target. */
- target->skipped = TRUE;
+ * temporary stream, and would truncate the target if we
+ * copied the temporary stream on top of it. Skip this target. */
+ prop_target->skipped = TRUE;
}
}
}
@@ -2578,16 +2560,46 @@ apply_one_patch(patch_target_t **patch_t
&& !target->skipped
&& target->has_prop_changes)
{
+ svn_boolean_t has_adds = FALSE;
+ svn_boolean_t has_deletes = FALSE;
+ svn_boolean_t has_mods = FALSE;
+
for (hash_index = apr_hash_first(scratch_pool, target->prop_targets);
hash_index;
hash_index = apr_hash_next(hash_index))
{
prop_patch_target_t *prop_target = apr_hash_this_val(hash_index);
- if (prop_target->operation != svn_diff_op_deleted)
- {
- ensure_exists = TRUE;
- }
+ switch (prop_target->operation)
+ {
+ case svn_diff_op_added:
+ has_adds = TRUE;
+ break;
+ case svn_diff_op_deleted:
+ has_deletes = TRUE;
+ break;
+ case svn_diff_op_modified:
+ default:
+ has_mods = TRUE;
+ break;
+ }
+ }
+
+ if (has_adds && !has_mods && !has_deletes)
+ ensure_exists = TRUE;
+ else if (has_mods && target->locally_deleted
+ || target->kind_on_disk == svn_node_none)
+ {
+ target->had_prop_rejects = TRUE;
+ for (hash_index = apr_hash_first(scratch_pool, target->prop_targets);
+ hash_index;
+ hash_index = apr_hash_next(hash_index))
+ {
+ prop_patch_target_t *prop_target = apr_hash_this_val(hash_index);
+
+ if (prop_target->operation != svn_diff_op_deleted)
+ prop_target->skipped = TRUE;
+ }
}
}
@@ -2940,19 +2952,36 @@ install_patched_target(patch_target_t *t
static svn_error_t *
write_out_rejected_hunks(patch_target_t *target,
svn_boolean_t dry_run,
- apr_pool_t *pool)
+ apr_pool_t *scratch_pool)
{
- SVN_ERR(svn_io_file_close(target->reject_file, pool));
-
if (! dry_run && (target->had_rejects || target->had_prop_rejects))
{
/* Write out rejected hunks, if any. */
- SVN_ERR(svn_io_copy_file(target->reject_path,
- apr_psprintf(pool, "%s.svnpatch.rej",
- target->local_abspath),
- FALSE, pool));
+ apr_file_t *reject_file;
+
+ SVN_ERR(svn_io_open_uniquely_named(&reject_file, NULL,
+ svn_dirent_dirname(
+ target->local_abspath,
+ scratch_pool),
+ svn_dirent_basename(
+ target->local_abspath,
+ NULL),
+ ".svnpatch.rej",
+ svn_io_file_del_none,
+ scratch_pool, scratch_pool));
+
+ SVN_ERR(svn_stream_reset(target->reject_stream));
+
+ /* svn_stream_copy3() closes the files for us */
+ SVN_ERR(svn_stream_copy3(target->reject_stream,
+ svn_stream_from_aprfile2(reject_file, FALSE,
+ scratch_pool),
+ NULL, NULL, scratch_pool));
/* ### TODO mark file as conflicted. */
}
+ else
+ SVN_ERR(svn_stream_close(target->reject_stream));
+
return SVN_NO_ERROR;
}
Modified: subversion/branches/1.9.x-patch-fixes/subversion/tests/cmdline/patch_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x-patch-fixes/subversion/tests/cmdline/patch_tests.py?rev=1706604&r1=1706603&r2=1706604&view=diff
==============================================================================
--- subversion/branches/1.9.x-patch-fixes/subversion/tests/cmdline/patch_tests.py (original)
+++ subversion/branches/1.9.x-patch-fixes/subversion/tests/cmdline/patch_tests.py Sat Oct 3 15:57:56 2015
@@ -2257,9 +2257,62 @@ def patch_with_properties(sbox):
expected_disk,
expected_status,
expected_skip,
- None, # expected err
- 1, # check-props
- 1) # dry-run
+ [], True, True)
+ # And repeat
+ expected_output = svntest.wc.State(wc_dir, {
+ 'iota' : Item(status=' G')
+ })
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
+ expected_output,
+ expected_disk,
+ expected_status,
+ expected_skip,
+ [], True, True)
+
+ # Reverse
+ expected_output.tweak('iota', status=' U')
+ expected_disk.tweak('iota',
+ props={'deleted': "This is the property 'deleted'.\n",
+ 'modified': "This is the property 'modified'.\n"})
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
+ expected_output,
+ expected_disk,
+ expected_status,
+ expected_skip,
+ [], True, True,
+ '--reverse-diff')
+
+ # Repeat
+ expected_output.tweak('iota', status=' G')
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
+ expected_output,
+ expected_disk,
+ expected_status,
+ expected_skip,
+ [], True, True,
+ '--reverse-diff')
+
+ # And now try against a not existing target
+ svntest.actions.run_and_verify_svn(None, [],
+ 'rm', '--force', sbox.ospath('iota'))
+ expected_output.tweak('iota', status=' C')
+ expected_disk.remove('iota')
+ expected_status.tweak('iota', status='D ')
+ expected_disk.add({
+ 'iota.svnpatch.rej' : Item(contents="--- iota\n"
+ "+++ iota\n"
+ "Property: modified\n"
+ "## -1,1 +1,1 ##\n"
+ "-This is the property 'modified'.\n"
+ "+The property 'modified' has changed.\n")
+ })
+ svntest.actions.run_and_verify_patch(wc_dir, patch_file_path,
+ expected_output,
+ expected_disk,
+ expected_status,
+ expected_skip,
+ [], True, True)
+
def patch_same_twice(sbox):
"apply the same patch twice"
@@ -5329,6 +5382,7 @@ def patch_closest(sbox):
truncate=True)
sbox.simple_commit()
+ os.remove(sbox.ospath('A/mu.svnpatch.rej'))
expected_output = [
'C %s\n' % sbox.ospath('A/mu'),
'> applied hunk @@ -47,7 +47,7 @@ with offset 4\n',
@@ -5367,6 +5421,7 @@ def patch_closest(sbox):
truncate=True)
sbox.simple_commit()
+ os.remove(sbox.ospath('A/mu.svnpatch.rej'))
expected_output = [
'C %s\n' % sbox.ospath('A/mu'),
'> applied hunk @@ -47,7 +47,7 @@ with offset 4\n',
@@ -5405,6 +5460,7 @@ def patch_closest(sbox):
truncate=True)
sbox.simple_commit()
+ os.remove(sbox.ospath('A/mu.svnpatch.rej'))
expected_output = [
'C %s\n' % sbox.ospath('A/mu'),
'> applied hunk @@ -47,7 +47,7 @@ with offset 4\n',
@@ -5443,6 +5499,7 @@ def patch_closest(sbox):
truncate=True)
sbox.simple_commit()
+ os.remove(sbox.ospath('A/mu.svnpatch.rej'))
expected_output = [
'C %s\n' % sbox.ospath('A/mu'),
'> applied hunk @@ -180,7 +180,7 @@ with offset -169\n',