svn commit: r1706110 - in /subversion/branches/patch-exec: BRANCH-README subversion/libsvn_diff/parse-diff.c subversion/tests/cmdline/patch_tests.py

[da...@apache.org]

Author: danielsh
Date: Wed Sep 30 18:18:18 2015
New Revision: 1706110

URL: http://svn.apache.org/viewvc?rev=1706110&view=rev
Log:
* /branches/patch-exec/BRANCH-README: Update todo list for tasks implemented
    earlier today on trunk.

Modified:
    subversion/branches/patch-exec/BRANCH-README
    subversion/branches/patch-exec/subversion/libsvn_diff/parse-diff.c
    subversion/branches/patch-exec/subversion/tests/cmdline/patch_tests.py

Modified: subversion/branches/patch-exec/BRANCH-README
URL: http://svn.apache.org/viewvc/subversion/branches/patch-exec/BRANCH-README?rev=1706110&r1=1706109&r2=1706110&view=diff
==============================================================================
--- subversion/branches/patch-exec/BRANCH-README (original)
+++ subversion/branches/patch-exec/BRANCH-README Wed Sep 30 18:18:18 2015
@@ -12,8 +12,8 @@ Steps:
 - [DONE] parser: Review handling of modes other than 0644/0755
                  Consider checking "mode & 0111"
 - [DONE] check rename/copy with mode change; ensure test coverage
-- [TODO] ensure binary diff & mode changes interact properly
-- [TODO] Teach 'svn diff --git' to emit mode information (executability)
+- [DONE] ensure binary diff & mode changes interact properly
+- [DONE] Teach 'svn diff --git' to emit mode information (executability)
   - In addition to the standard propchange form used for all user properties,
     for compatibility with released 'svn patch' versions
   - Consider the case of an unversioned file being one side of the diff.

Modified: subversion/branches/patch-exec/subversion/libsvn_diff/parse-diff.c
URL: http://svn.apache.org/viewvc/subversion/branches/patch-exec/subversion/libsvn_diff/parse-diff.c?rev=1706110&r1=1706109&r2=1706110&view=diff
==============================================================================
--- subversion/branches/patch-exec/subversion/libsvn_diff/parse-diff.c (original)
+++ subversion/branches/patch-exec/subversion/libsvn_diff/parse-diff.c Wed Sep 30 18:18:18 2015
@@ -2032,6 +2032,7 @@ static struct transition transitions[] =
 
   {"GIT binary patch",  state_git_diff_seen,    binary_patch_start},
   {"GIT binary patch",  state_git_tree_seen,    binary_patch_start},
+  {"GIT binary patch",  state_git_mode_seen,    binary_patch_start},
 };
 
 svn_error_t *

Modified: subversion/branches/patch-exec/subversion/tests/cmdline/patch_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/patch-exec/subversion/tests/cmdline/patch_tests.py?rev=1706110&r1=1706109&r2=1706110&view=diff
==============================================================================
--- subversion/branches/patch-exec/subversion/tests/cmdline/patch_tests.py (original)
+++ subversion/branches/patch-exec/subversion/tests/cmdline/patch_tests.py Wed Sep 30 18:18:18 2015
@@ -5657,14 +5657,21 @@ def patch_binary_file(sbox):
   sbox.simple_revert('iota')
 
   tmp = sbox.get_tempname()
-  svntest.main.file_write(tmp, ''.join(diff_output))
+  patch = diff_output[:]
+  patch[3:3] = [
+    "old mode 100644\n",
+    "new mode 100755\n",
+    #"index ...\n",
+  ]
+  svntest.main.file_write(tmp, ''.join(patch))
 
   expected_output = wc.State(wc_dir, {
     'iota'              : Item(status='UU'),
   })
   expected_disk = svntest.main.greek_state.copy()
   expected_disk.tweak('iota',
-                      props={'svn:mime-type':'application/binary'},
+                      props={'svn:mime-type':'application/binary',
+                             'svn:executable': '*'},
                       contents =
                       'This is the file \'iota\'.\n'
                       '\0\202\203\204\205\206\207nsomething\nelse\xFF')