subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1126983 - in /subversion/trunk/subversion: include/ libsvn_client/ svn/ tests/cmdline/ tests/libsvn_wc/
Date Tue, 24 May 2011 11:28:56 GMT
Author: rhuijben
Date: Tue May 24 11:28:55 2011
New Revision: 1126983

URL: http://svn.apache.org/viewvc?rev=1126983&view=rev
Log:
Remove the apply_local_external_modifications argument from the update and
switch processing. This new in 1.7 argument is no longer necessary once we
start using the EXTERNALS table in wc.db.

* subversion/include/svn_client.h
  (svn_client_update4): Remove argument.
  (svn_client_update3): Update documentation.
  (svn_client_switch4): Remove argument.
  (svn_client_switch3): Update documentation.

* subversion/libsvn_client/checkout.c
  (svn_client__checkout_internal): Update caller.

* subversion/libsvn_client/client.h
  (svn_client__update_internal,
   svn_client__switch_internal): Remove argument.

* subversion/libsvn_client/externals.c
  (switch_dir_external): Update caller.

* subversion/libsvn_client/switch.c
  (switch_internal): Remove argument. Always look at local changes when
    processing externals.
  (svn_client__switch_internal,
   svn_client_switch3): Update caller.

* subversion/libsvn_client/update.c
  (update_internal):  Remove argument. Always look at local changes when
    processing externals.

* subversion/svn/switch-cmd.c
  (svn_cl__switch): Update caller.

* subversion/svn/update-cmd.c
  (svn_cl__update): Update caller.

* subversion/tests/cmdline/externals_tests.py
  (update_external_on_locally_added_dir): Remove XFail marker.
  (switch_external_on_locally_added_dir): Remove XFail marker.
  (file_external_update_without_commit): Mark XFail. Triggers a new problem
     on installing a file external in an inner working copy.

* subversion/tests/libsvn_wc/op-depth-test.c
  (wc_update): Update caller.

Modified:
    subversion/trunk/subversion/include/svn_client.h
    subversion/trunk/subversion/libsvn_client/checkout.c
    subversion/trunk/subversion/libsvn_client/client.h
    subversion/trunk/subversion/libsvn_client/externals.c
    subversion/trunk/subversion/libsvn_client/switch.c
    subversion/trunk/subversion/libsvn_client/update.c
    subversion/trunk/subversion/svn/switch-cmd.c
    subversion/trunk/subversion/svn/update-cmd.c
    subversion/trunk/subversion/tests/cmdline/externals_tests.py
    subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c

Modified: subversion/trunk/subversion/include/svn_client.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_client.h?rev=1126983&r1=1126982&r2=1126983&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_client.h (original)
+++ subversion/trunk/subversion/include/svn_client.h Tue May 24 11:28:55 2011
@@ -1217,10 +1217,6 @@ svn_client_checkout(svn_revnum_t *result
  * files restored from text-base.  If @a ctx->cancel_func is non-NULL, invoke
  * it passing @a ctx->cancel_baton at various places during the update.
  *
- * If @a apply_local_external_modifications is TRUE, local versions of the
- * svn:externals property are processed during update instead of their
- * committed version.
- *
  * Use @a pool for any temporary allocation.
  *
  *  @todo  Multiple Targets
@@ -1245,15 +1241,13 @@ svn_client_update4(apr_array_header_t **
                    svn_boolean_t ignore_externals,
                    svn_boolean_t allow_unver_obstructions,
                    svn_boolean_t adds_as_modification,
-                   svn_boolean_t apply_local_external_modifications,
                    svn_boolean_t make_parents,
                    svn_client_ctx_t *ctx,
                    apr_pool_t *pool);
 
 /**
  * Similar to svn_client_update4() but with @a make_parents always set
- * to FALSE, @a adds_as_modification set to TRUE, and
- * @a apply_local_external_modifications set to FALSE.
+ * to FALSE and @a adds_as_modification set to TRUE.
  *
  * @deprecated Provided for backward compatibility with the 1.6 API.
  * @since New in 1.5.
@@ -1356,10 +1350,6 @@ svn_client_update(svn_revnum_t *result_r
  *              and returning #SVN_ERR_CLIENT_UNRELATED_RESOURCES if they
  *              do not. If @c TRUE, no such sanity checks are performed.
  *
- * @param [in] apply_local_external_modifications  If @c TRUE, local versions
- *              of the svn:externals property are processed during switch
- *              instead of their committed version.
- *
  * @param[in] ctx   The standard client context, used for authentication and
  *              notification.  The notifier is invoked for paths affected by
  *              the switch, and also for files which may be restored from the
@@ -1390,14 +1380,13 @@ svn_client_switch3(svn_revnum_t *result_
                    svn_boolean_t ignore_externals,
                    svn_boolean_t allow_unver_obstructions,
                    svn_boolean_t ignore_ancestry,
-                   svn_boolean_t apply_local_external_modifications,
                    svn_client_ctx_t *ctx,
                    apr_pool_t *pool);
 
 
 /**
  * Similar to svn_client_switch3() but with @a ignore_ancestry always
- * set to TRUE and @a apply_local_external_modifications set to FALSE.
+ * set to TRUE.
  *
  * @since New in 1.5.
  * @deprecated Provided for backward compatibility with the 1.4 API.

Modified: subversion/trunk/subversion/libsvn_client/checkout.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/checkout.c?rev=1126983&r1=1126982&r2=1126983&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/checkout.c (original)
+++ subversion/trunk/subversion/libsvn_client/checkout.c Tue May 24 11:28:55 2011
@@ -219,7 +219,7 @@ svn_client__checkout_internal(svn_revnum
                                         allow_unver_obstructions,
                                         TRUE /* adds_as_modification */,
                                         FALSE, FALSE,
-                                        FALSE, use_sleep, ctx, pool);
+                                        use_sleep, ctx, pool);
     }
 
   if (err)

Modified: subversion/trunk/subversion/libsvn_client/client.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/client.h?rev=1126983&r1=1126982&r2=1126983&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/client.h (original)
+++ subversion/trunk/subversion/libsvn_client/client.h Tue May 24 11:28:55 2011
@@ -441,7 +441,6 @@ svn_client__update_internal(svn_revnum_t
                             svn_boolean_t allow_unver_obstructions,
                             svn_boolean_t adds_as_modification,
                             svn_boolean_t make_parents,
-                            svn_boolean_t apply_local_external_modifications,
                             svn_boolean_t innerupdate,
                             svn_boolean_t *timestamp_sleep,
                             svn_client_ctx_t *ctx,
@@ -557,7 +556,6 @@ svn_client__switch_internal(svn_revnum_t
                             svn_boolean_t depth_is_sticky,
                             svn_boolean_t ignore_externals,
                             svn_boolean_t allow_unver_obstructions,
-                            svn_boolean_t apply_local_external_modifications,
                             svn_boolean_t ignore_ancestry,
                             svn_boolean_t innerswitch,
                             svn_boolean_t *timestamp_sleep,

Modified: subversion/trunk/subversion/libsvn_client/externals.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/externals.c?rev=1126983&r1=1126982&r2=1126983&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/externals.c (original)
+++ subversion/trunk/subversion/libsvn_client/externals.c Tue May 24 11:28:55 2011
@@ -175,7 +175,7 @@ switch_dir_external(const char *local_ab
               SVN_ERR(svn_client__update_internal(NULL, local_abspath,
                                                   revision, svn_depth_unknown,
                                                   FALSE, FALSE, FALSE, TRUE,
-                                                  FALSE, FALSE, TRUE,
+                                                  FALSE, TRUE,
                                                   timestamp_sleep,
                                                   ctx, subpool));
               svn_pool_destroy(subpool);
@@ -223,7 +223,7 @@ switch_dir_external(const char *local_ab
                                                   peg_revision, revision,
                                                   svn_depth_infinity,
                                                   TRUE, FALSE, FALSE,
-                                                  FALSE, TRUE, TRUE,
+                                                  TRUE, TRUE,
                                                   timestamp_sleep,
                                                   ctx, subpool));
 

Modified: subversion/trunk/subversion/libsvn_client/switch.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/switch.c?rev=1126983&r1=1126982&r2=1126983&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/switch.c (original)
+++ subversion/trunk/subversion/libsvn_client/switch.c Tue May 24 11:28:55 2011
@@ -67,7 +67,6 @@ switch_internal(svn_revnum_t *result_rev
                 svn_boolean_t ignore_externals,
                 svn_boolean_t allow_unver_obstructions,
                 svn_boolean_t ignore_ancestry,
-                svn_boolean_t apply_local_external_modifications,
                 svn_boolean_t innerswitch,
                 svn_boolean_t *timestamp_sleep,
                 svn_client_ctx_t *ctx,
@@ -288,8 +287,7 @@ switch_internal(svn_revnum_t *result_rev
      the primary operation. */
   if (SVN_DEPTH_IS_RECURSIVE(depth) && (! ignore_externals))
     {
-      if (apply_local_external_modifications)
-        SVN_ERR(svn_client__gather_local_external_changes(
+      SVN_ERR(svn_client__gather_local_external_changes(
                 efb.externals_new, efb.ambient_depths, local_abspath,
                 depth, ctx, pool));
 
@@ -339,7 +337,6 @@ svn_client__switch_internal(svn_revnum_t
                             svn_boolean_t depth_is_sticky,
                             svn_boolean_t ignore_externals,
                             svn_boolean_t allow_unver_obstructions,
-                            svn_boolean_t apply_local_external_modifications,
                             svn_boolean_t ignore_ancestry,
                             svn_boolean_t innerswitch,
                             svn_boolean_t *timestamp_sleep,
@@ -370,8 +367,7 @@ svn_client__switch_internal(svn_revnum_t
                          depth, depth_is_sticky,
                          ignore_externals,
                          allow_unver_obstructions, ignore_ancestry,
-                         apply_local_external_modifications, innerswitch,
-                         timestamp_sleep, ctx, pool);
+                         innerswitch, timestamp_sleep, ctx, pool);
 
   if (acquired_lock)
     err2 = svn_wc__release_write_lock(ctx->wc_ctx, anchor_abspath, pool);
@@ -392,7 +388,6 @@ svn_client_switch3(svn_revnum_t *result_
                    svn_boolean_t ignore_externals,
                    svn_boolean_t allow_unver_obstructions,
                    svn_boolean_t ignore_ancestry,
-                   svn_boolean_t apply_local_external_modifications,
                    svn_client_ctx_t *ctx,
                    apr_pool_t *pool)
 {
@@ -404,7 +399,6 @@ svn_client_switch3(svn_revnum_t *result_
                                      peg_revision, revision, depth,
                                      depth_is_sticky, ignore_externals,
                                      allow_unver_obstructions,
-                                     apply_local_external_modifications,
                                      ignore_ancestry,
                                      FALSE, NULL, ctx, pool);
 }

Modified: subversion/trunk/subversion/libsvn_client/update.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/update.c?rev=1126983&r1=1126982&r2=1126983&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/update.c (original)
+++ subversion/trunk/subversion/libsvn_client/update.c Tue May 24 11:28:55 2011
@@ -179,7 +179,6 @@ update_internal(svn_revnum_t *result_rev
                 svn_boolean_t ignore_externals,
                 svn_boolean_t allow_unver_obstructions,
                 svn_boolean_t adds_as_modification,
-                svn_boolean_t apply_local_external_modifications,
                 svn_boolean_t innerupdate,
                 svn_boolean_t *timestamp_sleep,
                 svn_boolean_t notify_summary,
@@ -415,8 +414,7 @@ update_internal(svn_revnum_t *result_rev
      the primary operation.  */
   if (SVN_DEPTH_IS_RECURSIVE(depth) && (! ignore_externals))
     {
-      if (apply_local_external_modifications)
-        SVN_ERR(svn_client__gather_local_external_changes(
+      SVN_ERR(svn_client__gather_local_external_changes(
                   efb.externals_new, efb.ambient_depths, local_abspath,
                   depth, ctx, pool));
       SVN_ERR(svn_client__handle_externals(efb.externals_old,
@@ -461,7 +459,6 @@ svn_client__update_internal(svn_revnum_t
                             svn_boolean_t allow_unver_obstructions,
                             svn_boolean_t adds_as_modification,
                             svn_boolean_t make_parents,
-                            svn_boolean_t apply_local_external_modifications,
                             svn_boolean_t innerupdate,
                             svn_boolean_t *timestamp_sleep,
                             svn_client_ctx_t *ctx,
@@ -514,7 +511,6 @@ svn_client__update_internal(svn_revnum_t
                                 &peg_revision, svn_depth_empty, FALSE,
                                 ignore_externals, allow_unver_obstructions,
                                 adds_as_modification,
-                                apply_local_external_modifications,
                                 innerupdate, timestamp_sleep,
                                 FALSE, ctx, pool);
           if (err)
@@ -540,7 +536,6 @@ svn_client__update_internal(svn_revnum_t
                         &peg_revision, depth, depth_is_sticky,
                         ignore_externals, allow_unver_obstructions,
                         adds_as_modification,
-                        apply_local_external_modifications,
                         innerupdate,
                         timestamp_sleep,
                         TRUE, ctx, pool);
@@ -562,7 +557,6 @@ svn_client_update4(apr_array_header_t **
                    svn_boolean_t ignore_externals,
                    svn_boolean_t allow_unver_obstructions,
                    svn_boolean_t adds_as_modification,
-                   svn_boolean_t apply_local_external_modifications,
                    svn_boolean_t make_parents,
                    svn_client_ctx_t *ctx,
                    apr_pool_t *pool)
@@ -603,7 +597,6 @@ svn_client_update4(apr_array_header_t **
                                         allow_unver_obstructions,
                                         adds_as_modification,
                                         make_parents,
-                                        apply_local_external_modifications,
                                         FALSE, &sleep,
                                         ctx, subpool);
 

Modified: subversion/trunk/subversion/svn/switch-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/switch-cmd.c?rev=1126983&r1=1126982&r2=1126983&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/switch-cmd.c (original)
+++ subversion/trunk/subversion/svn/switch-cmd.c Tue May 24 11:28:55 2011
@@ -177,7 +177,6 @@ svn_cl__switch(apr_getopt_t *os,
                            &(opt_state->start_revision), depth,
                            depth_is_sticky, opt_state->ignore_externals,
                            opt_state->force, opt_state->ignore_ancestry,
-                           FALSE /* apply_local_external_modifications */,
                            ctx, scratch_pool);
   if (err)
     {

Modified: subversion/trunk/subversion/svn/update-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/update-cmd.c?rev=1126983&r1=1126982&r2=1126983&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/update-cmd.c (original)
+++ subversion/trunk/subversion/svn/update-cmd.c Tue May 24 11:28:55 2011
@@ -167,7 +167,6 @@ svn_cl__update(apr_getopt_t *os,
                              depth, depth_is_sticky,
                              opt_state->ignore_externals,
                              opt_state->force, TRUE /* adds_as_modification */,
-                             FALSE /* apply_local_external_modifications */,
                              opt_state->parents,
                              ctx, scratch_pool));
 

Modified: subversion/trunk/subversion/tests/cmdline/externals_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/externals_tests.py?rev=1126983&r1=1126982&r2=1126983&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/externals_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/externals_tests.py Tue May 24 11:28:55 2011
@@ -1590,7 +1590,6 @@ def update_modify_file_external(sbox):
 
 # Test for issue #2267
 @Issue(2267)
-@XFail() # Needs new commandline option
 def update_external_on_locally_added_dir(sbox):
   "update an external on a locally added dir"
 
@@ -1631,7 +1630,6 @@ def update_external_on_locally_added_dir
 
 # Test for issue #2267
 @Issue(2267)
-@XFail() # Needs new commandline option
 def switch_external_on_locally_added_dir(sbox):
   "switch an external on a locally added dir"
 
@@ -1698,6 +1696,7 @@ def file_external_in_sibling(sbox):
                             [], 'update')
 
 @Issue(3823)
+@XFail()
 def file_external_update_without_commit(sbox):
   "update a file external without committing target"
 

Modified: subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c?rev=1126983&r1=1126982&r2=1126983&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c Tue May 24 11:28:55 2011
@@ -245,7 +245,7 @@ wc_update(svn_test__sandbox_t *b, const 
   APR_ARRAY_PUSH(paths, const char *) = wc_path(b, path);
   SVN_ERR(svn_client_create_context(&ctx, b->pool));
   return svn_client_update4(&result_revs, paths, &revision, svn_depth_infinity,
-                            TRUE, FALSE, FALSE, FALSE, FALSE, FALSE,
+                            TRUE, FALSE, FALSE, FALSE, FALSE,
                             ctx, b->pool);
 }
 



Mime
View raw message