You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by pr...@apache.org on 2013/04/05 07:29:34 UTC
svn commit: r1464833 [2/11] - in /subversion/branches/verify-keep-going: ./
build/ build/generator/ contrib/client-side/svncopy/ notes/
subversion/bindings/javahl/native/
subversion/bindings/javahl/src/org/apache/subversion/javahl/
subversion/bindings/...
Modified: subversion/branches/verify-keep-going/subversion/include/svn_client.h
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/include/svn_client.h?rev=1464833&r1=1464832&r2=1464833&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/include/svn_client.h (original)
+++ subversion/branches/verify-keep-going/subversion/include/svn_client.h Fri Apr 5 05:29:29 2013
@@ -515,10 +515,11 @@ typedef struct svn_client_commit_item3_t
* When committing a move, this contains the absolute path where
* the node was directly moved from. (If an ancestor at the original
* location was moved then it points to where the node itself was
- * moved, from. Not the original location)
+ * moved from; not the original location.)
* @since New in 1.8.
*/
const char *moved_from_abspath;
+
} svn_client_commit_item3_t;
/** The commit candidate structure.
@@ -1857,8 +1858,9 @@ svn_client_delete(svn_client_commit_info
* for it when walking the directory tree. Only the kind of node, including
* special status is available in @a dirent.
*
- * Implementations can set @a *filtered to TRUE, to make the import filter the
- * node and (if the node is a directory) all its descendants.
+ * Implementations can set @a *filtered to TRUE, to make the import
+ * process omit the node and (if the node is a directory) all its
+ * descendants.
*
* @a scratch_pool can be used for temporary allocations.
*
@@ -2093,9 +2095,9 @@ svn_client_import(svn_client_commit_info
*
* If @a include_file_externals and/or @a include_dir_externals are #TRUE,
* also commit all file and/or dir externals (respectively) that are reached
- * by recursion, with these exceptions: Never recurse to externals
- * - that have a fixed revision or
- * - that come from a different repository root URL (dir externals).
+ * by recursion, except for those externals which:
+ * - have a fixed revision, or
+ * - come from a different repository root URL (dir externals).
* These flags affect only recursion; externals that directly appear in @a
* targets are always included in the commit.
*
@@ -2140,6 +2142,7 @@ svn_client_commit6(const apr_array_heade
/**
* Similar to svn_client_commit6(), but passes @a include_file_externals as
* FALSE and @a include_dir_externals as FALSE.
+ *
* @since New in 1.7.
* @deprecated Provided for backward compatibility with the 1.7 API.
*/
@@ -3031,8 +3034,10 @@ svn_client_diff6(const apr_array_header_
apr_pool_t *pool);
/** Similar to svn_client_diff6(), but with @a outfile and @a errfile,
- * instead of @a outstream and @a errstream, and always showing property
- * changes and additions.
+ * instead of @a outstream and @a errstream, and with @a
+ * no_diff_added, @a ignore_properties, and @a properties_only always
+ * passed as @c FALSE (which means that additions and property changes
+ * are always transmitted).
*
* @deprecated Provided for backward compatibility with the 1.7 API.
* @since New in 1.7.
@@ -3192,9 +3197,11 @@ svn_client_diff_peg6(const apr_array_hea
svn_client_ctx_t *ctx,
apr_pool_t *pool);
-/** Similar to svn_client_diff_peg6(), but with @a outfile and @a errfile,
- * instead of @a outstream and @a errstream, and always showing property
- * changes.
+/** Similar to svn_client_diff6_peg6(), but with @a outfile and @a errfile,
+ * instead of @a outstream and @a errstream, and with @a
+ * no_diff_added, @a ignore_properties, and @a properties_only always
+ * passed as @c FALSE (which means that additions and property changes
+ * are always transmitted).
*
* @deprecated Provided for backward compatibility with the 1.7 API.
* @since New in 1.7.
@@ -3458,7 +3465,7 @@ typedef struct svn_client_automatic_merg
* @a allow_switched_subtrees enable merging into a WC that is in any or all
* of the states described by their names, but only if this function decides
* that the merge will be in the same direction as the last automatic merge.
- * If, on the other hand, the merge turns out to be in the opposite
+ * If, on the other hand, the last automatic merge was in the opposite
* direction (that is, if svn_client_automatic_merge_is_reintegrate_like()
* would return true), then such states of the WC are not allowed regardless
* of these flags. This function merely records these flags in the
@@ -3484,8 +3491,9 @@ svn_client_find_automatic_merge(svn_clie
/** Find out what kind of automatic merge would be needed, when the target
* is only known as a repository location rather than a WC.
*
- * Like svn_client_find_automatic_merge() except that @a source_path_or_url
- * at @a source_revision should refer to a repository location and not a WC.
+ * Like svn_client_find_automatic_merge() except that the target is
+ * specified by @a target_path_or_url at @a target_revision, which must
+ * refer to a repository location, instead of by a WC path argument.
*
* @note The result, @a *merge_p, is not intended for passing to
* svn_client_do_automatic_merge().
@@ -3512,11 +3520,16 @@ svn_client_find_automatic_merge_no_wc(
/** Perform an automatic merge.
*
* Perform a merge, according to the information stored in @a merge, into
- * the WC at @a target_wcpath. The @a merge structure would typically come
- * from calling svn_client_find_automatic_merge().
+ * the WC at @a target_wcpath. The @a merge structure must be obtained
+ * from svn_client_find_automatic_merge().
*
* The other parameters are as in svn_client_merge5().
*
+ * Return an error if the WC contains local modifications, mixed revisions
+ * and/or switched subtrees, unless such states are allowed by the
+ * corresponding parameters passed to svn_client_find_automatic_merge()
+ * and the required merge is not reintegrate-like.
+ *
* @since New in 1.8.
*/
svn_error_t *
@@ -3779,10 +3792,23 @@ svn_client_merge_reintegrate(const char
apr_pool_t *pool);
/**
- * Merge the changes between the filesystem object @a source_path_or_url in peg
- * revision @a source_peg_revision, as it changed between the ranges described
- * in @a ranges_to_merge.
- *
+ * Merge changes from the source branch identified by
+ * @a source_path_or_url in peg revision @a source_peg_revision,
+ * into the target branch working copy at @a target_wcpath.
+ *
+ * If @a ranges_to_merge is NULL then perform an automatic merge of
+ * all the eligible changes up to @a source_peg_revision. Do this in
+ * the same way as calling svn_client_find_automatic_merge() and then
+ * svn_client_do_automatic_merge(). If the merge is determined to be
+ * of the 'reintegrate' kind, then return an error if the WC contains
+ * mixed revisions, local modifications and/or switched subtrees; if
+ * the merge is determined to be of the non-reintegrate kind, then
+ * return an error if @a allow_mixed_rev is false and the WC contains
+ * mixed revisions.
+ *
+ * If @a ranges_to_merge is not NULL then merge the changes specified
+ * by the revision ranges in @a ranges_to_merge, or, when honouring
+ * mergeinfo, only the eligible parts of those revision ranges.
* @a ranges_to_merge is an array of <tt>svn_opt_revision_range_t
* *</tt> ranges. These ranges may describe additive and/or
* subtractive merge ranges, they may overlap fully or partially,
@@ -3791,6 +3817,8 @@ svn_client_merge_reintegrate(const char
* list of provided ranges has an `unspecified' or unrecognized
* `kind', return #SVN_ERR_CLIENT_BAD_REVISION.
*
+ * If @a ranges_to_merge is an empty array, then do nothing.
+ *
* All other options are handled identically to svn_client_merge5().
*
* @since New in 1.8.
@@ -3812,7 +3840,8 @@ svn_client_merge_peg5(const char *source
apr_pool_t *pool);
/**
- * Similar to svn_client_merge_peg5(), but the single @a ignore_ancestry
+ * Similar to svn_client_merge_peg5(), but automatic merge is not available
+ * (@a ranges_to_merge must not be NULL), and the single @a ignore_ancestry
* parameter maps to both @c ignore_mergeinfo and @c diff_ignore_ancestry.
*
* @deprecated Provided for backward compatibility with the 1.7 API.
@@ -3971,6 +4000,9 @@ svn_client_mergeinfo_get_merged(apr_hash
* @c svn_opt_revision_unspecified, no bounding occurs and the entire
* history of the merge source (up to @a source_peg_revision, per the
* typical default peg/operative revision behaviors) is considered.
+ * If @a source_start_revision is younger than @a source_end_revision,
+ * then @a receiver is called from youngest to oldest revisions.
+ * Otherwise @a receiver is called from oldest to youngest revisions.
*
* If @a depth is #svn_depth_empty consider only the explicit or
* inherited mergeinfo on @a target_path_or_url when calculating merged
@@ -4607,8 +4639,8 @@ svn_client_move7(const apr_array_header_
apr_pool_t *pool);
/**
- * Similar to svn_client_move7(), but with allow_mixed_revisions always
- * set to @c TRUE and record_only always to @c FALSE.
+ * Similar to svn_client_move7(), but with @a allow_mixed_revisions always
+ * set to @c TRUE and @a metadata_only always to @c FALSE.
*
* @since New in 1.7.
* @deprecated Provided for backward compatibility with the 1.7 API.
@@ -4985,8 +5017,9 @@ svn_client_revprop_set(const char *propn
* #svn_prop_inherited_item_t->path_or_url members are absolute working copy
* paths.
*
- * Allocate @a *props, its keys, and its values in @a pool, use
- * @a scratch_pool for temporary allocations.
+ * Allocate @a *props (including keys and values) and @a *inherited_props
+ * (including its elements) in @a result_pool, use @a scratch_pool for
+ * temporary allocations.
*
* @a target is a WC absolute path or a URL.
*
@@ -5040,8 +5073,8 @@ svn_client_propget5(apr_hash_t **props,
apr_pool_t *scratch_pool);
/**
- * Similar to svn_client_propget5 but doesn't support the retrieval of the
- * properties inherited by @a target.
+ * Similar to svn_client_propget5 but with @a inherited_props always
+ * passed as NULL.
*
* @since New in 1.7.
* @deprecated Provided for backward compatibility with the 1.8 API.
@@ -5200,9 +5233,9 @@ svn_client_proplist4(const char *target,
apr_pool_t *scratch_pool);
/**
- * Similar to svn_client_proplist4(), except that the @a receiver type is
- * a #svn_proplist_receiver_t and there is no support for finding the
- * inherited properties for @a target and there is no separate scratch pool.
+ * Similar to svn_client_proplist4(), except that the @a receiver type
+ * is a #svn_proplist_receiver_t, @a get_target_inherited_props is
+ * always passed NULL, and there is no separate scratch pool.
*
* @since New in 1.5.
*
@@ -5477,7 +5510,7 @@ svn_client_export(svn_revnum_t *result_r
* Moreover, we will never mix items which are part of separate
* externals, and will always finish listing an external before listing
* the next one.
-
+ *
* @a scratch_pool may be used for temporary allocations.
*
* @since New in 1.8.
@@ -5560,8 +5593,8 @@ svn_client_list3(const char *path_or_url
apr_pool_t *pool);
-/** Similar to svn_client_list3(), but with @a include_externals set to FALSE,
- * and using a #svn_client_list_func_t as callback.
+/** Similar to svn_client_list3(), but with @a include_externals set
+ * to FALSE, and using a #svn_client_list_func_t as callback.
*
* @deprecated Provided for backwards compatibility with the 1.7 API.
*
@@ -6505,7 +6538,7 @@ svn_client_uuid_from_path(const char **u
* If @a wri_abspath is not NULL, use the working copy identified by @a
* wri_abspath to potentially avoid transferring unneeded data.
*
- * @note This function is similar to svn_ra_open3(), but the caller avoids
+ * @note This function is similar to svn_ra_open4(), but the caller avoids
* having to providing its own callback functions.
* @since New in 1.8.
*/
@@ -6517,8 +6550,9 @@ svn_client_open_ra_session2(svn_ra_sessi
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
-/** Similar to svn_client_open_ra_session(), but doesn't allow passing a
- * working copy path.
+/** Similar to svn_client_open_ra_session(), but with @ wri_abspath
+ * always passed as NULL, and with the same pool used as both @a
+ * result_pool and @a scratch_pool.
*
* @since New in 1.3.
* @deprecated Provided for backward compatibility with the 1.7 API.
Modified: subversion/branches/verify-keep-going/subversion/include/svn_cmdline.h
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/include/svn_cmdline.h?rev=1464833&r1=1464832&r2=1464833&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/include/svn_cmdline.h (original)
+++ subversion/branches/verify-keep-going/subversion/include/svn_cmdline.h Fri Apr 5 05:29:29 2013
@@ -369,27 +369,6 @@ svn_cmdline_setup_auth_baton(svn_auth_ba
void *cancel_baton,
apr_pool_t *pool);
-/** Wrapper for apr_getopt_init(), which see.
- *
- * @since New in 1.4.
- *
- * This is a private API for Subversion's own use.
- */
-svn_error_t *
-svn_cmdline__getopt_init(apr_getopt_t **os,
- int argc,
- const char *argv[],
- apr_pool_t *pool);
-
-/* Determine whether interactive mode should be enabled, based on whether
- * the user passed the --non-interactive or --force-interactive options.
- * If neither option was passed, interactivity is enabled if standard
- * input is connected to a terminal device.
- * @since New in 1.8. */
-svn_boolean_t
-svn_cmdline__be_interactive(svn_boolean_t non_interactive,
- svn_boolean_t force_interactive);
-
#ifdef __cplusplus
}
#endif /* __cplusplus */
Modified: subversion/branches/verify-keep-going/subversion/include/svn_config.h
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/include/svn_config.h?rev=1464833&r1=1464832&r2=1464833&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/include/svn_config.h (original)
+++ subversion/branches/verify-keep-going/subversion/include/svn_config.h Fri Apr 5 05:29:29 2013
@@ -62,6 +62,10 @@ typedef struct svn_config_t svn_config_t
* client configuration files.
* @{
*/
+
+ /* This list of #defines is intentionally presented as a nested list
+ that matches the in-config hierarchy. */
+
#define SVN_CONFIG_CATEGORY_SERVERS "servers"
#define SVN_CONFIG_SECTION_GROUPS "groups"
#define SVN_CONFIG_SECTION_GLOBAL "global"
@@ -126,7 +130,7 @@ typedef struct svn_config_t svn_config_t
/** @since New in 1.8. */
#define SVN_CONFIG_SECTION_WORKING_COPY "working-copy"
/** @since New in 1.8. */
-#define SVN_CONFIG_OPTION_SQLITE_EXCLUSIVE "exclusive-locking"
+#define SVN_CONFIG_OPTION_SQLITE_EXCLUSIVE "exclusive-locking"
/** @since New in 1.8. */
#define SVN_CONFIG_OPTION_SQLITE_EXCLUSIVE_CLIENTS "exclusive-locking-clients"
/** @} */
@@ -227,8 +231,8 @@ svn_config_create(svn_config_t **cfgp,
* If @a file does not exist, then if @a must_exist, return an error,
* otherwise return an empty @c svn_config_t.
*
- * If @a section_names_case_sensitive is TRUE, populate section name hashes
- * case sensitively, except for the default SVN_CONFIG__DEFAULT_SECTION.
+ * If @a section_names_case_sensitive is @c TRUE, populate section name hashes
+ * case sensitively, except for the default #SVN_CONFIG__DEFAULT_SECTION.
*
* @since New in 1.7.
*/
@@ -240,7 +244,7 @@ svn_config_read2(svn_config_t **cfgp,
svn_boolean_t section_names_case_sensitive,
apr_pool_t *pool);
-/** Similar to svn_config_read2, but always passes FALSE to
+/** Similar to svn_config_read2, but always passes @c FALSE to
* section_names_case_sensitive.
*
* @deprecated Provided for backward compatibility with 1.6 API.
@@ -255,8 +259,8 @@ svn_config_read(svn_config_t **cfgp,
/** Read configuration data from @a stream into @a *cfgp, allocated in
* @a result_pool.
*
- * If @a section_names_case_sensitive is TRUE, populate section name hashes
- * case sensitively, except for the default SVN_CONFIG__DEFAULT_SECTION.
+ * If @a section_names_case_sensitive is @c TRUE, populate section name hashes
+ * case sensitively, except for the default #SVN_CONFIG__DEFAULT_SECTION.
*
* @since New in 1.8.
*/
@@ -335,12 +339,14 @@ svn_config_set_bool(svn_config_t *cfg,
const char *option,
svn_boolean_t value);
-/** Like svn_config_get(), but for 64 bit signed integers.
+/** Like svn_config_get(), but for 64-bit signed integers.
*
- * Parses the option as an integer value. Returns an error if the option
- * could not be converted to an integer.
+ * Parses the @a option in @a section of @a cfg as an integer value,
+ * setting @a *valuep to the result. If the option is not found, sets
+ * @a *valuep to @a default_value. If the option is found but cannot
+ * be converted to an integer, returns an error.
*
- * @since New in 1.8
+ * @since New in 1.8.
*/
svn_error_t *
svn_config_get_int64(svn_config_t *cfg,
@@ -349,11 +355,12 @@ svn_config_get_int64(svn_config_t *cfg,
const char *option,
apr_int64_t default_value);
-/** Like svn_config_set(), but for 64 bit signed integers.
+/** Like svn_config_set(), but for 64-bit signed integers.
*
- * Sets the option to the signed decimal @a value.
+ * Sets the value of @a option in @a section of @a cfg to the signed
+ * decimal @a value.
*
- * @since New in 1.8
+ * @since New in 1.8.
*/
void
svn_config_set_int64(svn_config_t *cfg,
@@ -384,17 +391,24 @@ svn_config_get_yes_no_ask(svn_config_t *
const char *option,
const char* default_value);
-/** Like svn_config_set(), but for tristate values.
+/** Like svn_config_get_bool(), but for tristate values.
*
- * Sets the option to 'TRUE'/'FALSE'/'UNKNOWN', depending on @a value.
+ * Set @a *valuep to #svn_tristate_true, #svn_tristate_false, or
+ * #svn_tristate_unknown, depending on the value of @a option in @a
+ * section of @a cfg. True and false values are the same as for
+ * svn_config_get_bool(); @a unknown_value specifies the option value
+ * allowed for third state (#svn_tristate_unknown).
*
- * @a unknown_value specifies options value value allowed for third state.
+ * Use @a default_value as the default value if @a option cannot be
+ * found.
*
* @since New in 1.8.
*/
svn_error_t *
-svn_config_get_tristate(svn_config_t *cfg, svn_tristate_t *valuep,
- const char *section, const char *option,
+svn_config_get_tristate(svn_config_t *cfg,
+ svn_tristate_t *valuep,
+ const char *section,
+ const char *option,
const char *unknown_value,
svn_tristate_t default_value);
Modified: subversion/branches/verify-keep-going/subversion/include/svn_dav.h
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/include/svn_dav.h?rev=1464833&r1=1464832&r2=1464833&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/include/svn_dav.h (original)
+++ subversion/branches/verify-keep-going/subversion/include/svn_dav.h Fri Apr 5 05:29:29 2013
@@ -277,12 +277,27 @@ extern "C" {
* @name Custom (extension) values for the DAV header.
* Note that although these share the SVN_DAV_PROP_NS_DAV namespace
* prefix, they are not properties; they are header values.
- *
- * @{ **/
+ * @{
+ */
+
+/* ##################################################################
+ *
+ * WARNING: At least some versions of Microsoft's Web Folders
+ * WebDAV client implementation are unable to handle
+ * DAV: headers with values longer than 63 characters,
+ * so please keep these strings within that limit.
+ *
+ * ##################################################################
+ */
+
/** Presence of this in a DAV header in an OPTIONS request or response
- * indicates that the transmitter supports @c svn_depth_t. */
-#define SVN_DAV_NS_DAV_SVN_DEPTH SVN_DAV_PROP_NS_DAV "svn/depth"
+ * indicates that the transmitter supports @c svn_depth_t.
+ *
+ * @since New in 1.5.
+ */
+#define SVN_DAV_NS_DAV_SVN_DEPTH\
+ SVN_DAV_PROP_NS_DAV "svn/depth"
/** Presence of this in a DAV header in an OPTIONS request or response
* indicates that the server knows how to handle merge-tracking
@@ -291,62 +306,85 @@ extern "C" {
* Note that this says nothing about whether the repository can handle
* mergeinfo, only whether the server does. For more information, see
* mod_dav_svn/version.c:get_vsn_options().
+ *
+ * @since New in 1.5.
*/
-#define SVN_DAV_NS_DAV_SVN_MERGEINFO SVN_DAV_PROP_NS_DAV "svn/mergeinfo"
+#define SVN_DAV_NS_DAV_SVN_MERGEINFO\
+ SVN_DAV_PROP_NS_DAV "svn/mergeinfo"
/** Presence of this in a DAV header in an OPTIONS response indicates
* that the transmitter (in this case, the server) knows how to send
- * custom revprops in log responses. */
-#define SVN_DAV_NS_DAV_SVN_LOG_REVPROPS SVN_DAV_PROP_NS_DAV "svn/log-revprops"
+ * custom revprops in log responses.
+ *
+ * @since New in 1.5.
+ */
+#define SVN_DAV_NS_DAV_SVN_LOG_REVPROPS\
+ SVN_DAV_PROP_NS_DAV "svn/log-revprops"
/** Presence of this in a DAV header in an OPTIONS response indicates
* that the transmitter (in this case, the server) knows how to handle
- * a replay of a directory in the repository (not root). */
+ * a replay of a directory in the repository (not root).
+ *
+ * @since New in 1.5.
+ */
#define SVN_DAV_NS_DAV_SVN_PARTIAL_REPLAY\
SVN_DAV_PROP_NS_DAV "svn/partial-replay"
/** Presence of this in a DAV header in an OPTIONS response indicates
* that the transmitter (in this case, the server) knows how to enforce
* old-value atomicity in PROPPATCH (for editing revprops).
- * @since New in 1.7 */
+ *
+ * @since New in 1.7.
+ */
#define SVN_DAV_NS_DAV_SVN_ATOMIC_REVPROPS\
SVN_DAV_PROP_NS_DAV "svn/atomic-revprops"
/** Presence of this in a DAV header in an OPTIONS response indicates
* that the transmitter (in this case, the server) knows how to get
* inherited properties.
- * @since New in 1.8. */
-#define SVN_DAV_NS_DAV_SVN_INHERITED_PROPS \
- SVN_DAV_PROP_NS_DAV "svn/inherited-props"
+ *
+ * @since New in 1.8.
+ */
+#define SVN_DAV_NS_DAV_SVN_INHERITED_PROPS\
+ SVN_DAV_PROP_NS_DAV "svn/inherited-props"
/** Presence of this in a DAV header in an OPTIONS response indicates
* that the transmitter (in this case, the server) knows how to
* properly handle ephemeral (that is, deleted-just-before-commit) FS
* transaction properties.
- * @since New in 1.8. */
+ *
+ * @since New in 1.8.
+ */
#define SVN_DAV_NS_DAV_SVN_EPHEMERAL_TXNPROPS\
SVN_DAV_PROP_NS_DAV "svn/ephemeral-txnprops"
/** Presence of this in a DAV header in an OPTIONS response indicates
- * that the transmitter (in this case, the server) supports serving properties
- * inline in update editor when 'send-all' is 'false'.
- * @since New in 1.8. */
+ * that the transmitter (in this case, the server) supports serving
+ * properties inline in update editor when 'send-all' is 'false'.
+ *
+ * @since New in 1.8.
+ */
#define SVN_DAV_NS_DAV_SVN_INLINE_PROPS\
SVN_DAV_PROP_NS_DAV "svn/inline-props"
/** Presence of this in a DAV header in an OPTIONS response indicates
* that the transmitter (in this case, the server) knows how to handle
* a replay of a revision resource. Transmitters must be
- * HTTP-v2-enabled to support this feature. */
+ * HTTP-v2-enabled to support this feature.
+ *
+ * @since New in 1.8.
+ */
#define SVN_DAV_NS_DAV_SVN_REPLAY_REV_RESOURCE\
SVN_DAV_PROP_NS_DAV "svn/replay-rev-resource"
/** Presence of this in a DAV header in an OPTIONS response indicates
* that the transmitter (in this case, the server) knows how to handle
* a reversed fetch of file versions.
- * @since New in 1.8. */
-#define SVN_DAV_NS_DAV_SVN_GET_FILE_REVS_REVERSE\
- SVN_DAV_PROP_NS_DAV "svn/get-file-revs-rvrs"
+ *
+ * @since New in 1.8.
+ */
+#define SVN_DAV_NS_DAV_SVN_REVERSE_FILE_REVS\
+ SVN_DAV_PROP_NS_DAV "svn/reverse-file-revs"
/** @} */
Modified: subversion/branches/verify-keep-going/subversion/include/svn_delta.h
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/include/svn_delta.h?rev=1464833&r1=1464832&r2=1464833&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/include/svn_delta.h (original)
+++ subversion/branches/verify-keep-going/subversion/include/svn_delta.h Fri Apr 5 05:29:29 2013
@@ -1119,70 +1119,6 @@ typedef struct svn_delta_editor_t
svn_delta_editor_t *
svn_delta_default_editor(apr_pool_t *pool);
-/** Callback to retrieve a node's entire set of properties. This is
- * needed by the various editor shims in order to effect backward compat.
- *
- * @since New in 1.8.
- */
-typedef svn_error_t *(*svn_delta_fetch_props_func_t)(
- apr_hash_t **props,
- void *baton,
- const char *path,
- svn_revnum_t base_revision,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool
- );
-
-/** Callback to retrieve a node's kind. This is needed by the various editor
- * shims in order to effect backward compat.
- *
- * @since New in 1.8.
- */
-typedef svn_error_t *(*svn_delta_fetch_kind_func_t)(
- svn_node_kind_t *kind,
- void *baton,
- const char *path,
- svn_revnum_t base_revision,
- apr_pool_t *scratch_pool
- );
-
-/** Callback to fetch the FILENAME of a file to use as the delta base for
- * PATH. The file should last at least as long as RESULT_POOL. If the base
- * stream is empty, return NULL through FILENAME.
- *
- * @since New in 1.8.
- */
-typedef svn_error_t *(*svn_delta_fetch_base_func_t)(
- const char **filename,
- void *baton,
- const char *path,
- svn_revnum_t base_revision,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool
- );
-
-/** Collection of callbacks used for the shim code. To enable this struct
- * to grow, always use svn_delta_shim_callbacks_default()
- * to allocate new instances of it.
- *
- * @since New in 1.8.
- */
-typedef struct svn_delta_shim_callbacks_t
-{
- svn_delta_fetch_props_func_t fetch_props_func;
- svn_delta_fetch_kind_func_t fetch_kind_func;
- svn_delta_fetch_base_func_t fetch_base_func;
- void *fetch_baton;
-} svn_delta_shim_callbacks_t;
-
-/** Return a collection of default shim functions in @a result_pool.
- *
- * @since New in 1.8.
- */
-svn_delta_shim_callbacks_t *
-svn_delta_shim_callbacks_default(apr_pool_t *result_pool);
-
-
/** A text-delta window handler which does nothing.
*
* Editors can return this handler from @c apply_textdelta if they don't
Modified: subversion/branches/verify-keep-going/subversion/include/svn_error.h
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/include/svn_error.h?rev=1464833&r1=1464832&r2=1464833&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/include/svn_error.h (original)
+++ subversion/branches/verify-keep-going/subversion/include/svn_error.h Fri Apr 5 05:29:29 2013
@@ -210,7 +210,7 @@ void
svn_error_clear(svn_error_t *error);
-#if defined(SVN_DEBUG)
+#if defined(SVN_ERR__TRACING)
/** Set the error location for debug mode. */
void
svn_error__locate(const char *file,
@@ -461,10 +461,22 @@ svn_error_t *svn_error_purge_tracing(svn
abort(); \
} while (1)
-/** Like SVN_ERR_ASSERT(), but append ERR to the returned error chain.
+/** Check that a condition is true: if not, report an error (appending
+ * ERR if non-NULL) and possibly terminate the program.
*
- * If EXPR is false, return a malfunction error whose chain includes ERR.
- * If EXPR is true, do nothing. (In particular, this does not clear ERR.)
+ * If the boolean expression @a expr is true, do nothing. Otherwise,
+ * act as determined by the current "malfunction handler" which may have
+ * been specified by a call to svn_error_set_malfunction_handler() or else
+ * is the default handler as specified in that function's documentation. If
+ * the malfunction handler returns, then cause the function using this macro
+ * to return the error object that it generated.
+ *
+ * @note The intended use of this macro is to check a condition that cannot
+ * possibly be false unless there is a bug in the program.
+ *
+ * @note The condition to be checked should not be computationally expensive
+ * if it is reached often, as, unlike traditional "assert" statements, the
+ * evaluation of this expression is not compiled out in release-mode builds.
*
* Types: (svn_boolean_t expr, svn_error_t *err)
*
@@ -485,38 +497,13 @@ svn_error_t *svn_error_purge_tracing(svn
} while (0)
#endif
-
-/** Check that a condition is true: if not, report an error and possibly
- * terminate the program.
- *
- * If the Boolean expression @a expr is true, do nothing. Otherwise,
- * act as determined by the current "malfunction handler" which may have
- * been specified by a call to svn_error_set_malfunction_handler() or else
- * is the default handler as specified in that function's documentation. If
- * the malfunction handler returns, then cause the function using this macro
- * to return the error object that it generated.
- *
- * @note The intended use of this macro is to check a condition that cannot
- * possibly be false unless there is a bug in the program.
+/** Like SVN_ERR_ASSERT_E(), but with @a err always NULL.
*
- * @note The condition to be checked should not be computationally expensive
- * if it is reached often, as, unlike traditional "assert" statements, the
- * evaluation of this expression is not compiled out in release-mode builds.
+ * @see SVN_ERR_ASSERT_E()
*
* @since New in 1.6.
- *
- * @see SVN_ERR_ASSERT_E()
*/
-#ifdef __clang_analyzer__
-#include <assert.h>
-#define SVN_ERR_ASSERT(expr) assert((expr))
-#else
-#define SVN_ERR_ASSERT(expr) \
- do { \
- if (!(expr)) \
- SVN_ERR(svn_error__malfunction(TRUE, __FILE__, __LINE__, #expr)); \
- } while (0)
-#endif
+#define SVN_ERR_ASSERT(expr) SVN_ERR_ASSERT_E(expr, NULL)
/** Similar to SVN_ERR_ASSERT(), but without the option of returning
* an error to the calling function.
Modified: subversion/branches/verify-keep-going/subversion/include/svn_error_codes.h
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/include/svn_error_codes.h?rev=1464833&r1=1464832&r2=1464833&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/include/svn_error_codes.h (original)
+++ subversion/branches/verify-keep-going/subversion/include/svn_error_codes.h Fri Apr 5 05:29:29 2013
@@ -1428,12 +1428,12 @@ SVN_ERROR_START
/** @since New in 1.8. */
SVN_ERRDEF(SVN_ERR_TOO_MANY_MEMCACHED_SERVERS,
SVN_ERR_MISC_CATEGORY_START + 36,
- "too many memcached servers configured")
+ "Too many memcached servers configured")
/** @since New in 1.8. */
SVN_ERRDEF(SVN_ERR_MALFORMED_VERSION_STRING,
SVN_ERR_MISC_CATEGORY_START + 37,
- "failed to parse version number string")
+ "Failed to parse version number string")
/** @since New in 1.8. */
SVN_ERRDEF(SVN_ERR_CORRUPTED_ATOMIC_STORAGE,
Modified: subversion/branches/verify-keep-going/subversion/include/svn_fs.h
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/include/svn_fs.h?rev=1464833&r1=1464832&r2=1464833&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/include/svn_fs.h (original)
+++ subversion/branches/verify-keep-going/subversion/include/svn_fs.h Fri Apr 5 05:29:29 2013
@@ -95,6 +95,24 @@ typedef struct svn_fs_t svn_fs_t;
*/
#define SVN_FS_CONFIG_FSFS_CACHE_REVPROPS "fsfs-cache-revprops"
+/** Select the cache namespace. If you potentially share the cache with
+ * another FS object for the same repository, objects read through one FS
+ * will not need to be read again for the other. In most cases, that is
+ * a very desirable behavior and the default is, therefore, an empty
+ * namespace.
+ *
+ * If you want to be sure that your FS instance will actually read all
+ * requested data at least once, you need to specify a separate namespace
+ * for it. All repository verification code, for instance, should use
+ * some GUID here that is different each time you open an FS instance.
+ *
+ * @since New in 1.8.
+ */
+#define SVN_FS_CONFIG_FSFS_CACHE_NS "fsfs-cache-namespace"
+
+/* Note to maintainers: if you add further SVN_FS_CONFIG_FSFS_CACHE_* knobs,
+ update fs_fs.c:verify_as_revision_before_current_plus_plus(). */
+
/* See also svn_fs_type(). */
/** @since New in 1.1. */
#define SVN_FS_CONFIG_FS_TYPE "fs-type"
@@ -276,73 +294,6 @@ typedef void (*svn_fs_progress_notify_fu
apr_pool_t *pool);
/**
- * Perform backend-specific data consistency and correctness validations
- * to the Subversion filesystem (mainly the meta-data) located in the
- * directory @a path. Use @a scratch_pool for temporary allocations.
- *
- * @a start and @a end are used to limit the amount of checks being done
- * to data that is relevant to that range of revisions. However, this is
- * only a lower limit to the actual amount of checks being done. The
- * backend may not even be able to limit the errors begin reported.
- * @a start and @a end may be #SVN_INVALID_REVNUM, in which case
- * svn_repos_verify_fs2()'s semantics apply. When @c r0 is being
- * verified, global invariants may be verified as well.
- *
- * The optional @a notify_func callback is only a general feedback that
- * the operation is still in process but may be called in random revisions
- * order and more than once for the same revision, i.e. r2, r1, r2 would
- * be a valid sequence.
- *
- * The optional @a cancel_func callback will be invoked as usual to allow
- * the user to preempt this potentially lengthy operation.
- *
- * @note You probably don't want to use this directly. Take a look at
- * svn_repos_verify_fs2() instead, which does non-backend-specific
- * verifications as well.
- *
- * @note To ensure a full verification using all tests and covering all
- * revisions, you must call this function *and* #svn_fs_verify_rev.
- *
- * @note Implementors, please do tests that can be done efficiently for
- * a single revision to #svn_fs_verify_rev. This function is meant for
- * global checks or tests that require an expensive context setup.
- *
- * @since New in 1.8.
- */
-svn_error_t *
-svn_fs_verify(const char *path,
- svn_revnum_t start,
- svn_revnum_t end,
- svn_fs_progress_notify_func_t notify_func,
- void *notify_baton,
- svn_cancel_func_t cancel_func,
- void *cancel_baton,
- apr_pool_t *scratch_pool);
-
-/**
- * Perform backend-specific data consistency and correctness validations
- * to revision @a revision of the Subversion filesystem @a fs.
- * Use @a scratch_pool for temporary allocations.
- *
- * @note You probably don't want to use this directly. Take a look at
- * svn_repos_verify_fs3() instead, which does non-backend-specific
- * verifications as well.
- *
- * @note To ensure a full verification using all tests and covering all
- * revisions, you must call this function *and* #svn_fs_verify.
- *
- * @note Implementors, please do tests that cannot be done efficiently for
- * a single revision to #svn_fs_verify. This function is meant for local
- * checks that don't require an expensive context setup.
- *
- * @since New in 1.8.
- */
-svn_error_t *
-svn_fs_verify_rev(svn_fs_t *fs,
- svn_revnum_t revision,
- apr_pool_t *scratch_pool);
-
-/**
* Return, in @a *fs_type, a string identifying the back-end type of
* the Subversion filesystem located in @a path. Allocate @a *fs_type
* in @a pool.
@@ -393,9 +344,10 @@ svn_fs_delete_fs(const char *path,
* means deleting copied, unused logfiles for a Berkeley DB source
* filesystem.
*
- * If @a incremental is TRUE, make an effort to not re-copy information
- * already present in the destination. If incremental hotcopy is not
- * implemented, raise SVN_ERR_UNSUPPORTED_FEATURE.
+ * If @a incremental is TRUE, make an effort to avoid re-copying
+ * information already present in the destination where possible. If
+ * incremental hotcopy is not implemented, raise
+ * #SVN_ERR_UNSUPPORTED_FEATURE.
*
* Use @a scratch_pool for temporary allocations.
*
@@ -411,8 +363,8 @@ svn_fs_hotcopy2(const char *src_path,
apr_pool_t *scratch_pool);
/**
- * Like svn_fs_hotcopy2(), but without the @a incremental parameter
- * and without cancellation support.
+ * Like svn_fs_hotcopy2(), but with @a incremental always passed as @c
+ * TRUE and without cancellation support.
*
* @deprecated Provided for backward compatibility with the 1.7 API.
* @since New in 1.1.
@@ -472,7 +424,9 @@ svn_fs_recover(const char *path,
*
* @note The BDB backend doesn't implement this feature so most
* callers should not call this function directly but should use the
- * higher level #svn_repos_freeze instead.
+ * higher level svn_repos_freeze() instead.
+ *
+ * @see svn_repos_freeze()
*
* @since New in 1.8.
*/
@@ -1648,10 +1602,10 @@ svn_fs_closest_copy(svn_fs_root_t **root
* @a inherit indicates whether to retrieve explicit,
* explicit-or-inherited, or only inherited mergeinfo.
*
- * If @a adjust_inherited_mergeinfo is TRUE, then any inherited
+ * If @a adjust_inherited_mergeinfo is @c TRUE, then any inherited
* mergeinfo returned in @a *catalog is normalized to represent the
- * inherited mergeinfo on the path doing the inheriting. If
- * @a adjust_inherited_mergeinfo is FALSE, then any inherited
+ * inherited mergeinfo on the path which inherits it. If
+ * @a adjust_inherited_mergeinfo is @c FALSE, then any inherited
* mergeinfo is the raw explicit mergeinfo from the nearest parent
* of the path with explicit mergeinfo, unadjusted for the path-wise
* difference between the path and its parent. This may include
@@ -1681,7 +1635,7 @@ svn_fs_get_mergeinfo2(svn_mergeinfo_cata
/**
* Same as svn_fs_get_mergeinfo2(), but with @a adjust_inherited_mergeinfo
- * set always set to TRUE and only one pool.
+ * set always set to @c TRUE and with only one pool.
*
* @deprecated Provided for backward compatibility with the 1.5 API.
*/
@@ -1928,11 +1882,11 @@ svn_fs_file_contents(svn_stream_t **cont
apr_pool_t *pool);
/**
- * Callback function type that gets presented with a immutable non-NULL
- * @a contents of @a len bytes. Further parameters may be passed through
- * in @a baton.
+ * Callback function type used with svn_fs_try_process_file_contents()
+ * that delivers the immutable, non-NULL @a contents of @a len bytes.
+ * @a baton is an implementation-specific closure.
*
- * Allocations must be made in @a pool.
+ * Use @a scratch_pool for allocations.
*
* @since New in 1.8.
*/
@@ -1940,18 +1894,17 @@ typedef svn_error_t *
(*svn_fs_process_contents_func_t)(const unsigned char *contents,
apr_size_t len,
void *baton,
- apr_pool_t *pool);
+ apr_pool_t *scratch_pool);
-/** Attempts to efficiently provide the contents of the file @a path in
- * @a root. If that succeeds, @a *success will be set to #TRUE and the
- * contents will be passed to the the @a processor along with the given
- * @a baton. Allocations take place in @a pool.
+/** Efficiently deliver the contents of the file @a path in @a root
+ * via @a processor (with @a baton), setting @a *success to @c TRUE
+ * upon doing so. Use @a pool for allocations.
*
* This function is intended to support zero copy data processing. It may
* not be implemented for all data backends or not applicable for certain
- * content. In that case, @a *success will always be #FALSE. Also, this
- * is a best-effort function which means there is no guarantee that e.g.
- * @a processor gets called at for any content.
+ * content. In that case, @a *success will always be @c FALSE. Also, this
+ * is a best-effort function which means that there is no guarantee that
+ * @a processor gets called at all for some content.
*
* @note @a processor is expected to be relatively short function with
* at most O(content size) runtime.
@@ -2467,6 +2420,84 @@ svn_fs_pack(const char *db_path,
apr_pool_t *pool);
+/**
+ * Perform backend-specific data consistency and correctness validations
+ * to the Subversion filesystem (mainly the meta-data) located in the
+ * directory @a path. Use @a scratch_pool for temporary allocations.
+ *
+ * @a start and @a end define the (minimum) range of revisions to check.
+ * If @a start is #SVN_INVALID_REVNUM, it defaults to @c r0. Likewise,
+ * @a end will default to the current youngest repository revision when
+ * given as #SVN_INVALID_REVNUM. Since meta data checks may have to touch
+ * other revisions as well, you may receive notifications for revisions
+ * outside the specified range. In fact, it is perfectly legal for a FS
+ * implementation to always check all revisions.
+ *
+ * Global invariants are only guaranteed to get verified when @a r0 has
+ * been included in the range of revisions to check.
+ *
+ * The optional @a notify_func callback is only a general feedback that
+ * the operation is still in process but may be called in random revisions
+ * order and more than once for the same revision, i.e. r2, r1, r2 would
+ * be a valid sequence.
+ *
+ * The optional @a cancel_func callback will be invoked as usual to allow
+ * the user to preempt this potentially lengthy operation.
+ *
+ * @note You probably don't want to use this directly. Take a look at
+ * svn_repos_verify_fs2() instead, which does non-backend-specific
+ * verifications as well.
+ *
+ * @note To ensure a full verification using all tests and covering all
+ * revisions, you must call this function *and* #svn_fs_verify_rev.
+ *
+ * @note Implementors, please do tests that can be done efficiently for
+ * a single revision in #svn_fs_verify_root. This function is meant for
+ * global checks or tests that require an expensive context setup.
+ *
+ * @see svn_repos_verify_fs2()
+ * @see svn_fs_verify_root()
+ *
+ * @since New in 1.8.
+ */
+svn_error_t *
+svn_fs_verify(const char *path,
+ svn_revnum_t start,
+ svn_revnum_t end,
+ svn_fs_progress_notify_func_t notify_func,
+ void *notify_baton,
+ svn_cancel_func_t cancel_func,
+ void *cancel_baton,
+ apr_pool_t *scratch_pool);
+
+/**
+ * Perform backend-specific data consistency and correctness validations
+ * of @a root in the Subversion filesystem @a fs. @a root is typically
+ * a revision root (see svn_fs_revision_root()), but may be a
+ * transaction root. Use @a scratch_pool for temporary allocations.
+ *
+ * @note You probably don't want to use this directly. Take a look at
+ * svn_repos_verify_fs2() instead, which does non-backend-specific
+ * verifications as well.
+ *
+ * @note To ensure a full verification using all available tests and
+ * covering all revisions, you must call both this function and
+ * #svn_fs_verify.
+ *
+ * @note Implementors, please perform tests that cannot be done
+ * efficiently for a single revision in #svn_fs_verify. This function
+ * is intended for local checks that don't require an expensive context
+ * setup.
+ *
+ * @see svn_repos_verify_fs2()
+ * @see svn_fs_verify()
+ *
+ * @since New in 1.8.
+ */
+svn_error_t *
+svn_fs_verify_root(svn_fs_root_t *root,
+ apr_pool_t *scratch_pool);
+
/** @} */
Modified: subversion/branches/verify-keep-going/subversion/include/svn_io.h
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/include/svn_io.h?rev=1464833&r1=1464832&r2=1464833&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/include/svn_io.h (original)
+++ subversion/branches/verify-keep-going/subversion/include/svn_io.h Fri Apr 5 05:29:29 2013
@@ -617,6 +617,8 @@ svn_io_filesizes_different_p(svn_boolean
* definitely different. That is, if the size of one or both files
* cannot be determined (due to stat() returning an error), then the sizes
* are not known to be different, so @a *different_p12 is set to 0.
+ *
+ * @since New in 1.8.
*/
svn_error_t *
svn_io_filesizes_three_different_p(svn_boolean_t *different_p12,
@@ -664,7 +666,10 @@ svn_io_files_contents_same_p(svn_boolean
/** Set @a *same12 to TRUE if @a file1 and @a file2 have the same
* contents, else set it to FALSE. Do the similar for @a *same23
* with @a file2 and @a file3, and @a *same13 for @a file1 and @a
- * file3. Use @a pool for temporary allocations.
+ * file3. The filenames @a file1, @a file2 and @a file3 are
+ * utf8-encoded. Use @a scratch_pool for temporary allocations.
+ *
+ * @since New in 1.8.
*/
svn_error_t *
svn_io_files_contents_three_same_p(svn_boolean_t *same12,
@@ -740,7 +745,7 @@ svn_io_lock_open_file(apr_file_t *lockfi
* Unlock the file @a lockfile_handle.
*
* Use @a pool for memory allocations. @a pool must be the pool that
- * @a lockfile_handle has been created in or one of its sub-pools.
+ * was passed to svn_io_lock_open_file().
*
* @since New in 1.8.
*/
@@ -1653,17 +1658,20 @@ svn_io_dir_walk(const char *dirname,
*
* If @a inherit is TRUE, the invoked program inherits its environment from
* the caller and @a cmd, if not absolute, is searched for in PATH.
- * Otherwise, the invoked program runs with an empty environment and @a cmd
- * must be an absolute path.
*
- * If @a inherit is FALSE and @a env is not NULL, the invoked program
- * inherits the environment defined by @a env, instead of an empty
- * environment or the caller's environment.
+ * If @a inherit is FALSE @a cmd must be an absolute path and the invoked
+ * program inherits the environment defined by @a env or runs with an empty
+ * environment in @a env is NULL.
*
* @note On some platforms, failure to execute @a cmd in the child process
* will result in error output being written to @a errfile, if non-NULL, and
* a non-zero exit status being returned to the parent process.
*
+ * @note An APR bug affects Windows: passing a NULL @a env does not
+ * guarantee the invoked program to run with an empty environment when
+ * @a inherits is FALSE, the program may inherit its parent's environment.
+ * Explicitly pass an empty @a env to get an empty environment.
+ *
* @since New in 1.8.
*/
svn_error_t *svn_io_start_cmd3(apr_proc_t *cmd_proc,
Modified: subversion/branches/verify-keep-going/subversion/include/svn_mergeinfo.h
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/include/svn_mergeinfo.h?rev=1464833&r1=1464832&r2=1464833&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/include/svn_mergeinfo.h (original)
+++ subversion/branches/verify-keep-going/subversion/include/svn_mergeinfo.h Fri Apr 5 05:29:29 2013
@@ -315,8 +315,8 @@ svn_rangelist_diff(svn_rangelist_t **del
* in sorted order and be compacted to the minimal number of ranges
* needed to represent the merged result.
*
- * If the original rangelisted contain non collapsed adjacent ranges, the
- * final result is not guaranteed to be compacted either.
+ * If the original rangelist contains non-collapsed adjacent ranges,
+ * the final result is not guaranteed to be compacted either.
*
* Use @a scratch_pool for temporary allocations.
*
Modified: subversion/branches/verify-keep-going/subversion/include/svn_path.h
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/include/svn_path.h?rev=1464833&r1=1464832&r2=1464833&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/include/svn_path.h (original)
+++ subversion/branches/verify-keep-going/subversion/include/svn_path.h Fri Apr 5 05:29:29 2013
@@ -677,10 +677,9 @@ svn_path_cstring_to_utf8(const char **pa
* @{
*/
-
/**
- * Return true iff @a path is a repository-relative URL: specifically that
- * it starts with the characters "^/"
+ * Return @c TRUE iff @a path is a repository-relative URL: specifically
+ * that it starts with the characters "^/"
*
* @a path is in UTF-8 encoding.
*
@@ -694,22 +693,20 @@ svn_path_is_repos_relative_url(const cha
/**
* Set @a absolute_url to the absolute URL represented by @a relative_url
- * relative to @a repos_root_url. @a absolute_url will be allocated in
- * @a pool.
- *
- * @a absolute_url will end with a peg revision specifier if @a relative_url
- * did.
+ * relative to @a repos_root_url, preserving any peg revision
+ * specifier present in @a relative_url. Allocate @a absolute_url
+ * from @a pool.
*
* @a relative_url is in repository-relative syntax: "^/[REL-URL][@PEG]"
*
- * @a repos_root_url is the absolute url of the repository root.
+ * @a repos_root_url is the absolute URL of the repository root.
*
* All strings are in UTF-8 encoding.
*
* @a repos_root_url and @a relative_url do not have to be properly
- * URI-encoded, canonical, or valid in any other way. The caller is expected
- * to perform canonicalization on @a absolute_url after the call to the
- * function.
+ * URI-encoded, canonical, or valid in any other way. The caller is
+ * expected to perform canonicalization on @a absolute_url after the
+ * call to the function.
*
* @since New in 1.8.
*/
@@ -719,7 +716,6 @@ svn_path_resolve_repos_relative_url(cons
const char *repos_root_url,
apr_pool_t *pool);
-
/** @} */
#ifdef __cplusplus
Modified: subversion/branches/verify-keep-going/subversion/include/svn_pools.h
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/include/svn_pools.h?rev=1464833&r1=1464832&r2=1464833&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/include/svn_pools.h (original)
+++ subversion/branches/verify-keep-going/subversion/include/svn_pools.h Fri Apr 5 05:29:29 2013
@@ -90,14 +90,17 @@ svn_pool_create_ex_debug(pool, allocator
* new allocator to #SVN_ALLOCATOR_RECOMMENDED_MAX_FREE and ensures
* proper synchronization if the allocator is used by multiple threads.
*
- * If your application uses multiple threads, creating a separate allocator
- * for each of these threads may not be feasible. Set the @a thread_safe
- * parameter to @c TRUE in that case. Pools will still not thread-safe, i.e.
- * access to them may require explicit serialization. Set the parameter to
- * @c FALSE, otherwise, to maximize performance.
+ * If your application uses multiple threads, creating a separate
+ * allocator for each of these threads may not be feasible. Set the
+ * @a thread_safe parameter to @c TRUE in that case; otherwise, set @a
+ * thread_safe to @c FALSE to maximize performance.
*
- * To access the owner pool, which can also serve as the root pool for your
- * sub-pools, call @c apr_allocator_get_owner().
+ * @note Even if @a thread_safe is @c TRUE, pools themselves will
+ * still not be thread-safe and their access may require explicit
+ * serialization.
+ *
+ * To access the owner pool, which can also serve as the root pool for
+ * your sub-pools, call @c apr_allocator_get_owner().
*
* @since: New in 1.8
*/
Modified: subversion/branches/verify-keep-going/subversion/include/svn_props.h
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/include/svn_props.h?rev=1464833&r1=1464832&r2=1464833&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/include/svn_props.h (original)
+++ subversion/branches/verify-keep-going/subversion/include/svn_props.h Fri Apr 5 05:29:29 2013
@@ -91,12 +91,15 @@ svn_prop_array_dup(const apr_array_heade
*/
typedef struct svn_prop_inherited_item_t
{
- /** The absolute working copy path, relative filesystem path, or URL from
- * which the properties in @a prop_hash are inherited. */
+ /** The absolute working copy path, relative filesystem path, or URL
+ * from which the properties in @a prop_hash are inherited. (For
+ * details about which path specification format is in use for a
+ * particular instance of this structure, consult the documentation
+ * for the API which produced it.) */
const char *path_or_url;
- /** A hash of (const char *) inherited property names, and (svn_string_t *)
- * property values. */
+ /** A hash of (<tt>const char *</tt>) inherited property names, and
+ * (<tt>svn_string_t *</tt>) property values. */
apr_hash_t *prop_hash;
} svn_prop_inherited_item_t;
@@ -169,7 +172,7 @@ typedef enum svn_prop_kind
/** Return the property kind of a property named @a prop_name.
*
- * @since New in 1.8
+ * @since New in 1.8.
*/
svn_prop_kind_t
svn_property_kind2(const char *prop_name);
@@ -208,58 +211,58 @@ svn_prop_has_svn_prop(const apr_hash_t *
/** Return @c TRUE iff @a prop_name is a Subversion property whose
* value is interpreted as a boolean.
*
- * @since New in 1.5
+ * @since New in 1.5.
*/
svn_boolean_t
svn_prop_is_boolean(const char *prop_name);
/** Return @c TRUE iff @a prop_name is in the "svn:" name space and is a
- * known revision property. For example, svn:log or svn:date.
+ * known revision property ("svn:log" or "svn:date", e.g.).
*
- * This will return FALSE for any property name that is not known by this
+ * This will return @c FALSE for any property name that is not known by this
* version of the library, even though the name may be known to other (for
* example, later) Subversion software.
*
- * @since New in 1.8
+ * @since New in 1.8.
*/
svn_boolean_t
svn_prop_is_known_svn_rev_prop(const char *prop_name);
/** Return @c TRUE iff @a prop_name is in the "svn:" name space and is a
- * known versioned property that is allowed on a file and/or on a directory.
- * For example, svn:eol-style or svn:ignore or svn:mergeinfo.
+ * known versioned property that is allowed on a file and/or on a
+ * directory ("svn:eol-style", "svn:ignore", or "svn:mergeinfo", e.g.).
*
- * This will return FALSE for any property name that is not known by this
- * version of the library, even though the name may be known to other (for
- * example, later) Subversion software.
+ * This will return @c FALSE for any property name that is not known
+ * by this version of the library, even though the name may be known
+ * to other (for example, later) Subversion software.
*
- * @since New in 1.8
+ * @since New in 1.8.
*/
svn_boolean_t
svn_prop_is_known_svn_node_prop(const char *prop_name);
-/** Return @c TRUE iff @a prop_name is in the "svn:" name space and is a
- * known versioned property that is allowed on a file. For example,
- * svn:eol-style or svn:mergeinfo.
- *
- * This will return FALSE for any property name that is not known by this
- * version of the library, even though the name may be known to other (for
- * example, later) Subversion software.
+/** Return @c TRUE iff @a prop_name is in the "svn:" name space and is
+ * a known versioned property that is allowed on a file
+ * ("svn:eol-style" or "svn:mergeinfo", e.g.).
+ *
+ * This will return @c FALSE for any property name that is not known
+ * by this version of the library, even though the name may be known
+ * to other (for example, later) Subversion software.
*
- * @since New in 1.8
+ * @since New in 1.8.
*/
svn_boolean_t
svn_prop_is_known_svn_file_prop(const char *prop_name);
-/** Return @c TRUE iff @a prop_name represents the name of a Subversion
- * known versioned property that is allowed on a directory. For example,
- * svn:ignore or svn:mergeinfo.
+/** Return @c TRUE iff @a prop_name is in the "svn:" name space and is
+ * a known versioned property that is allowed on a directory
+ * ("svn:ignore" or "svn:mergeinfo", e.g.).
+ *
+ * This will return @c FALSE for any property name that is not known
+ * by this version of the library, even though the name may be known
+ * to other (for example, later) Subversion software.
*
- * This will return FALSE for any property name that is not known by this
- * version of the library, even though the name may be known to other (for
- * example, later) Subversion software.
- *
- * @since New in 1.8
+ * @since New in 1.8.
*/
svn_boolean_t
svn_prop_is_known_svn_dir_prop(const char *prop_name);
@@ -486,9 +489,10 @@ svn_prop_name_is_valid(const char *prop_
/** @} */ /* Meta-data properties */
/**
- * This is a list of all user-vixible and -settable versioned node properties.
+ * This is a list of all user-visible and -settable versioned node
+ * properties.
*
- * @since New in 1.8
+ * @since New in 1.8.
*/
#define SVN_PROP_NODE_ALL_PROPS SVN_PROP_MIME_TYPE, \
SVN_PROP_IGNORE, \
@@ -662,19 +666,25 @@ svn_prop_name_is_valid(const char *prop_
*/
/** The prefix used for all (ephemeral) transaction properties.
- * @since New in 1.8. */
+ *
+ * @since New in 1.8.
+ */
#define SVN_PROP_TXN_PREFIX SVN_PROP_PREFIX "txn-"
/** Identifies the client version compability level. For clients
* compiled against Subversion libraries, this is @c SVN_VER_NUMBER.
* Third-party implementations are advised to use similar formatting
* for values of this property.
- * @since New in 1.8. */
+ *
+ * @since New in 1.8.
+ */
#define SVN_PROP_TXN_CLIENT_COMPAT_VERSION \
SVN_PROP_TXN_PREFIX "client-compat-version"
/** Identifies the client's user agent string, if any.
- * @since New in 1.8. */
+ *
+ * @since New in 1.8.
+ */
#define SVN_PROP_TXN_USER_AGENT \
SVN_PROP_TXN_PREFIX "user-agent"
@@ -685,7 +695,9 @@ svn_prop_name_is_valid(const char *prop_
* to new properties named @c SVN_PROP_REVISION_PREFIX + "something",
* allowing that information to survive the commit-time removal of
* ephemeral transaction properties.
- * @since New in 1.8. */
+ *
+ * @since New in 1.8.
+ */
#define SVN_PROP_REVISION_PREFIX SVN_PROP_PREFIX "revision-"
Modified: subversion/branches/verify-keep-going/subversion/include/svn_ra_svn.h
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/include/svn_ra_svn.h?rev=1464833&r1=1464832&r2=1464833&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/include/svn_ra_svn.h (original)
+++ subversion/branches/verify-keep-going/subversion/include/svn_ra_svn.h Fri Apr 5 05:29:29 2013
@@ -224,15 +224,6 @@ typedef enum svn_ra_svn_cmd_t
svn_ra_svn_cmd__last
} svn_ra_svn_cmd_t;
-/**
- * Set the shim callbacks to be used by @a conn to @a shim_callbacks.
- *
- * @note This is a private API, external consumers should not use it.
- */
-svn_error_t *
-svn_ra_svn__set_shim_callbacks(svn_ra_svn_conn_t *conn,
- svn_delta_shim_callbacks_t *shim_callbacks);
-
/** Initialize a connection structure for the given socket or
* input/output files.
*
@@ -240,6 +231,14 @@ svn_ra_svn__set_shim_callbacks(svn_ra_sv
* @a compression_level specifies the desired network data compression
* level (zlib) from 0 (no compression) to 9 (best but slowest).
*
+ * If @a zero_copy_limit is not 0, cached file contents smaller than the
+ * given limit may be sent directly to the network socket. Otherwise,
+ * it will be copied into a temporary buffer before being forwarded to
+ * the network stack. Since the zero-copy code path has to enforce strict
+ * time-outs, the receiver must be able to process @a zero_copy_limit
+ * bytes within one second. Even temporary failure to do so may cause
+ * the server to cancel the respective operation with a time-out error.
+ *
* To reduce the overhead of checking for cancellation requests from the
* data receiver, set @a error_check_interval to some non-zero value.
* It defines the number of bytes that must have been sent since the last
@@ -301,14 +300,17 @@ svn_boolean_t
svn_ra_svn_has_capability(svn_ra_svn_conn_t *conn,
const char *capability);
-/** Return the data compression level to use for network transmissions
+/** Return the data compression level to use for network transmissions.
*
* @since New in 1.7.
*/
int
svn_ra_svn_compression_level(svn_ra_svn_conn_t *conn);
-/** Return the zero-copy data block limit to use for network transmissions
+/** Return the zero-copy data block limit to use for network
+ * transmissions.
+ *
+ * @see http://en.wikipedia.org/wiki/Zero-copy
*
* @since New in 1.8.
*/
Modified: subversion/branches/verify-keep-going/subversion/include/svn_repos.h
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/include/svn_repos.h?rev=1464833&r1=1464832&r2=1464833&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/include/svn_repos.h (original)
+++ subversion/branches/verify-keep-going/subversion/include/svn_repos.h Fri Apr 5 05:29:29 2013
@@ -248,7 +248,7 @@ typedef enum svn_repos_notify_action_t
svn_repos_notify_load_skipped_rev,
/** The structure of a revision is being verified. @since New in 1.8. */
- svn_repos_notify_verify_struc_rev,
+ svn_repos_notify_verify_rev_structure,
/** A revision is found with corruption/errors. @since New in 1.8. */
svn_repos_notify_failure
@@ -544,8 +544,8 @@ svn_repos_hotcopy2(const char *src_path,
apr_pool_t *pool);
/**
- * Like svn_repos_hotcopy2(), but without the @a incremental parameter
- * and without cancellation support.
+ * Like svn_repos_hotcopy2(), but with @a incremental always passed as
+ * @c FALSE and without cancellation support.
*
* @deprecated Provided for backward compatibility with the 1.6 API.
*/
@@ -666,11 +666,11 @@ svn_repos_recover(const char *path,
/**
* Take an exclusive lock on each of the repositories in @a paths to
- * prevent commits and then while holding all the locks invoke
- * @a freeze_body passing @a baton. The repositories may be readable
- * by Subversion while frozen, or it may be unreadable, depending on
- * which FS backend the repository uses. Repositories are locked
- * in array order from zero.
+ * prevent commits and then while holding all the locks invoke @a
+ * freeze_body passing @a baton. Each repository may be readable by
+ * Subversion while frozen, or may be unreadable, depending on which
+ * FS backend the repository uses. Repositories are locked in the
+ * order in which they are specified in the array.
*
* @since New in 1.8.
*/
@@ -791,20 +791,23 @@ const char *
svn_repos_post_unlock_hook(svn_repos_t *repos,
apr_pool_t *pool);
-/** Set the environment that @a repos's hooks will inherit.
- * The environment is specified in a file at @a hooks_env_path.
- * If @a hooks_env_path is @c NULL, the file is searched at its
- * default location in the repository. If @a hooks_env_path is
- * not absolute, it specifies a path relative to the parent of
- * the file's default location in the repository.
+/** Specify that Subversion should consult the configuration file
+ * located at @a hooks_env_path to determine how to setup the
+ * environment for hook scripts invoked for the repository @a repos.
+ * As a special case, if @a hooks_env_path is @c NULL, look for the
+ * file in its default location within the repository disk structure.
+ * If @a hooks_env_path is not absolute, it specifies a path relative
+ * to the parent of the file's default location.
+ *
+ * @a result_pool should be the same pool that @a repos was allocated in.
+ * Use @a scratch_pool for temporary allocations.
+ *
+ * If this function is not called, or if the specified configuration
+ * file does not define any environment variables, hooks will run in
+ * an empty environment.
*
- * The @a result_pool should be the same pool that @a repos was allocated in.
- * The @a scratch_pool is used for temporary allocations.
- *
- * If this function is not called, or if the file does not list any
- * environment variables, hooks will run in an empty environment.
- *
- * @since New in 1.8. */
+ * @since New in 1.8.
+ */
svn_error_t *
svn_repos_hooks_setenv(svn_repos_t *repos,
const char *hooks_env_path,
@@ -855,12 +858,13 @@ svn_repos_hooks_setenv(svn_repos_t *repo
* avoid sending data through @a editor/@a edit_baton which is not
* authorized for transmission.
*
- * @a zero_copy_limit controls up to which size in bytes data blocks may
- * be sent using the zero-copy code path. On that path, a number of
- * in-memory copy operations have been eliminated to maximize throughput.
- * However, until the whole block has been pushed to the network stack,
- * other clients may get blocked. Thus, be careful when using larger
- * values here. 0 disables the optimization.
+ * @a zero_copy_limit controls the maximum size (in bytes) at which
+ * data blocks may be sent using the zero-copy code path. On that
+ * path, a number of in-memory copy operations have been eliminated to
+ * maximize throughput. However, until the whole block has been
+ * pushed to the network stack, other clients block, so be careful
+ * when using larger values here. Pass 0 for @a zero_copy_limit to
+ * disable this optimization altogether.
*
* @a note Never activate this optimization if @a editor might access
* any FSFS data structures (and, hence, caches). So, it is basically
@@ -919,8 +923,8 @@ svn_repos_begin_report3(void **report_ba
apr_pool_t *pool);
/**
- * The same as svn_repos_begin_report3(), but setting the @a zero_copy_limit
- * to 0.
+ * The same as svn_repos_begin_report3(), but with @a zero_copy_limit
+ * always passed as 0.
*
* @since New in 1.5.
*
@@ -1227,6 +1231,8 @@ svn_repos_abort_report(void *report_bato
* ### reporter instead; there are some stray references to the
* ### svn_repos_dir_delta[2] in comments which should probably
* ### actually refer to the reporter.
+ *
+ * @since New in 1.5.
*/
svn_error_t *
svn_repos_dir_delta2(svn_fs_root_t *src_root,
@@ -2532,7 +2538,8 @@ svn_repos_node_from_baton(void *edit_bat
* through the @c HEAD revision.
*
* For every verified revision call @a notify_func with @a rev set to
- * the verified revision and @a warning_text @c NULL.
+ * the verified revision and @a warning_text @c NULL. For warnings call @a
+ * notify_func with @a warning_text set.
*
* For every revision verification failure, if @a notify_func is not @c NULL,
* call @a notify_func with @a rev set to the corrupt revision and @err set to
@@ -2559,11 +2566,9 @@ svn_repos_verify_fs3(svn_repos_t *repos,
svn_cancel_func_t cancel,
void *cancel_baton,
apr_pool_t *scratch_pool);
-
/**
* Like svn_repos_verify_fs3(), but with @a keep_going set to @c FALSE.
* @since New in 1.7.
- * @deprecated Provided for backward compatibility with the 1.7 API.
*/
SVN_DEPRECATED
svn_error_t *
@@ -2723,13 +2728,6 @@ svn_repos_dump_fs(svn_repos_t *repos,
* @a cancel_baton as argument to see if the client wishes to cancel
* the load.
*
- * @note If @a start_rev and @a end_rev are valid revisions, this
- * function presumes the revisions as numbered in @a dumpstream only
- * increase from the beginning of the stream to the end. Gaps in the
- * number sequence are ignored, but upon finding a revision number
- * younger than the specified range, this function may stop loading
- * new revisions regardless of their number.
- *
* @since New in 1.8.
*/
svn_error_t *
@@ -2978,13 +2976,6 @@ svn_repos_parse_dumpstream3(svn_stream_t
* loaded nodes, from root to @a parent_dir. The directory @a parent_dir
* must be an existing directory in the repository.
*
- * @note If @a start_rev and @a end_rev are valid revisions, this
- * function presumes the revisions as numbered in @a dumpstream only
- * increase from the beginning of the stream to the end. Gaps in the
- * number sequence are ignored, but upon finding a revision number
- * younger than the specified range, this function may stop loading
- * new revisions regardless of their number.
- *
* @since New in 1.8.
*/
svn_error_t *
@@ -3194,28 +3185,12 @@ svn_repos_get_fs_build_parser(const svn_
*/
typedef struct svn_authz_t svn_authz_t;
-/**
- * Similar to svn_repos_authz_read2(), but without support for
- * authz files stored in a Subversion repository (absolute or
- * relative URLs) and without the @a repos_root argument.
- *
- * @since New in 1.3.
- * @deprecated Provided for backward compatibility with the 1.7 API.
- */
-SVN_DEPRECATED
-svn_error_t *
-svn_repos_authz_read(svn_authz_t **authz_p,
- const char *file,
- svn_boolean_t must_exist,
- apr_pool_t *pool);
-
/**
- * Read authz configuration data from @a path (a file, repos relative
- * url, an absolute file url, or a registry path) into @a *authz_p,
- * allocated in @a pool.
+ * Read authz configuration data from @a path (a dirent, an absolute file url
+ * or a registry path) into @a *authz_p, allocated in @a pool.
*
- * If @a groups_path (a file, repos relative url, an absolute file url,
- * or a registry path) is set, use the global groups parsed from it.
+ * If @a groups_path (a dirent, an absolute file url, or a registry path) is
+ * set, use the global groups parsed from it.
*
* If @a path or @a groups_path is not a valid authz rule file, then return
* #SVN_ERR_AUTHZ_INVALID_CONFIG. The contents of @a *authz_p is then
@@ -3223,28 +3198,37 @@ svn_repos_authz_read(svn_authz_t **authz
* is also an error other than #SVN_ERR_AUTHZ_INVALID_CONFIG (exact error
* depends on the access type).
*
- * If @a path is a repos relative URL then @a repos_root must be set to
- * the root of the repository the authz configuration will be used with.
- * The same applies to @a groups_path if it is being used.
- *
- * @since New in 1.8
+ * @since New in 1.8.
*/
svn_error_t *
svn_repos_authz_read2(svn_authz_t **authz_p,
const char *path,
const char *groups_path,
svn_boolean_t must_exist,
- const char *repos_root,
apr_pool_t *pool);
+/**
+ * Similar to svn_repos_authz_read2(), but with @a groups_path and @a
+ * repos_root always passed as @c NULL.
+ *
+ * @since New in 1.3.
+ * @deprecated Provided for backward compatibility with the 1.7 API.
+ */
+SVN_DEPRECATED
+svn_error_t *
+svn_repos_authz_read(svn_authz_t **authz_p,
+ const char *file,
+ svn_boolean_t must_exist,
+ apr_pool_t *pool);
+
/**
* Read authz configuration data from @a stream into @a *authz_p,
* allocated in @a pool.
*
* If @a groups_stream is set, use the global groups parsed from it.
*
- * @since New in 1.8
+ * @since New in 1.8.
*/
svn_error_t *
svn_repos_authz_parse(svn_authz_t **authz_p,
Modified: subversion/branches/verify-keep-going/subversion/include/svn_sorts.h
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/include/svn_sorts.h?rev=1464833&r1=1464832&r2=1464833&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/include/svn_sorts.h (original)
+++ subversion/branches/verify-keep-going/subversion/include/svn_sorts.h Fri Apr 5 05:29:29 2013
@@ -209,6 +209,8 @@ svn_sort__array_delete(apr_array_header_
int elements_to_delete);
/* Reverse the order of elements in @a array, in place.
+ *
+ * @note Private. For use by Subversion's own code only.
*/
void
svn_sort__array_reverse(apr_array_header_t *array,
Modified: subversion/branches/verify-keep-going/subversion/include/svn_string.h
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/include/svn_string.h?rev=1464833&r1=1464832&r2=1464833&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/include/svn_string.h (original)
+++ subversion/branches/verify-keep-going/subversion/include/svn_string.h Fri Apr 5 05:29:29 2013
@@ -328,6 +328,8 @@ svn_stringbuf_appendcstr(svn_stringbuf_t
* Reallocs if necessary. @a str is affected, nothing else is.
*
* @note The inserted string may be a sub-range if @a str.
+ *
+ * @since New in 1.8.
*/
void
svn_stringbuf_insert(svn_stringbuf_t *str,
@@ -340,17 +342,25 @@ svn_stringbuf_insert(svn_stringbuf_t *st
* at @a pos. If the latter is larger or equal to @c str->pos, this will
* be a no-op. Otherwise, the resulting string will be @c str->len-count
* bytes long.
+ *
+ * @since New in 1.8.
*/
void
svn_stringbuf_remove(svn_stringbuf_t *str,
apr_size_t pos,
apr_size_t count);
-/** Faster but functionally equivalent to the following sequence:
+/** Replace in @a str the substring which starts at @a pos and is @a
+ * old_count bytes long with a new substring @a bytes (which is @a
+ * new_count bytes long).
+ *
+ * This is faster but functionally equivalent to the following sequence:
* @code
- * svn_stringbuf_remove(str, pos, old_count);
- * svn_stringbuf_insert(str, pos, bytes, new_count);
+ svn_stringbuf_remove(str, pos, old_count);
+ svn_stringbuf_insert(str, pos, bytes, new_count);
* @endcode
+ *
+ * @since New in 1.8.
*/
void
svn_stringbuf_replace(svn_stringbuf_t *str,
@@ -447,7 +457,7 @@ svn_cstring_match_list(const char *str,
* if no token is left. Modifies @a str such that the next call will return
* the next token.
*
- * Note that the content of @a *str may be modified by this function.
+ * @note The content of @a *str may be modified by this function.
*
* @since New in 1.8.
*/
Modified: subversion/branches/verify-keep-going/subversion/include/svn_types.h
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/include/svn_types.h?rev=1464833&r1=1464832&r2=1464833&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/include/svn_types.h (original)
+++ subversion/branches/verify-keep-going/subversion/include/svn_types.h Fri Apr 5 05:29:29 2013
@@ -29,6 +29,7 @@
/* ### this should go away, but it causes too much breakage right now */
#include <stdlib.h>
+#include <limits.h> /* for ULONG_MAX */
#include <apr.h> /* for apr_size_t, apr_int64_t, ... */
#include <apr_errno.h> /* for apr_status_t */
Modified: subversion/branches/verify-keep-going/subversion/include/svn_utf.h
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/include/svn_utf.h?rev=1464833&r1=1464832&r2=1464833&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/include/svn_utf.h (original)
+++ subversion/branches/verify-keep-going/subversion/include/svn_utf.h Fri Apr 5 05:29:29 2013
@@ -238,7 +238,9 @@ svn_utf_cstring_from_utf8_string(const c
/** Return the display width of UTF-8-encoded C string @a cstr.
* If the string is not printable or invalid UTF-8, return -1.
- * @since New in 1.8. */
+ *
+ * @since New in 1.8.
+ */
int
svn_utf_cstring_utf8_width(const char *cstr);
Modified: subversion/branches/verify-keep-going/subversion/include/svn_version.h
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/include/svn_version.h?rev=1464833&r1=1464832&r2=1464833&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/include/svn_version.h (original)
+++ subversion/branches/verify-keep-going/subversion/include/svn_version.h Fri Apr 5 05:29:29 2013
@@ -258,7 +258,7 @@ svn_subr_version(void);
/**
- * Extended version infomation, including info about the running system.
+ * Extended version information, including info about the running system.
*
* @since New in 1.8.
*/
@@ -266,7 +266,7 @@ typedef struct svn_version_extended_t sv
/**
* Return version information for the running program. If @a verbose
- * is true, collect extra information that may be expensive to
+ * is #TRUE, collect extra information that may be expensive to
* retrieve (for example, the OS release name, list of shared
* libraries, etc.). Use @a pool for all allocations.
*
Modified: subversion/branches/verify-keep-going/subversion/include/svn_wc.h
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/include/svn_wc.h?rev=1464833&r1=1464832&r2=1464833&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/include/svn_wc.h (original)
+++ subversion/branches/verify-keep-going/subversion/include/svn_wc.h Fri Apr 5 05:29:29 2013
@@ -1253,7 +1253,7 @@ typedef enum svn_wc_notify_action_t
/** A move in the working copy has been broken, i.e. degraded into a
* copy + delete. The notified path is the move source (the deleted path).
- * ### Provide path to move destination as well?
+ * ### TODO: Provide path to move destination as well?
* @since New in 1.8. */
svn_wc_notify_move_broken
@@ -3740,7 +3740,7 @@ typedef struct svn_wc_status3_t
* @since New in 1.8. */
const char *moved_to_abspath;
- /** TRUE iff the item is a file brought in by an svn:externals definition.
+ /** @c TRUE iff the item is a file brought in by an svn:externals definition.
* @since New in 1.8. */
svn_boolean_t file_external;
@@ -4570,9 +4570,13 @@ svn_wc_add_from_disk2(svn_wc_context_t *
/**
- * Similar to svn_wc_add4(), but gives the new node an empty set of properties.
+ * Similar to svn_wc_add_from_disk2(), but always passes NULL for @a
+ * props.
*
- * This is a replacement for svn_wc_add4() case 2a.
+ * This is a replacement for svn_wc_add4() case 2a (which see for
+ * details).
+
+ * @see svn_wc_add4()
*
* @since New in 1.7.
* @deprecated Provided for backward compatibility with the 1.7 API.
@@ -6844,9 +6848,12 @@ svn_wc_merge5(enum svn_wc_merge_outcome_
void *cancel_baton,
apr_pool_t *scratch_pool);
-/** Similar to svn_wc_merge5() but doesn't merge property changes. Instead of
- * handling this in a single operation, a separate call to svn_wc_merge_props3()
- * before calling svn_wc_merge4() is needed
+/** Similar to svn_wc_merge5() but with @a merge_props_state and @a
+ * original_props always passed as NULL.
+ *
+ * Unlike svn_wc_merge5(), this function doesn't merge property
+ * changes. Callers of this function must first use
+ * svn_wc_merge_props3() to get this functionality.
*
* @since New in 1.7.
* @deprecated Provided for backwards compatibility with the 1.7 API.
@@ -8150,8 +8157,8 @@ svn_wc_read_kind2(svn_node_kind_t *kind,
svn_boolean_t show_hidden,
apr_pool_t *scratch_pool);
-/** Similar to svn_wc_read_kind2() but always shows deleted nodes and returns
- * the result as a #svn_node_kind_t.
+/** Similar to svn_wc_read_kind2() but with @a show_deleted always
+ * passed as TRUE.
*
* @since New in 1.7.
* @deprecated Provided for backward compatibility with the 1.7 API.
Modified: subversion/branches/verify-keep-going/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c?rev=1464833&r1=1464832&r2=1464833&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c (original)
+++ subversion/branches/verify-keep-going/subversion/libsvn_auth_gnome_keyring/gnome_keyring.c Fri Apr 5 05:29:29 2013
@@ -32,6 +32,7 @@
#include "svn_auth.h"
#include "svn_config.h"
#include "svn_error.h"
+#include "svn_hash.h"
#include "svn_pools.h"
#include "private/svn_auth_private.h"
@@ -243,13 +244,11 @@ ensure_gnome_keyring_is_unlocked(svn_boo
if (! non_interactive)
{
svn_auth_gnome_keyring_unlock_prompt_func_t unlock_prompt_func =
- apr_hash_get(parameters,
- SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_FUNC,
- APR_HASH_KEY_STRING);
+ svn_hash_gets(parameters,
+ SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_FUNC);
void *unlock_prompt_baton =
- apr_hash_get(parameters,
- SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_BATON,
- APR_HASH_KEY_STRING);
+ svn_hash_gets(parameters,
+ SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_BATON);
char *keyring_password;
@@ -298,9 +297,7 @@ password_get_gnome_keyring(svn_boolean_t
SVN_ERR(ensure_gnome_keyring_is_unlocked(non_interactive, parameters, pool));
- if (! apr_hash_get(parameters,
- "gnome-keyring-opening-failed",
- APR_HASH_KEY_STRING))
+ if (! svn_hash_gets(parameters, "gnome-keyring-opening-failed"))
{
result = gnome_keyring_find_network_password_sync(username, realmstring,
NULL, NULL, NULL, NULL,
@@ -330,10 +327,7 @@ password_get_gnome_keyring(svn_boolean_t
}
else
{
- apr_hash_set(parameters,
- "gnome-keyring-opening-failed",
- APR_HASH_KEY_STRING,
- "");
+ svn_hash_sets(parameters, "gnome-keyring-opening-failed", "");
}
return SVN_NO_ERROR;
@@ -358,9 +352,7 @@ password_set_gnome_keyring(svn_boolean_t
SVN_ERR(ensure_gnome_keyring_is_unlocked(non_interactive, parameters, pool));
- if (! apr_hash_get(parameters,
- "gnome-keyring-opening-failed",
- APR_HASH_KEY_STRING))
+ if (! svn_hash_gets(parameters, "gnome-keyring-opening-failed"))
{
result = gnome_keyring_set_network_password_sync(NULL, /* default keyring */
username, realmstring,
@@ -374,10 +366,7 @@ password_set_gnome_keyring(svn_boolean_t
}
if (result != GNOME_KEYRING_RESULT_OK)
{
- apr_hash_set(parameters,
- "gnome-keyring-opening-failed",
- APR_HASH_KEY_STRING,
- "");
+ svn_hash_sets(parameters, "gnome-keyring-opening-failed", "");
}
*done = (result == GNOME_KEYRING_RESULT_OK);