You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2018/01/12 12:23:44 UTC
svn commit: r1820974 - in /subversion/branches/shelve-checkpoint/subversion:
include/svn_client.h libsvn_client/shelve.c
Author: julianfoad
Date: Fri Jan 12 12:23:43 2018
New Revision: 1820974
URL: http://svn.apache.org/viewvc?rev=1820974&view=rev
Log:
On the 'shelve-checkpoint' branch: remove unused code.
Modified:
subversion/branches/shelve-checkpoint/subversion/include/svn_client.h
subversion/branches/shelve-checkpoint/subversion/libsvn_client/shelve.c
Modified: subversion/branches/shelve-checkpoint/subversion/include/svn_client.h
URL: http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/subversion/include/svn_client.h?rev=1820974&r1=1820973&r2=1820974&view=diff
==============================================================================
--- subversion/branches/shelve-checkpoint/subversion/include/svn_client.h (original)
+++ subversion/branches/shelve-checkpoint/subversion/include/svn_client.h Fri Jan 12 12:23:43 2018
@@ -6730,13 +6730,12 @@ typedef struct svn_client_shelf_t
{
/* Public fields (read-only for public use) */
const char *name;
- const char *log_message;
- apr_hash_t *revprops;
int max_version;
/* Private fields */
const char *wc_root_abspath;
const char *shelves_dir;
+ apr_hash_t *revprops;
svn_client_ctx_t *ctx;
apr_pool_t *pool;
} svn_client_shelf_t;
@@ -6881,20 +6880,6 @@ svn_client_shelf_get_paths(apr_hash_t **
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
-/** Set @a *has_changes to indicate whether @a shelf @a version
- * contains any modifications, in other words if svn_client_shelf_get_paths()
- * would return a non-empty set of paths.
- *
- * @since New in 1.10, changed in 1.X.
- * @warning EXPERIMENTAL.
- */
-SVN_EXPERIMENTAL
-svn_error_t *
-svn_client_shelf_has_changes(svn_boolean_t *has_changes,
- svn_client_shelf_t *shelf,
- int version,
- apr_pool_t *scratch_pool);
-
/** Set the log message in @a shelf, using the log message callbacks in
* the client context.
*
Modified: subversion/branches/shelve-checkpoint/subversion/libsvn_client/shelve.c
URL: http://svn.apache.org/viewvc/subversion/branches/shelve-checkpoint/subversion/libsvn_client/shelve.c?rev=1820974&r1=1820973&r2=1820974&view=diff
==============================================================================
--- subversion/branches/shelve-checkpoint/subversion/libsvn_client/shelve.c (original)
+++ subversion/branches/shelve-checkpoint/subversion/libsvn_client/shelve.c Fri Jan 12 12:23:43 2018
@@ -427,20 +427,6 @@ svn_client_shelf_get_paths(apr_hash_t **
}
svn_error_t *
-svn_client_shelf_has_changes(svn_boolean_t *has_changes,
- svn_client_shelf_t *shelf,
- int version,
- apr_pool_t *scratch_pool)
-{
- apr_hash_t *patch_paths;
-
- SVN_ERR(svn_client_shelf_get_paths(&patch_paths, shelf, version,
- scratch_pool, scratch_pool));
- *has_changes = (apr_hash_count(patch_paths) != 0);
- return SVN_NO_ERROR;
-}
-
-svn_error_t *
svn_client_shelf_apply(svn_client_shelf_t *shelf,
int version,
svn_boolean_t dry_run,