subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1438939 - /subversion/trunk/subversion/libsvn_client/repos_diff.c
Date Sat, 26 Jan 2013 18:44:24 GMT
Author: rhuijben
Date: Sat Jan 26 18:44:23 2013
New Revision: 1438939

URL: http://svn.apache.org/viewvc?rev=1438939&view=rev
Log:
* subversion/libsvn_client/repos_diff.c
  (diff_state_handle): Lose 2 spaces before a huge code block. No functional
    changes.

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

Modified: subversion/trunk/subversion/libsvn_client/repos_diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/repos_diff.c?rev=1438939&r1=1438938&r2=1438939&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/repos_diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/repos_diff.c Sat Jan 26 18:44:23 2013
@@ -1446,44 +1446,44 @@ diff_state_handle(svn_boolean_t tree_con
   /* This code is only used from the merge api, and should really be
      integrated there. */
 
-    {
-      deleted_path_notify_t *dpn;
-      svn_wc_notify_t *notify;
-      svn_wc_notify_action_t action;
-      svn_node_kind_t notify_kind = (kind == svn_kind_dir) ? svn_node_dir
-                                                           : svn_node_file;
-
-      if (for_add)
-        action = svn_wc_notify_update_add;
-      else
-        action = svn_wc_notify_update_update;
-
-      /* Find out if a pending delete notification for this path is
-      * still around. */
-      dpn = apr_hash_get(eb->deleted_paths, relpath, APR_HASH_KEY_STRING);
-      if (dpn)
-        {
-          /* If any was found, we will handle the pending 'deleted path
-          * notification' (DPN) here. Remove it from the list. */
-          apr_hash_set(eb->deleted_paths, relpath,
-                       APR_HASH_KEY_STRING, NULL);
-
-          /* the pending delete might be on a different node kind. */
-          notify_kind = dpn->kind;
-          notify_content_state = notify_prop_state = dpn->state;
-
-          if (for_add && dpn->action == svn_wc_notify_update_delete)
-            action = svn_wc_notify_update_replace;
-        }
-
-      notify = svn_wc_create_notify(relpath, action, scratch_pool);
-      notify->kind = notify_kind;
-      notify->content_state = notify_content_state;
-      notify->prop_state = notify_prop_state;
-      (*eb->notify_func)(eb->notify_baton, notify, scratch_pool);
-    }
+  {
+    deleted_path_notify_t *dpn;
+    svn_wc_notify_t *notify;
+    svn_wc_notify_action_t action;
+    svn_node_kind_t notify_kind = (kind == svn_kind_dir) ? svn_node_dir
+                                                         : svn_node_file;
+
+    if (for_add)
+      action = svn_wc_notify_update_add;
+    else
+      action = svn_wc_notify_update_update;
+
+    /* Find out if a pending delete notification for this path is
+    * still around. */
+    dpn = apr_hash_get(eb->deleted_paths, relpath, APR_HASH_KEY_STRING);
+    if (dpn)
+      {
+        /* If any was found, we will handle the pending 'deleted path
+        * notification' (DPN) here. Remove it from the list. */
+        apr_hash_set(eb->deleted_paths, relpath,
+                     APR_HASH_KEY_STRING, NULL);
+
+        /* the pending delete might be on a different node kind. */
+        notify_kind = dpn->kind;
+        notify_content_state = notify_prop_state = dpn->state;
+
+        if (for_add && dpn->action == svn_wc_notify_update_delete)
+          action = svn_wc_notify_update_replace;
+      }
+
+    notify = svn_wc_create_notify(relpath, action, scratch_pool);
+    notify->kind = notify_kind;
+    notify->content_state = notify_content_state;
+    notify->prop_state = notify_prop_state;
+    (*eb->notify_func)(eb->notify_baton, notify, scratch_pool);
+  }
 
-    return SVN_NO_ERROR;
+  return SVN_NO_ERROR;
 }
 
 static svn_error_t *



Mime
View raw message