You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by cm...@apache.org on 2011/01/28 00:48:59 UTC
svn commit: r1064363 - in /subversion/branches/uris-as-urls: ./
subversion/include/ subversion/include/private/ subversion/libsvn_client/
subversion/libsvn_diff/ subversion/libsvn_ra/ subversion/libsvn_repos/
subversion/libsvn_subr/ subversion/libsvn_wc/
Author: cmpilato
Date: Thu Jan 27 23:48:58 2011
New Revision: 1064363
URL: http://svn.apache.org/viewvc?rev=1064363&view=rev
Log:
Sync the 'uris-as-urls' branch with recent trunk changes.
(Merged /subversion/trunk:r1063883-1064362.)
Modified:
subversion/branches/uris-as-urls/ (props changed)
subversion/branches/uris-as-urls/COMMITTERS
subversion/branches/uris-as-urls/INSTALL
subversion/branches/uris-as-urls/subversion/include/private/svn_eol_private.h
subversion/branches/uris-as-urls/subversion/include/private/svn_fs_util.h
subversion/branches/uris-as-urls/subversion/include/private/svn_mergeinfo_private.h
subversion/branches/uris-as-urls/subversion/include/private/svn_opt_private.h
subversion/branches/uris-as-urls/subversion/include/private/svn_ra_private.h
subversion/branches/uris-as-urls/subversion/include/private/svn_sqlite.h
subversion/branches/uris-as-urls/subversion/include/private/svn_wc_private.h
subversion/branches/uris-as-urls/subversion/include/svn_client.h
subversion/branches/uris-as-urls/subversion/include/svn_cmdline.h
subversion/branches/uris-as-urls/subversion/include/svn_config.h
subversion/branches/uris-as-urls/subversion/include/svn_dav.h
subversion/branches/uris-as-urls/subversion/include/svn_delta.h
subversion/branches/uris-as-urls/subversion/include/svn_diff.h
subversion/branches/uris-as-urls/subversion/include/svn_editor.h
subversion/branches/uris-as-urls/subversion/include/svn_fs.h
subversion/branches/uris-as-urls/subversion/include/svn_io.h
subversion/branches/uris-as-urls/subversion/include/svn_mergeinfo.h
subversion/branches/uris-as-urls/subversion/include/svn_ra.h
subversion/branches/uris-as-urls/subversion/include/svn_repos.h
subversion/branches/uris-as-urls/subversion/include/svn_subst.h
subversion/branches/uris-as-urls/subversion/include/svn_types.h
subversion/branches/uris-as-urls/subversion/include/svn_wc.h
subversion/branches/uris-as-urls/subversion/libsvn_client/client.h
subversion/branches/uris-as-urls/subversion/libsvn_client/status.c
subversion/branches/uris-as-urls/subversion/libsvn_diff/token.c
subversion/branches/uris-as-urls/subversion/libsvn_ra/util.c
subversion/branches/uris-as-urls/subversion/libsvn_repos/authz.c
subversion/branches/uris-as-urls/subversion/libsvn_subr/io.c
subversion/branches/uris-as-urls/subversion/libsvn_wc/util.c
subversion/branches/uris-as-urls/subversion/libsvn_wc/workqueue.h
Propchange: subversion/branches/uris-as-urls/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 27 23:48:58 2011
@@ -40,4 +40,4 @@
/subversion/branches/tc_url_rev:874351-874483
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
-/subversion/trunk:1060426-1063882
+/subversion/trunk:1060426-1064362
Modified: subversion/branches/uris-as-urls/COMMITTERS
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/COMMITTERS?rev=1064363&r1=1064362&r2=1064363&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/COMMITTERS [UTF-8] (original)
+++ subversion/branches/uris-as-urls/COMMITTERS [UTF-8] Thu Jan 27 23:48:58 2011
@@ -101,33 +101,41 @@ Commit access for specific areas:
Miscellaneous:
- kbohling Kirby C. Bohling <kb...@birddog.com> (tools/dev)
+ kbohling Kirby C. Bohling <kb...@birddog.com> (tools/dev) [EMAIL
+ IS BOUNCING]
nsd Nick Duffek <ni...@duffek.com> (doc)
xsteve Stefan Reichör <st...@xsteve.at> (psvn.el)
josander Jostein Andersen <jo...@vait.se> (various)
niemeyer Gustavo Niemeyer <ni...@conectiva.com> (svnperms.py)
- zbrown Zack Brown <zb...@tumblerings.org> (doc)
+ [EMAIL IS BOUNCING]
+ zbrown Zack Brown <zb...@tumblerings.org> (doc) [EMAIL IS
+ BOUNCING]
mprice Michael Price <ec...@gmail.com> (releases)
jrepenning Jack Repenning <jr...@collab.net> (tools/dev)
- lonestar Martin Maurer <ma...@email.de> (svnshow)
- shlomif Shlomi Fish <sh...@vipe.technion.ac.il> (svn-push)
+ jlonestar Martin Maurer <ma...@email.de> (svnshow) [EMAIL
+ IS BOUNCING]
+ shlomif Shlomi Fish <sh...@vipe.technion.ac.il> (svn-push) [EMAIL
+ IS BOUNCING]
mthelen Michael W Thelen <mi...@pietdepsi.com> (doc)
jeremybettis Jeremy Bettis <je...@deadbeef.com> (case-insensitive)
martinto Martin Tomes <li...@tomes.org> (case-insensitive)
danpat Daniel Patterson <da...@danpat.net> (svn-graph.pl)
- archiecobbs Archie Cobbs <ar...@awarix.com> (svnmerge)
+ archiecobbs Archie Cobbs <ar...@awarix.com> (svnmerge) [EMAIL
+ IS BOUNCING]
giovannibajo Giovanni Bajo <ra...@develer.com> (svnmerge)
offby1 Eric Hanchrow <of...@blarg.net> (doc)
nomis80 Simon Perreault <no...@nomis80.org> (svn-clean)
jlvarner Joshua Varner <jl...@gmail.com> (doc)
nori Kobayashi Noritada <no...@dolphin.c.u-tokyo.ac.jp> (Ruby tools,
- po: ja)
+ po: ja) [EMAIL IS
+ BOUNCING]
mf Martin Furter <mf...@rola.ch> (svnmirror.sh
svn-backup-dumps.py)
adejong Arthur de Jong <ar...@ch.tudelft.nl> (svn2cl)
wsanchez Wilfredo Sánchez <ws...@wsanchez.net> (various contrib)
mhagger Michael Haggerty <mh...@alum.mit.edu> (svntest)
- madanus Madan U S <ma...@collab.net> (svnmerge)
+ madanus Madan U S <ma...@collab.net> (svnmerge) [EMAIL
+ IS BOUNCING]
wein Mathias Weinert <we...@mccw.de> (mailer)
bhuvan Bhuvaneswaran <bh...@collab.net> (svn2feed.py,
build/hudson)
@@ -156,13 +164,16 @@ Commit access for specific areas:
jzgoda Jaroslaw Zgoda <jz...@o2.pl> (po: pl)
karolszk Karol Szkudlarek <ka...@mikronika.com.pl> (po: pl)
plasma Wei-Hon Chen <pl...@ms9.hinet.net> (po: zh_TW)
- jihuang June-Yen Huang <ji...@iis.sinica.edu.tw> (po: zh_TW)
+ jihuang June-Yen Huang <ji...@iis.sinica.edu.tw> (po: zh_TW) [EMAIL
+ IS BOUNCING]
marcosc Marcos Chaves <ma...@gmail.com> (po: pt_BR)
pynoos Hojin Choi <ho...@gmail.com> (po: ko)
blueboh Jeong Seolin <bl...@gmail.com> (po: ko)
dongsheng Dongsheng Song <so...@live.cn> (po: zh_CN)
- hynnet YingNing Huang <hy...@bao.hynnet.com> (po: zh_CN)
- lark Wang Jian <la...@linux.net.cn> (po: zh_CN)
+ hynnet YingNing Huang <hy...@bao.hynnet.com> (po: zh_CN) [EMAIL
+ IS BOUNCING]
+ lark Wang Jian <la...@linux.net.cn> (po: zh_CN) [EMAIL
+ IS BOUNCING]
giorgio_valoti Giorgio Valoti <gi...@mac.com> (po: it)
nebiac Federico Nebiacolombo <ci...@amsjv.it> (po: it)
fabien Fabien Coelho <fa...@coelho.net> (po: fr)
Modified: subversion/branches/uris-as-urls/INSTALL
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/INSTALL?rev=1064363&r1=1064362&r2=1064363&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/INSTALL (original)
+++ subversion/branches/uris-as-urls/INSTALL Thu Jan 27 23:48:58 2011
@@ -322,7 +322,7 @@ I. INTRODUCTION
newer. The autogen.sh script knows about that.
- 5. An HTTP client libary: serf. (OPTIONAL)
+ 5. An HTTP client library: serf. (OPTIONAL)
If you want your client to be able to speak to an Apache
server (via a http:// or https:// URL), you must link against
Modified: subversion/branches/uris-as-urls/subversion/include/private/svn_eol_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/subversion/include/private/svn_eol_private.h?rev=1064363&r1=1064362&r2=1064363&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/subversion/include/private/svn_eol_private.h (original)
+++ subversion/branches/uris-as-urls/subversion/include/private/svn_eol_private.h Thu Jan 27 23:48:58 2011
@@ -49,7 +49,7 @@ char *
svn_eol__find_eol_start(char *buf, apr_size_t len);
/* Return the first eol marker found in [@a buf, @a endp) as a
- * NUL-terminated string, or NULL if no eol marker is found.
+ * NULL-terminated string, or NULL if no eol marker is found.
*
* If the last valid character of @a buf is the first byte of a
* potentially two-byte eol sequence, just return that single-character
Modified: subversion/branches/uris-as-urls/subversion/include/private/svn_fs_util.h
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/subversion/include/private/svn_fs_util.h?rev=1064363&r1=1064362&r2=1064363&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/subversion/include/private/svn_fs_util.h (original)
+++ subversion/branches/uris-as-urls/subversion/include/private/svn_fs_util.h Thu Jan 27 23:48:58 2011
@@ -52,7 +52,7 @@ svn_fs__canonicalize_abspath(const char
/* If EXPECT_OPEN, verify that FS refers to an open database;
otherwise, verify that FS refers to an unopened database. Return
- an appropriate error if the expecation fails to match the
+ an appropriate error if the expectation fails to match the
reality. */
svn_error_t *
svn_fs__check_fs(svn_fs_t *fs, svn_boolean_t expect_open);
Modified: subversion/branches/uris-as-urls/subversion/include/private/svn_mergeinfo_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/subversion/include/private/svn_mergeinfo_private.h?rev=1064363&r1=1064362&r2=1064363&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/subversion/include/private/svn_mergeinfo_private.h (original)
+++ subversion/branches/uris-as-urls/subversion/include/private/svn_mergeinfo_private.h Thu Jan 27 23:48:58 2011
@@ -54,14 +54,14 @@ svn_mergeinfo__set_inheritance(svn_merge
/* Return whether INFO1 and INFO2 are equal in *IS_EQUAL.
- CONSIDER_INERITANCE determines how the rangelists in the two
- hashes are compared for equality. If CONSIDER_INERITANCE is FALSE,
+ CONSIDER_INHERITANCE determines how the rangelists in the two
+ hashes are compared for equality. If CONSIDER_INHERITANCE is FALSE,
then the start and end revisions of the svn_merge_range_t's being
compared are the only factors considered when determining equality.
e.g. '/trunk: 1,3-4*,5' == '/trunk: 1,3-5'
- If CONSIDER_INERITANCE is TRUE, then the inheritability of the
+ If CONSIDER_INHERITANCE is TRUE, then the inheritability of the
svn_merge_range_t's is also considered and must be the same for two
otherwise identical ranges to be judged equal.
@@ -168,8 +168,8 @@ svn_mergeinfo__get_range_endpoints(svn_r
/* Set *FILTERED_MERGEINFO to a deep copy of MERGEINFO, allocated in
RESULT_POOL, less any rangelists that fall outside of the range
- OLDEST_REV:YOUGEST_REV (inclusive) if INCLUDE_RANGE is true, or less
- any rangelists within the range OLDEST_REV:YOUGEST_REV if INCLUDE_RANGE
+ OLDEST_REV:YOUNGEST_REV (inclusive) if INCLUDE_RANGE is true, or less
+ any rangelists within the range OLDEST_REV:YOUNGEST_REV if INCLUDE_RANGE
is false. If all the rangelists mapped to a given path are filtered
then filter that path as well. If all paths are filtered or MERGEINFO is
empty or NULL then *FILTERED_MERGEINFO is set to an empty hash.
Modified: subversion/branches/uris-as-urls/subversion/include/private/svn_opt_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/subversion/include/private/svn_opt_private.h?rev=1064363&r1=1064362&r2=1064363&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/subversion/include/private/svn_opt_private.h (original)
+++ subversion/branches/uris-as-urls/subversion/include/private/svn_opt_private.h Thu Jan 27 23:48:58 2011
@@ -79,9 +79,9 @@ svn_opt__arg_canonicalize_url(const char
/*
* Attempt to transform PATH_IN, which is a local path-like user input, into a
* valid local path:
- * - Attempt to get the correct capitialization by trying to actually find
+ * - Attempt to get the correct capitalization by trying to actually find
* the path specified.
- * - If the path does not exist (which is valid) the given capitialization
+ * - If the path does not exist (which is valid) the given capitalization
* is used.
* - canonicalize the separator ("/") characters
* PATH_IN is in UTF-8 encoding and has no peg revision specifier.
Modified: subversion/branches/uris-as-urls/subversion/include/private/svn_ra_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/subversion/include/private/svn_ra_private.h?rev=1064363&r1=1064362&r2=1064363&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/subversion/include/private/svn_ra_private.h (original)
+++ subversion/branches/uris-as-urls/subversion/include/private/svn_ra_private.h Thu Jan 27 23:48:58 2011
@@ -37,7 +37,7 @@ extern "C" {
#endif /* __cplusplus */
/* Return an error with code SVN_ERR_UNSUPPORTED_FEATURE, and an error
- message referencing PATH_OR_URL, if the "server" pointed to be
+ message referencing PATH_OR_URL, if the "server" pointed to by
RA_SESSION doesn't support Merge Tracking (e.g. is pre-1.5).
Perform temporary allocations in POOL. */
svn_error_t *
Modified: subversion/branches/uris-as-urls/subversion/include/private/svn_sqlite.h
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/subversion/include/private/svn_sqlite.h?rev=1064363&r1=1064362&r2=1064363&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/subversion/include/private/svn_sqlite.h (original)
+++ subversion/branches/uris-as-urls/subversion/include/private/svn_sqlite.h Thu Jan 27 23:48:58 2011
@@ -118,7 +118,7 @@ svn_sqlite__open(svn_sqlite__db_t **db,
int latest_schema, const char * const *upgrade_sql,
apr_pool_t *result_pool, apr_pool_t *scratch_pool);
-/* Explicity close the connection in DB. */
+/* Explicitly close the connection in DB. */
svn_error_t *
svn_sqlite__close(svn_sqlite__db_t *db);
Modified: subversion/branches/uris-as-urls/subversion/include/private/svn_wc_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/subversion/include/private/svn_wc_private.h?rev=1064363&r1=1064362&r2=1064363&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/subversion/include/private/svn_wc_private.h (original)
+++ subversion/branches/uris-as-urls/subversion/include/private/svn_wc_private.h Thu Jan 27 23:48:58 2011
@@ -571,7 +571,7 @@ svn_wc__node_is_file_external(svn_boolea
* that there can be multiple prop conflicts.
*
* One or two of @a prop_conflicted, @a text_conflicted and @a
- * tree_conflicted can be NULL if we're not interrested in that particular
+ * tree_conflicted can be NULL if we're not interested in that particular
* value.
*/
svn_error_t *
Modified: subversion/branches/uris-as-urls/subversion/include/svn_client.h
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/subversion/include/svn_client.h?rev=1064363&r1=1064362&r2=1064363&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/subversion/include/svn_client.h (original)
+++ subversion/branches/uris-as-urls/subversion/include/svn_client.h Thu Jan 27 23:48:58 2011
@@ -2813,7 +2813,7 @@ svn_client_diff(const apr_array_header_t
*
* If @a peg_revision is #svn_opt_revision_unspecified, behave
* identically to svn_client_diff5(), using @a path for both of that
- * function's @a path1 and @a path2 argments.
+ * function's @a path1 and @a path2 arguments.
*
* All other options are handled identically to svn_client_diff5().
*
@@ -2996,7 +2996,7 @@ svn_client_diff_summarize(const char *pa
*
* If @a peg_revision is #svn_opt_revision_unspecified, behave
* identically to svn_client_diff_summarize2(), using @a path for both
- * of that function's @a path1 and @a path2 argments.
+ * of that function's @a path1 and @a path2 arguments.
*
* The function may report false positives if @a ignore_ancestry is false,
* as described in the documentation for svn_client_diff_summarize2().
@@ -4378,7 +4378,7 @@ svn_client_revprop_get(const char *propn
apr_pool_t *pool);
/**
- * Invoke @a receiver with @a receiver_baton to return the regular properies
+ * Invoke @a receiver with @a receiver_baton to return the regular properties
* of @a target, a URL or working copy path. @a receiver will be called
* for each path encountered.
*
@@ -4434,7 +4434,7 @@ svn_client_proplist3(const char *target,
*
* @since New in 1.2.
*
- * @deprecated Provided for backward compatiblility with the 1.4 API.
+ * @deprecated Provided for backward compatibility with the 1.4 API.
*/
SVN_DEPRECATED
svn_error_t *
@@ -5442,10 +5442,10 @@ svn_client_url_from_path2(const char **u
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
-/** Simlar to svn_client_url_from_path2(), but without a context argument.
+/** Similar to svn_client_url_from_path2(), but without a context argument.
*
* @since New in 1.5.
- * @deprecated Provided for backward compatilibity with the 1.6 API.
+ * @deprecated Provided for backward compatibility with the 1.6 API.
*/
SVN_DEPRECATED
svn_error_t *
@@ -5503,7 +5503,7 @@ svn_client_uuid_from_path2(const char **
/** Similar to svn_client_uuid_from_path2(), but with a relative path and
* an access baton.
*
- * @deprecated Provided for backward compatilibity with the 1.6 API.
+ * @deprecated Provided for backward compatibility with the 1.6 API.
*/
SVN_DEPRECATED
svn_error_t *
Modified: subversion/branches/uris-as-urls/subversion/include/svn_cmdline.h
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/subversion/include/svn_cmdline.h?rev=1064363&r1=1064362&r2=1064363&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/subversion/include/svn_cmdline.h (original)
+++ subversion/branches/uris-as-urls/subversion/include/svn_cmdline.h Thu Jan 27 23:48:58 2011
@@ -289,7 +289,7 @@ svn_cmdline_auth_ssl_client_cert_pw_prom
apr_pool_t *pool);
/** An implementation of @c svn_auth_plaintext_prompt_func_t that
- * prompts the user whether storing unencypted passwords to disk is OK.
+ * prompts the user whether storing unencrypted passwords to disk is OK.
*
* Expects a @c svn_cmdline_prompt_baton2_t to be passed as @a baton.
*
@@ -302,7 +302,7 @@ svn_cmdline_auth_plaintext_prompt(svn_bo
apr_pool_t *pool);
/** An implementation of @c svn_auth_plaintext_passphrase_prompt_func_t that
- * prompts the user whether storing unencypted passphrase to disk is OK.
+ * prompts the user whether storing unencrypted passphrase to disk is OK.
*
* Expects a @c svn_cmdline_prompt_baton2_t to be passed as @a baton.
*
Modified: subversion/branches/uris-as-urls/subversion/include/svn_config.h
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/subversion/include/svn_config.h?rev=1064363&r1=1064362&r2=1064363&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/subversion/include/svn_config.h (original)
+++ subversion/branches/uris-as-urls/subversion/include/svn_config.h Thu Jan 27 23:48:58 2011
@@ -309,7 +309,7 @@ typedef svn_boolean_t (*svn_config_secti
void *baton);
/** Similar to svn_config_enumerate_sections2(), but uses a memory pool of
- * @a cfg instead of one that is explicitely provided.
+ * @a cfg instead of one that is explicitly provided.
*
* @deprecated Provided for backwards compatibility with the 1.2 API.
*/
@@ -356,7 +356,7 @@ typedef svn_boolean_t (*svn_config_enume
void *baton);
/** Similar to svn_config_enumerate2(), but uses a memory pool of
- * @a cfg instead of one that is explicitely provided.
+ * @a cfg instead of one that is explicitly provided.
*
* @deprecated Provided for backwards compatibility with the 1.2 API.
*/
Modified: subversion/branches/uris-as-urls/subversion/include/svn_dav.h
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/subversion/include/svn_dav.h?rev=1064363&r1=1064362&r2=1064363&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/subversion/include/svn_dav.h (original)
+++ subversion/branches/uris-as-urls/subversion/include/svn_dav.h Thu Jan 27 23:48:58 2011
@@ -92,12 +92,12 @@ extern "C" {
universe of svn_lock_t->owner.) */
#define SVN_DAV_LOCK_OWNER_HEADER "X-SVN-Lock-Owner"
-/** Assuming the OPTIONS was performed againts a resource within a
+/** Assuming the OPTIONS was performed against a resource within a
* Subversion repository, then this header indicates the youngest
* revision in the repository. */
#define SVN_DAV_YOUNGEST_REV_HEADER "SVN-Youngest-Rev"
-/** Assuming the OPTIONS was performed againts a resource within a
+/** Assuming the OPTIONS was performed against a resource within a
* Subversion repository, then this header indicates the UUID of the
* repository. */
#define SVN_DAV_REPOS_UUID_HEADER "SVN-Repository-UUID"
Modified: subversion/branches/uris-as-urls/subversion/include/svn_delta.h
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/subversion/include/svn_delta.h?rev=1064363&r1=1064362&r2=1064363&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/subversion/include/svn_delta.h (original)
+++ subversion/branches/uris-as-urls/subversion/include/svn_delta.h Thu Jan 27 23:48:58 2011
@@ -1058,7 +1058,7 @@ svn_delta_get_cancellation_editor(svn_ca
* #svn_depth_infinity, #svn_depth_empty, #svn_depth_files,
* #svn_depth_immediates, or #svn_depth_unknown.
*
- * If filtering is deemed unncessary (or if @a requested_depth is
+ * If filtering is deemed unnecessary (or if @a requested_depth is
* #svn_depth_unknown), @a *editor and @a *edit_baton will be set to @a
* wrapped_editor and @a wrapped_baton, respectively; otherwise,
* they'll be set to new objects allocated from @a pool.
@@ -1195,7 +1195,7 @@ typedef svn_error_t *(*svn_file_rev_hand
* reproduced here for dependency reasons.
*
* @deprecated This type is provided for the svn_compat_wrap_file_rev_handler()
- * compatibilty wrapper, and should not be used for new development.
+ * compatibility wrapper, and should not be used for new development.
* @since New in 1.5.
*/
typedef svn_error_t *(*svn_file_rev_handler_old_t)(
Modified: subversion/branches/uris-as-urls/subversion/include/svn_diff.h
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/subversion/include/svn_diff.h?rev=1064363&r1=1064362&r2=1064363&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/subversion/include/svn_diff.h (original)
+++ subversion/branches/uris-as-urls/subversion/include/svn_diff.h Thu Jan 27 23:48:58 2011
@@ -490,7 +490,7 @@ svn_diff_file_diff4_2(svn_diff_t **diff,
const svn_diff_file_options_t *options,
apr_pool_t *pool);
-/** Simliar to svn_file_diff4_2(), but with @a options set to a struct with
+/** Similar to svn_file_diff4_2(), but with @a options set to a struct with
* default options.
*
* @deprecated Provided for backwards compatibility with the 1.3 API.
@@ -639,7 +639,7 @@ svn_diff_mem_string_diff(svn_diff_t **di
apr_pool_t *pool);
-/** Generate @a diff output from the @a orginal, @a modified and @a latest
+/** Generate @a diff output from the @a original, @a modified and @a latest
* in-memory strings. @a diff will be allocated in @a pool.
*
* @since New in 1.5.
Modified: subversion/branches/uris-as-urls/subversion/include/svn_editor.h
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/subversion/include/svn_editor.h?rev=1064363&r1=1064362&r2=1064363&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/subversion/include/svn_editor.h (original)
+++ subversion/branches/uris-as-urls/subversion/include/svn_editor.h Thu Jan 27 23:48:58 2011
@@ -89,7 +89,7 @@ extern "C" {
*
* HISTORY
*
- * Classicaly, Subversion had a notion of a "tree delta" which could be
+ * Classically, Subversion had a notion of a "tree delta" which could be
* passed around as an independent entity. Theory implied this delta was an
* entity in its own right, to be used when and where necessary.
* Unfortunately, this theory did not work well in practice. The producer
@@ -105,7 +105,7 @@ extern "C" {
* a set of operations describing the change, and a "receiver" accepts and
* applies them to its tree.
*
- * The classic interace was named "@c svn_delta_editor_t" and was described
+ * The classic interface was named "@c svn_delta_editor_t" and was described
* idiomatically as the "editor interface". This generation of the interface
* retains the "editor" name for that reason. All notions of a "tree delta"
* structure are no longer part of this interface.
Modified: subversion/branches/uris-as-urls/subversion/include/svn_fs.h
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/subversion/include/svn_fs.h?rev=1064363&r1=1064362&r2=1064363&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/subversion/include/svn_fs.h (original)
+++ subversion/branches/uris-as-urls/subversion/include/svn_fs.h Thu Jan 27 23:48:58 2011
@@ -1524,7 +1524,7 @@ svn_fs_get_mergeinfo(svn_mergeinfo_catal
* mergeinfo hash. If @a mergeinfo is NULL then @a *validated_mergeinfo is
* set to NULL.
*
- * @a *validated_mergeinfo is allocated in @a result_pool. All tempporary
+ * @a *validated_mergeinfo is allocated in @a result_pool. All temporary
* allocations are performed in @a scratch_pool.
*
* @since New in 1.7.
Modified: subversion/branches/uris-as-urls/subversion/include/svn_io.h
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/subversion/include/svn_io.h?rev=1064363&r1=1064362&r2=1064363&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/subversion/include/svn_io.h (original)
+++ subversion/branches/uris-as-urls/subversion/include/svn_io.h Thu Jan 27 23:48:58 2011
@@ -738,7 +738,7 @@ svn_io_dir_file_copy(const char *src_pat
*
* In Subversion 1.7 reset support was added as an optional feature of
* streams. If a stream implements resetting it allows reading the data
- * again after a successfull call to svn_stream_reset().
+ * again after a successful call to svn_stream_reset().
*/
typedef struct svn_stream_t svn_stream_t;
@@ -1304,7 +1304,7 @@ svn_io_remove_file(const char *path,
* doesn't exist. Use @a pool for temporary allocations.
*
* Because recursive delete of a directory tree can be a lengthy operation,
- * provide @a cancel_func and @a cancel_baton for interruptability.
+ * provide @a cancel_func and @a cancel_baton for interruptibility.
*
* @since New in 1.5.
*/
Modified: subversion/branches/uris-as-urls/subversion/include/svn_mergeinfo.h
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/subversion/include/svn_mergeinfo.h?rev=1064363&r1=1064362&r2=1064363&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/subversion/include/svn_mergeinfo.h (original)
+++ subversion/branches/uris-as-urls/subversion/include/svn_mergeinfo.h Thu Jan 27 23:48:58 2011
@@ -61,7 +61,7 @@ extern "C" {
*
* If a path has no @c SVN_PROP_MERGEINFO of its own, it inherits mergeinfo
* from its nearest parent that has @c SVN_PROP_MERGEINFO set. The
- * exception to this is @c SVN_PROP_MERGEINFO with non-ineritable revision
+ * exception to this is @c SVN_PROP_MERGEINFO with non-inheritable revision
* ranges. These non-inheritable ranges apply only to the path which they
* are set on.
*
@@ -518,7 +518,7 @@ typedef enum svn_mergeinfo_inheritance_t
svn_mergeinfo_inherited,
/** Mergeinfo on target's nearest (path-wise, not history-wise)
- ancestor, regardless of whether target has explict mergeinfo. */
+ ancestor, regardless of whether target has explicit mergeinfo. */
svn_mergeinfo_nearest_ancestor
} svn_mergeinfo_inheritance_t;
Modified: subversion/branches/uris-as-urls/subversion/include/svn_ra.h
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/subversion/include/svn_ra.h?rev=1064363&r1=1064362&r2=1064363&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/subversion/include/svn_ra.h (original)
+++ subversion/branches/uris-as-urls/subversion/include/svn_ra.h Thu Jan 27 23:48:58 2011
@@ -503,7 +503,7 @@ typedef struct svn_ra_callbacks2_t
/** Notification callback baton, used with progress_func. */
void *progress_baton;
- /** Cancelation function
+ /** Cancellation function
*
* As its baton, the general callback baton is used
*
@@ -638,7 +638,7 @@ svn_ra_open3(svn_ra_session_t **session_
apr_pool_t *pool);
/**
- * Similiar to svn_ra_open3(), but with @a uuid set to @c NULL.
+ * Similar to svn_ra_open3(), but with @a uuid set to @c NULL.
*
* @since New in 1.3.
* @deprecated Provided for backward compatibility with the 1.4 API.
@@ -1671,7 +1671,7 @@ svn_ra_get_file_revs2(svn_ra_session_t *
apr_pool_t *pool);
/**
- * Similiar to svn_ra_get_file_revs2(), but with @a include_merged_revisions
+ * Similar to svn_ra_get_file_revs2(), but with @a include_merged_revisions
* set to FALSE.
*
* @since New in 1.2.
Modified: subversion/branches/uris-as-urls/subversion/include/svn_repos.h
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/subversion/include/svn_repos.h?rev=1064363&r1=1064362&r2=1064363&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/subversion/include/svn_repos.h (original)
+++ subversion/branches/uris-as-urls/subversion/include/svn_repos.h Thu Jan 27 23:48:58 2011
@@ -185,7 +185,7 @@ typedef svn_error_t *(*svn_repos_file_re
/* Notification system. */
-/** The type of action occuring.
+/** The type of action occurring.
*
* @since New in 1.7.
*/
@@ -1067,7 +1067,7 @@ svn_repos_abort_report(void *report_bato
* proportional to the greatest depth of the tree under @a tgt_root, not
* the total size of the delta.
*
- * ### svn_repos_dir_delta2 is mostly superceded by the reporter
+ * ### svn_repos_dir_delta2 is mostly superseded by the reporter
* ### functionality (svn_repos_begin_report2 and friends).
* ### svn_repos_dir_delta2 does allow the roots to be transaction
* ### roots rather than just revision roots, and it has the
Modified: subversion/branches/uris-as-urls/subversion/include/svn_subst.h
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/subversion/include/svn_subst.h?rev=1064363&r1=1064362&r2=1064363&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/subversion/include/svn_subst.h (original)
+++ subversion/branches/uris-as-urls/subversion/include/svn_subst.h Thu Jan 27 23:48:58 2011
@@ -362,7 +362,7 @@ svn_subst_read_specialfile(svn_stream_t
apr_pool_t *scratch_pool);
-/** Set @a *stream to a writeable stream that accepts content in
+/** Set @a *stream to a writable stream that accepts content in
* the "normal form" for a special file, to be located at @a path, and
* will create that file when the stream is closed. The stream will be
* allocated in @a result_pool, and any temporary allocations will be
Modified: subversion/branches/uris-as-urls/subversion/include/svn_types.h
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/subversion/include/svn_types.h?rev=1064363&r1=1064362&r2=1064363&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/subversion/include/svn_types.h (original)
+++ subversion/branches/uris-as-urls/subversion/include/svn_types.h Thu Jan 27 23:48:58 2011
@@ -69,7 +69,7 @@ extern "C" {
* is much cheaper than repeated aligned access. Define this macro to 1
* on those machines.
* Unaligned access on other machines (e.g. IA64) will trigger memory
- * acccess faults or simply misbehave.
+ * access faults or simply misbehave.
*
* @since New in 1.7.
*/
@@ -98,7 +98,7 @@ typedef struct svn_error_t
*
* Note that if this error was generated by Subversion's API, you'll
* probably want to use svn_err_best_message() to get a single
- * decriptive string for this error chain (see the @a child member)
+ * descriptive string for this error chain (see the @a child member)
* or svn_handle_error2() to print the error chain in full. This is
* because Subversion's API functions sometimes add many links to
* the error chain that lack details (used only to produce virtual
@@ -795,10 +795,10 @@ svn_log_changed_path_dup(const svn_log_c
typedef struct svn_log_entry_t
{
/** A hash containing as keys every path committed in @a revision; the
- * values are (#svn_log_changed_path_t *) stuctures.
+ * values are (#svn_log_changed_path_t *) structures.
*
* The subversion core libraries will always set this field to the same
- * value as changed_paths2 for compatibity reasons.
+ * value as changed_paths2 for compatibility reasons.
*
* @deprecated Provided for backward compatibility with the 1.5 API.
*/
@@ -830,13 +830,13 @@ typedef struct svn_log_entry_t
svn_boolean_t has_children;
/** A hash containing as keys every path committed in @a revision; the
- * values are (#svn_log_changed_path2_t *) stuctures.
+ * values are (#svn_log_changed_path2_t *) structures.
*
* If this value is not @c NULL, it MUST have the same value as
* changed_paths or svn_log_entry_dup() will not create an identical copy.
*
* The subversion core libraries will always set this field to the same
- * value as changed_paths for compatibity with users assuming an older
+ * value as changed_paths for compatibility with users assuming an older
* version.
*
* @since New in 1.6.
@@ -885,7 +885,7 @@ svn_log_entry_dup(const svn_log_entry_t
* This function is invoked once on each log message, in the order
* determined by the caller (see above-mentioned functions).
*
- * @a baton is what you think it is, and @a log_entry contains relevent
+ * @a baton is what you think it is, and @a log_entry contains relevant
* information for the log message. Any of @a log_entry->author,
* @a log_entry->date, or @a log_entry->message may be @c NULL.
*
Modified: subversion/branches/uris-as-urls/subversion/include/svn_wc.h
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/subversion/include/svn_wc.h?rev=1064363&r1=1064362&r2=1064363&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/subversion/include/svn_wc.h (original)
+++ subversion/branches/uris-as-urls/subversion/include/svn_wc.h Thu Jan 27 23:48:58 2011
@@ -99,15 +99,16 @@ extern "C" {
const svn_version_t *
svn_wc_version(void);
+
/**
* @defgroup svn_wc Working copy management
* @{
*/
-/** Flags for use with svn_wc_translated_file2
+
+/** Flags for use with svn_wc_translated_file2() and svn_wc_translated_stream().
*
* @defgroup translate_flags Translation flags
- *
* @{
*/
@@ -156,6 +157,7 @@ svn_wc_version(void);
/** @} */
+
/**
* @defgroup svn_wc_context Working copy context
* @{
@@ -172,6 +174,8 @@ svn_wc_version(void);
* @note: #svn_wc_context_t should be passed by non-const pointer in all
* APIs, even for read-only operations, as it contains mutable data (caching,
* etc.).
+ *
+ * @since New in 1.7.
*/
typedef struct svn_wc_context_t svn_wc_context_t;
@@ -213,16 +217,23 @@ svn_wc_context_destroy(svn_wc_context_t
/** @} */
-/* Locking/Opening/Closing */
+/**
+ * Locking/Opening/Closing using adm access batons.
+ *
+ * @defgroup svn_wc_adm_access Adm access batons (deprecated)
+ * @{
+ */
/** Baton for access to a working copy administrative area.
*
- * One day all such access will require a baton, we're not there yet.
- *
* Access batons can be grouped into sets, by passing an existing open
* baton when opening a new baton. Given one baton in a set, other batons
* may be retrieved. This allows an entire hierarchy to be locked, and
* then the set of batons can be passed around by passing a single baton.
+ *
+ * @deprecated Provided for backward compatibility with the 1.6 API.
+ * New code should use a #svn_wc_context_t object to access the working
+ * copy.
*/
typedef struct svn_wc_adm_access_t svn_wc_adm_access_t;
@@ -254,7 +265,7 @@ typedef struct svn_wc_adm_access_t svn_w
* subdirectory of @a path is already write locked.
*
* If @a cancel_func is non-NULL, call it with @a cancel_baton to determine
- * if the client has cancelled the operation.
+ * if the client has canceled the operation.
*
* @a pool will be used to allocate memory for the baton and any subsequently
* cached items. If @a adm_access has not been closed when the pool is
@@ -384,7 +395,7 @@ svn_wc_adm_probe_open(svn_wc_adm_access_
* will hold write locks.
*
* If @a cancel_func is non-NULL, call it with @a cancel_baton to determine
- * if the client has cancelled the operation.
+ * if the client has canceled the operation.
*
* This function is essentially a combination of svn_wc_adm_open3() and
* svn_wc_get_actual_target(), with the emphasis on reducing physical IO.
@@ -414,6 +425,8 @@ svn_wc_adm_open_anchor(svn_wc_adm_access
* absent from, @a associated, return #SVN_ERR_WC_NOT_LOCKED.
*
* @a pool is used only for local processing, it is not used for the batons.
+ *
+ * @deprecated Provided for backward compatibility with the 1.6 API.
*/
SVN_DEPRECATED
svn_error_t *
@@ -428,6 +441,8 @@ svn_wc_adm_retrieve(svn_wc_adm_access_t
* directory, or does not exist, then the behaviour is like that of
* svn_wc_adm_retrieve() with @a path replaced by the parent directory of
* @a path.
+ *
+ * @deprecated Provided for backward compatibility with the 1.6 API.
*/
SVN_DEPRECATED
svn_error_t *
@@ -454,7 +469,7 @@ svn_wc_adm_probe_retrieve(svn_wc_adm_acc
* @a associated.
*
* If @a cancel_func is non-NULL, call it with @a cancel_baton to determine
- * if the client has cancelled the operation.
+ * if the client has canceled the operation.
*
* Use @a pool only for local processing, not to allocate @a *adm_access.
*
@@ -513,6 +528,7 @@ svn_wc_adm_probe_try(svn_wc_adm_access_t
* Any temporary allocations are performed using @a scratch_pool.
*
* @since New in 1.6
+ * @deprecated Provided for backward compatibility with the 1.6 API.
*/
SVN_DEPRECATED
svn_error_t *
@@ -523,18 +539,24 @@ svn_wc_adm_close2(svn_wc_adm_access_t *a
* Similar to svn_wc_adm_close2(), but with the internal pool of @a adm_access
* used for temporary allocations.
*
- * @deprecated Provided for backward compabibility with the 1.5 API.
+ * @deprecated Provided for backward compatibility with the 1.5 API.
*/
SVN_DEPRECATED
svn_error_t *
svn_wc_adm_close(svn_wc_adm_access_t *adm_access);
-/** Return the path used to open the access baton @a adm_access */
+/** Return the path used to open the access baton @a adm_access.
+ *
+ * @deprecated Provided for backward compatibility with the 1.6 API.
+ */
SVN_DEPRECATED
const char *
svn_wc_adm_access_path(const svn_wc_adm_access_t *adm_access);
-/** Return the pool used by access baton @a adm_access */
+/** Return the pool used by access baton @a adm_access.
+ *
+ * @deprecated Provided for backward compatibility with the 1.6 API.
+ */
SVN_DEPRECATED
apr_pool_t *
svn_wc_adm_access_pool(const svn_wc_adm_access_t *adm_access);
@@ -543,12 +565,16 @@ svn_wc_adm_access_pool(const svn_wc_adm_
* @c FALSE otherwise. Compared to svn_wc_locked() this is a cheap, fast
* function that doesn't access the filesystem.
*
+ * @deprecated Provided for backward compatibility with the 1.6 API.
* New code should use svn_wc_locked2() instead.
*/
SVN_DEPRECATED
svn_boolean_t
svn_wc_adm_locked(const svn_wc_adm_access_t *adm_access);
+/** @} */
+
+
/** Gets up to two booleans indicating whether a path is locked for
* writing.
*
@@ -557,7 +583,7 @@ svn_wc_adm_locked(const svn_wc_adm_acces
* write_lock on @a local_abspath
*
* @a locked_here and/or @a locked can be NULL when you are not
- * interrested in a specific value
+ * interested in a specific value
*
* @since New in 1.7.
*/
@@ -582,6 +608,24 @@ svn_wc_locked(svn_boolean_t *locked,
/**
+ * @defgroup svn_wc_adm_dir_name Name of Subversion's admin dir
+ * @{
+ */
+
+/** The default name of the administrative subdirectory.
+ *
+ * Ideally, this would be completely private to wc internals (in fact,
+ * it used to be that adm_subdir() in adm_files.c was the only function
+ * who knew the adm subdir's name). However, import wants to protect
+ * against importing administrative subdirs, so now the name is a
+ * matter of public record.
+ *
+ * @deprecated Provided for backward compatibility with the 1.2 API.
+ */
+#define SVN_WC_ADM_DIR_NAME ".svn"
+
+
+/**
* Return @c TRUE if @a name is the name of the WC administrative
* directory. Use @a pool for any temporary allocations. Only works
* with base directory names, not paths or URIs.
@@ -626,8 +670,13 @@ svn_error_t *
svn_wc_set_adm_dir(const char *name,
apr_pool_t *pool);
+/** @} */
-
+
+/**
+ * @defgroup svn_wc_externals Externals
+ * @{
+ */
/** Callback for external definitions updates
*
@@ -887,9 +936,8 @@ svn_wc_parse_externals_description(apr_h
const char *desc,
apr_pool_t *pool);
-
+/** @} */
-/* Notification/callback handling. */
/**
* @defgroup svn_wc_notifications Notification callback handling
@@ -1187,7 +1235,7 @@ typedef struct svn_wc_notify_t {
/** Path, either absolute or relative to the current working directory
* (i.e., not relative to an anchor). @c path is "." or another valid path
- * value for compatibilty reasons when the real target is an url that
+ * value for compatibility reasons when the real target is an url that
* is available in @c url. */
const char *path;
@@ -1367,29 +1415,9 @@ typedef void (*svn_wc_notify_func_t)(voi
/**
- * A simple callback type to wrap svn_ra_get_file(); see that
- * docstring for more information.
- *
- * This technique allows libsvn_client to 'wrap' svn_ra_get_file() and
- * pass it down into libsvn_wc functions, thus allowing the WC layer
- * to legally call the RA function via (blind) callback.
- *
- * @since New in 1.5
- */
-typedef svn_error_t *(*svn_wc_get_file_t)(void *baton,
- const char *path,
- svn_revnum_t revision,
- svn_stream_t *stream,
- svn_revnum_t *fetched_rev,
- apr_hash_t **props,
- apr_pool_t *pool);
-
-
-/**
* Interactive conflict handling
*
* @defgroup svn_wc_conflict Conflict callback functionality
- *
* @{
*
* This API gives a Subversion client application the opportunity to
@@ -1973,7 +2001,7 @@ svn_wc_create_conflict_result(svn_wc_con
* Implementations of this callback are free to present the conflict
* using any user interface. This may include simple contextual
* conflicts in a file's text or properties, or more complex
- * 'tree'-based conflcts related to obstructed additions, deletions,
+ * 'tree'-based conflicts related to obstructed additions, deletions,
* and edits. The callback implementation is free to decide which
* sorts of conflicts to handle; it's also free to decide which types
* of conflicts are automatically resolvable and which require user
@@ -2558,23 +2586,10 @@ svn_wc_props_modified_p(svn_boolean_t *m
apr_pool_t *pool);
-
-
-/** Administrative subdir.
- *
- * Ideally, this would be completely private to wc internals (in fact,
- * it used to be that adm_subdir() in adm_files.c was the only function
- * who knew the adm subdir's name). However, import wants to protect
- * against importing administrative subdirs, so now the name is a
- * matter of public record.
- *
- * @deprecated Provided for backward compatibility with the 1.2 API.
+/**
+ * @defgroup svn_wc_entries Entries and status (deprecated)
+ * @{
*/
-#define SVN_WC_ADM_DIR_NAME ".svn"
-
-
-
-/* Entries and status. */
/** The schedule states an entry can be in. */
typedef enum svn_wc_schedule_t
@@ -2599,20 +2614,13 @@ typedef enum svn_wc_schedule_t
* when it isn't set to the actual size value of the unchanged
* working file.
*
- * @defgroup svn_wc_entry_working_size_constants Working size constants
- *
- * @{
- */
-
-/** The value of the working size is unknown (hasn't been
+ * The value of the working size is unknown (hasn't been
* calculated and stored in the past for whatever reason).
*
* @since New in 1.5
*/
#define SVN_WC_ENTRY_WORKING_SIZE_UNKNOWN (-1)
-/** @} */
-
/** A working copy entry -- that is, revision control information about
* one versioned entity.
*/
@@ -2940,6 +2948,8 @@ svn_wc_entry_t *
svn_wc_entry_dup(const svn_wc_entry_t *entry,
apr_pool_t *pool);
+/** @} */
+
/** Given @a local_abspath in a dir under version control, decide if it is
* in a state of conflict; return the answers in @a *text_conflicted_p, @a
@@ -3080,7 +3090,7 @@ typedef struct svn_wc_entry_callbacks_t
* If #svn_depth_infinity, recurse fully starting from @a path.
*
* If @a cancel_func is non-NULL, call it with @a cancel_baton to determine
- * if the client has cancelled the operation.
+ * if the client has canceled the operation.
*
* Like our other entries interfaces, entries that are in a 'excluded',
* 'deleted' or 'absent' state (and not scheduled for re-addition) are not
@@ -3281,7 +3291,7 @@ svn_wc_maybe_set_repos_root(svn_wc_adm_a
* We have three functions for getting working copy status: one function
* for getting the status of exactly one thing, another for
* getting the statuses of (potentially) multiple things and a third for
- * gettting the working copy out-of-dateness with respect to the repository.
+ * getting the working copy out-of-dateness with respect to the repository.
*
* Why do we have two different functions for getting working copy status?
* The concept of depth, as explained in the documentation for
@@ -3377,7 +3387,7 @@ typedef struct svn_wc_status3_t
/** Set to TRUE if the item is the victim of a conflict. */
svn_boolean_t conflicted;
- /** The status of the node itself. In order of precendence: Tree conflicts,
+ /** The status of the node itself. In order of precedence: Tree conflicts,
* structural changes, text changes (including text conflicts). */
enum svn_wc_status_kind node_status;
@@ -3804,7 +3814,7 @@ typedef void (*svn_wc_status_func_t)(voi
* or @c NULL if the default set of ignorable file patterns should be used.
*
* If @a cancel_func is non-NULL, call it with @a cancel_baton while walking
- * to determine if the client has cancelled the operation.
+ * to determine if the client has canceled the operation.
*
* If @a external_func is non-NULL and an external definition is found
* while walking @a local_abspath, call @a external_func with @a
@@ -3878,7 +3888,7 @@ svn_wc_walk_status(svn_wc_context_t *wc_
* or @c NULL if the default set of ignorable file patterns should be used.
*
* If @a cancel_func is non-NULL, call it with @a cancel_baton while building
- * the @a statushash to determine if the client has cancelled the operation.
+ * the @a statushash to determine if the client has canceled the operation.
*
* If @a traversal_info is non-NULL, then record pre-update traversal
* state in it. (Caller should obtain @a traversal_info from
@@ -4692,7 +4702,7 @@ typedef struct svn_wc_committed_queue_t
* Create a queue for use with svn_wc_queue_committed() and
* svn_wc_process_committed_queue().
*
- * The returned queue and all further allocations required for queueing
+ * The returned queue and all further allocations required for queuing
* new items will also be done from @a pool.
*
* @since New in 1.5.
@@ -5095,7 +5105,10 @@ svn_wc_crawl_revisions(const char *path,
apr_pool_t *pool);
-/* Working copy roots. */
+/**
+ * @defgroup svn_wc_roots Working copy roots
+ * @{
+ */
/** Set @a *wc_root to @c TRUE if @a local_abspath represents a "working copy
* root", @c FALSE otherwise. Here, @a local_abspath is a "working copy root"
@@ -5144,7 +5157,9 @@ svn_wc_get_wc_root(const char **wcroot_a
apr_pool_t *scratch_pool,
apr_pool_t *result_pool);
-
+/** @} */
+
+
/* Updates. */
/** Conditionally split @a path into an @a anchor and @a target for the
@@ -5192,8 +5207,29 @@ svn_wc_get_actual_target(const char *pat
apr_pool_t *pool);
-
-/* Update and update-like functionality. */
+/**
+ * @defgroup svn_wc_update_switch Update and switch (update-like functionality)
+ * @{
+ */
+
+/**
+ * A simple callback type to wrap svn_ra_get_file(); see that
+ * docstring for more information.
+ *
+ * This technique allows libsvn_client to 'wrap' svn_ra_get_file() and
+ * pass it down into libsvn_wc functions, thus allowing the WC layer
+ * to legally call the RA function via (blind) callback.
+ *
+ * @since New in 1.5
+ * @deprecated Provided for backward compatibility with the 1.6 API.
+ */
+typedef svn_error_t *(*svn_wc_get_file_t)(void *baton,
+ const char *path,
+ svn_revnum_t revision,
+ svn_stream_t *stream,
+ svn_revnum_t *fetched_rev,
+ apr_hash_t **props,
+ apr_pool_t *pool);
/**
* Set @a *editor and @a *edit_baton to an editor and baton for updating a
@@ -5496,8 +5532,14 @@ svn_wc_get_switch_editor(svn_revnum_t *t
svn_wc_traversal_info_t *ti,
apr_pool_t *pool);
+/** @} */
+
+
+/**
+ * @defgroup svn_wc_properties Properties
+ * @{
+ */
-
/* A word about the implementation of working copy property storage:
*
* Since properties are key/val pairs, you'd think we store them in
@@ -5780,10 +5822,13 @@ svn_wc_canonicalize_svn_prop(const svn_s
void *getter_baton,
apr_pool_t *pool);
+/** @} */
-/* Diffs */
-
+/**
+ * @defgroup svn_wc_diffs Diffs
+ * @{
+ */
/**
* Return an @a editor/@a edit_baton for diffing a working copy against the
@@ -6154,6 +6199,13 @@ svn_wc_get_prop_diffs(apr_array_header_t
svn_wc_adm_access_t *adm_access,
apr_pool_t *pool);
+/** @} */
+
+
+/**
+ * @defgroup svn_wc_merging Merging
+ * @{
+ */
/** The outcome of a merge carried out (or tried as a dry-run) by
* svn_wc_merge()
@@ -6439,6 +6491,8 @@ svn_wc_merge_prop_diffs(svn_wc_notify_st
svn_boolean_t dry_run,
apr_pool_t *pool);
+/** @} */
+
/** Given a @a path to a wc file, return in @a *contents a readonly stream to
* the pristine contents of the file that would serve as base content for the
@@ -6529,7 +6583,7 @@ svn_wc_cleanup3(svn_wc_context_t *wc_ctx
* swn_wc_context_t.
*
* @since New in 1.2.
- * @deprecated Provided for backward compability with the 1.6 API.
+ * @deprecated Provided for backward compatibility with the 1.6 API.
*/
SVN_DEPRECATED
svn_error_t *
@@ -6885,8 +6939,11 @@ svn_wc_create_tmp_file(apr_file_t **fp,
apr_pool_t *pool);
-
-/* EOL conversion and keyword expansion. */
+/**
+ * @defgroup svn_wc_translate EOL conversion and keyword expansion
+ * @{
+ */
+
/** Set @a xlated_path to a translated copy of @a src
* or to @a src itself if no translation is necessary.
@@ -6896,7 +6953,7 @@ svn_wc_create_tmp_file(apr_file_t **fp,
* as requested by @a flags.
*
* If @a cancel_func is non-NULL, call it with @a cancel_baton to determine
- * if the client has cancelled the operation.
+ * if the client has canceled the operation.
*
* When translating to the normal form, inconsistent eol styles will be
* repaired when appropriate for the given setting. When translating
@@ -6960,7 +7017,7 @@ svn_wc_translated_file(const char **xlat
* @a local_abspath; stream write operations are not supported.
*
* The @a flags are the same constants as those used for
- * svn_wc_translated_file().
+ * svn_wc_translated_file2().
*
* @since New in 1.5.
* @deprecated Provided for compatibility with the 1.6 API.
@@ -6974,9 +7031,13 @@ svn_wc_translated_stream(svn_stream_t **
apr_uint32_t flags,
apr_pool_t *pool);
-
-/* Text/Prop Deltas Using an Editor */
+ /** @} */
+
+/**
+ * @defgroup svn_wc_deltas Text/Prop Deltas Using an Editor
+ * @{
+ */
/** Send the local modifications for versioned file @a local_abspath (with
* matching @a file_baton) through @a editor, then close @a file_baton
@@ -7092,6 +7153,13 @@ svn_wc_transmit_prop_deltas(const char *
const char **tempfile,
apr_pool_t *pool);
+/** @} */
+
+
+/**
+ * @defgroup svn_wc_ignore Ignoring unversioned files and directories
+ * @{
+ */
/** Get the run-time configured list of ignore patterns from the
* #svn_config_t's in the @a config hash, and store them in @a *patterns.
@@ -7106,7 +7174,7 @@ svn_wc_get_default_ignores(apr_array_hea
* @a config hash and the local ignore patterns from the directory
* at @a local_abspath, using @a wc_ctx, and store them in @a *patterns.
* Allocate @a *patterns and its contents in @a result_pool, use @a
- * scrach_pool for temporary allocations.
+ * scratch_pool for temporary allocations.
*
* @since New in 1.7.
*/
@@ -7141,7 +7209,14 @@ svn_wc_match_ignore_list(const char *str
const apr_array_header_t *list,
apr_pool_t *pool);
-
+/** @} */
+
+
+/**
+ * @defgroup svn_wc_repos_locks Repository locks
+ * @{
+ */
+
/** Add @a lock to the working copy for @a local_abspath. If @a
* local_abspath is read-only, due to locking properties, make it writable.
* Perform temporary allocations in @a scratch_pool.
@@ -7193,7 +7268,9 @@ svn_wc_remove_lock(const char *path,
svn_wc_adm_access_t *adm_access,
apr_pool_t *pool);
-
+/** @} */
+
+
/** A structure to report a summary of a working copy, including the
* mix of revisions found within it, whether any parts are switched or
* locally modified, and whether it is a sparse checkout.
@@ -7240,7 +7317,7 @@ typedef struct svn_wc_revision_status_t
* modified.
*
* If @a cancel_func is non-NULL, call it with @a cancel_baton to determine
- * if the client has cancelled the operation.
+ * if the client has canceled the operation.
*
* Allocate *result_p in @a result_pool, use @a scratch_pool for temporary
* allocations.
@@ -7285,7 +7362,7 @@ svn_wc_revision_status(svn_wc_revision_s
* be the empty string.
*
* If @a cancel_func is not @c NULL, call it with @a cancel_baton to
- * determine if the client has cancelled the operation.
+ * determine if the client has canceled the operation.
*
* If @a notify_func is not @c NULL, call it with @a notify_baton to
* report the change (using notification types
@@ -7348,10 +7425,10 @@ svn_wc_set_changelist(const char *path,
* (e.g., #svn_depth_infinity).
*
* @a wc_ctx contains a tree lock, for the local path to the working copy
- * which will be used as the root of this operation. If
+ * which will be used as the root of this operation.
*
* If @a cancel_func is not @c NULL, call it with @a cancel_baton at
- * various points to determine if the client has cancelled the operation.
+ * various points to determine if the client has canceled the operation.
*
* If @a notify_func is not @c NULL, call it with @a notify_baton to
* report changes as they are made.
@@ -7403,7 +7480,7 @@ svn_wc_crop_tree(svn_wc_adm_access_t *an
* report changes as they are made.
*
* If @a cancel_func is not @c NULL, call it with @a cancel_baton at
- * various points to determine if the client has cancelled the operation.
+ * various points to determine if the client has canceled the operation.
*
*
* @since New in 1.7
Modified: subversion/branches/uris-as-urls/subversion/libsvn_client/client.h
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/subversion/libsvn_client/client.h?rev=1064363&r1=1064362&r2=1064363&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/subversion/libsvn_client/client.h (original)
+++ subversion/branches/uris-as-urls/subversion/libsvn_client/client.h Thu Jan 27 23:48:58 2011
@@ -860,6 +860,8 @@ int svn_client__sort_commit_item_urls(co
a common *BASE_URL for the items in the array, and rewrite those
items' URLs to be relative to that *BASE_URL.
+ COMMIT_ITEMS is an array of (svn_client_commit_item3_t *) items.
+
Afterwards, some of the items in COMMIT_ITEMS may contain data
allocated in POOL. */
svn_error_t *
@@ -871,7 +873,9 @@ svn_client__condense_commit_items(const
/* Commit the items in the COMMIT_ITEMS array using EDITOR/EDIT_BATON
to describe the committed local mods. Prior to this call,
COMMIT_ITEMS should have been run through (and BASE_URL generated
- by) svn_client__condense_commit_items.
+ by) svn_client__condense_commit_items().
+
+ COMMIT_ITEMS is an array of (svn_client_commit_item3_t *) items.
CTX->NOTIFY_FUNC/CTX->BATON will be called as the commit progresses, as
a way of describing actions to the application layer (if non NULL).
Modified: subversion/branches/uris-as-urls/subversion/libsvn_client/status.c
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/subversion/libsvn_client/status.c?rev=1064363&r1=1064362&r2=1064363&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/subversion/libsvn_client/status.c (original)
+++ subversion/branches/uris-as-urls/subversion/libsvn_client/status.c Thu Jan 27 23:48:58 2011
@@ -585,6 +585,9 @@ svn_client_status_dup(const svn_client_s
if (status->changelist)
st->changelist = apr_pstrdup(result_pool, status->changelist);
+ if (status->ood_changed_author)
+ st->ood_changed_author = apr_pstrdup(result_pool, status->ood_changed_author);
+
if (status->repos_lock)
st->repos_lock = svn_lock_dup(status->repos_lock, result_pool);
Modified: subversion/branches/uris-as-urls/subversion/libsvn_diff/token.c
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/subversion/libsvn_diff/token.c?rev=1064363&r1=1064362&r2=1064363&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/subversion/libsvn_diff/token.c (original)
+++ subversion/branches/uris-as-urls/subversion/libsvn_diff/token.c Thu Jan 27 23:48:58 2011
@@ -69,10 +69,10 @@ svn_diff__tree_create(svn_diff__tree_t *
static svn_error_t *
-svn_diff__tree_insert_token(svn_diff__node_t **node, svn_diff__tree_t *tree,
- void *diff_baton,
- const svn_diff_fns_t *vtable,
- apr_uint32_t hash, void *token)
+tree_insert_token(svn_diff__node_t **node, svn_diff__tree_t *tree,
+ void *diff_baton,
+ const svn_diff_fns_t *vtable,
+ apr_uint32_t hash, void *token)
{
svn_diff__node_t *new_node;
svn_diff__node_t **node_ref;
@@ -165,9 +165,7 @@ svn_diff__get_tokens(svn_diff__position_
break;
offset++;
- SVN_ERR(svn_diff__tree_insert_token(&node, tree,
- diff_baton, vtable,
- hash, token));
+ SVN_ERR(tree_insert_token(&node, tree, diff_baton, vtable, hash, token));
/* Create a new position */
position = apr_palloc(pool, sizeof(*position));
Modified: subversion/branches/uris-as-urls/subversion/libsvn_ra/util.c
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/subversion/libsvn_ra/util.c?rev=1064363&r1=1064362&r2=1064363&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/subversion/libsvn_ra/util.c (original)
+++ subversion/branches/uris-as-urls/subversion/libsvn_ra/util.c Thu Jan 27 23:48:58 2011
@@ -38,10 +38,6 @@
#include "svn_private_config.h"
#include "private/svn_ra_private.h"
-/* Return an error with code SVN_ERR_UNSUPPORTED_FEATURE, and an error
- message referencing PATH_OR_URL, if the "server" pointed to be
- RA_SESSION doesn't support Merge Tracking (e.g. is pre-1.5).
- Perform temporary allocations in POOL. */
svn_error_t *
svn_ra__assert_mergeinfo_capable_server(svn_ra_session_t *ra_session,
const char *path_or_url,
Modified: subversion/branches/uris-as-urls/subversion/libsvn_repos/authz.c
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/subversion/libsvn_repos/authz.c?rev=1064363&r1=1064362&r2=1064363&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/subversion/libsvn_repos/authz.c (original)
+++ subversion/branches/uris-as-urls/subversion/libsvn_repos/authz.c Thu Jan 27 23:48:58 2011
@@ -398,8 +398,8 @@ authz_get_any_access_parser_cb(const cha
/* Does the section apply to the query? */
if (section_name[0] == '/'
- || strncmp(section_name, b->repos_path,
- strlen(b->repos_path)) == 0)
+ || strncasecmp(section_name, b->repos_path,
+ strlen(b->repos_path)) == 0)
{
b->allow = b->deny = svn_authz_none;
Modified: subversion/branches/uris-as-urls/subversion/libsvn_subr/io.c
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/subversion/libsvn_subr/io.c?rev=1064363&r1=1064362&r2=1064363&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/subversion/libsvn_subr/io.c (original)
+++ subversion/branches/uris-as-urls/subversion/libsvn_subr/io.c Thu Jan 27 23:48:58 2011
@@ -85,19 +85,14 @@
#define RETRY_INITIAL_SLEEP 1000
#define RETRY_MAX_SLEEP 128000
-#ifndef WIN32_RETRY_LOOP
-#if defined(WIN32) && !defined(SVN_NO_WIN32_RETRY_LOOP)
-#define WIN32_RETRY_LOOP(err, expr) \
+#define RETRY_LOOP(err, expr, test) \
do \
{ \
apr_status_t os_err = APR_TO_OS_ERROR(err); \
int sleep_count = RETRY_INITIAL_SLEEP; \
int retries; \
for (retries = 0; \
- retries < RETRY_MAX_ATTEMPTS && \
- (os_err == ERROR_ACCESS_DENIED \
- || os_err == ERROR_SHARING_VIOLATION \
- || os_err == ERROR_DIR_NOT_EMPTY); \
+ retries < RETRY_MAX_ATTEMPTS && (test); \
++retries, os_err = APR_TO_OS_ERROR(err)) \
{ \
apr_sleep(sleep_count); \
@@ -107,6 +102,20 @@
} \
} \
while (0)
+
+#if defined(EDEADLK) && APR_HAS_THREADS
+#define EDEADLK_RETRY_LOOP(err, expr) \
+ RETRY_LOOP(err, expr, (os_err == EDEADLK))
+#else
+#define EDEADLK_RETRY_LOOP(err, expr) ((void)0)
+#endif
+
+#ifndef WIN32_RETRY_LOOP
+#if defined(WIN32) && !defined(SVN_NO_WIN32_RETRY_LOOP)
+#define WIN32_RETRY_LOOP(err, expr) \
+ RETRY_LOOP(err, expr, (os_err == ERROR_ACCESS_DENIED \
+ || os_err == ERROR_SHARING_VIOLATION \
+ || os_err == ERROR_DIR_NOT_EMPTY))
#else
#define WIN32_RETRY_LOOP(err, expr) ((void)0)
#endif
@@ -1695,6 +1704,22 @@ svn_io_file_lock2(const char *lock_file,
/* Get lock on the filehandle. */
apr_err = apr_file_lock(lockfile_handle, locktype);
+
+ /* In deployments with two or more multithreaded servers running on
+ the same system serving two or more fsfs repositories it is
+ possible for a deadlock to occur when getting a write lock on
+ db/txn-current-lock:
+
+ Process 1 Process 2
+ --------- ---------
+ thread 1: get lock in repos A
+ thread 1: get lock in repos B
+ thread 2: block getting lock in repos A
+ thread 2: try to get lock in B *** deadlock ***
+
+ Retry for a while for the deadlock to clear. */
+ EDEADLK_RETRY_LOOP(apr_err, apr_file_lock(lockfile_handle, locktype));
+
if (apr_err)
{
switch (locktype & APR_FLOCK_TYPEMASK)
Modified: subversion/branches/uris-as-urls/subversion/libsvn_wc/util.c
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/subversion/libsvn_wc/util.c?rev=1064363&r1=1064362&r2=1064363&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/subversion/libsvn_wc/util.c (original)
+++ subversion/branches/uris-as-urls/subversion/libsvn_wc/util.c Thu Jan 27 23:48:58 2011
@@ -346,7 +346,7 @@ svn_wc__conflict_description2_dup(const
svn_wc_conflict_version_t *
svn_wc_conflict_version_create(const char *repos_url,
- const char* path_in_repos,
+ const char *path_in_repos,
svn_revnum_t peg_rev,
svn_node_kind_t node_kind,
apr_pool_t *pool)
Modified: subversion/branches/uris-as-urls/subversion/libsvn_wc/workqueue.h
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/subversion/libsvn_wc/workqueue.h?rev=1064363&r1=1064362&r2=1064363&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/subversion/libsvn_wc/workqueue.h (original)
+++ subversion/branches/uris-as-urls/subversion/libsvn_wc/workqueue.h Thu Jan 27 23:48:58 2011
@@ -286,6 +286,8 @@ svn_wc__wq_add_deletion_postcommit(svn_w
apr_pool_t *scratch_pool);
+/* Queue a work item that will call log_do_committed() with all of these
+ * parameters. See log_do_committed(). */
svn_error_t *
svn_wc__wq_add_postcommit(svn_wc__db_t *db,
const char *local_abspath,