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 14:56:51 UTC
svn commit: r1706570 - 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 12:56:50 2015
New Revision: 1706570
URL: http://svn.apache.org/viewvc?rev=1706570&view=rev
Log:
On the patch fixes branch: Merge r1705869 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 12:56:50 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,1705710,1705733,1705856,1706213,1706217,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,1705710,1705733,1705856,1705869,1706213,1706217,1706493
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=1706570&r1=1706569&r2=1706570&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 12:56:50 2015
@@ -231,6 +231,9 @@ typedef struct patch_target_t {
* patch was applied to it. */
svn_boolean_t local_mods;
+ /* The operation on the target as set in the patch file */
+ svn_diff_operation_kind_t operation;
+
/* True if the target was added by the patch, which means that it did
* not exist on disk before patching and has content after patching. */
svn_boolean_t added;
@@ -1040,6 +1043,7 @@ init_patch_target(patch_target_t **patch
target->kind_on_disk = svn_node_none;
target->content = content;
target->prop_targets = apr_hash_make(result_pool);
+ target->operation = patch->operation;
SVN_ERR(resolve_target_path(target, choose_target_filename(patch),
root_abspath, strip_count, prop_changes_only,
@@ -1718,17 +1722,24 @@ get_hunk_info(hunk_info_t **hi, patch_ta
svn_linenum_t modified_start;
modified_start = svn_diff_hunk_get_modified_start(hunk);
- if (modified_start == 0)
+ if (modified_start == 0
+ && (target->operation == svn_diff_op_unchanged
+ || target->operation == svn_diff_op_deleted))
{
- /* Patch wants to delete the file.
+ /* Patch wants to delete the file. */
- ### locally_deleted is always false here? */
already_applied = target->locally_deleted;
}
else
{
- SVN_ERR(seek_to_line(content, modified_start,
- scratch_pool));
+ svn_linenum_t seek_to;
+
+ if (modified_start == 0)
+ seek_to = 1; /* Empty file case */
+ else
+ seek_to = modified_start;
+
+ SVN_ERR(seek_to_line(content, seek_to, scratch_pool));
SVN_ERR(scan_for_match(&matched_line, content,
hunk, TRUE,
modified_start + 1,
@@ -2561,9 +2572,13 @@ apply_one_patch(patch_target_t **patch_t
* case of adding an empty file which has properties set on it or
* adding an empty file with a 'git diff' */
if (target->kind_on_disk == svn_node_none
- && ! target->has_prop_changes
- && ! target->added)
+ && !target->has_prop_changes
+ && !target->has_text_changes
+ && !target->had_already_applied
+ && !target->added)
+ {
target->skipped = TRUE;
+ }
}
else if (patched_file.size > 0 && working_file.size == 0)
{
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=1706570&r1=1706569&r2=1706570&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 12:56:50 2015
@@ -2448,10 +2448,9 @@ def patch_same_twice(sbox):
'G %s\n' % sbox.ospath('A/mu'),
'> hunk @@ -6,6 +6,9 @@ already applied\n',
'> hunk @@ -14,11 +17,8 @@ already applied\n',
- 'Skipped \'%s\'\n' % beta_path,
- ] + svntest.main.summary_of_conflicts(skipped_paths=1)
-
- expected_skip = wc.State('', {beta_path : Item(verb='Skipped')})
+ 'G %s\n' % sbox.ospath('A/B/E/beta'),
+ '> hunk @@ -1,1 +0,0 @@ already applied\n',
+ ]
# See above comment about the iota patch being applied twice.
iota_contents += "Some more bytes\n"
@@ -5144,13 +5143,11 @@ def patch_delete_modified(sbox):
expected_output, expected_disk,
expected_status, expected_skip)
- # Second application skips
+ # Second application notifies already applied
expected_output = [
- 'Skipped \'%s\'\n' % sbox.ospath('A/B/E/beta'),
- ] + svntest.main.summary_of_conflicts(skipped_paths=1)
- expected_skip = wc.State('', {
- sbox.ospath('A/B/E/beta') : Item(verb='Skipped'),
- })
+ 'G %s\n' % sbox.ospath('A/B/E/beta'),
+ '> hunk @@ -1,1 +0,0 @@ already applied\n',
+ ]
svntest.actions.run_and_verify_patch(wc_dir, os.path.abspath(patch_file_path),
expected_output, expected_disk,
expected_status, expected_skip)
@@ -5548,12 +5545,9 @@ def patch_delete_missing_eol(sbox):
expected_status, expected_skip,
[], False, True)
- # Try again? -> Skip... Why not some already applied notification?
- # -> There is nothing to compare to
+ # Try again? -> Merged
expected_output = wc.State(wc_dir, {
- })
- expected_skip = wc.State(wc_dir, {
- 'A/B/E/beta' : Item(verb='Skipped'),
+ 'A/B/E/beta' : Item(status='G '),
})
svntest.actions.run_and_verify_patch(wc_dir, patch,
expected_output, expected_disk,
@@ -5927,6 +5921,13 @@ def patch_empty_vs_delete(sbox):
expected_status, expected_skip,
[], True, True)
+ # Retry
+ expected_output.tweak('iota', status='G ')
+ svntest.actions.run_and_verify_patch(wc_dir, empty_git_patch,
+ expected_output, expected_disk,
+ expected_status, expected_skip,
+ [], True, True)
+
svntest.actions.run_and_verify_svn(None, [],
'revert', sbox.ospath('iota'))
@@ -5943,10 +5944,19 @@ def patch_empty_vs_delete(sbox):
[], True, True,
'--strip', strip_count)
+ # Retry
+ expected_output.tweak('iota', status='G ')
+ svntest.actions.run_and_verify_patch(wc_dir, empty_patch,
+ expected_output, expected_disk,
+ expected_status, expected_skip,
+ [], True, True,
+ '--strip', strip_count)
+
svntest.actions.run_and_verify_svn(None, [],
'revert', sbox.ospath('iota'))
# Ordinary diff to deleted
+ expected_output.tweak('iota', status='D ')
svntest.actions.run_and_verify_patch(wc_dir, del_patch,
expected_output, expected_disk,
expected_status, expected_skip,