svn commit: r1599595 - in /subversion/trunk/subversion: libsvn_client/diff.c libsvn_diff/binary_diff.c

[rhuijben]

Author: rhuijben
Date: Tue Jun  3 15:03:21 2014
New Revision: 1599595

URL: http://svn.apache.org/r1599595
Log:
Following up on r1599552, tweak code for compatibility with git.

* subversion/libsvn_client/diff.c
  (diff_content_changed): Add missing headers.

* subversion/libsvn_diff/binary_diff.c
  (write_literal): Properly read unsigned characters.

Modified:
    subversion/trunk/subversion/libsvn_client/diff.c
    subversion/trunk/subversion/libsvn_diff/binary_diff.c

Modified: subversion/trunk/subversion/libsvn_client/diff.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/diff.c?rev=1599595&r1=1599594&r2=1599595&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/diff.c Tue Jun  3 15:03:21 2014
@@ -710,8 +710,29 @@ diff_content_changed(svn_boolean_t *wrot
         {
           svn_stream_t *left_stream;
           svn_stream_t *right_stream;
+          const char *repos_relpath1;
+          const char *repos_relpath2;
 
-          /* ### We might miss some git headers? */
+          SVN_ERR(make_repos_relpath(&repos_relpath1, diff_relpath,
+                                      dwi->ddi.orig_path_1,
+                                      dwi->ddi.session_relpath,
+                                      dwi->wc_ctx,
+                                      dwi->ddi.anchor,
+                                      scratch_pool, scratch_pool));
+          SVN_ERR(make_repos_relpath(&repos_relpath2, diff_relpath,
+                                      dwi->ddi.orig_path_2,
+                                      dwi->ddi.session_relpath,
+                                      dwi->wc_ctx,
+                                      dwi->ddi.anchor,
+                                      scratch_pool, scratch_pool));
+          SVN_ERR(print_git_diff_header(outstream, &label1, &label2,
+                                        operation,
+                                        repos_relpath1, repos_relpath2,
+                                        rev1, rev2,
+                                        copyfrom_path,
+                                        copyfrom_rev,
+                                        dwi->header_encoding,
+                                        scratch_pool));
 
           SVN_ERR(svn_stream_open_readonly(&left_stream, tmpfile1,
                                            scratch_pool, scratch_pool));

Modified: subversion/trunk/subversion/libsvn_diff/binary_diff.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_diff/binary_diff.c?rev=1599595&r1=1599594&r2=1599595&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_diff/binary_diff.c (original)
+++ subversion/trunk/subversion/libsvn_diff/binary_diff.c Tue Jun  3 15:03:21 
2014
@@ -118,7 +118,7 @@ write_literal(svn_filesize_t uncompresse
   do
     {
       char chunk[GIT_BASE85_CHUNKSIZE];
-      const char *next;
+      const unsigned char *next;
       int left;
 
       rd = sizeof(chunk);
@@ -134,7 +134,7 @@ write_literal(svn_filesize_t uncompresse
       }
 
       left = rd;
-      next = chunk;
+      next = (void*)chunk;
       while (left)
       {
         char five[5];
@@ -218,4 +218,4 @@ svn_diff_output_binary(svn_stream_t *out
   SVN_ERR(svn_stream_puts(output_stream, APR_EOL_STR));
 
   return SVN_NO_ERROR;
-}
\ No newline at end of file
+}