subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1841079 - in /subversion/trunk/subversion: include/svn_client.h libsvn_client/shelf.c
Date Mon, 17 Sep 2018 15:53:33 GMT
Author: julianfoad
Date: Mon Sep 17 15:53:33 2018
New Revision: 1841079

URL: http://svn.apache.org/viewvc?rev=1841079&view=rev
Log:
Shelving: remove deprecated experimental APIs.

* subversion/include/svn_client.h,
  subversion/libbsvn_client/shelf.c
  (svn_client_shelf_save_new_version2,
   svn_client_shelf_save_new_version,
   svn_client_shelf_set_current_version,
   svn_client_shelf_export_patch): Remove.

Modified:
    subversion/trunk/subversion/include/svn_client.h
    subversion/trunk/subversion/libsvn_client/shelf.c

Modified: subversion/trunk/subversion/include/svn_client.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_client.h?rev=1841079&r1=1841078&r2=1841079&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_client.h (original)
+++ subversion/trunk/subversion/include/svn_client.h Mon Sep 17 15:53:33 2018
@@ -7068,37 +7068,6 @@ svn_client_shelf_save_new_version3(svn_c
                                    void *not_shelved_baton,
                                    apr_pool_t *scratch_pool);
 
-/** @deprecated Use svn_client_shelf_save_new_version3() instead.
- *
- * If any paths cannot be shelved, throw an error.
- *
- * If there are no local modifications in the specified locations, do not
- * create a new version of @a shelf; set @a *new_version_p to null and
- * return SVN_NO_ERROR. In this case @a shelf->max_version after the call
- * is the same as before the call.
- *
- * @warning EXPERIMENTAL.
- */
-SVN_DEPRECATED
-svn_error_t *
-svn_client_shelf_save_new_version2(svn_client_shelf_version_t **new_version_p,
-                                   svn_client_shelf_t *shelf,
-                                   const apr_array_header_t *paths,
-                                   svn_depth_t depth,
-                                   const apr_array_header_t *changelists,
-                                   apr_pool_t *scratch_pool);
-
-/** @deprecated Use svn_client_shelf_save_new_version2() instead.
- * @warning EXPERIMENTAL.
- */
-SVN_DEPRECATED
-svn_error_t *
-svn_client_shelf_save_new_version(svn_client_shelf_t *shelf,
-                                  const apr_array_header_t *paths,
-                                  svn_depth_t depth,
-                                  const apr_array_header_t *changelists,
-                                  apr_pool_t *scratch_pool);
-
 /** Delete all newer versions of @a shelf newer than @a shelf_version.
  *
  * If @a shelf_version is null, delete all versions of @a shelf. (The
@@ -7120,15 +7089,6 @@ svn_client_shelf_delete_newer_versions(s
                                        svn_client_shelf_version_t *shelf_version,
                                        apr_pool_t *scratch_pool);
 
-/** @deprecated Use svn_client_shelf_delete_newer_versions() instead.
- * @warning EXPERIMENTAL.
- */
-SVN_DEPRECATED
-svn_error_t *
-svn_client_shelf_set_current_version(svn_client_shelf_t *shelf,
-                                     int version_number,
-                                     apr_pool_t *scratch_pool);
-
 /** Return in @a shelf_version an existing version of @a shelf, given its
  * @a version_number. Error if that version doesn't exist.
  *
@@ -7233,15 +7193,6 @@ svn_client_shelf_unapply(svn_client_shel
                          svn_boolean_t dry_run,
                          apr_pool_t *scratch_pool);
 
-/** @deprecated Use svn_client__shelf_diff() instead.
- * @warning EXPERIMENTAL.
- */
-SVN_DEPRECATED
-svn_error_t *
-svn_client_shelf_export_patch(svn_client_shelf_version_t *shelf_version,
-                              svn_stream_t *outstream,
-                              apr_pool_t *scratch_pool);
-
 /** Set @a *affected_paths to a hash with one entry for each path affected
  * by the @a shelf_version.
  *

Modified: subversion/trunk/subversion/libsvn_client/shelf.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/shelf.c?rev=1841079&r1=1841078&r2=1841079&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/shelf.c (original)
+++ subversion/trunk/subversion/libsvn_client/shelf.c Mon Sep 17 15:53:33 2018
@@ -1877,23 +1877,6 @@ svn_client_shelf_unapply(svn_client_shel
 }
 
 svn_error_t *
-svn_client_shelf_set_current_version(svn_client_shelf_t *shelf,
-                                     int version_number,
-                                     apr_pool_t *scratch_pool)
-{
-  svn_client_shelf_version_t *shelf_version = NULL;
-
-  if (version_number > 0)
-    {
-      SVN_ERR(svn_client_shelf_version_open(&shelf_version, shelf, version_number,
-                                            scratch_pool, scratch_pool));
-    }
-  SVN_ERR(svn_client_shelf_delete_newer_versions(shelf, shelf_version,
-                                                 scratch_pool));
-  return SVN_NO_ERROR;
-}
-
-svn_error_t *
 svn_client_shelf_delete_newer_versions(svn_client_shelf_t *shelf,
                                        svn_client_shelf_version_t *shelf_version,
                                        apr_pool_t *scratch_pool)
@@ -1937,14 +1920,6 @@ svn_client__shelf_diff(svn_client_shelf_
 }
 
 svn_error_t *
-svn_client_shelf_export_patch(svn_client_shelf_version_t *shelf_version,
-                              svn_stream_t *outstream,
-                              apr_pool_t *scratch_pool)
-{
-  return SVN_NO_ERROR;
-}
-
-svn_error_t *
 svn_client_shelf_save_new_version3(svn_client_shelf_version_t **new_version_p,
                                    svn_client_shelf_t *shelf,
                                    const apr_array_header_t *paths,
@@ -1987,79 +1962,6 @@ svn_client_shelf_save_new_version3(svn_c
   return SVN_NO_ERROR;
 }
 
-/* A compatibility callback for counting not-shelved paths. */
-static svn_error_t *
-was_not_shelved(void *baton,
-                const char *path,
-                const svn_client_status_t *status,
-                apr_pool_t *scratch_pool)
-{
-  int *num_paths_not_shelved = baton;
-
-  ++(*num_paths_not_shelved);
-  return SVN_NO_ERROR;
-}
-
-/* A compatibility wrapper. */
-static svn_error_t *
-save_new_version2(svn_client_shelf_version_t **new_version_p,
-                  svn_client_shelf_t *shelf,
-                  const apr_array_header_t *paths,
-                  svn_depth_t depth,
-                  const apr_array_header_t *changelists,
-                  apr_pool_t *scratch_pool)
-{
-  svn_client_shelf_version_t *previous_version;
-  int num_paths_not_shelved = 0;
-
-  SVN_ERR(svn_client_shelf_get_newest_version(&previous_version, shelf,
-                                              scratch_pool, scratch_pool));
-  SVN_ERR(svn_client_shelf_save_new_version3(new_version_p, shelf,
-                                             paths, depth, changelists,
-                                             NULL, NULL,
-                                             was_not_shelved, &num_paths_not_shelved,
-                                             scratch_pool));
-  if (num_paths_not_shelved)
-    {
-      SVN_ERR(svn_client_shelf_delete_newer_versions(shelf, previous_version,
-                                                     scratch_pool));
-      return svn_error_createf(SVN_ERR_ILLEGAL_TARGET, NULL,
-                               Q_("%d path could not be shelved",
-                                  "%d paths could not be shelved",
-                                  num_paths_not_shelved),
-                               num_paths_not_shelved);
-    }
-
-  return SVN_NO_ERROR;
-}
-
-svn_error_t *
-svn_client_shelf_save_new_version2(svn_client_shelf_version_t **new_version_p,
-                                   svn_client_shelf_t *shelf,
-                                   const apr_array_header_t *paths,
-                                   svn_depth_t depth,
-                                   const apr_array_header_t *changelists,
-                                   apr_pool_t *scratch_pool)
-{
-  SVN_ERR(save_new_version2(new_version_p, shelf,
-                            paths, depth, changelists,
-                            scratch_pool));
-  return SVN_NO_ERROR;
-}
-
-svn_error_t *
-svn_client_shelf_save_new_version(svn_client_shelf_t *shelf,
-                                  const apr_array_header_t *paths,
-                                  svn_depth_t depth,
-                                  const apr_array_header_t *changelists,
-                                  apr_pool_t *scratch_pool)
-{
-  SVN_ERR(save_new_version2(NULL, shelf,
-                            paths, depth, changelists,
-                            scratch_pool));
-  return SVN_NO_ERROR;
-}
-
 svn_error_t *
 svn_client_shelf_get_log_message(char **log_message,
                                  svn_client_shelf_t *shelf,



Mime
View raw message