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 2011/01/27 18:49:52 UTC
svn commit: r1064228 - in
/subversion/branches/ignore-mergeinfo-log/subversion: include/svn_dav.h
include/svn_ra.h include/svn_ra_svn.h libsvn_ra_local/ra_plugin.c
libsvn_ra_neon/options.c libsvn_ra_serf/options.c libsvn_ra_svn/client.c
Author: hwright
Date: Thu Jan 27 17:49:51 2011
New Revision: 1064228
URL: http://svn.apache.org/viewvc?rev=1064228&view=rev
Log:
On the ignore-mergeinfo-log branch:
Rename the ignore mergeinfo RA capability to reflect the more generic
ignore-prop-mods API and capabitility.
* subversion/libsvn_ra_local/ra_plugin.c,
subversion/libsvn_ra_serf/options.c,
subversion/libsvn_ra_neon/options.c,
subversion/libsvn_ra_svn/client.c:
Update references.
* subversion/include/svn_dav.h
(SVN_DAV_NS_DAV_SVN_IGNORE_MERGEINFO):
Rename to SVN_DAV_NS_DAV_SVN_IGNORE_PROP_MODS.
* subversion/include/svn_ra_svn.h
(SVN_RA_SVN_CAP_IGNORE_MERGEINFO): Rename to SVN_RA_SVN_CAP_IGNORE_PROP_MODS.
* subversion/include/svn_ra.h
(SVN_RA_CAPABILITY_IGNORE_MERGEINFO):
Rename to SVN_RA_CAPABILITY_IGNORE_PROP_MODS.
Modified:
subversion/branches/ignore-mergeinfo-log/subversion/include/svn_dav.h
subversion/branches/ignore-mergeinfo-log/subversion/include/svn_ra.h
subversion/branches/ignore-mergeinfo-log/subversion/include/svn_ra_svn.h
subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_local/ra_plugin.c
subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_neon/options.c
subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_serf/options.c
subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_svn/client.c
Modified: subversion/branches/ignore-mergeinfo-log/subversion/include/svn_dav.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo-log/subversion/include/svn_dav.h?rev=1064228&r1=1064227&r2=1064228&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo-log/subversion/include/svn_dav.h (original)
+++ subversion/branches/ignore-mergeinfo-log/subversion/include/svn_dav.h Thu Jan 27 17:49:51 2011
@@ -251,8 +251,8 @@ extern "C" {
/** Presence of this in a DAV header in an OPTIONS response indicates
* that the transmitter (in this case, the server) knows how to filter
* various operations with respect to mergeinfo. */
-#define SVN_DAV_NS_DAV_SVN_IGNORE_MERGEINFO\
- SVN_DAV_PROP_NS_DAV "svn/ignore-mergeinfo"
+#define SVN_DAV_NS_DAV_SVN_IGNORE_PROP_MODS\
+ SVN_DAV_PROP_NS_DAV "svn/ignore-prop-mods"
/** Presence of this in a DAV header in an OPTIONS response indicates
* that the transmitter (in this case, the server) knows how to handle
Modified: subversion/branches/ignore-mergeinfo-log/subversion/include/svn_ra.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo-log/subversion/include/svn_ra.h?rev=1064228&r1=1064227&r2=1064228&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo-log/subversion/include/svn_ra.h (original)
+++ subversion/branches/ignore-mergeinfo-log/subversion/include/svn_ra.h Thu Jan 27 17:49:51 2011
@@ -2003,12 +2003,12 @@ svn_ra_has_capability(svn_ra_session_t *
#define SVN_RA_CAPABILITY_ATOMIC_REVPROPS "atomic-revprops"
/**
- * The capability to ignore mergeinfo when performing various requests,
- * such as logs.
+ * The capability for the client to request the server to ignore various
+ * prop mods when performing various requests, such as logs.
*
* @since New in 1.7
*/
-#define SVN_RA_CAPABILITY_IGNORE_MERGEINFO "ignore-mergeinfo"
+#define SVN_RA_CAPABILITY_IGNORE_PROP_MODS "ignore-prop-mods"
/* *** PLEASE READ THIS IF YOU ADD A NEW CAPABILITY ***
*
Modified: subversion/branches/ignore-mergeinfo-log/subversion/include/svn_ra_svn.h
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo-log/subversion/include/svn_ra_svn.h?rev=1064228&r1=1064227&r2=1064228&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo-log/subversion/include/svn_ra_svn.h (original)
+++ subversion/branches/ignore-mergeinfo-log/subversion/include/svn_ra_svn.h Thu Jan 27 17:49:51 2011
@@ -62,8 +62,8 @@ extern "C" {
#define SVN_RA_SVN_CAP_PARTIAL_REPLAY "partial-replay"
/* maps to SVN_RA_CAPABILITY_ATOMIC_REVPROPS */
#define SVN_RA_SVN_CAP_ATOMIC_REVPROPS "atomic-revprops"
-/* maps to SVN_RA_CAPABILITY_IGNORE_MERGEINFO */
-#define SVN_RA_SVN_CAP_IGNORE_MERGEINFO "ignore-mergeinfo"
+/* maps to SVN_RA_CAPABILITY_IGNORE_PROP_MODS */
+#define SVN_RA_SVN_CAP_IGNORE_PROP_MODS "ignore-prop-mods"
/** ra_svn passes @c svn_dirent_t fields over the wire as a list of
* words, these are the values used to represent each field.
Modified: subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_local/ra_plugin.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_local/ra_plugin.c?rev=1064228&r1=1064227&r2=1064228&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_local/ra_plugin.c (original)
+++ subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_local/ra_plugin.c Thu Jan 27 17:49:51 2011
@@ -1404,7 +1404,7 @@ svn_ra_local__has_capability(svn_ra_sess
|| strcmp(capability, SVN_RA_CAPABILITY_PARTIAL_REPLAY) == 0
|| strcmp(capability, SVN_RA_CAPABILITY_COMMIT_REVPROPS) == 0
|| strcmp(capability, SVN_RA_CAPABILITY_ATOMIC_REVPROPS) == 0
- || strcmp(capability, SVN_RA_CAPABILITY_IGNORE_MERGEINFO) == 0)
+ || strcmp(capability, SVN_RA_CAPABILITY_IGNORE_PROP_MODS) == 0)
{
*has = TRUE;
}
Modified: subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_neon/options.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_neon/options.c?rev=1064228&r1=1064227&r2=1064228&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_neon/options.c (original)
+++ subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_neon/options.c Thu Jan 27 17:49:51 2011
@@ -154,7 +154,7 @@ parse_capabilities(ne_request *req,
APR_HASH_KEY_STRING, capability_no);
apr_hash_set(ras->capabilities, SVN_RA_CAPABILITY_ATOMIC_REVPROPS,
APR_HASH_KEY_STRING, capability_no);
- apr_hash_set(ras->capabilities, SVN_RA_CAPABILITY_IGNORE_MERGEINFO,
+ apr_hash_set(ras->capabilities, SVN_RA_CAPABILITY_IGNORE_PROP_MODS,
APR_HASH_KEY_STRING, capability_no);
/* Then find out which ones are supported. */
@@ -207,9 +207,9 @@ parse_capabilities(ne_request *req,
apr_hash_set(ras->capabilities, SVN_RA_CAPABILITY_ATOMIC_REVPROPS,
APR_HASH_KEY_STRING, capability_yes);
- if (svn_cstring_match_glob_list(SVN_DAV_NS_DAV_SVN_IGNORE_MERGEINFO,
+ if (svn_cstring_match_glob_list(SVN_DAV_NS_DAV_SVN_IGNORE_PROP_MODS,
vals))
- apr_hash_set(ras->capabilities, SVN_RA_CAPABILITY_IGNORE_MERGEINFO,
+ apr_hash_set(ras->capabilities, SVN_RA_CAPABILITY_IGNORE_PROP_MODS,
APR_HASH_KEY_STRING, capability_yes);
if (svn_cstring_match_glob_list(SVN_DAV_NS_DAV_SVN_PARTIAL_REPLAY,
Modified: subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_serf/options.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_serf/options.c?rev=1064228&r1=1064227&r2=1064228&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_serf/options.c (original)
+++ subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_serf/options.c Thu Jan 27 17:49:51 2011
@@ -322,11 +322,11 @@ capabilities_headers_iterator_callback(v
SVN_RA_CAPABILITY_ATOMIC_REVPROPS,
APR_HASH_KEY_STRING, capability_yes);
}
- if (svn_cstring_match_glob_list(SVN_DAV_NS_DAV_SVN_IGNORE_MERGEINFO,
+ if (svn_cstring_match_glob_list(SVN_DAV_NS_DAV_SVN_IGNORE_PROP_MODS,
vals))
{
apr_hash_set(orc->session->capabilities,
- SVN_RA_CAPABILITY_IGNORE_MERGEINFO,
+ SVN_RA_CAPABILITY_IGNORE_PROP_MODS,
APR_HASH_KEY_STRING, capability_yes);
}
if (svn_cstring_match_glob_list(SVN_DAV_NS_DAV_SVN_PARTIAL_REPLAY, vals))
@@ -424,7 +424,7 @@ options_response_handler(serf_request_t
APR_HASH_KEY_STRING, capability_no);
apr_hash_set(orc->session->capabilities, SVN_RA_CAPABILITY_ATOMIC_REVPROPS,
APR_HASH_KEY_STRING, capability_no);
- apr_hash_set(orc->session->capabilities, SVN_RA_CAPABILITY_IGNORE_MERGEINFO,
+ apr_hash_set(orc->session->capabilities, SVN_RA_CAPABILITY_IGNORE_PROP_MODS,
APR_HASH_KEY_STRING, capability_no);
/* Then see which ones we can discover. */
Modified: subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_svn/client.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_svn/client.c?rev=1064228&r1=1064227&r2=1064228&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_svn/client.c (original)
+++ subversion/branches/ignore-mergeinfo-log/subversion/libsvn_ra_svn/client.c Thu Jan 27 17:49:51 2011
@@ -2467,9 +2467,9 @@ static svn_error_t *ra_svn_has_capabilit
else if (strcmp(capability, SVN_RA_CAPABILITY_ATOMIC_REVPROPS) == 0)
*has = svn_ra_svn_has_capability(sess->conn,
SVN_RA_SVN_CAP_ATOMIC_REVPROPS);
- else if (strcmp(capability, SVN_RA_CAPABILITY_IGNORE_MERGEINFO) == 0)
+ else if (strcmp(capability, SVN_RA_CAPABILITY_IGNORE_PROP_MODS) == 0)
*has = svn_ra_svn_has_capability(sess->conn,
- SVN_RA_SVN_CAP_IGNORE_MERGEINFO);
+ SVN_RA_SVN_CAP_IGNORE_PROP_MODS);
else /* Don't know any other capabilities, so error. */
{
return svn_error_createf