subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1243840 - /subversion/trunk/subversion/libsvn_client/externals.c
Date Tue, 14 Feb 2012 09:27:16 GMT
Author: stsp
Date: Tue Feb 14 09:27:16 2012
New Revision: 1243840

URL: http://svn.apache.org/viewvc?rev=1243840&view=rev
Log:
Follow-up to r1243694:

* subversion/libsvn_client/externals.c
  (handle_external_item_change): Eliminate some code duplication.
   No functional change.

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

Modified: subversion/trunk/subversion/libsvn_client/externals.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/externals.c?rev=1243840&r1=1243839&r2=1243840&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/externals.c (original)
+++ subversion/trunk/subversion/libsvn_client/externals.c Tue Feb 14 09:27:16 2012
@@ -693,21 +693,7 @@ handle_external_item_change(const struct
                                     scratch_pool));
         break;
       case svn_node_file:
-        if (strcmp(eb->repos_root_url, ra_cache.repos_root_url) == 0)
-          {
-            SVN_ERR(switch_file_external(local_abspath,
-                                         new_url,
-                                         &new_item->peg_revision,
-                                         &new_item->revision,
-                                         parent_dir_abspath,
-                                         ra_session,
-                                         ra_cache.ra_session_url,
-                                         ra_cache.ra_revnum,
-                                         ra_cache.repos_root_url,
-                                         eb->timestamp_sleep, eb->ctx,
-                                         scratch_pool));
-          }
-        else
+        if (strcmp(eb->repos_root_url, ra_cache.repos_root_url))
           {
             const char *repos_uuid;
             const char *ext_repos_relpath;
@@ -747,19 +733,20 @@ handle_external_item_change(const struct
                                                   ext_repos_relpath,
                                                   scratch_pool);
             SVN_ERR(svn_ra_reparent(ra_session, new_url, scratch_pool));
-            SVN_ERR(switch_file_external(local_abspath,
-                                         new_url,
-                                         &new_item->peg_revision,
-                                         &new_item->revision,
-                                         parent_dir_abspath,
-                                         ra_session,
-                                         ra_cache.ra_session_url,
-                                         ra_cache.ra_revnum,
-                                         ra_cache.repos_root_url,
-                                         eb->timestamp_sleep, eb->ctx,
-                                         scratch_pool));
 
           }
+
+        SVN_ERR(switch_file_external(local_abspath,
+                                     new_url,
+                                     &new_item->peg_revision,
+                                     &new_item->revision,
+                                     parent_dir_abspath,
+                                     ra_session,
+                                     ra_cache.ra_session_url,
+                                     ra_cache.ra_revnum,
+                                     ra_cache.repos_root_url,
+                                     eb->timestamp_sleep, eb->ctx,
+                                     scratch_pool));
         break;
       default:
         SVN_ERR_MALFUNCTION();



Mime
View raw message