You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2010/08/10 19:03:37 UTC
svn commit: r984122 [11/40] - in /subversion/branches/ignore-mergeinfo: ./
build/ build/ac-macros/ build/generator/ build/generator/swig/
build/generator/templates/ build/generator/util/ build/hudson/
build/hudson/jobs/ build/hudson/jobs/subversion-1.6...
Modified: subversion/branches/ignore-mergeinfo/subversion/include/svn_dirent_uri.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/include/svn_dirent_uri.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/include/svn_dirent_uri.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/include/svn_dirent_uri.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -69,7 +69,7 @@
* All code that works with local files, MUST USE the dirent apis.
*
* When translating between local paths (dirents) and uris code should
- * always go via the relative path format.
+ * always go via the relative path format.
* E.g.
* - by truncating a parent portion from a path with svn_*_skip_ancestor(),
* - or by converting portions to basenames and then joining to existing paths.
@@ -180,11 +180,11 @@ svn_relpath_join(const char *base,
apr_pool_t *pool);
/** Join a valid base uri (@a base) with a relative path or uri
- * (@a component), allocating the result in @a pool. @a relpath need
+ * (@a component), allocating the result in @a pool. @a component need
* not be a single component: it can be a relative path or a '/'
* prefixed relative path to join component to the root path of @a base.
*
- * If @a relpath is the empty path, then @a base will be copied and
+ * If @a component is the empty path, then @a base will be copied and
* returned.
*
* If the @a component is an absolute uri, then it is copied and returned.
@@ -200,8 +200,8 @@ svn_uri_join(const char *base,
apr_pool_t *pool);
-/** Gets the name of the specified canonicalized @a dirent as it is known
- * within its parent directory. If the @a dirent is root, return "". The
+/** Gets the name of the specified canonicalized @a dirent as it is known
+ * within its parent directory. If the @a dirent is root, return "". The
* returned value will not have slashes in it.
*
* Example: svn_dirent_basename("/foo/bar") -> "bar"
@@ -393,9 +393,9 @@ svn_boolean_t
svn_uri_is_absolute(const char *uri);
/** Return TRUE if @a dirent is considered a root directory on the platform
- * at hand.
+ * at hand.
* E.g.:
- * On Posix: '/'
+ * On Posix: '/'
* On Windows: '/', 'X:/', '//server/share', 'X:'
*
* Note that on Windows '/' and 'X:' are roots, but paths starting with this
@@ -678,7 +678,7 @@ svn_uri_skip_ancestor(const char *uri1,
* remove_redundancies is TRUE.
*
* - Set @a *pcommon to the absolute dirent of the dirent common to
- * all of the targets. If the targets have no common prefix (e.g.
+ * all of the targets. If the targets have no common prefix (e.g.
* "C:/file" and "D:/file" on Windows), set @a *pcommon to the empty
* string.
*
@@ -718,15 +718,15 @@ svn_dirent_condense_targets(const char *
* (an array of <tt>const char *</tt>'s), and remove redundant uris if @a
* remove_redundancies is TRUE.
*
- * - Set @a *pcommon to the common base uri of all of the targets.
- * If the targets have no common prefix (e.g. "http://srv1/file"
+ * - Set @a *pcommon to the common base uri of all of the targets.
+ * If the targets have no common prefix (e.g. "http://srv1/file"
* and "http://srv2/file"), set @a *pcommon to the empty
* string.
*
* - If @a pcondensed_targets is non-NULL, set @a *pcondensed_targets
* to an array of targets relative to @a *pcommon, and if @a
- * remove_redundancies is TRUE, omit any uris that are descendants of
- * another uri in @a targets. If *pcommon is empty, @a
+ * remove_redundancies is TRUE, omit any uris that are descendants of
+ * another uri in @a targets. If *pcommon is empty, @a
* *pcondensed_targets will contain absolute dirents; redundancies
* can still be removed. If @a pcondensed_targets is NULL, leave it
* alone.
Modified: subversion/branches/ignore-mergeinfo/subversion/include/svn_dso.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/include/svn_dso.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/include/svn_dso.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/include/svn_dso.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/include/svn_editor.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/include/svn_editor.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/include/svn_editor.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/include/svn_editor.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -128,14 +128,14 @@ extern "C" {
*
* - @b Create: A receiver uses svn_editor_create() to create an
* "empty" svn_editor_t. It cannot be used yet, since it still lacks
- * actual callback functions. svn_editor_create() sets the @c
- * svn_editor_t's callback baton and scratch pool that the callback
+ * actual callback functions. svn_editor_create() sets the
+ * #svn_editor_t's callback baton and scratch pool that the callback
* functions receive, as well as a cancellation callback and baton
* (see "Cancellation" below).
- *
+ *
* - @b Set callbacks: The receiver calls svn_editor_setcb_many() or a
- * succession of the other svn_editor_setcb_*() functions to tell @c
- * svn_editor_t which functions to call when driven by the various
+ * succession of the other svn_editor_setcb_*() functions to tell
+ * #svn_editor_t which functions to call when driven by the various
* operations. Callback functions are implemented by the receiver and must
* adhere to the @c svn_editor_cb_*_t function types as expected by the
* svn_editor_setcb_*() functions. See: \n
@@ -155,11 +155,11 @@ extern "C" {
* svn_editor_setcb_complete() \n
* svn_editor_setcb_abort()
*
- * - @b Drive: The driver is provided with the completed @c svn_editor_t
+ * - @b Drive: The driver is provided with the completed #svn_editor_t
* instance. (It is typically passed to a generic driving
* API, which could receive the driving editor calls over the network
- * by providing a proxy @c svn_editor_t on the remote side.)
- * The driver invokes the @c svn_editor_t instance's callback functions
+ * by providing a proxy #svn_editor_t on the remote side.)
+ * The driver invokes the #svn_editor_t instance's callback functions
* according to the restrictions defined below, in order to describe the
* entire set of operations necessary to transform the receiver's tree
* into the desired target. The callbacks can be invoked using the
@@ -194,7 +194,7 @@ extern "C" {
* each callback returns. See "Pool Usage".
* \n\n
* If the receiver encounters an error within a callback, it returns an
- * @c svn_error_t*. The driver receives this and aborts transmission.
+ * #svn_error_t*. The driver receives this and aborts transmission.
*
* - @b Complete/Abort: The driver will end transmission by calling \n
* svn_editor_complete() if successful, or \n
@@ -228,7 +228,7 @@ extern "C" {
* first of them has to be either svn_editor_set_props() or
* svn_editor_add_file().
*
- * - svn_editor_delete() must not be used to replace a path -- i.e.
+ * - svn_editor_delete() must not be used to replace a path -- i.e.
* svn_editor_delete() must not be followed by an svn_editor_add_*() on
* the same path, nor by an svn_editor_copy() or svn_editor_move() with
* the same path as the copy/move target.
@@ -239,14 +239,14 @@ extern "C" {
* replaced node, like node kind, etc.
* @todo say which function(s) to use.
*
- * - svn_editor_delete() must not be used to move a path -- i.e.
+ * - svn_editor_delete() must not be used to move a path -- i.e.
* svn_editor_delete() must not delete the source path of a previous
* svn_editor_copy() call. Instead, svn_editor_move() must be used.
*
* - One of svn_editor_complete() or svn_editor_abort() must be called
* exactly once, which must be the final call the driver invokes.
* Invoking svn_editor_complete() must imply that the set of changes has
- * been transmitted completely and without errors, and invoking
+ * been transmitted completely and without errors, and invoking
* svn_editor_abort() must imply that the transformation was not completed
* successfully.
*
@@ -259,9 +259,9 @@ extern "C" {
* return, except for the following pairs, where a change must be completed
* when receiving the second callback in each pair:
* - svn_editor_add_file() and svn_editor_set_text()
- * - svn_editor_set_props() (if @a complete is FALSE) and
+ * - svn_editor_set_props() (if @a complete is FALSE) and
* svn_editor_set_text() (if the node is a file)
- * - svn_editor_set_props() (if @a complete is FALSE) and
+ * - svn_editor_set_props() (if @a complete is FALSE) and
* svn_editor_set_target() (if the node is a symbolic link)
*
* This restriction is not recursive -- a directory's children may remain
@@ -290,7 +290,7 @@ extern "C" {
*
* <h3>Pool Usage</h3>
* The @a result_pool passed to svn_editor_create() is used to allocate
- * the @c svn_editor_t instance, and thus it must not be cleared before the
+ * the #svn_editor_t instance, and thus it must not be cleared before the
* driver has finished driving the editor.
*
* The @a scratch_pool passed to each callback invocation is derived from
@@ -300,20 +300,20 @@ extern "C" {
* function, you may use your own pool kept in the @a editor_baton.
*
* The @a scratch_pool passed to svn_editor_create() may be used to help
- * during construction of the @c svn_editor_t instance, but it is assumed to
+ * during construction of the #svn_editor_t instance, but it is assumed to
* live only until svn_editor_create() returns.
* \n\n
*
- * <h3>Cancellation</h3>
+ * <h3>Cancellation</h3>
* To allow graceful interruption by external events (like a user abort),
- * svn_editor_create() can be passed an @c svn_cancel_func_t that is
+ * svn_editor_create() can be passed an #svn_cancel_func_t that is
* polled every time the driver invokes a callback, just before the
* actual editor callback implementation is invoked. If this function
* decides to return with an error, the driver will receive this error
* as if the callback function had returned it, i.e. as the result from
* calling any of the driving functions (e.g. svn_editor_add_directory()).
* As with any other error, the driver must then invoke svn_editor_abort()
- * and abort the transformation sequence. See @c svn_cancel_func_t.
+ * and abort the transformation sequence. See #svn_cancel_func_t.
*
* The @a cancel_baton argument to svn_editor_create() is passed
* unchanged to each poll of @a cancel_func.
@@ -321,7 +321,7 @@ extern "C" {
* The cancellation function and baton are typically provided by the client
* context.
*
- *
+ *
* ### TODO @todo anything missing? -- allow text and prop change to follow
* a move or copy. -- set_text() vs. apply_text_delta()? -- If a
* set_props/set_text/set_target/copy/move/delete in a merge source is
@@ -343,9 +343,9 @@ typedef struct svn_editor_t svn_editor_t
* @a editor_baton originally passed to svn_editor_create(), as well as
* a @a scratch_pool argument.
*
- * - The "driving" functions have an @c svn_editor_t* argument, in order to
+ * - The "driving" functions have an #svn_editor_t* argument, in order to
* call the implementations of the function types defined here that are
- * registered with the given @c svn_editor_t instance.
+ * registered with the given #svn_editor_t instance.
*
* Note that any remaining arguments for these function types are explained
* in the comment for the "driving" functions. Each function type links to
@@ -485,11 +485,11 @@ typedef svn_error_t *(*svn_editor_cb_abo
* @{
*/
-/** Allocate an @c svn_editor_t instance from @a result_pool, store
+/** Allocate an #svn_editor_t instance from @a result_pool, store
* @a editor_baton, @a cancel_func and @a cancel_baton in the new instance
* and return it in @a editor.
* @a scratch_pool is used for temporary allocations (if any). Note that
- * this is NOT the same @c scratch_pool that is passed to callback functions.
+ * this is NOT the same @a scratch_pool that is passed to callback functions.
* @see svn_editor_t
* @since New in 1.7.
*/
@@ -502,7 +502,7 @@ svn_editor_create(svn_editor_t **editor,
apr_pool_t *scratch_pool);
-/** Sets the @c svn_editor_cb_add_directory_t callback in @a editor
+/** Sets the #svn_editor_cb_add_directory_t callback in @a editor
* to @a callback.
* @a scratch_pool is used for temporary allocations (if any).
* @see also svn_editor_setcb_many().
@@ -513,7 +513,7 @@ svn_editor_setcb_add_directory(svn_edito
svn_editor_cb_add_directory_t callback,
apr_pool_t *scratch_pool);
-/** Sets the @c svn_editor_cb_add_file_t callback in @a editor
+/** Sets the #svn_editor_cb_add_file_t callback in @a editor
* to @a callback.
* @a scratch_pool is used for temporary allocations (if any).
* @see also svn_editor_setcb_many().
@@ -524,7 +524,7 @@ svn_editor_setcb_add_file(svn_editor_t *
svn_editor_cb_add_file_t callback,
apr_pool_t *scratch_pool);
-/** Sets the @c svn_editor_cb_add_symlink_t callback in @a editor
+/** Sets the #svn_editor_cb_add_symlink_t callback in @a editor
* to @a callback.
* @a scratch_pool is used for temporary allocations (if any).
* @see also svn_editor_setcb_many().
@@ -535,7 +535,7 @@ svn_editor_setcb_add_symlink(svn_editor_
svn_editor_cb_add_symlink_t callback,
apr_pool_t *scratch_pool);
-/** Sets the @c svn_editor_cb_add_absent_t callback in @a editor
+/** Sets the #svn_editor_cb_add_absent_t callback in @a editor
* to @a callback.
* @a scratch_pool is used for temporary allocations (if any).
* @see also svn_editor_setcb_many().
@@ -546,7 +546,7 @@ svn_editor_setcb_add_absent(svn_editor_t
svn_editor_cb_add_absent_t callback,
apr_pool_t *scratch_pool);
-/** Sets the @c svn_editor_cb_set_props_t callback in @a editor
+/** Sets the #svn_editor_cb_set_props_t callback in @a editor
* to @a callback.
* @a scratch_pool is used for temporary allocations (if any).
* @see also svn_editor_setcb_many().
@@ -557,7 +557,7 @@ svn_editor_setcb_set_props(svn_editor_t
svn_editor_cb_set_props_t callback,
apr_pool_t *scratch_pool);
-/** Sets the @c svn_editor_cb_set_text_t callback in @a editor
+/** Sets the #svn_editor_cb_set_text_t callback in @a editor
* to @a callback.
* @a scratch_pool is used for temporary allocations (if any).
* @see also svn_editor_setcb_many().
@@ -568,7 +568,7 @@ svn_editor_setcb_set_text(svn_editor_t *
svn_editor_cb_set_text_t callback,
apr_pool_t *scratch_pool);
-/** Sets the @c svn_editor_cb_set_target_t callback in @a editor
+/** Sets the #svn_editor_cb_set_target_t callback in @a editor
* to @a callback.
* @a scratch_pool is used for temporary allocations (if any).
* @see also svn_editor_setcb_many().
@@ -579,7 +579,7 @@ svn_editor_setcb_set_target(svn_editor_t
svn_editor_cb_set_target_t callback,
apr_pool_t *scratch_pool);
-/** Sets the @c svn_editor_cb_delete_t callback in @a editor
+/** Sets the #svn_editor_cb_delete_t callback in @a editor
* to @a callback.
* @a scratch_pool is used for temporary allocations (if any).
* @see also svn_editor_setcb_many().
@@ -590,7 +590,7 @@ svn_editor_setcb_delete(svn_editor_t *ed
svn_editor_cb_delete_t callback,
apr_pool_t *scratch_pool);
-/** Sets the @c svn_editor_cb_copy_t callback in @a editor
+/** Sets the #svn_editor_cb_copy_t callback in @a editor
* to @a callback.
* @a scratch_pool is used for temporary allocations (if any).
* @see also svn_editor_setcb_many().
@@ -601,7 +601,7 @@ svn_editor_setcb_copy(svn_editor_t *edit
svn_editor_cb_copy_t callback,
apr_pool_t *scratch_pool);
-/** Sets the @c svn_editor_cb_move_t callback in @a editor
+/** Sets the #svn_editor_cb_move_t callback in @a editor
* to @a callback.
* @a scratch_pool is used for temporary allocations (if any).
* @see also svn_editor_setcb_many().
@@ -612,7 +612,7 @@ svn_editor_setcb_move(svn_editor_t *edit
svn_editor_cb_move_t callback,
apr_pool_t *scratch_pool);
-/** Sets the @c svn_editor_cb_complete_t callback in @a editor
+/** Sets the #svn_editor_cb_complete_t callback in @a editor
* to @a callback.
* @a scratch_pool is used for temporary allocations (if any).
* @see also svn_editor_setcb_many().
@@ -623,7 +623,7 @@ svn_editor_setcb_complete(svn_editor_t *
svn_editor_cb_complete_t callback,
apr_pool_t *scratch_pool);
-/** Sets the @c svn_editor_cb_abort_t callback in @a editor
+/** Sets the #svn_editor_cb_abort_t callback in @a editor
* to @a callback.
* @a scratch_pool is used for temporary allocations (if any).
* @see also svn_editor_setcb_many().
@@ -678,7 +678,7 @@ svn_editor_setcb_many(svn_editor_t *edit
* @{
*/
-/** Drive @a editor's @c svn_editor_cb_add_directory_t callback.
+/** Drive @a editor's #svn_editor_cb_add_directory_t callback.
*
* Create a new directory at @a relpath. The immediate parent of @a relpath
* is expected to exist.
@@ -699,7 +699,7 @@ svn_editor_setcb_many(svn_editor_t *edit
* added subsequently is given in @a children. @a children is an array of
* const char*s, each giving the basename of an immediate child.
*
- * For all restrictions on driving the editor, see @c svn_editor_t.
+ * For all restrictions on driving the editor, see #svn_editor_t.
*/
svn_error_t *
svn_editor_add_directory(svn_editor_t *editor,
@@ -708,7 +708,7 @@ svn_editor_add_directory(svn_editor_t *e
apr_hash_t *props,
svn_revnum_t replaces_rev);
-/** Drive @a editor's @c svn_editor_cb_add_file_t callback.
+/** Drive @a editor's #svn_editor_cb_add_file_t callback.
*
* Create a new file at @a relpath. The immediate parent of @a relpath
* is expected to exist.
@@ -725,7 +725,7 @@ svn_editor_add_directory(svn_editor_t *e
* by an "add" on the same path. Instead, an "add" with @a replaces_rev set
* accordingly MUST be used.
*
- * For all restrictions on driving the editor, see @c svn_editor_t.
+ * For all restrictions on driving the editor, see #svn_editor_t.
* @since New in 1.7.
*/
svn_error_t *
@@ -734,7 +734,7 @@ svn_editor_add_file(svn_editor_t *editor
apr_hash_t *props,
svn_revnum_t replaces_rev);
-/** Drive @a editor's @c svn_editor_cb_add_symlink_t callback.
+/** Drive @a editor's #svn_editor_cb_add_symlink_t callback.
*
* Create a new symbolic link at @a relpath, with a link target of @a
* target. The immediate parent of @a relpath is expected to exist.
@@ -742,7 +742,7 @@ svn_editor_add_file(svn_editor_t *editor
* For descriptions of @a props and @a replaces_rev, see
* svn_editor_add_file().
*
- * For all restrictions on driving the editor, see @c svn_editor_t.
+ * For all restrictions on driving the editor, see #svn_editor_t.
* @since New in 1.7.
*/
svn_error_t *
@@ -752,7 +752,7 @@ svn_editor_add_symlink(svn_editor_t *edi
apr_hash_t *props,
svn_revnum_t replaces_rev);
-/** Drive @a editor's @c svn_editor_cb_add_absent_t callback.
+/** Drive @a editor's #svn_editor_cb_add_absent_t callback.
*
* Create an "absent" node of kind @a kind at @a relpath. The immediate
* parent of @a relpath is expected to exist.
@@ -760,7 +760,7 @@ svn_editor_add_symlink(svn_editor_t *edi
*
* For a description of @a replaces_rev, see svn_editor_add_file().
*
- * For all restrictions on driving the editor, see @c svn_editor_t.
+ * For all restrictions on driving the editor, see #svn_editor_t.
* @since New in 1.7.
*/
svn_error_t *
@@ -769,7 +769,7 @@ svn_editor_add_absent(svn_editor_t *edit
svn_node_kind_t kind,
svn_revnum_t replaces_rev);
-/** Drive @a editor's @c svn_editor_cb_set_props_t callback.
+/** Drive @a editor's #svn_editor_cb_set_props_t callback.
*
* Set or change properties on the existing node at @a relpath.
* ### TODO @todo Does this send *all* properties, always?
@@ -781,7 +781,7 @@ svn_editor_add_absent(svn_editor_t *edit
* - @a relpath is a symbolic link and an svn_editor_set_target() call will
* follow on the same path.
*
- * For all restrictions on driving the editor, see @c svn_editor_t.
+ * For all restrictions on driving the editor, see #svn_editor_t.
* @since New in 1.7.
*/
svn_error_t *
@@ -791,14 +791,14 @@ svn_editor_set_props(svn_editor_t *edito
apr_hash_t *props,
svn_boolean_t complete);
-/** Drive @a editor's @c svn_editor_cb_set_text_t callback.
+/** Drive @a editor's #svn_editor_cb_set_text_t callback.
*
* Set/change the text content of a file at @a relpath to @a contents
* with checksum @a checksum.
* ### TODO @todo Does this send the *complete* content, always?
* ### TODO @todo What is REVISION for?
*
- * For all restrictions on driving the editor, see @c svn_editor_t.
+ * For all restrictions on driving the editor, see #svn_editor_t.
* @since New in 1.7.
*/
svn_error_t *
@@ -808,13 +808,13 @@ svn_editor_set_text(svn_editor_t *editor
const svn_checksum_t *checksum,
svn_stream_t *contents);
-/** Drive @a editor's @c svn_editor_cb_set_target_t callback.
+/** Drive @a editor's #svn_editor_cb_set_target_t callback.
*
* Set/change the link target that a symbolic link at @a relpath points at
* to @a target.
* ### TODO @todo What is REVISION for?
*
- * For all restrictions on driving the editor, see @c svn_editor_t.
+ * For all restrictions on driving the editor, see #svn_editor_t.
* @since New in 1.7.
*/
svn_error_t *
@@ -823,12 +823,12 @@ svn_editor_set_target(svn_editor_t *edit
svn_revnum_t revision,
const char *target);
-/** Drive @a editor's @c svn_editor_cb_delete_t callback.
+/** Drive @a editor's #svn_editor_cb_delete_t callback.
*
* Delete the existing node at @a relpath, expected to be identical to
* revision @a revision of that path.
*
- * For all restrictions on driving the editor, see @c svn_editor_t.
+ * For all restrictions on driving the editor, see #svn_editor_t.
* @since New in 1.7.
*/
svn_error_t *
@@ -836,14 +836,14 @@ svn_editor_delete(svn_editor_t *editor,
const char *relpath,
svn_revnum_t revision);
-/** Drive @a editor's @c svn_editor_cb_copy_t callback.
+/** Drive @a editor's #svn_editor_cb_copy_t callback.
*
* Copy the node at @a src_relpath, expected to be identical to revision @a
* src_revision of that path, to @a dst_relpath.
*
* For a description of @a replaces_rev, see svn_editor_add_file().
*
- * For all restrictions on driving the editor, see @c svn_editor_t.
+ * For all restrictions on driving the editor, see #svn_editor_t.
* @since New in 1.7.
*/
svn_error_t *
@@ -853,13 +853,13 @@ svn_editor_copy(svn_editor_t *editor,
const char *dst_relpath,
svn_revnum_t replaces_rev);
-/** Drive @a editor's @c svn_editor_cb_move_t callback.
+/** Drive @a editor's #svn_editor_cb_move_t callback.
* Move the node at @a src_relpath, expected to be identical to revision @a
* src_revision of that path, to @a dst_relpath.
*
* For a description of @a replaces_rev, see svn_editor_add_file().
*
- * For all restrictions on driving the editor, see @c svn_editor_t.
+ * For all restrictions on driving the editor, see #svn_editor_t.
* @since New in 1.7.
*/
svn_error_t *
@@ -869,22 +869,22 @@ svn_editor_move(svn_editor_t *editor,
const char *dst_relpath,
svn_revnum_t replaces_rev);
-/** Drive @a editor's @c svn_editor_cb_complete_t callback.
+/** Drive @a editor's #svn_editor_cb_complete_t callback.
*
* Send word that the tree delta has been completed successfully.
*
- * For all restrictions on driving the editor, see @c svn_editor_t.
+ * For all restrictions on driving the editor, see #svn_editor_t.
* @since New in 1.7.
*/
svn_error_t *
svn_editor_complete(svn_editor_t *editor);
-/** Drive @a editor's @c svn_editor_cb_abort_t callback.
+/** Drive @a editor's #svn_editor_cb_abort_t callback.
*
* Notify that the tree delta transmission was not successful.
* ### TODO @todo Shouldn't we add a reason-for-aborting argument?
*
- * For all restrictions on driving the editor, see @c svn_editor_t.
+ * For all restrictions on driving the editor, see #svn_editor_t.
* @since New in 1.7.
*/
svn_error_t *
Modified: subversion/branches/ignore-mergeinfo/subversion/include/svn_error.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/include/svn_error.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/include/svn_error.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/include/svn_error.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -290,7 +290,7 @@ svn_handle_warning(FILE *stream,
/**
* A statement macro for returning error values.
- *
+ *
* This macro can be used when directly returning an error to ensure
* that the call stack is recorded correctly.
*/
Modified: subversion/branches/ignore-mergeinfo/subversion/include/svn_error_codes.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/include/svn_error_codes.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/include/svn_error_codes.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/include/svn_error_codes.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -293,6 +293,11 @@ SVN_ERROR_START
SVN_ERR_STREAM_CATEGORY_START + 3,
"Stream doesn't support resetting")
+ /** @since New in 1.7. */
+ SVN_ERRDEF(SVN_ERR_STREAM_SEEK_NOT_SUPPORTED,
+ SVN_ERR_STREAM_CATEGORY_START + 4,
+ "Stream doesn't support seeking")
+
/* node errors */
SVN_ERRDEF(SVN_ERR_NODE_UNKNOWN_KIND,
@@ -372,7 +377,7 @@ SVN_ERROR_START
SVN_ERR_WC_CATEGORY_START + 7,
"Path is not a working copy directory")
- /* This name is deprecated. Use SVN_ERR_WC_NOT_WORKING_COPY.
+ /* This name is deprecated. Use SVN_ERR_WC_NOT_WORKING_COPY.
* @deprecated Provided for backward compatibility with the 1.6 API. */
#define SVN_ERR_WC_NOT_DIRECTORY SVN_ERR_WC_NOT_WORKING_COPY
Modified: subversion/branches/ignore-mergeinfo/subversion/include/svn_fs.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/include/svn_fs.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/include/svn_fs.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/include/svn_fs.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/include/svn_hash.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/include/svn_hash.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/include/svn_hash.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/include/svn_hash.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/include/svn_io.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/include/svn_io.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/include/svn_io.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/include/svn_io.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -197,6 +197,10 @@ svn_io_open_uniquely_named(apr_file_t **
* issues.)
*
* The file will be deleted according to @a delete_when.
+ * When passing @c svn_io_file_del_none please don't forget to eventually
+ * remove the temporary file to avoid filling up the system temp directory.
+ * It is often appropriate to bind the lifetime of the temporary file to
+ * the lifetime of a pool by using @c svn_io_file_del_on_pool_cleanup.
*
* Temporary allocations will be performed in @a scratch_pool.
*
@@ -698,6 +702,30 @@ typedef svn_error_t *(*svn_close_fn_t)(v
*/
typedef svn_error_t *(*svn_io_reset_fn_t)(void *baton);
+/* An opaque type which represents a mark on a stream.
+ *
+ * @see svn_stream_mark().
+ * @since New in 1.7.
+ */
+typedef struct svn_stream_mark_t svn_stream_mark_t;
+
+/** Mark handler function for a generic stream. @see svn_stream_t and
+ * svn_stream_mark().
+ *
+ * @since New in 1.7.
+ */
+typedef svn_error_t *(*svn_io_mark_fn_t)(void *baton,
+ svn_stream_mark_t **mark,
+ apr_pool_t *pool);
+
+/** Seek handler function for a generic stream. @see svn_stream_t and
+ * svn_stream_seek().
+ *
+ * @since New in 1.7.
+ */
+typedef svn_error_t *(*svn_io_seek_fn_t)(void *baton,
+ svn_stream_mark_t *mark);
+
/** Line-filtering callback function for a generic stream.
* @a baton is the stream's baton.
* @see svn_stream_t, svn_stream_set_baton() and svn_stream_readline().
@@ -766,6 +794,22 @@ void
svn_stream_set_reset(svn_stream_t *stream,
svn_io_reset_fn_t reset_fn);
+/** Set @a stream's mark function to @a mark_fn
+ *
+ * @since New in 1.7.
+ */
+void
+svn_stream_set_mark(svn_stream_t *stream,
+ svn_io_mark_fn_t mark_fn);
+
+/** Set @a stream's seek function to @a seek_fn
+ *
+ * @since New in 1.7.
+ */
+void
+svn_stream_set_seek(svn_stream_t *stream,
+ svn_io_seek_fn_t seek_fn);
+
/** Set @a stream's line-filtering callback function to @a line_filter_cb
*
* @since New in 1.7.
@@ -1023,8 +1067,8 @@ svn_error_t *
svn_stream_close(svn_stream_t *stream);
/** Reset a generic stream back to its origin. E.g. On a file this would be
- * implemented as a seek to position 0). This function returns a
- * @a SVN_ERR_STREAM_RESET_NOT_SUPPORTED error when the stream doesn't
+ * implemented as a seek to position 0). This function returns a
+ * #SVN_ERR_STREAM_RESET_NOT_SUPPORTED error when the stream doesn't
* implement resetting.
*
* @since New in 1.7.
@@ -1032,6 +1076,44 @@ svn_stream_close(svn_stream_t *stream);
svn_error_t *
svn_stream_reset(svn_stream_t *stream);
+/** Set a @a mark at the current position of a generic @a stream,
+ * which can later be sought back to using svn_stream_seek().
+ * The @a mark is allocated in @a pool.
+ *
+ * This function returns the #SVN_ERR_STREAM_SEEK_NOT_SUPPORTED error
+ * if the stream doesn't implement seeking.
+ *
+ * @see svn_stream_seek()
+ * @since New in 1.7.
+ */
+svn_error_t *
+svn_stream_mark(svn_stream_t *stream,
+ svn_stream_mark_t **mark,
+ apr_pool_t *pool);
+
+/* Seek to a @a mark in a generic @a stream.
+ * This function returns the #SVN_ERR_STREAM_SEEK_NOT_SUPPORTED error
+ * if the stream doesn't implement seeking.
+ *
+ * @see svn_stream_mark()
+ * @since New in 1.7.
+ */
+svn_error_t *
+svn_stream_seek(svn_stream_t *stream, svn_stream_mark_t *mark);
+
+/** Return a writable stream which, when written to, writes to both of the
+ * underlying streams. Both of these streams will be closed upon closure of
+ * the returned stream; use svn_stream_disown() if this is not the desired
+ * behavior. One or both of @a out1 and @a out2 may be @c NULL. If both are
+ * @c NULL, @c NULL is returned.
+ *
+ * @since New in 1.7.
+ */
+svn_stream_t *
+svn_stream_tee(svn_stream_t *out1,
+ svn_stream_t *out2,
+ apr_pool_t *pool);
+
/** Write to @a stream using a printf-style @a fmt specifier, passed through
* apr_psprintf() using memory from @a pool.
@@ -1088,6 +1170,20 @@ svn_stream_readline(svn_stream_t *stream
svn_boolean_t *eof,
apr_pool_t *pool);
+/**
+ * Similar to svn_stream_readline(). The line-terminator is detected
+ * automatically. If @a eol is not NULL, the detected line-terminator
+ * is returned in @a *eol. If EOF is reached and the stream does not
+ * end with a newline character, @a *eol will be NULL.
+ *
+ * @since New in 1.7.
+ */
+svn_error_t *
+svn_stream_readline_detect_eol(svn_stream_t *stream,
+ svn_stringbuf_t **stringbuf,
+ const char **eol,
+ svn_boolean_t *eof,
+ apr_pool_t *pool);
/**
* Read the contents of the readable stream @a from and write them to the
@@ -1820,43 +1916,13 @@ svn_io_file_name_get(const char **filena
apr_file_t *file,
apr_pool_t *pool);
-/** Open a new file (for reading and writing) with a unique name based on
- * utf-8 encoded @a filename, in the directory @a dirpath. The file handle is
- * returned in @a *file, and the name is returned in @a *unique_name, also
- * utf8-encoded. Either @a file or @a unique_name may be @c NULL.
+/** Wrapper for apr_file_perms_set().
*
- * If @a delete_when is #svn_io_file_del_on_close, then the @c APR_DELONCLOSE
- * flag will be used when opening the file. The @c APR_BUFFERED flag will
- * always be used.
- *
- * If @a dirpath is NULL, then the directory returned by svn_io_temp_dir()
- * will be used.
- *
- * If @a filename is NULL, a completely random name will be used.
- * Else, a random name based on @a filename will be used.
- *
- * Allocates @a *file and @a *unique_name in @a result_pool. All
- * intermediate allocations will be performed in @a scratch_pool.
- *
- * If @a file is NULL, the file is closed before returning.
- *
- * Claim of Historical Inevitability: this function was written
- * because
- *
- * - svn_io_open_uniquely_named() creates predictable filenames
- * and can cause performance problems when many temporary
- * files are needed in a single directory
- *
- * @since New in 1.7
- */
+ * @since New in 1.7. */
svn_error_t *
-svn_io_mktemp(apr_file_t **file,
- const char **unique_name,
- const char *dirpath,
- const char *filename,
- svn_io_file_del_t delete_when,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
+svn_io_file_perms_set(const char *fname,
+ apr_fileperms_t perms,
+ apr_pool_t *pool);
/** @} */
Modified: subversion/branches/ignore-mergeinfo/subversion/include/svn_iter.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/include/svn_iter.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/include/svn_iter.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/include/svn_iter.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/include/svn_md5.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/include/svn_md5.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/include/svn_md5.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/include/svn_md5.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/include/svn_mergeinfo.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/include/svn_mergeinfo.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/include/svn_mergeinfo.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/include/svn_mergeinfo.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -157,6 +157,9 @@ typedef apr_hash_t *svn_mergeinfo_catalo
* inheritability are also allowed, but will be combined into a single
* range when placed into @a *mergeinfo.
*
+ * @a input may contain relative merge source paths, but these are
+ * converted to absolute paths in @a *mergeinfo.
+ *
* @since New in 1.5.
*/
svn_error_t *
@@ -438,6 +441,9 @@ svn_mergeinfo_inheritable(svn_mergeinfo_
* mergeinfo. Set @a *output to the result, allocated in @a pool.
* If @a input contains no elements, set @a *output to the empty string.
*
+ * @a mergeinput may contain relative merge source paths, but these are
+ * converted to absolute paths in @a *output.
+ *
* @since New in 1.5.
*/
svn_error_t *
Modified: subversion/branches/ignore-mergeinfo/subversion/include/svn_nls.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/include/svn_nls.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/include/svn_nls.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/include/svn_nls.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/include/svn_opt.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/include/svn_opt.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/include/svn_opt.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/include/svn_opt.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/include/svn_path.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/include/svn_path.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/include/svn_path.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/include/svn_path.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -153,7 +153,7 @@ svn_path_basename(const char *path, apr_
*
* The returned dirname will be allocated in @a pool.
*
- * New code should use either svn_dirent_dirname() (for local paths) or
+ * New code should use either svn_dirent_dirname() (for local paths) or
* svn_uri_dirname() (for urls and repository paths).
*
* @deprecated Provided for backward compatibility with the 1.6 API.
Modified: subversion/branches/ignore-mergeinfo/subversion/include/svn_pools.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/include/svn_pools.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/include/svn_pools.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/include/svn_pools.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/include/svn_props.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/include/svn_props.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/include/svn_props.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/include/svn_props.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -108,7 +108,7 @@ svn_prop_hash_dup(apr_hash_t *hash,
/**
* Return the value of property @a prop_name as it is in @a properties,
- * with values <tt>const svn_string_t</tt>. If @a prop_name is not
+ * with values <tt>const svn_string_t</tt>. If @a prop_name is not
* in @a properties or @ properties is NULL, return NULL.
*/
const char *
@@ -350,10 +350,10 @@ svn_prop_name_is_valid(const char *prop_
/** Meta-data properties.
*
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/include/svn_quoprint.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/include/svn_quoprint.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/include/svn_quoprint.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/include/svn_quoprint.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/include/svn_ra.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/include/svn_ra.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/include/svn_ra.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/include/svn_ra.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -661,6 +661,31 @@ svn_ra_get_session_url(svn_ra_session_t
apr_pool_t *pool);
+/** Convert @a url into a path relative to the URL at which @a ra_session
+ * is parented, setting @a *rel_path to that value. If @a url is not
+ * a child of the session URL, return @c SVN_ERR_RA_ILLEGAL_URL.
+ *
+ * @since New in 1.7.
+ */
+svn_error_t *
+svn_ra_get_path_relative_to_session(svn_ra_session_t *ra_session,
+ const char **rel_path,
+ const char *url,
+ apr_pool_t *pool);
+
+/** Convert @a url into a path relative to the repository root URL of
+ * the repository with which @a ra_session is associated, setting @a
+ * *rel_path to that value. If @a url is not a child of repository
+ * root URL, return @c SVN_ERR_RA_ILLEGAL_URL.
+ *
+ * @since New in 1.7.
+ */
+svn_error_t *
+svn_ra_get_path_relative_to_root(svn_ra_session_t *ra_session,
+ const char **rel_path,
+ const char *url,
+ apr_pool_t *pool);
+
/**
* Get the latest revision number from the repository of @a session.
*
@@ -1312,7 +1337,7 @@ svn_ra_do_diff(svn_ra_session_t *session
* If @a limit is non-zero only invoke @a receiver on the first @a limit
* logs.
*
- * If @a discover_changed_paths, then each call to receiver passes a
+ * If @a discover_changed_paths, then each call to @a receiver passes a
* <tt>const apr_hash_t *</tt> for the receiver's @a changed_paths argument;
* the hash's keys are all the paths committed in that revision.
* Otherwise, each call to receiver passes NULL for @a changed_paths.
Modified: subversion/branches/ignore-mergeinfo/subversion/include/svn_ra_svn.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/include/svn_ra_svn.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/include/svn_ra_svn.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/include/svn_ra_svn.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/include/svn_repos.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/include/svn_repos.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/include/svn_repos.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/include/svn_repos.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
@@ -479,6 +479,8 @@ svn_repos_post_revprop_change_hook(svn_r
/** Return the path to @a repos's pre-obliterate hook, allocated in
* @a pool.
+ *
+ * @since New in 1.7.
*/
const char *
svn_repos_pre_obliterate_hook(svn_repos_t *repos,
@@ -486,6 +488,8 @@ svn_repos_pre_obliterate_hook(svn_repos_
/** Return the path to @a repos's post-obliterate hook, allocated in
* @a pool.
+ *
+ * @since New in 1.7.
*/
const char *
svn_repos_post_obliterate_hook(svn_repos_t *repos,
Modified: subversion/branches/ignore-mergeinfo/subversion/include/svn_sorts.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/include/svn_sorts.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/include/svn_sorts.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/include/svn_sorts.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/include/svn_string.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/include/svn_string.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/include/svn_string.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/include/svn_string.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/include/svn_subst.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/include/svn_subst.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/include/svn_subst.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/include/svn_subst.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/include/svn_time.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/include/svn_time.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/include/svn_time.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/include/svn_time.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/include/svn_types.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/include/svn_types.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/include/svn_types.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/include/svn_types.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/include/svn_user.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/include/svn_user.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/include/svn_user.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/include/svn_user.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/include/svn_utf.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/include/svn_utf.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/include/svn_utf.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/include/svn_utf.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
Modified: subversion/branches/ignore-mergeinfo/subversion/include/svn_version.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo/subversion/include/svn_version.h?rev=984122&r1=984121&r2=984122&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo/subversion/include/svn_version.h (original)
+++ subversion/branches/ignore-mergeinfo/subversion/include/svn_version.h Tue Aug 10 17:03:06 2010
@@ -1,10 +1,10 @@
/**
* @copyright
* ====================================================================
- * Licensed to the Subversion Corporation (SVN Corp.) under one
+ * Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
- * regarding copyright ownership. The SVN Corp. licenses this file
+ * regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at