subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dan...@apache.org
Subject svn commit: r952116 - /subversion/trunk/subversion/libsvn_client/diff.c
Date Mon, 07 Jun 2010 06:33:24 GMT
Author: dannas
Date: Mon Jun  7 06:33:24 2010
New Revision: 952116

URL: http://svn.apache.org/viewvc?rev=952116&view=rev
Log:
Make 'svn diff' able to create 'git diffs' for added paths. At the
same time, fix a bug where all subsequent diffs after a deleted file had
git headers saying they were deleted.

With SVN_EXPERIMENTAL_PATCH defined, 'svn diff' can now create 
'git diffs' for added, modified and deleted paths. A patch for the
following operations to a greek-tree can successfully be applied to
another greek-tree using mercurial (a VCS using 'git diffs'):

echo "bar" > bar
$SVN add bar
$SVN rm A/D
echo "Changed 'iota'" >> iota
echo "foo" > foo
$SVN add foo
echo "Changed 'lambda'" >> A/B/lambda

* subversion/libsvn_client/diff.c
  (diff_cmd_baton): Add 'added' field.
  (diff_content_changed): Adjust the diff labels for the case of an
    added path. The labels are now correct for all existing use cases.
  (diff_file_added): Set the 'added' field to TRUE before creating the
    diff and reset it to FALSE afterwards.
  (diff_file_deleted_with_diff): Set the deleted field to FALSE after
    the diff has been created.

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

Modified: subversion/trunk/subversion/libsvn_client/diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/diff.c?rev=952116&r1=952115&r2=952116&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/diff.c Mon Jun  7 06:33:24 2010
@@ -430,8 +430,12 @@ struct diff_cmd_baton {
      relative to for output generation (see issue #2723). */
   const char *relative_to_dir;
 
-  /* ### Add moved, copied and added fields when we can detect those
-   * ### properly. */
+  /* ### Add moved and copied fields when we can detect those
+   * ### properly. 
+   *
+   * ### Should we pass these fields as parameters to the affected funcs
+   * ### instead of in the baton? */
+  svn_boolean_t added;
   svn_boolean_t deleted;
 };
 
@@ -676,10 +680,11 @@ diff_content_changed(const char *path,
                    "Index: %s" APR_EOL_STR "%s" APR_EOL_STR,
                    path, equal_string));
 #ifdef SVN_EXPERIMENTAL_PATCH
-          /* ### We need to adjust the labels to comply with the git unidiff
-           * ### standard. The labels must be adjusted for the case of an
-           * ### add too. 
-           * 
+
+          /* We adjust the labels to comply with the git unidiff standard.
+           *
+           * ### Move this logic into print_git_diff_header?
+           *
            * ### If the paths has different length, the revisions will not
            * ### be in the same column. Is that a problem? */
           if (diff_cmd_baton->deleted)
@@ -688,6 +693,12 @@ diff_content_changed(const char *path,
                                   subpool);
               label2 = diff_label("/dev/null", rev2, subpool);
             }
+          else if (diff_cmd_baton->added)
+            {
+              label1 = diff_label("/dev/null", rev1, subpool);
+              label2 = diff_label(apr_psprintf(subpool, "b/%s", path2), rev2,
+                                  subpool);
+            }
           else
             {
               label1 = diff_label(apr_psprintf(subpool, "a/%s", path1), rev1,
@@ -703,7 +714,7 @@ diff_content_changed(const char *path,
                                         diff_cmd_baton->deleted,
                                         FALSE, /* copied */
                                         FALSE, /* moved */
-                                        FALSE, /* added */
+                                        diff_cmd_baton->added,
                                         diff_cmd_baton->header_encoding,
                                         path, subpool));
 #endif
@@ -787,6 +798,8 @@ diff_file_added(const char *local_dir_ab
 {
   struct diff_cmd_baton *diff_cmd_baton = diff_baton;
 
+  diff_cmd_baton->added = TRUE;
+
   /* We want diff_file_changed to unconditionally show diffs, even if
      the diff is empty (as would be the case if an empty file were
      added.)  It's important, because 'patch' would still see an empty
@@ -802,6 +815,7 @@ diff_file_added(const char *local_dir_ab
                             prop_changes, original_props, diff_baton,
                             scratch_pool));
 
+  diff_cmd_baton->added = FALSE;
   diff_cmd_baton->force_empty = FALSE;
 
   return SVN_NO_ERROR;
@@ -825,14 +839,17 @@ diff_file_deleted_with_diff(const char *
   diff_cmd_baton->deleted = TRUE;
 
   /* We don't list all the deleted properties. */
-  return diff_file_changed(local_dir_abspath, state, NULL, tree_conflicted,
-                           path, tmpfile1, tmpfile2,
-                           diff_cmd_baton->revnum1, diff_cmd_baton->revnum2,
-                           mimetype1, mimetype2,
-                           apr_array_make(diff_cmd_baton->pool, 1,
-                                          sizeof(svn_prop_t)),
-                           apr_hash_make(diff_cmd_baton->pool), diff_baton,
-                           scratch_pool);
+  SVN_ERR(diff_file_changed(local_dir_abspath, state, NULL, tree_conflicted,
+                            path, tmpfile1, tmpfile2,
+                            diff_cmd_baton->revnum1, diff_cmd_baton->revnum2,
+                            mimetype1, mimetype2,
+                            apr_array_make(diff_cmd_baton->pool, 1,
+                                           sizeof(svn_prop_t)),
+                            apr_hash_make(diff_cmd_baton->pool), diff_baton,
+                            scratch_pool));
+  diff_cmd_baton->deleted = FALSE;
+
+  return SVN_NO_ERROR;
 }
 
 /* An svn_wc_diff_callbacks4_t function. */
@@ -1857,6 +1874,7 @@ svn_client_diff5(const apr_array_header_
   diff_cmd_baton.force_binary = ignore_content_type;
   diff_cmd_baton.relative_to_dir = relative_to_dir;
   diff_cmd_baton.deleted = FALSE;
+  diff_cmd_baton.added = FALSE;
 
   return do_diff(&diff_params, &diff_callbacks, &diff_cmd_baton, ctx, pool);
 }
@@ -1924,6 +1942,7 @@ svn_client_diff_peg5(const apr_array_hea
   diff_cmd_baton.force_binary = ignore_content_type;
   diff_cmd_baton.relative_to_dir = relative_to_dir;
   diff_cmd_baton.deleted = FALSE;
+  diff_cmd_baton.added = FALSE;
 
   return do_diff(&diff_params, &diff_callbacks, &diff_cmd_baton, ctx, pool);
 }



Mime
View raw message