You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2012/11/05 17:30:55 UTC
svn commit: r1405866 [1/4] - in /subversion/branches/wc-collate-path: ./
subversion/ subversion/bindings/javahl/native/ subversion/include/
subversion/include/private/ subversion/libsvn_client/
subversion/libsvn_delta/ subversion/libsvn_fs_fs/ subversi...
Author: brane
Date: Mon Nov 5 16:30:51 2012
New Revision: 1405866
URL: http://svn.apache.org/viewvc?rev=1405866&view=rev
Log:
Sync wc-collate-path branch with trunk up to r1405863.
Added:
subversion/branches/wc-collate-path/subversion/libsvn_ra/deprecated.h
- copied unchanged from r1405863, subversion/trunk/subversion/libsvn_ra/deprecated.h
subversion/branches/wc-collate-path/tools/dev/benchmarks/suite1/generate_charts
- copied unchanged from r1405863, subversion/trunk/tools/dev/benchmarks/suite1/generate_charts
Modified:
subversion/branches/wc-collate-path/ (props changed)
subversion/branches/wc-collate-path/COMMITTERS
subversion/branches/wc-collate-path/configure.ac
subversion/branches/wc-collate-path/subversion/bindings/javahl/native/ClientContext.cpp
subversion/branches/wc-collate-path/subversion/bindings/javahl/native/CopySources.cpp
subversion/branches/wc-collate-path/subversion/bindings/javahl/native/CreateJ.cpp
subversion/branches/wc-collate-path/subversion/bindings/javahl/native/EnumMapper.cpp
subversion/branches/wc-collate-path/subversion/bindings/javahl/native/InputStream.cpp
subversion/branches/wc-collate-path/subversion/bindings/javahl/native/JNICriticalSection.cpp
subversion/branches/wc-collate-path/subversion/bindings/javahl/native/JNIMutex.cpp
subversion/branches/wc-collate-path/subversion/bindings/javahl/native/JNIThreadData.cpp
subversion/branches/wc-collate-path/subversion/bindings/javahl/native/JNIUtil.cpp
subversion/branches/wc-collate-path/subversion/bindings/javahl/native/LogMessageCallback.cpp
subversion/branches/wc-collate-path/subversion/bindings/javahl/native/OutputStream.cpp
subversion/branches/wc-collate-path/subversion/bindings/javahl/native/Prompter.cpp
subversion/branches/wc-collate-path/subversion/bindings/javahl/native/Revision.cpp
subversion/branches/wc-collate-path/subversion/bindings/javahl/native/RevisionRange.cpp
subversion/branches/wc-collate-path/subversion/bindings/javahl/native/RevpropTable.cpp
subversion/branches/wc-collate-path/subversion/bindings/javahl/native/SVNClient.cpp
subversion/branches/wc-collate-path/subversion/bindings/javahl/native/SVNRepos.cpp
subversion/branches/wc-collate-path/subversion/bindings/javahl/native/StringArray.cpp
subversion/branches/wc-collate-path/subversion/bindings/javahl/native/Targets.cpp
subversion/branches/wc-collate-path/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
subversion/branches/wc-collate-path/subversion/include/private/svn_named_atomic.h
subversion/branches/wc-collate-path/subversion/include/svn_delta.h
subversion/branches/wc-collate-path/subversion/include/svn_error_codes.h
subversion/branches/wc-collate-path/subversion/include/svn_fs.h
subversion/branches/wc-collate-path/subversion/include/svn_props.h
subversion/branches/wc-collate-path/subversion/libsvn_client/add.c
subversion/branches/wc-collate-path/subversion/libsvn_client/client.h
subversion/branches/wc-collate-path/subversion/libsvn_client/commit.c
subversion/branches/wc-collate-path/subversion/libsvn_client/commit_util.c
subversion/branches/wc-collate-path/subversion/libsvn_client/copy.c
subversion/branches/wc-collate-path/subversion/libsvn_client/delete.c
subversion/branches/wc-collate-path/subversion/libsvn_client/deprecated.c
subversion/branches/wc-collate-path/subversion/libsvn_client/patch.c
subversion/branches/wc-collate-path/subversion/libsvn_client/prop_commands.c
subversion/branches/wc-collate-path/subversion/libsvn_delta/compat.c
subversion/branches/wc-collate-path/subversion/libsvn_delta/deprecated.c
subversion/branches/wc-collate-path/subversion/libsvn_delta/path_driver.c
subversion/branches/wc-collate-path/subversion/libsvn_delta/svndiff.c
subversion/branches/wc-collate-path/subversion/libsvn_delta/text_delta.c
subversion/branches/wc-collate-path/subversion/libsvn_fs_fs/caching.c
subversion/branches/wc-collate-path/subversion/libsvn_fs_fs/fs_fs.c
subversion/branches/wc-collate-path/subversion/libsvn_ra/compat.c
subversion/branches/wc-collate-path/subversion/libsvn_ra/deprecated.c
subversion/branches/wc-collate-path/subversion/libsvn_ra/ra_loader.c
subversion/branches/wc-collate-path/subversion/libsvn_ra_serf/commit.c
subversion/branches/wc-collate-path/subversion/libsvn_ra_serf/ra_serf.h
subversion/branches/wc-collate-path/subversion/libsvn_ra_serf/serf.c
subversion/branches/wc-collate-path/subversion/libsvn_ra_serf/util.c
subversion/branches/wc-collate-path/subversion/libsvn_ra_serf/util_error.c
subversion/branches/wc-collate-path/subversion/libsvn_ra_svn/client.c
subversion/branches/wc-collate-path/subversion/libsvn_ra_svn/cyrus_auth.c
subversion/branches/wc-collate-path/subversion/libsvn_ra_svn/ra_svn.h
subversion/branches/wc-collate-path/subversion/libsvn_repos/fs-wrap.c
subversion/branches/wc-collate-path/subversion/libsvn_repos/load.c
subversion/branches/wc-collate-path/subversion/libsvn_repos/replay.c
subversion/branches/wc-collate-path/subversion/libsvn_subr/cache-membuffer.c
subversion/branches/wc-collate-path/subversion/libsvn_subr/config_win.c
subversion/branches/wc-collate-path/subversion/libsvn_subr/dirent_uri.c
subversion/branches/wc-collate-path/subversion/libsvn_subr/io.c
subversion/branches/wc-collate-path/subversion/libsvn_subr/named_atomic.c
subversion/branches/wc-collate-path/subversion/libsvn_subr/spillbuf.c
subversion/branches/wc-collate-path/subversion/libsvn_subr/sqlite.c
subversion/branches/wc-collate-path/subversion/libsvn_subr/temp_serializer.c
subversion/branches/wc-collate-path/subversion/libsvn_subr/utf_width.c
subversion/branches/wc-collate-path/subversion/libsvn_subr/win32_crashrpt.c
subversion/branches/wc-collate-path/subversion/libsvn_wc/adm_files.c
subversion/branches/wc-collate-path/subversion/libsvn_wc/adm_ops.c
subversion/branches/wc-collate-path/subversion/libsvn_wc/cleanup.c
subversion/branches/wc-collate-path/subversion/libsvn_wc/context.c
subversion/branches/wc-collate-path/subversion/libsvn_wc/entries.c
subversion/branches/wc-collate-path/subversion/libsvn_wc/entries.h
subversion/branches/wc-collate-path/subversion/libsvn_wc/lock.c
subversion/branches/wc-collate-path/subversion/libsvn_wc/lock.h
subversion/branches/wc-collate-path/subversion/libsvn_wc/old-and-busted.c
subversion/branches/wc-collate-path/subversion/libsvn_wc/upgrade.c
subversion/branches/wc-collate-path/subversion/libsvn_wc/util.c
subversion/branches/wc-collate-path/subversion/libsvn_wc/wc_db.c
subversion/branches/wc-collate-path/subversion/libsvn_wc/wc_db.h
subversion/branches/wc-collate-path/subversion/libsvn_wc/wc_db_private.h
subversion/branches/wc-collate-path/subversion/libsvn_wc/wc_db_update_move.c
subversion/branches/wc-collate-path/subversion/libsvn_wc/wc_db_util.c
subversion/branches/wc-collate-path/subversion/libsvn_wc/wc_db_wcroot.c
subversion/branches/wc-collate-path/subversion/mod_dav_svn/dav_svn.h
subversion/branches/wc-collate-path/subversion/mod_dav_svn/reports/update.c
subversion/branches/wc-collate-path/subversion/mod_dav_svn/util.c
subversion/branches/wc-collate-path/subversion/mod_dav_svn/version.c
subversion/branches/wc-collate-path/subversion/svn/mergeinfo-cmd.c
subversion/branches/wc-collate-path/subversion/svn_private_config.hw
subversion/branches/wc-collate-path/subversion/svnadmin/main.c
subversion/branches/wc-collate-path/subversion/svndumpfilter/main.c
subversion/branches/wc-collate-path/subversion/svnserve/cyrus_auth.c
subversion/branches/wc-collate-path/subversion/tests/cmdline/autoprop_tests.py
subversion/branches/wc-collate-path/subversion/tests/cmdline/export_tests.py
subversion/branches/wc-collate-path/subversion/tests/cmdline/externals_tests.py
subversion/branches/wc-collate-path/subversion/tests/cmdline/import_tests.py
subversion/branches/wc-collate-path/subversion/tests/cmdline/merge_tests.py
subversion/branches/wc-collate-path/subversion/tests/cmdline/mergeinfo_tests.py
subversion/branches/wc-collate-path/subversion/tests/cmdline/prop_tests.py
subversion/branches/wc-collate-path/subversion/tests/cmdline/svnadmin_tests.py
subversion/branches/wc-collate-path/subversion/tests/cmdline/svntest/main.py
subversion/branches/wc-collate-path/subversion/tests/cmdline/update_tests.py
subversion/branches/wc-collate-path/subversion/tests/cmdline/upgrade_tests.py
subversion/branches/wc-collate-path/subversion/tests/libsvn_subr/io-test.c
subversion/branches/wc-collate-path/subversion/tests/libsvn_subr/named_atomic-test.c
subversion/branches/wc-collate-path/subversion/tests/libsvn_wc/db-test.c
subversion/branches/wc-collate-path/subversion/tests/libsvn_wc/entries-compat.c
subversion/branches/wc-collate-path/subversion/tests/libsvn_wc/op-depth-test.c
subversion/branches/wc-collate-path/tools/client-side/svn-bench/null-log-cmd.c
subversion/branches/wc-collate-path/tools/dev/benchmarks/suite1/benchmark.py
subversion/branches/wc-collate-path/tools/dev/benchmarks/suite1/cronjob
subversion/branches/wc-collate-path/tools/dev/benchmarks/suite1/run
subversion/branches/wc-collate-path/tools/server-side/fsfs-reorg.c
Propchange: subversion/branches/wc-collate-path/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1402685-1405863
Modified: subversion/branches/wc-collate-path/COMMITTERS
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/COMMITTERS?rev=1405866&r1=1405865&r2=1405866&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/COMMITTERS [UTF-8] (original)
+++ subversion/branches/wc-collate-path/COMMITTERS [UTF-8] Mon Nov 5 16:30:51 2012
@@ -41,7 +41,7 @@ Blanket commit access:
lgo Lieven Govaerts <lg...@mobsol.be>
hwright Hyrum Wright <hy...@hyrumwright.org>
vgeorgescu Vlad Georgescu <vg...@gmail.com>
- kameshj Kamesh Jayachandran <ka...@collab.net>
+ kameshj Kamesh Jayachandran <ka...@gmail.com>
markphip Mark Phippard <mp...@collab.net>
arfrever Arfrever Frehtes Taifersar Arahesis <ar...@gmail.com>
stsp Stefan Sperling <st...@elego.de>
Modified: subversion/branches/wc-collate-path/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/configure.ac?rev=1405866&r1=1405865&r2=1405866&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/configure.ac (original)
+++ subversion/branches/wc-collate-path/configure.ac Mon Nov 5 16:30:51 2012
@@ -1017,6 +1017,11 @@ AS_HELP_STRING([--enable-maintainer-mode
CFLAGS="-Wno-system-headers $CFLAGS_KEEP"
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[]])], [CFLAGS_KEEP="$CFLAGS"])
+ dnl Put this flag behind -Wall:
+
+ CFLAGS="$CFLAGS_KEEP -Wno-format-nonliteral"
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[]])], [CFLAGS_KEEP="$CFLAGS"])
+
AC_LANG_POP([C])
CFLAGS="$CFLAGS_KEEP"
fi
@@ -1388,6 +1393,10 @@ dnl Provide ${host} for use in compiled
AC_DEFINE_UNQUOTED([SVN_BUILD_HOST], "${host}",
[Defined to the config.guess name of the build system])
+dnl Provide ${target} for use in compiled code (for user-agent string)
+AC_DEFINE_UNQUOTED([SVN_BUILD_TARGET], "${target}",
+ [Defined to the config.guess name of the build target])
+
AC_OUTPUT
# ==== Print final messages to user ==========================================
Modified: subversion/branches/wc-collate-path/subversion/bindings/javahl/native/ClientContext.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/bindings/javahl/native/ClientContext.cpp?rev=1405866&r1=1405865&r2=1405866&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/bindings/javahl/native/ClientContext.cpp (original)
+++ subversion/branches/wc-collate-path/subversion/bindings/javahl/native/ClientContext.cpp Mon Nov 5 16:30:51 2012
@@ -126,7 +126,7 @@ struct clearctx_baton_t
static apr_status_t clear_ctx_ptrs(void *ptr)
{
- clearctx_baton_t *bt = (clearctx_baton_t*)ptr;
+ clearctx_baton_t *bt = reinterpret_cast<clearctx_baton_t*>(ptr);
/* Reset all values to those before overwriting by getContext. */
*bt->ctx = *bt->backup;
@@ -149,9 +149,11 @@ ClientContext::getContext(CommitMessage
Note that this allows creating a stack of context changes if
the function is invoked multiple times with different pools.
*/
- clearctx_baton_t *bt = (clearctx_baton_t *)apr_pcalloc(pool, sizeof(*bt));
+ clearctx_baton_t *bt =
+ reinterpret_cast<clearctx_baton_t *>(apr_pcalloc(pool, sizeof(*bt)));
bt->ctx = ctx;
- bt->backup = (svn_client_ctx_t*)apr_pmemdup(pool, ctx, sizeof(*ctx));
+ bt->backup =
+ reinterpret_cast<svn_client_ctx_t*>(apr_pmemdup(pool, ctx, sizeof(*ctx)));
apr_pool_cleanup_register(in_pool.getPool(), bt, clear_ctx_ptrs,
clear_ctx_ptrs);
@@ -167,9 +169,10 @@ ClientContext::getContext(CommitMessage
bt->backup->config = ctx->config;
}
- svn_config_t *config = (svn_config_t *) apr_hash_get(ctx->config,
- SVN_CONFIG_CATEGORY_CONFIG,
- APR_HASH_KEY_STRING);
+ svn_config_t *config =
+ reinterpret_cast<svn_config_t *>(apr_hash_get(ctx->config,
+ SVN_CONFIG_CATEGORY_CONFIG,
+ APR_HASH_KEY_STRING));
/* The whole list of registered providers */
Modified: subversion/branches/wc-collate-path/subversion/bindings/javahl/native/CopySources.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/bindings/javahl/native/CopySources.cpp?rev=1405866&r1=1405865&r2=1405866&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/bindings/javahl/native/CopySources.cpp (original)
+++ subversion/branches/wc-collate-path/subversion/bindings/javahl/native/CopySources.cpp Mon Nov 5 16:30:51 2012
@@ -95,12 +95,13 @@ CopySources::array(SVN::Pool &pool)
std::vector<jobject> sources = m_copySources.vector();
apr_array_header_t *copySources =
- apr_array_make(p, sources.size(), sizeof(svn_client_copy_source_t *));
+ apr_array_make(p, static_cast<int>(sources.size()),
+ sizeof(svn_client_copy_source_t *));
for (std::vector<jobject>::const_iterator it = sources.begin();
it < sources.end(); ++it)
{
svn_client_copy_source_t *src =
- (svn_client_copy_source_t *) apr_palloc(p, sizeof(*src));
+ reinterpret_cast<svn_client_copy_source_t *>(apr_palloc(p, sizeof(*src)));
// Extract the path or URL from the copy source.
static jmethodID getPath = 0;
@@ -141,9 +142,10 @@ CopySources::array(SVN::Pool &pool)
// TODO: Default this to svn_opt_revision_undefined (or HEAD)
Revision rev(jrev);
- src->revision = (const svn_opt_revision_t *)
- apr_palloc(p, sizeof(*src->revision));
- memcpy((void *) src->revision, rev.revision(),
+ src->revision = reinterpret_cast<const svn_opt_revision_t *>
+ (apr_palloc(p, sizeof(*src->revision)));
+ memcpy(const_cast<svn_opt_revision_t *>(src->revision),
+ rev.revision(),
sizeof(*src->revision));
env->DeleteLocalRef(jrev);
@@ -161,9 +163,10 @@ CopySources::array(SVN::Pool &pool)
return NULL;
Revision pegRev(jPegRev, true);
- src->peg_revision = (const svn_opt_revision_t *)
- apr_palloc(p, sizeof(*src->peg_revision));
- memcpy((void *) src->peg_revision, pegRev.revision(),
+ src->peg_revision = reinterpret_cast<const svn_opt_revision_t *>
+ (apr_palloc(p, sizeof(*src->peg_revision)));
+ memcpy(const_cast<svn_opt_revision_t *>(src->peg_revision),
+ pegRev.revision(),
sizeof(*src->peg_revision));
env->DeleteLocalRef(jPegRev);
Modified: subversion/branches/wc-collate-path/subversion/bindings/javahl/native/CreateJ.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/bindings/javahl/native/CreateJ.cpp?rev=1405866&r1=1405865&r2=1405866&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/bindings/javahl/native/CreateJ.cpp (original)
+++ subversion/branches/wc-collate-path/subversion/bindings/javahl/native/CreateJ.cpp Mon Nov 5 16:30:51 2012
@@ -206,9 +206,10 @@ CreateJ::Checksum(const svn_checksum_t *
POP_AND_RETURN_NULL;
}
- jbyteArray jdigest = JNIUtil::makeJByteArray(
- (const signed char *)checksum->digest,
- svn_checksum_size(checksum));
+ jbyteArray jdigest
+ = JNIUtil::makeJByteArray(
+ reinterpret_cast<const signed char *>(checksum->digest),
+ static_cast<int>(svn_checksum_size(checksum)));
if (JNIUtil::isExceptionThrown())
POP_AND_RETURN_NULL;
@@ -1026,14 +1027,18 @@ jobject CreateJ::PropertyMap(apr_hash_t
const char *key;
svn_string_t *val;
- apr_hash_this(hi, (const void **)&key, NULL, (void **)&val);
+ apr_hash_this(hi,
+ reinterpret_cast<const void **>(&key),
+ NULL,
+ reinterpret_cast<void **>(&val));
jstring jpropName = JNIUtil::makeJString(key);
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NULL;
jbyteArray jpropVal = JNIUtil::makeJByteArray(
- (const signed char *)val->data, val->len);
+ reinterpret_cast<const signed char *>(val->data),
+ static_cast<int>(val->len));
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NULL;
Modified: subversion/branches/wc-collate-path/subversion/bindings/javahl/native/EnumMapper.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/bindings/javahl/native/EnumMapper.cpp?rev=1405866&r1=1405865&r2=1405866&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/bindings/javahl/native/EnumMapper.cpp (original)
+++ subversion/branches/wc-collate-path/subversion/bindings/javahl/native/EnumMapper.cpp Mon Nov 5 16:30:51 2012
@@ -81,7 +81,8 @@ jobject EnumMapper::mapChangePathAction(
jobject EnumMapper::mapNotifyState(svn_wc_notify_state_t state)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/ClientNotifyInformation$Status", (int) state);
+ return mapEnum(JAVA_PACKAGE"/ClientNotifyInformation$Status",
+ static_cast<int>(state));
}
/**
@@ -90,13 +91,15 @@ jobject EnumMapper::mapNotifyState(svn_w
jobject EnumMapper::mapNotifyAction(svn_wc_notify_action_t action)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/ClientNotifyInformation$Action", (int) action);
+ return mapEnum(JAVA_PACKAGE"/ClientNotifyInformation$Action",
+ static_cast<int>(action));
}
jobject EnumMapper::mapReposNotifyNodeAction(svn_node_action action)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/ReposNotifyInformation$NodeAction", (int) action);
+ return mapEnum(JAVA_PACKAGE"/ReposNotifyInformation$NodeAction",
+ static_cast<int>(action));
}
/**
@@ -105,7 +108,8 @@ jobject EnumMapper::mapReposNotifyNodeAc
jobject EnumMapper::mapReposNotifyAction(svn_repos_notify_action_t action)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/ReposNotifyInformation$Action", (int) action);
+ return mapEnum(JAVA_PACKAGE"/ReposNotifyInformation$Action",
+ static_cast<int>(action));
}
/**
@@ -114,7 +118,8 @@ jobject EnumMapper::mapReposNotifyAction
jobject EnumMapper::mapNodeKind(svn_node_kind_t nodeKind)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/types/NodeKind", (int) nodeKind);
+ return mapEnum(JAVA_PACKAGE"/types/NodeKind",
+ static_cast<int>(nodeKind));
}
/**
@@ -123,7 +128,8 @@ jobject EnumMapper::mapNodeKind(svn_node
jobject EnumMapper::mapNotifyLockState(svn_wc_notify_lock_state_t state)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/ClientNotifyInformation$LockStatus", (int) state);
+ return mapEnum(JAVA_PACKAGE"/ClientNotifyInformation$LockStatus",
+ static_cast<int>(state));
}
/**
@@ -132,7 +138,8 @@ jobject EnumMapper::mapNotifyLockState(s
jobject EnumMapper::mapScheduleKind(svn_wc_schedule_t schedule)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/types/Info$ScheduleKind", (int) schedule);
+ return mapEnum(JAVA_PACKAGE"/types/Info$ScheduleKind",
+ static_cast<int>(schedule));
}
/**
@@ -142,31 +149,36 @@ jobject EnumMapper::mapStatusKind(svn_wc
{
// We're assuming a valid value for the C enum above
// The offset here is +1
- return mapEnum(JAVA_PACKAGE"/types/Status$Kind", ((int) svnKind) - 1);
+ return mapEnum(JAVA_PACKAGE"/types/Status$Kind",
+ static_cast<int>(svnKind) - 1);
}
jobject EnumMapper::mapChecksumKind(svn_checksum_kind_t kind)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/types/Checksum$Kind", (int) kind);
+ return mapEnum(JAVA_PACKAGE"/types/Checksum$Kind",
+ static_cast<int>(kind));
}
jobject EnumMapper::mapConflictKind(svn_wc_conflict_kind_t kind)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/ConflictDescriptor$Kind", (int) kind);
+ return mapEnum(JAVA_PACKAGE"/ConflictDescriptor$Kind",
+ static_cast<int>(kind));
}
jobject EnumMapper::mapConflictAction(svn_wc_conflict_action_t action)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/ConflictDescriptor$Action", (int) action);
+ return mapEnum(JAVA_PACKAGE"/ConflictDescriptor$Action",
+ static_cast<int>(action));
}
jobject EnumMapper::mapConflictReason(svn_wc_conflict_reason_t reason)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/ConflictDescriptor$Reason", (int) reason);
+ return mapEnum(JAVA_PACKAGE"/ConflictDescriptor$Reason",
+ static_cast<int>(reason));
}
int EnumMapper::toMergeinfoLogKind(jobject jLogKind)
@@ -182,45 +194,47 @@ int EnumMapper::toLogLevel(jobject jLogL
svn_depth_t EnumMapper::toDepth(jobject jdepth)
{
// The offset for depths is -2
- return (svn_depth_t) (getOrdinal(JAVA_PACKAGE"/types/Depth", jdepth) - 2);
+ return static_cast<svn_depth_t>(getOrdinal(JAVA_PACKAGE"/types/Depth", jdepth) - 2);
}
jobject EnumMapper::mapDepth(svn_depth_t depth)
{
// We're assuming a valid value for the C enum above
// The offset for depths is -2
- return mapEnum(JAVA_PACKAGE"/types/Depth", ((int) depth) + 2);
+ return mapEnum(JAVA_PACKAGE"/types/Depth", static_cast<int>(depth) + 2);
}
jobject EnumMapper::mapOperation(svn_wc_operation_t operation)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/ConflictDescriptor$Operation", (int) operation);
+ return mapEnum(JAVA_PACKAGE"/ConflictDescriptor$Operation",
+ static_cast<int>(operation));
}
jobject EnumMapper::mapTristate(svn_tristate_t tristate)
{
// We're assuming a valid value for the C enum above
return mapEnum(JAVA_PACKAGE"/types/Tristate",
- (int) (tristate - svn_tristate_false));
+ static_cast<int>(tristate - svn_tristate_false));
}
svn_wc_conflict_choice_t EnumMapper::toConflictChoice(jobject jchoice)
{
- return (svn_wc_conflict_choice_t) getOrdinal(
- JAVA_PACKAGE"/ConflictResult$Choice", jchoice);
+ return static_cast<svn_wc_conflict_choice_t>
+ (getOrdinal(JAVA_PACKAGE"/ConflictResult$Choice", jchoice));
}
svn_opt_revision_kind EnumMapper::toRevisionKind(jobject jkind)
{
- return (svn_opt_revision_kind) getOrdinal(JAVA_PACKAGE"/types/Revision$Kind",
- jkind);
+ return static_cast<svn_opt_revision_kind>
+ (getOrdinal(JAVA_PACKAGE"/types/Revision$Kind", jkind));
}
jobject EnumMapper::mapSummarizeKind(svn_client_diff_summarize_kind_t sKind)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/DiffSummary$DiffKind", (int) sKind);
+ return mapEnum(JAVA_PACKAGE"/DiffSummary$DiffKind",
+ static_cast<int>(sKind));
}
jobject EnumMapper::mapEnum(const char *clazzName, int index)
@@ -282,5 +296,5 @@ int EnumMapper::getOrdinal(const char *c
POP_AND_RETURN(-1);
env->PopLocalFrame(NULL);
- return (int) jorder;
+ return static_cast<int>(jorder);
}
Modified: subversion/branches/wc-collate-path/subversion/bindings/javahl/native/InputStream.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/bindings/javahl/native/InputStream.cpp?rev=1405866&r1=1405865&r2=1405866&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/bindings/javahl/native/InputStream.cpp (original)
+++ subversion/branches/wc-collate-path/subversion/bindings/javahl/native/InputStream.cpp Mon Nov 5 16:30:51 2012
@@ -89,8 +89,9 @@ svn_error_t *InputStream::read(void *bat
}
// Allocate a Java byte array to read the data.
- jbyteArray data = JNIUtil::makeJByteArray((const signed char*)buffer,
- *len);
+ jbyteArray data = JNIUtil::makeJByteArray
+ (reinterpret_cast<const signed char*>(buffer),
+ static_cast<int>(*len));
if (JNIUtil::isJavaExceptionThrown())
return SVN_NO_ERROR;
@@ -138,7 +139,7 @@ svn_error_t *InputStream::close(void *ba
JNIEnv *env = JNIUtil::getEnv();
// An object of our class is passed in as the baton
- InputStream *that = (InputStream*)baton;
+ InputStream *that = reinterpret_cast<InputStream*>(baton);
// The method id will not change during the time this library is
// loaded, so it can be cached.
Modified: subversion/branches/wc-collate-path/subversion/bindings/javahl/native/JNICriticalSection.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/bindings/javahl/native/JNICriticalSection.cpp?rev=1405866&r1=1405865&r2=1405866&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/bindings/javahl/native/JNICriticalSection.cpp (original)
+++ subversion/branches/wc-collate-path/subversion/bindings/javahl/native/JNICriticalSection.cpp Mon Nov 5 16:30:51 2012
@@ -39,7 +39,7 @@
JNICriticalSection::JNICriticalSection(JNIMutex &mutex)
{
m_mutex = &mutex;
- apr_status_t apr_err = apr_thread_mutex_lock (mutex.m_mutex);
+ apr_status_t apr_err = apr_thread_mutex_lock(mutex.m_mutex);
if (apr_err)
{
JNIUtil::handleAPRError(apr_err, "apr_thread_mutex_lock");
@@ -53,7 +53,7 @@ JNICriticalSection::JNICriticalSection(J
*/
JNICriticalSection::~JNICriticalSection()
{
- apr_status_t apr_err = apr_thread_mutex_unlock (m_mutex->m_mutex);
+ apr_status_t apr_err = apr_thread_mutex_unlock(m_mutex->m_mutex);
if (apr_err)
{
JNIUtil::handleAPRError(apr_err, "apr_thread_mutex_unlock");
Modified: subversion/branches/wc-collate-path/subversion/bindings/javahl/native/JNIMutex.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/bindings/javahl/native/JNIMutex.cpp?rev=1405866&r1=1405865&r2=1405866&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/bindings/javahl/native/JNIMutex.cpp (original)
+++ subversion/branches/wc-collate-path/subversion/bindings/javahl/native/JNIMutex.cpp Mon Nov 5 16:30:51 2012
@@ -38,7 +38,7 @@
JNIMutex::JNIMutex(apr_pool_t *pool)
{
apr_status_t apr_err =
- apr_thread_mutex_create (&m_mutex, APR_THREAD_MUTEX_NESTED, pool);
+ apr_thread_mutex_create(&m_mutex, APR_THREAD_MUTEX_NESTED, pool);
if (apr_err)
JNIUtil::handleAPRError(apr_err, "apr_thread_mutex_create");
}
@@ -48,7 +48,7 @@ JNIMutex::JNIMutex(apr_pool_t *pool)
*/
JNIMutex::~JNIMutex()
{
- apr_status_t apr_err = apr_thread_mutex_destroy (m_mutex);
+ apr_status_t apr_err = apr_thread_mutex_destroy(m_mutex);
if (apr_err)
JNIUtil::handleAPRError(apr_err, "apr_thread_mutex_destroy");
}
Modified: subversion/branches/wc-collate-path/subversion/bindings/javahl/native/JNIThreadData.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/bindings/javahl/native/JNIThreadData.cpp?rev=1405866&r1=1405865&r2=1405866&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/bindings/javahl/native/JNIThreadData.cpp (original)
+++ subversion/branches/wc-collate-path/subversion/bindings/javahl/native/JNIThreadData.cpp Mon Nov 5 16:30:51 2012
@@ -124,7 +124,7 @@ void JNIThreadData::pushNewThreadData()
}
JNIThreadData *newData = new JNIThreadData();
newData->m_previous =data;
- apr_err = apr_threadkey_private_set (newData, g_key);
+ apr_err = apr_threadkey_private_set(newData, g_key);
if (apr_err)
{
JNIUtil::handleAPRError(apr_err, "apr_threadkey_private_set");
@@ -151,7 +151,7 @@ void JNIThreadData::popThreadData()
JNIThreadData *oldData = data->m_previous;
delete data;
- apr_err = apr_threadkey_private_set (oldData, g_key);
+ apr_err = apr_threadkey_private_set(oldData, g_key);
if (apr_err)
{
JNIUtil::handleAPRError(apr_err, "apr_threadkey_private_set");
Modified: subversion/branches/wc-collate-path/subversion/bindings/javahl/native/JNIUtil.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/bindings/javahl/native/JNIUtil.cpp?rev=1405866&r1=1405865&r2=1405866&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/bindings/javahl/native/JNIUtil.cpp (original)
+++ subversion/branches/wc-collate-path/subversion/bindings/javahl/native/JNIUtil.cpp Mon Nov 5 16:30:51 2012
@@ -211,7 +211,7 @@ bool JNIUtil::JNIGlobalInit(JNIEnv *env)
GetModuleFileNameW(moduleHandle, ucs2_path, inwords);
inwords = lstrlenW(ucs2_path);
outbytes = outlength = 3 * (inwords + 1);
- utf8_path = (char *)apr_palloc(pool, outlength);
+ utf8_path = reinterpret_cast<char *>(apr_palloc(pool, outlength));
apr_err = apr_conv_ucs2_to_utf8((const apr_wchar_t *) ucs2_path,
&inwords, utf8_path, &outbytes);
if (!apr_err && (inwords > 0 || outbytes == 0))
@@ -240,7 +240,7 @@ bool JNIUtil::JNIGlobalInit(JNIEnv *env)
/* See http://svn.apache.org/repos/asf/subversion/trunk/notes/asp-dot-net-hack.txt */
/* ### This code really only needs to be invoked by consumers of
### the libsvn_wc library, which basically means SVNClient. */
- if (getenv ("SVN_ASP_DOT_NET_HACK"))
+ if (getenv("SVN_ASP_DOT_NET_HACK"))
{
err = svn_wc_set_adm_dir("_svn", g_pool);
if (err)
Modified: subversion/branches/wc-collate-path/subversion/bindings/javahl/native/LogMessageCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/bindings/javahl/native/LogMessageCallback.cpp?rev=1405866&r1=1405865&r2=1405866&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/bindings/javahl/native/LogMessageCallback.cpp (original)
+++ subversion/branches/wc-collate-path/subversion/bindings/javahl/native/LogMessageCallback.cpp Mon Nov 5 16:30:51 2012
@@ -102,9 +102,10 @@ LogMessageCallback::singleMessage(svn_lo
hi;
hi = apr_hash_next(hi))
{
- const char *path = (const char *) svn__apr_hash_index_key(hi);
+ const char *path =
+ reinterpret_cast<const char *>(svn__apr_hash_index_key(hi));
svn_log_changed_path2_t *log_item =
- (svn_log_changed_path2_t *) svn__apr_hash_index_val(hi);
+ reinterpret_cast<svn_log_changed_path2_t *>(svn__apr_hash_index_val(hi));
jobject cp = CreateJ::ChangedPath(path, log_item);
Modified: subversion/branches/wc-collate-path/subversion/bindings/javahl/native/OutputStream.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/bindings/javahl/native/OutputStream.cpp?rev=1405866&r1=1405865&r2=1405866&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/bindings/javahl/native/OutputStream.cpp (original)
+++ subversion/branches/wc-collate-path/subversion/bindings/javahl/native/OutputStream.cpp Mon Nov 5 16:30:51 2012
@@ -95,8 +95,9 @@ svn_error_t *OutputStream::write(void *b
}
// convert the data to a Java byte array
- jbyteArray data = JNIUtil::makeJByteArray((const signed char*)buffer,
- *len);
+ jbyteArray data = JNIUtil::makeJByteArray
+ (reinterpret_cast<const signed char*>(buffer),
+ static_cast<int>(*len));
if (JNIUtil::isJavaExceptionThrown())
return SVN_NO_ERROR;
@@ -120,7 +121,7 @@ svn_error_t *OutputStream::close(void *b
JNIEnv *env = JNIUtil::getEnv();
// An object of our class is passed in as the baton
- OutputStream *that = (OutputStream*)baton;
+ OutputStream *that = reinterpret_cast<OutputStream*>(baton);
// The method id will not change during the time this library is
// loaded, so it can be cached.
Modified: subversion/branches/wc-collate-path/subversion/bindings/javahl/native/Prompter.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/bindings/javahl/native/Prompter.cpp?rev=1405866&r1=1405865&r2=1405866&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/bindings/javahl/native/Prompter.cpp (original)
+++ subversion/branches/wc-collate-path/subversion/bindings/javahl/native/Prompter.cpp Mon Nov 5 16:30:51 2012
@@ -429,7 +429,7 @@ svn_error_t *Prompter::simple_prompt(svn
{
Prompter *that = static_cast<Prompter *>(baton);
svn_auth_cred_simple_t *ret =
- (svn_auth_cred_simple_t*)apr_pcalloc(pool, sizeof(*ret));
+ reinterpret_cast<svn_auth_cred_simple_t*>(apr_pcalloc(pool, sizeof(*ret)));
if (!that->prompt(realm, username, may_save ? true : false))
return svn_error_create(SVN_ERR_RA_NOT_AUTHORIZED, NULL,
_("User canceled dialog"));
@@ -462,7 +462,7 @@ svn_error_t *Prompter::username_prompt(s
{
Prompter *that = static_cast<Prompter *>(baton);
svn_auth_cred_username_t *ret =
- (svn_auth_cred_username_t*)apr_pcalloc(pool, sizeof(*ret));
+ reinterpret_cast<svn_auth_cred_username_t*>(apr_pcalloc(pool, sizeof(*ret)));
const char *user = that->askQuestion(realm, _("Username: "), true,
may_save ? true : false);
if (user == NULL)
@@ -486,7 +486,7 @@ Prompter::ssl_server_trust_prompt(svn_au
{
Prompter *that = static_cast<Prompter *>(baton);
svn_auth_cred_ssl_server_trust_t *ret =
- (svn_auth_cred_ssl_server_trust_t*)apr_pcalloc(pool, sizeof(*ret));
+ reinterpret_cast<svn_auth_cred_ssl_server_trust_t*>(apr_pcalloc(pool, sizeof(*ret)));
std::string question = _("Error validating server certificate for ");
question += realm;
@@ -552,7 +552,7 @@ Prompter::ssl_client_cert_prompt(svn_aut
{
Prompter *that = static_cast<Prompter *>(baton);
svn_auth_cred_ssl_client_cert_t *ret =
- (svn_auth_cred_ssl_client_cert_t*)apr_pcalloc(pool, sizeof(*ret));
+ reinterpret_cast<svn_auth_cred_ssl_client_cert_t*>(apr_pcalloc(pool, sizeof(*ret)));
const char *cert_file =
that->askQuestion(realm, _("client certificate filename: "), true,
may_save ? true : false);
@@ -574,7 +574,7 @@ Prompter::ssl_client_cert_pw_prompt(svn_
{
Prompter *that = static_cast<Prompter *>(baton);
svn_auth_cred_ssl_client_cert_pw_t *ret =
- (svn_auth_cred_ssl_client_cert_pw_t*)apr_pcalloc(pool, sizeof(*ret));
+ reinterpret_cast<svn_auth_cred_ssl_client_cert_pw_t*>(apr_pcalloc(pool, sizeof(*ret)));
const char *info = that->askQuestion(realm,
_("client certificate passphrase: "),
false, may_save ? true : false);
Modified: subversion/branches/wc-collate-path/subversion/bindings/javahl/native/Revision.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/bindings/javahl/native/Revision.cpp?rev=1405866&r1=1405865&r2=1405866&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/bindings/javahl/native/Revision.cpp (original)
+++ subversion/branches/wc-collate-path/subversion/bindings/javahl/native/Revision.cpp Mon Nov 5 16:30:51 2012
@@ -31,7 +31,7 @@
const svn_opt_revision_kind Revision::START = svn_opt_revision_unspecified;
const svn_opt_revision_kind Revision::HEAD = svn_opt_revision_head;
-Revision::Revision (const svn_opt_revision_kind kind)
+Revision::Revision(const svn_opt_revision_kind kind)
{
m_revision.kind = kind;
m_revision.value.number = 0;
@@ -149,7 +149,7 @@ Revision::~Revision()
{
}
-const svn_opt_revision_t *Revision::revision () const
+const svn_opt_revision_t *Revision::revision() const
{
return &m_revision;
}
Modified: subversion/branches/wc-collate-path/subversion/bindings/javahl/native/RevisionRange.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/bindings/javahl/native/RevisionRange.cpp?rev=1405866&r1=1405865&r2=1405866&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/bindings/javahl/native/RevisionRange.cpp (original)
+++ subversion/branches/wc-collate-path/subversion/bindings/javahl/native/RevisionRange.cpp Mon Nov 5 16:30:51 2012
@@ -87,7 +87,8 @@ const svn_opt_revision_range_t *Revision
return NULL;
svn_opt_revision_range_t *range =
- (svn_opt_revision_range_t *) apr_palloc(pool.getPool(), sizeof(*range));
+ reinterpret_cast<svn_opt_revision_range_t *>
+ (apr_palloc(pool.getPool(), sizeof(*range)));
range->start = *startRevision.revision();
if (JNIUtil::isExceptionThrown())
Modified: subversion/branches/wc-collate-path/subversion/bindings/javahl/native/RevpropTable.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/bindings/javahl/native/RevpropTable.cpp?rev=1405866&r1=1405865&r2=1405866&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/bindings/javahl/native/RevpropTable.cpp (original)
+++ subversion/branches/wc-collate-path/subversion/bindings/javahl/native/RevpropTable.cpp Mon Nov 5 16:30:51 2012
@@ -120,8 +120,8 @@ RevpropTable::RevpropTable(jobject jrevp
if (JNIUtil::isExceptionThrown())
return;
- m_revprops[std::string((const char *)propname)]
- = std::string((const char *)propval);
+ m_revprops[std::string(static_cast<const char *>(propname))]
+ = std::string(static_cast<const char *>(propval));
JNIUtil::getEnv()->DeleteLocalRef(jpropval);
}
Modified: subversion/branches/wc-collate-path/subversion/bindings/javahl/native/SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/bindings/javahl/native/SVNClient.cpp?rev=1405866&r1=1405865&r2=1405866&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/branches/wc-collate-path/subversion/bindings/javahl/native/SVNClient.cpp Mon Nov 5 16:30:51 2012
@@ -195,7 +195,7 @@ void SVNClient::logMessages(const char *
SVN_JNI_ERR(target.error_occured(), );
apr_array_header_t *ranges =
- apr_array_make(subPool.getPool(), logRanges.size(),
+ apr_array_make(subPool.getPool(), static_cast<int>(logRanges.size()),
sizeof(svn_opt_revision_range_t *));
std::vector<RevisionRange>::const_iterator it;
@@ -207,8 +207,8 @@ void SVNClient::logMessages(const char *
== svn_opt_revision_unspecified)
{
svn_opt_revision_range_t *range =
- (svn_opt_revision_range_t *)apr_pcalloc(subPool.getPool(),
- sizeof(*range));
+ reinterpret_cast<svn_opt_revision_range_t *>
+ (apr_pcalloc(subPool.getPool(), sizeof(*range)));
range->start.kind = svn_opt_revision_number;
range->start.value.number = 1;
range->end.kind = svn_opt_revision_head;
@@ -644,7 +644,8 @@ void SVNClient::merge(const char *path,
return;
apr_array_header_t *ranges =
- apr_array_make(subPool.getPool(), rangesToMerge.size(),
+ apr_array_make(subPool.getPool(),
+ static_cast<int>(rangesToMerge.size()),
sizeof(const svn_opt_revision_range_t *));
std::vector<RevisionRange>::const_iterator it;
@@ -656,8 +657,8 @@ void SVNClient::merge(const char *path,
== svn_opt_revision_unspecified)
{
svn_opt_revision_range_t *range =
- (svn_opt_revision_range_t *)apr_pcalloc(subPool.getPool(),
- sizeof(*range));
+ reinterpret_cast<svn_opt_revision_range_t *>
+ (apr_pcalloc(subPool.getPool(), sizeof(*range)));
range->start.kind = svn_opt_revision_number;
range->start.value.number = 1;
range->end.kind = svn_opt_revision_head;
@@ -762,9 +763,10 @@ SVNClient::getMergeinfo(const char *targ
void *val;
apr_hash_this(hi, &path, NULL, &val);
- jstring jpath = JNIUtil::makeJString((const char *) path);
+ jstring jpath =
+ JNIUtil::makeJString(reinterpret_cast<const char *>(path));
jobject jranges =
- CreateJ::RevisionRangeList((svn_rangelist_t *) val);
+ CreateJ::RevisionRangeList(reinterpret_cast<svn_rangelist_t *>(val));
env->CallVoidMethod(jmergeinfo, addRevisions, jpath, jranges);
@@ -848,13 +850,14 @@ jbyteArray SVNClient::propertyGet(const
return NULL; // no property with this name
svn_string_t *propval;
- apr_hash_this(hi, NULL, NULL, (void**)&propval);
+ apr_hash_this(hi, NULL, NULL, reinterpret_cast<void**>(&propval));
if (propval == NULL)
return NULL;
- return JNIUtil::makeJByteArray((const signed char *)propval->data,
- propval->len);
+ return JNIUtil::makeJByteArray
+ (reinterpret_cast<const signed char *>(propval->data),
+ static_cast<int>(propval->len));
}
void SVNClient::properties(const char *path, Revision &revision,
@@ -890,8 +893,10 @@ void SVNClient::propertySetLocal(Targets
if (value.isNull())
val = NULL;
else
- val = svn_string_ncreate((const char *)value.getBytes(), value.getLength(),
- subPool.getPool());
+ val = svn_string_ncreate
+ (reinterpret_cast<const char *>(value.getBytes()),
+ value.getLength(),
+ subPool.getPool());
svn_client_ctx_t *ctx = context.getContext(NULL, subPool);
if (ctx == NULL)
@@ -918,8 +923,10 @@ void SVNClient::propertySetRemote(const
if (value.isNull())
val = NULL;
else
- val = svn_string_ncreate((const char *)value.getBytes(), value.getLength(),
- subPool.getPool());
+ val = svn_string_ncreate
+ (reinterpret_cast<const char *>(value.getBytes()),
+ value.getLength(),
+ subPool.getPool());
Path intPath(path, subPool);
SVN_JNI_ERR(intPath.error_occured(), );
@@ -1157,8 +1164,9 @@ jbyteArray SVNClient::revProperty(const
if (propval == NULL)
return NULL;
- return JNIUtil::makeJByteArray((const signed char *)propval->data,
- propval->len);
+ return JNIUtil::makeJByteArray
+ (reinterpret_cast<const signed char *>(propval->data),
+ static_cast<int>(propval->len));
}
void SVNClient::relocate(const char *from, const char *to, const char *path,
bool ignoreExternals)
@@ -1269,8 +1277,9 @@ void SVNClient::unlock(Targets &targets,
const apr_array_header_t *targetsApr = targets.array(subPool);
SVN_JNI_ERR(targets.error_occured(), );
svn_client_ctx_t *ctx = context.getContext(NULL, subPool);
- SVN_JNI_ERR(svn_client_unlock((apr_array_header_t*)targetsApr, force,
- ctx, subPool.getPool()), );
+ SVN_JNI_ERR(svn_client_unlock(
+ const_cast<apr_array_header_t*>(targetsApr), force,
+ ctx, subPool.getPool()), );
}
void SVNClient::setRevProperty(const char *path,
const char *name, Revision &rev,
Modified: subversion/branches/wc-collate-path/subversion/bindings/javahl/native/SVNRepos.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/bindings/javahl/native/SVNRepos.cpp?rev=1405866&r1=1405865&r2=1405866&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/bindings/javahl/native/SVNRepos.cpp (original)
+++ subversion/branches/wc-collate-path/subversion/bindings/javahl/native/SVNRepos.cpp Mon Nov 5 16:30:51 2012
@@ -169,7 +169,7 @@ void SVNRepos::deltify(File &path, Revis
for (revision = start; revision <= end; ++revision)
{
revisionPool.clear();
- SVN_JNI_ERR(svn_fs_deltify_revision (fs, revision, revisionPool.getPool()),
+ SVN_JNI_ERR(svn_fs_deltify_revision(fs, revision, revisionPool.getPool()),
);
}
@@ -273,7 +273,7 @@ void SVNRepos::hotcopy(File &path, File
}
static void
-list_dblogs (File &path, MessageReceiver &receiver, bool only_unused)
+list_dblogs(File &path, MessageReceiver &receiver, bool only_unused)
{
SVN::Pool requestPool;
apr_array_header_t *logfiles;
@@ -297,7 +297,7 @@ list_dblogs (File &path, MessageReceiver
log_utf8 = svn_dirent_join(path.getInternalStyle(requestPool),
APR_ARRAY_IDX(logfiles, i, const char *),
requestPool.getPool());
- log_utf8 = svn_dirent_local_style (log_utf8, requestPool.getPool());
+ log_utf8 = svn_dirent_local_style(log_utf8, requestPool.getPool());
receiver.receiveMessage(log_utf8);
}
}
@@ -365,13 +365,13 @@ void SVNRepos::lstxns(File &path, Messag
SVN_JNI_ERR(svn_repos_open2(&repos, path.getInternalStyle(requestPool),
NULL, requestPool.getPool()), );
- fs = svn_repos_fs (repos);
+ fs = svn_repos_fs(repos);
SVN_JNI_ERR(svn_fs_list_transactions(&txns, fs, requestPool.getPool()), );
/* Loop, printing revisions. */
for (int i = 0; i < txns->nelts; ++i)
{
- messageReceiver.receiveMessage(APR_ARRAY_IDX (txns, i, const char *));
+ messageReceiver.receiveMessage(APR_ARRAY_IDX(txns, i, const char *));
}
@@ -402,7 +402,7 @@ jlong SVNRepos::recover(File &path, Repo
* recovery actually worked. */
SVN_JNI_ERR(svn_repos_open2(&repos, path.getInternalStyle(requestPool),
NULL, requestPool.getPool()), -1);
- SVN_JNI_ERR(svn_fs_youngest_rev(&youngest_rev, svn_repos_fs (repos),
+ SVN_JNI_ERR(svn_fs_youngest_rev(&youngest_rev, svn_repos_fs(repos),
requestPool.getPool()),
-1);
return youngest_rev;
@@ -426,13 +426,13 @@ void SVNRepos::rmtxns(File &path, String
SVN_JNI_ERR(svn_repos_open2(&repos, path.getInternalStyle(requestPool),
NULL, requestPool.getPool()), );
- fs = svn_repos_fs (repos);
+ fs = svn_repos_fs(repos);
args = transactions.array(requestPool);
/* All the rest of the arguments are transaction names. */
for (i = 0; i < args->nelts; ++i)
{
- const char *txn_name = APR_ARRAY_IDX (args, i, const char *);
+ const char *txn_name = APR_ARRAY_IDX(args, i, const char *);
svn_error_t *err;
/* Try to open the txn. If that succeeds, try to abort it. */
@@ -446,7 +446,7 @@ void SVNRepos::rmtxns(File &path, String
* all. */
if (err && (err->apr_err == SVN_ERR_FS_TRANSACTION_DEAD))
{
- svn_error_clear (err);
+ svn_error_clear(err);
err = svn_fs_purge_txn(fs, txn_name, transactionPool.getPool());
}
@@ -500,7 +500,7 @@ void SVNRepos::setRevProp(File &path, Re
}
else
{
- svn_fs_t *fs = svn_repos_fs (repos);
+ svn_fs_t *fs = svn_repos_fs(repos);
err = svn_fs_change_rev_prop2(fs, revision.revision()->value.number,
propName, NULL, propValStr,
requestPool.getPool());
@@ -557,7 +557,7 @@ SVNRepos::verify(File &path, Revision &r
* with no interest in the output. */
SVN_JNI_ERR(svn_repos_open2(&repos, path.getInternalStyle(requestPool),
NULL, requestPool.getPool()), );
- SVN_JNI_ERR(svn_fs_youngest_rev(&youngest, svn_repos_fs (repos),
+ SVN_JNI_ERR(svn_fs_youngest_rev(&youngest, svn_repos_fs(repos),
requestPool.getPool()), );
/* Find the revision numbers at which to start and end. */
@@ -661,13 +661,13 @@ jobject SVNRepos::lslocks(File &path, sv
std::vector<jobject> jlocks;
- for (hi = apr_hash_first (requestPool.getPool(), locks);
+ for (hi = apr_hash_first(requestPool.getPool(), locks);
hi;
- hi = apr_hash_next (hi))
+ hi = apr_hash_next(hi))
{
void *val;
- apr_hash_this (hi, NULL, NULL, &val);
- svn_lock_t *lock = (svn_lock_t *)val;
+ apr_hash_this(hi, NULL, NULL, &val);
+ svn_lock_t *lock = reinterpret_cast<svn_lock_t *>(val);
jobject jLock = CreateJ::Lock(lock);
jlocks.push_back(jLock);
@@ -693,7 +693,7 @@ void SVNRepos::rmlocks(File &path, Strin
SVN_JNI_ERR(svn_repos_open2(&repos, path.getInternalStyle(requestPool),
NULL, requestPool.getPool()), );
- fs = svn_repos_fs (repos);
+ fs = svn_repos_fs(repos);
const char *username;
/* svn_fs_unlock() demands that some username be associated with the
@@ -702,12 +702,12 @@ void SVNRepos::rmlocks(File &path, Strin
apr_uid_t uid;
apr_gid_t gid;
char *un;
- if (apr_uid_current (&uid, &gid, requestPool.getPool()) == APR_SUCCESS &&
- apr_uid_name_get (&un, uid, requestPool.getPool()) == APR_SUCCESS)
+ if (apr_uid_current(&uid, &gid, requestPool.getPool()) == APR_SUCCESS &&
+ apr_uid_name_get(&un, uid, requestPool.getPool()) == APR_SUCCESS)
{
svn_error_t *err = svn_utf_cstring_to_utf8(&username, un,
requestPool.getPool());
- svn_error_clear (err);
+ svn_error_clear(err);
if (err)
username = "administrator";
}
@@ -723,7 +723,7 @@ void SVNRepos::rmlocks(File &path, Strin
const apr_array_header_t *args = locks.array(requestPool);
for (int i = 0; i < args->nelts; ++i)
{
- const char *lock_path = APR_ARRAY_IDX (args, i, const char *);
+ const char *lock_path = APR_ARRAY_IDX(args, i, const char *);
svn_lock_t *lock;
/* Fetch the path's svn_lock_t. */
@@ -734,13 +734,13 @@ void SVNRepos::rmlocks(File &path, Strin
continue;
/* Now forcibly destroy the lock. */
- err = svn_fs_unlock (fs, lock_path,
- lock->token, 1 /* force */, subpool.getPool());
+ err = svn_fs_unlock(fs, lock_path,
+ lock->token, 1 /* force */, subpool.getPool());
if (err)
goto move_on;
move_on:
- svn_error_clear (err);
+ svn_error_clear(err);
subpool.clear();
}
Modified: subversion/branches/wc-collate-path/subversion/bindings/javahl/native/StringArray.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/bindings/javahl/native/StringArray.cpp?rev=1405866&r1=1405865&r2=1405866&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/bindings/javahl/native/StringArray.cpp (original)
+++ subversion/branches/wc-collate-path/subversion/bindings/javahl/native/StringArray.cpp Mon Nov 5 16:30:51 2012
@@ -39,7 +39,8 @@ StringArray::~StringArray()
const apr_array_header_t *StringArray::array(const SVN::Pool &pool)
{
apr_array_header_t *strings
- = apr_array_make(pool.getPool(), m_strings.size(), sizeof(char *));
+ = apr_array_make(pool.getPool(), static_cast<int>(m_strings.size()),
+ sizeof(char *));
std::vector<std::string>::const_iterator it;
for (it = m_strings.begin(); it < m_strings.end(); ++it)
@@ -69,7 +70,7 @@ StringArray::init(void)
if (JNIUtil::isExceptionThrown())
return;
- m_strings.push_back(std::string((const char *)str));
+ m_strings.push_back(std::string(static_cast<const char *>(str)));
}
}
Modified: subversion/branches/wc-collate-path/subversion/bindings/javahl/native/Targets.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/bindings/javahl/native/Targets.cpp?rev=1405866&r1=1405865&r2=1405866&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/bindings/javahl/native/Targets.cpp (original)
+++ subversion/branches/wc-collate-path/subversion/bindings/javahl/native/Targets.cpp Mon Nov 5 16:30:51 2012
@@ -40,13 +40,13 @@ Targets::Targets(const char *path, SVN::
: m_subpool(in_pool)
{
m_strArray = NULL;
- m_targets.push_back (apr_pstrdup(m_subpool.getPool(), path));
+ m_targets.push_back(apr_pstrdup(m_subpool.getPool(), path));
m_error_occured = NULL;
}
void Targets::add(const char *path)
{
- m_targets.push_back (path);
+ m_targets.push_back(path);
}
const apr_array_header_t *Targets::array(const SVN::Pool &pool)
@@ -72,9 +72,9 @@ const apr_array_header_t *Targets::array
std::vector<const char*>::const_iterator it;
apr_pool_t *apr_pool = pool.getPool();
- apr_array_header_t *apr_targets = apr_array_make (apr_pool,
- m_targets.size(),
- sizeof(const char *));
+ apr_array_header_t *apr_targets
+ = apr_array_make(apr_pool, static_cast<int>(m_targets.size()),
+ sizeof(const char *));
for (it = m_targets.begin(); it != m_targets.end(); ++it)
{
Modified: subversion/branches/wc-collate-path/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp?rev=1405866&r1=1405865&r2=1405866&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp (original)
+++ subversion/branches/wc-collate-path/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp Mon Nov 5 16:30:51 2012
@@ -161,7 +161,8 @@ Java_org_apache_subversion_javahl_SVNCli
ListCallback callback(jcallback);
cl->list(url, revision, pegRevision, EnumMapper::toDepth(jdepth),
- (int)jdirentFields, jfetchLocks ? true : false, &callback);
+ static_cast<int>(jdirentFields), jfetchLocks ? true : false,
+ &callback);
}
JNIEXPORT void JNICALL
@@ -306,7 +307,7 @@ Java_org_apache_subversion_javahl_SVNCli
cl->logMessages(path, pegRevision, revisionRanges,
jstopOnCopy ? true: false, jdisoverPaths ? true : false,
jincludeMergedRevisions ? true : false,
- revProps, jlimit, &callback);
+ revProps, static_cast<long>(jlimit), &callback);
}
JNIEXPORT jlong JNICALL
@@ -958,8 +959,8 @@ Java_org_apache_subversion_javahl_SVNCli
return;
CommitCallback callback(jcallback);
- cl->propertySetRemote(path, jbaseRev, name, &message, value,
- jforce ? true:false,
+ cl->propertySetRemote(path, static_cast<svn_revnum_t>(jbaseRev),
+ name, &message, value, jforce ? true : false,
revprops, jcallback ? &callback : NULL);
}
@@ -1770,7 +1771,8 @@ Java_org_apache_subversion_javahl_SVNCli
return;
PatchCallback callback(jcallback);
- cl->patch(patchPath, targetPath, jdryRun ? true : false, (int) jstripCount,
+ cl->patch(patchPath, targetPath,
+ jdryRun ? true : false, static_cast<int>(jstripCount),
jreverse ? true : false, jignoreWhitespace ? true : false,
jremoveTempfiles ? true : false, &callback);
}
Modified: subversion/branches/wc-collate-path/subversion/include/private/svn_named_atomic.h
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/include/private/svn_named_atomic.h?rev=1405866&r1=1405865&r2=1405866&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/include/private/svn_named_atomic.h (original)
+++ subversion/branches/wc-collate-path/subversion/include/private/svn_named_atomic.h Mon Nov 5 16:30:51 2012
@@ -83,6 +83,17 @@ svn_atomic_namespace__create(svn_atomic_
const char *name,
apr_pool_t *result_pool);
+/** Removes persistent data structures (files in particular) that got
+ * created for the namespace given by @a name. Use @a pool for temporary
+ * allocations.
+ *
+ * @note You must not call this while the respective namespace is still
+ * in use. Calling this multiple times for the same namespace is safe.
+ */
+svn_error_t *
+svn_atomic_namespace__cleanup(const char *name,
+ apr_pool_t *pool);
+
/** Find the atomic with the specified @a name in namespace @a ns and
* return it in @a *atomic. If no object with that name can be found, the
* behavior depends on @a auto_create. If it is @c FALSE, @a *atomic will
Modified: subversion/branches/wc-collate-path/subversion/include/svn_delta.h
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/include/svn_delta.h?rev=1405866&r1=1405865&r2=1405866&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/include/svn_delta.h (original)
+++ subversion/branches/wc-collate-path/subversion/include/svn_delta.h Mon Nov 5 16:30:51 2012
@@ -1324,8 +1324,9 @@ typedef svn_error_t *(*svn_delta_path_dr
* Each path in @a paths is a const char *. The editor drive will be
* performed in the same order as @a paths. The paths should be sorted
* using something like svn_sort_compare_paths to ensure that a depth-first
- * pattern is observed for directory/file baton creation. Some callers may
- * need further customization of the order (ie. libsvn_delta/compat.c).
+ * pattern is observed for directory/file baton creation. If @a sort_paths
+ * is set, the function will sort the paths for you. Some callers may need
+ * further customization of the order (ie. libsvn_delta/compat.c).
*
* Use @a scratch_pool for all necessary allocations.
*
@@ -1335,6 +1336,7 @@ svn_error_t *
svn_delta_path_driver2(const svn_delta_editor_t *editor,
void *edit_baton,
const apr_array_header_t *paths,
+ svn_boolean_t sort_paths,
svn_delta_path_driver_cb_func_t callback_func,
void *callback_baton,
apr_pool_t *scratch_pool);
Modified: subversion/branches/wc-collate-path/subversion/include/svn_error_codes.h
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/include/svn_error_codes.h?rev=1405866&r1=1405865&r2=1405866&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/include/svn_error_codes.h (original)
+++ subversion/branches/wc-collate-path/subversion/include/svn_error_codes.h Mon Nov 5 16:30:51 2012
@@ -1425,6 +1425,11 @@ SVN_ERROR_START
SVN_ERR_MISC_CATEGORY_START + 37,
"failed to parse version number string")
+ /** @since New in 1.8. */
+ SVN_ERRDEF(SVN_ERR_CORRUPTED_ATOMIC_STORAGE,
+ SVN_ERR_MISC_CATEGORY_START + 38,
+ "Atomic data storage is corrupt")
+
/* command-line client errors */
SVN_ERRDEF(SVN_ERR_CL_ARG_PARSING_ERROR,
Modified: subversion/branches/wc-collate-path/subversion/include/svn_fs.h
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/include/svn_fs.h?rev=1405866&r1=1405865&r2=1405866&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/include/svn_fs.h (original)
+++ subversion/branches/wc-collate-path/subversion/include/svn_fs.h Mon Nov 5 16:30:51 2012
@@ -88,6 +88,10 @@ typedef struct svn_fs_t svn_fs_t;
/** Enable / disable revprop caching for a FSFS repository.
*
+ * "2" is allowed, too and means "enable if efficient",
+ * i.e. this will not create warning at runtime if there
+ * if no efficient support for revprop caching.
+ *
* @since New in 1.8.
*/
#define SVN_FS_CONFIG_FSFS_CACHE_REVPROPS "fsfs-cache-revprops"
Modified: subversion/branches/wc-collate-path/subversion/include/svn_props.h
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/include/svn_props.h?rev=1405866&r1=1405865&r2=1405866&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/include/svn_props.h (original)
+++ subversion/branches/wc-collate-path/subversion/include/svn_props.h Mon Nov 5 16:30:51 2012
@@ -384,14 +384,11 @@ svn_prop_name_is_valid(const char *prop_
*/
#define SVN_PROP_MERGEINFO SVN_PROP_PREFIX "mergeinfo"
-/** Prefix for all Subersion inhertiable properties. */
-#define SVN_PROP_INHERITABLE_PREFIX SVN_PROP_PREFIX "inheritable-"
-
/** Property used to record inheritable configuration auto-props. */
-#define SVN_PROP_INHERITABLE_AUTO_PROPS SVN_PROP_INHERITABLE_PREFIX "auto-props"
+#define SVN_PROP_INHERITABLE_AUTO_PROPS SVN_PROP_PREFIX "auto-props"
/** Property used to record inheritable configuration ignores. */
-#define SVN_PROP_INHERITABLE_IGNORES SVN_PROP_INHERITABLE_PREFIX "ignores"
+#define SVN_PROP_INHERITABLE_IGNORES SVN_PROP_PREFIX "global-ignores"
/** Meta-data properties.
*
Modified: subversion/branches/wc-collate-path/subversion/libsvn_client/add.c
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/libsvn_client/add.c?rev=1405866&r1=1405865&r2=1405866&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/libsvn_client/add.c (original)
+++ subversion/branches/wc-collate-path/subversion/libsvn_client/add.c Mon Nov 5 16:30:51 2012
@@ -292,7 +292,7 @@ add_file(const char *local_abspath,
apr_hash_t *file_autoprops;
/* Get automatic properties */
- /* Grab the inherited svn:inheritable-auto-props and config file
+ /* Grab the inherited svn:auto-props and config file
auto-props for this file if we haven't already got them
when iterating over the file's unversioned parents. */
if (autoprops == NULL)
@@ -380,12 +380,12 @@ add_file(const char *local_abspath,
* if necessary.
*
* If not NULL, *CONFIG_AUTOPROPS is a hash representing the config file and
- * svn:inheritable-auto-props autoprops which apply to DIR_ABSPATH. It maps
+ * svn:auto-props autoprops which apply to DIR_ABSPATH. It maps
* const char * file patterns to another hash which maps const char *
* property names to const char *property values. If *CONFIG_AUTOPROPS is
* NULL and DIR_ABSPATH is unversioned, then this function will populate
* *CONFIG_AUTOPROPS (allocated in RESULT_POOL) using DIR_ABSPATH's nearest
- * versioned parent to determine the svn:inheritable-auto-props which DIR_ABSPATH
+ * versioned parent to determine the svn:auto-props which DIR_ABSPATH
* will inherit once added.
*
* If IGNORES is not NULL, then it is an array of const char * ignore patterns
@@ -452,9 +452,9 @@ add_dir_recursive(const char *dir_abspat
/* For the root of any unversioned subtree, get some or all of the
following:
- 1) Explicit and inherited svn:inheritable-auto-props properties on
+ 1) Explicit and inherited svn:auto-props properties on
DIR_ABSPATH
- 2) Explicit and inherited svn:inheritabled-ignores properties on
+ 2) Explicit and inherited svn:global-ignores properties on
DIR_ABSPATH
3) auto-props from the CTX->CONFIG hash */
if (!entry_exists && *config_autoprops == NULL)
@@ -537,7 +537,7 @@ add_dir_recursive(const char *dir_abspat
}
/* This structure is used as baton for collecting the config entries
- in the auto-props section and any inherited svn:inheritable-auto-props
+ in the auto-props section and any inherited svn:auto-props
properties.
*/
typedef struct collect_auto_props_baton_t
@@ -702,7 +702,7 @@ svn_client__get_all_auto_props(apr_hash_
/* Are "traditional" auto-props enabled? If so grab them from the
config. This is our starting set auto-props, which may be overriden
- by svn:inheritable-auto-props. */
+ by svn:auto-props. */
SVN_ERR(svn_config_get_bool(cfg, &use_autoprops,
SVN_CONFIG_SECTION_MISCELLANY,
SVN_CONFIG_OPTION_ENABLE_AUTO_PROPS, FALSE));
@@ -781,7 +781,7 @@ svn_client__get_all_auto_props(apr_hash_
config_auto_prop_pattern = svn_stringbuf_create_empty(iterpool);
config_auto_prop_val = svn_stringbuf_create_empty(iterpool);
- /* Parse svn:inheritable-auto-props value. */
+ /* Parse svn:auto-props value. */
while (*ch != '\0')
{
svn_stringbuf_setempty(config_auto_prop_pattern);
@@ -1365,9 +1365,8 @@ mkdir_urls(const apr_array_header_t *url
pool));
/* Call the path-based editor driver. */
- err = svn_delta_path_driver(editor, edit_baton, SVN_INVALID_REVNUM,
- targets, path_driver_cb_func,
- (void *)editor, pool);
+ err = svn_delta_path_driver2(editor, edit_baton, targets, TRUE,
+ path_driver_cb_func, (void *)editor, pool);
if (err)
{
/* At least try to abort the edit (and fs txn) before throwing err. */
Modified: subversion/branches/wc-collate-path/subversion/libsvn_client/client.h
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/libsvn_client/client.h?rev=1405866&r1=1405865&r2=1405866&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/libsvn_client/client.h (original)
+++ subversion/branches/wc-collate-path/subversion/libsvn_client/client.h Mon Nov 5 16:30:51 2012
@@ -351,11 +351,11 @@ svn_error_t *svn_client__get_paths_auto_
apr_pool_t *scratch_pool);
/* Gather all auto-props from CTX->config (or none if auto-props are
- disabled) and all svn:inheritable-auto-props explicitly set on or inherited
+ disabled) and all svn:auto-props explicitly set on or inherited
by PATH_OR_URL.
If PATH_OR_URL is an unversioned WC path then gather the
- svn:inheritable-auto-props inherited by PATH_OR_URL's nearest versioned
+ svn:auto-props inherited by PATH_OR_URL's nearest versioned
parent.
If PATH_OR_URL is a URL ask for the properties @HEAD, if it is a WC
@@ -366,10 +366,10 @@ svn_error_t *svn_client__get_paths_auto_
names to const char *property values.
If a given property name exists for the same pattern in both the config
- file and in an a svn:inheritable-auto-props property, the latter overrides the
+ file and in an a svn:auto-props property, the latter overrides the
former. If a given property name exists for the same pattern in two
- different inherited svn:inheritable-auto-props, then the closer path-wise
- property overrides the more distant. svn:inheritable-auto-props explicitly set
+ different inherited svn:auto-props, then the closer path-wise
+ property overrides the more distant. svn:auto-props explicitly set
on PATH_OR_URL have the highest precedence and override inherited props
and config file settings.
@@ -383,7 +383,7 @@ svn_error_t *svn_client__get_all_auto_pr
/* Get a combined list of ignore patterns from CTX->CONFIG, local ignore
patterns on LOCAL_ABSPATH (per the svn:ignore property), and from any
- svn:inheritable-ignores properties set on, or inherited by, LOCAL_ABSPATH.
+ svn:global-ignores properties set on, or inherited by, LOCAL_ABSPATH.
If LOCAL_ABSPATH is unversioned but is located within a valid working copy,
then find its nearest versioned parent path, if any, and return the ignore
patterns for that parent. Return an SVN_ERR_WC_NOT_WORKING_COPY error if
@@ -398,7 +398,7 @@ svn_error_t *svn_client__get_all_ignores
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
-/* Get a list of ignore patterns defined by the svn:inheritable-ignores
+/* Get a list of ignore patterns defined by the svn:global-ignores
properties set on, or inherited by, PATH_OR_URL. Store the collected
patterns as const char * elements in the array *IGNORES. Allocate
*IGNORES and its contents in RESULT_POOL. Use SCRATCH_POOL for
Modified: subversion/branches/wc-collate-path/subversion/libsvn_client/commit.c
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/libsvn_client/commit.c?rev=1405866&r1=1405865&r2=1405866&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/libsvn_client/commit.c (original)
+++ subversion/branches/wc-collate-path/subversion/libsvn_client/commit.c Mon Nov 5 16:30:51 2012
@@ -77,7 +77,7 @@ typedef struct import_ctx_t
svn_magic__cookie_t *magic_cookie;
/* Collection of all possible configuration file dictated auto-props and
- svn:inheritable-auto-props. A hash mapping const char * file patterns to a
+ svn:auto-props. A hash mapping const char * file patterns to a
second hash which maps const char * property names to const char *
property values. Properties which don't have a value, e.g. svn:executable,
simply map the property name to an empty string. */
@@ -613,7 +613,7 @@ import_dir(const svn_delta_editor_t *edi
* the import (values are unused).
*
* AUTOPROPS is hash of all config file autoprops and
- * svn:inheritable-auto-props inherited by the import target, see the
+ * svn:auto-props inherited by the import target, see the
* IMPORT_CTX member of the same name.
*
* LOCAL_IGNORES is an array of const char * ignore patterns which
@@ -622,7 +622,7 @@ import_dir(const svn_delta_editor_t *edi
* target should be ignored and not imported.
*
* MANDATORY_IGNORES is an array of const char * ignore patterns which
- * correspond to the svn:inheritable-ignores properties (if any) set on
+ * correspond to the svn:global-ignores properties (if any) set on
* the root of the repository target or inherited by it.
*
* If NO_IGNORE is FALSE, don't import files or directories that match
@@ -1029,7 +1029,7 @@ svn_client_import5(const char *path,
commit_baton, NULL, TRUE,
scratch_pool));
- /* Get inherited svn:inheritable-auto-props, svn:inheritable-ignores, and
+ /* Get inherited svn:auto-props, svn:global-ignores, and
svn:ignores for the location we are importing to. */
SVN_ERR(svn_client__get_all_auto_props(&autoprops, url, ctx,
scratch_pool, iterpool));
@@ -1428,14 +1428,14 @@ append_externals_as_explicit_targets(apr
/* Easy part of applying DEPTH to externals. */
if (depth == svn_depth_empty)
- {
- /* Don't recurse. */
- return SVN_NO_ERROR;
- }
- else if (depth != svn_depth_infinity)
- {
- include_dir_externals = FALSE;
- /* We slip in dir externals as explicit targets. When we do that,
+ {
+ /* Don't recurse. */
+ return SVN_NO_ERROR;
+ }
+ else if (depth != svn_depth_infinity)
+ {
+ include_dir_externals = FALSE;
+ /* We slip in dir externals as explicit targets. When we do that,
* depth_immediates should become depth_empty for dir externals targets.
* But adding the dir external to the list of targets makes it get
* handled with depth_immediates itself, and thus will also include the
@@ -1450,7 +1450,7 @@ append_externals_as_explicit_targets(apr
* ### --depth=immediates --include-externals', commit dir externals
* ### (only immediate children of a target) with depth_empty instead of
* ### not at all. No other effect. So not doing that for now. */
- }
+ }
/* Iterate *and* grow REL_TARGETS at the same time. */
rel_targets_nelts_fixed = rel_targets->nelts;
Modified: subversion/branches/wc-collate-path/subversion/libsvn_client/commit_util.c
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/libsvn_client/commit_util.c?rev=1405866&r1=1405865&r2=1405866&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/libsvn_client/commit_util.c (original)
+++ subversion/branches/wc-collate-path/subversion/libsvn_client/commit_util.c Mon Nov 5 16:30:51 2012
@@ -1793,9 +1793,8 @@ svn_client__do_commit(const char *base_u
cb_baton.base_url = base_url;
/* Drive the commit editor! */
- SVN_ERR(svn_delta_path_driver(editor, edit_baton, SVN_INVALID_REVNUM,
- paths, do_item_commit, &cb_baton,
- scratch_pool));
+ SVN_ERR(svn_delta_path_driver2(editor, edit_baton, paths, TRUE,
+ do_item_commit, &cb_baton, scratch_pool));
/* Transmit outstanding text deltas. */
for (hi = apr_hash_first(scratch_pool, file_mods);
Modified: subversion/branches/wc-collate-path/subversion/libsvn_client/copy.c
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/libsvn_client/copy.c?rev=1405866&r1=1405865&r2=1405866&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/libsvn_client/copy.c (original)
+++ subversion/branches/wc-collate-path/subversion/libsvn_client/copy.c Mon Nov 5 16:30:51 2012
@@ -1147,8 +1147,8 @@ repos_to_repos_copy(const apr_array_head
cb_baton.is_move = is_move;
/* Call the path-based editor driver. */
- err = svn_delta_path_driver(editor, edit_baton, SVN_INVALID_REVNUM, paths,
- path_driver_cb_func, &cb_baton, pool);
+ err = svn_delta_path_driver2(editor, edit_baton, paths, TRUE,
+ path_driver_cb_func, &cb_baton, pool);
if (err)
{
/* At least try to abort the edit (and fs txn) before throwing err. */
Modified: subversion/branches/wc-collate-path/subversion/libsvn_client/delete.c
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/libsvn_client/delete.c?rev=1405866&r1=1405865&r2=1405866&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/libsvn_client/delete.c (original)
+++ subversion/branches/wc-collate-path/subversion/libsvn_client/delete.c Mon Nov 5 16:30:51 2012
@@ -206,9 +206,8 @@ single_repos_delete(svn_ra_session_t *ra
pool));
/* Call the path-based editor driver. */
- err = svn_delta_path_driver(editor, edit_baton, SVN_INVALID_REVNUM,
- relpaths, path_driver_cb_func,
- (void *)editor, pool);
+ err = svn_delta_path_driver2(editor, edit_baton, relpaths, TRUE,
+ path_driver_cb_func, (void *)editor, pool);
if (err)
{
Modified: subversion/branches/wc-collate-path/subversion/libsvn_client/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/libsvn_client/deprecated.c?rev=1405866&r1=1405865&r2=1405866&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/libsvn_client/deprecated.c (original)
+++ subversion/branches/wc-collate-path/subversion/libsvn_client/deprecated.c Mon Nov 5 16:30:51 2012
@@ -2385,7 +2385,7 @@ info_from_info2(svn_info_t **new_info,
info->size64 = info2->size;
if (info2->size == SVN_INVALID_FILESIZE)
info->size = SVN_INFO_SIZE_UNKNOWN;
- else if (((apr_size_t)info->size64) == info->size64)
+ else if (((svn_filesize_t)(apr_size_t)info->size64) == info->size64)
info->size = (apr_size_t)info->size64;
else /* >= 4GB */
info->size = SVN_INFO_SIZE_UNKNOWN;
@@ -2411,7 +2411,7 @@ info_from_info2(svn_info_t **new_info,
info->depth = svn_depth_infinity;
info->working_size64 = info2->wc_info->recorded_size;
- if (((apr_size_t)info->working_size64) == info->working_size64)
+ if (((svn_filesize_t)(apr_size_t)info->working_size64) == info->working_size64)
info->working_size = (apr_size_t)info->working_size64;
else /* >= 4GB */
info->working_size = SVN_INFO_SIZE_UNKNOWN;
Modified: subversion/branches/wc-collate-path/subversion/libsvn_client/patch.c
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/libsvn_client/patch.c?rev=1405866&r1=1405865&r2=1405866&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/libsvn_client/patch.c (original)
+++ subversion/branches/wc-collate-path/subversion/libsvn_client/patch.c Mon Nov 5 16:30:51 2012
@@ -542,7 +542,7 @@ readline_prop(void *baton, svn_stringbuf
str = svn_stringbuf_create_ensure(80, result_pool);
- if (b->offset >= b->value->len)
+ if ((apr_uint64_t)b->offset >= (apr_uint64_t)b->value->len)
{
*eol_str = NULL;
*eof = TRUE;
Modified: subversion/branches/wc-collate-path/subversion/libsvn_client/prop_commands.c
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/libsvn_client/prop_commands.c?rev=1405866&r1=1405865&r2=1405866&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/libsvn_client/prop_commands.c (original)
+++ subversion/branches/wc-collate-path/subversion/libsvn_client/prop_commands.c Mon Nov 5 16:30:51 2012
@@ -356,11 +356,9 @@ svn_client_propset_local(const char *pro
ctx->notify_func2(ctx->notify_baton2, notify, iterpool);
}
-
- svn_error_clear(err);
}
- else
- SVN_ERR(err);
+
+ SVN_ERR(err);
SVN_WC__CALL_WITH_WRITE_LOCK(
svn_wc_prop_set4(ctx->wc_ctx, target_abspath, propname,
Modified: subversion/branches/wc-collate-path/subversion/libsvn_delta/compat.c
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/libsvn_delta/compat.c?rev=1405866&r1=1405865&r2=1405866&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/libsvn_delta/compat.c (original)
+++ subversion/branches/wc-collate-path/subversion/libsvn_delta/compat.c Mon Nov 5 16:30:51 2012
@@ -1726,7 +1726,7 @@ drive_changes(const struct editor_baton
/* Get a sorted list of Ev1-relative paths. */
paths = get_sorted_paths(eb->changes, eb->base_relpath, scratch_pool);
SVN_ERR(svn_delta_path_driver2(eb->deditor, eb->dedit_baton, paths,
- apply_change, (void *)eb,
+ FALSE, apply_change, (void *)eb,
scratch_pool));
return SVN_NO_ERROR;
Modified: subversion/branches/wc-collate-path/subversion/libsvn_delta/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/libsvn_delta/deprecated.c?rev=1405866&r1=1405865&r2=1405866&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/libsvn_delta/deprecated.c (original)
+++ subversion/branches/wc-collate-path/subversion/libsvn_delta/deprecated.c Mon Nov 5 16:30:51 2012
@@ -39,15 +39,10 @@ svn_delta_path_driver(const svn_delta_ed
void *callback_baton,
apr_pool_t *scratch_pool)
{
- apr_array_header_t *sorted;
-
/* REVISION is dropped on the floor. */
- /* Construct a copy of PATHS, then sort them in a depth-first order. */
- sorted = apr_array_copy(scratch_pool, paths);
- qsort(sorted->elts, sorted->nelts, sorted->elt_size, svn_sort_compare_paths);
-
- return svn_error_trace(svn_delta_path_driver2(editor, edit_baton, sorted,
+ return svn_error_trace(svn_delta_path_driver2(editor, edit_baton, paths,
+ TRUE,
callback_func, callback_baton,
scratch_pool));
}
Modified: subversion/branches/wc-collate-path/subversion/libsvn_delta/path_driver.c
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/libsvn_delta/path_driver.c?rev=1405866&r1=1405865&r2=1405866&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/libsvn_delta/path_driver.c (original)
+++ subversion/branches/wc-collate-path/subversion/libsvn_delta/path_driver.c Mon Nov 5 16:30:51 2012
@@ -133,6 +133,7 @@ svn_error_t *
svn_delta_path_driver2(const svn_delta_editor_t *editor,
void *edit_baton,
const apr_array_header_t *paths,
+ svn_boolean_t sort_paths,
svn_delta_path_driver_cb_func_t callback_func,
void *callback_baton,
apr_pool_t *pool)
@@ -151,6 +152,16 @@ svn_delta_path_driver2(const svn_delta_e
subpool = svn_pool_create(pool);
iterpool = svn_pool_create(pool);
+
+ /* sort paths if necessary */
+ if (sort_paths && paths->nelts > 1)
+ {
+ apr_array_header_t *sorted = apr_array_copy(subpool, paths);
+ qsort(sorted->elts, sorted->nelts, sorted->elt_size,
+ svn_sort_compare_paths);
+ paths = sorted;
+ }
+
item = apr_pcalloc(subpool, sizeof(*item));
/* If the root of the edit is also a target path, we want to call
Modified: subversion/branches/wc-collate-path/subversion/libsvn_delta/svndiff.c
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/libsvn_delta/svndiff.c?rev=1405866&r1=1405865&r2=1405866&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/libsvn_delta/svndiff.c (original)
+++ subversion/branches/wc-collate-path/subversion/libsvn_delta/svndiff.c Mon Nov 5 16:30:51 2012
@@ -852,7 +852,7 @@ write_handler(void *baton,
/* Check for integer overflow. */
if (sview_offset < 0 || inslen + newlen < inslen
|| sview_len + tview_len < sview_len
- || sview_offset + sview_len < sview_offset)
+ || (apr_size_t)sview_offset + sview_len < (apr_size_t)sview_offset)
return svn_error_create(SVN_ERR_SVNDIFF_CORRUPT_WINDOW, NULL,
_("Svndiff contains corrupt window header"));
@@ -1016,7 +1016,7 @@ read_window_header(svn_stream_t *stream,
/* Check for integer overflow. */
if (*sview_offset < 0 || *inslen + *newlen < *inslen
|| *sview_len + *tview_len < *sview_len
- || *sview_offset + *sview_len < *sview_offset)
+ || (apr_size_t)*sview_offset + *sview_len < (apr_size_t)*sview_offset)
return svn_error_create(SVN_ERR_SVNDIFF_CORRUPT_WINDOW, NULL,
_("Svndiff contains corrupt window header"));
Modified: subversion/branches/wc-collate-path/subversion/libsvn_delta/text_delta.c
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/libsvn_delta/text_delta.c?rev=1405866&r1=1405865&r2=1405866&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/libsvn_delta/text_delta.c (original)
+++ subversion/branches/wc-collate-path/subversion/libsvn_delta/text_delta.c Mon Nov 5 16:30:51 2012
@@ -801,7 +801,8 @@ apply_window(svn_txdelta_window_t *windo
/* If the existing view overlaps with the new view, copy the
* overlap to the beginning of the new buffer. */
- if (ab->sbuf_offset + ab->sbuf_len > window->sview_offset)
+ if ( (apr_size_t)ab->sbuf_offset + ab->sbuf_len
+ > (apr_size_t)window->sview_offset)
{
apr_size_t start =
(apr_size_t)(window->sview_offset - ab->sbuf_offset);
Modified: subversion/branches/wc-collate-path/subversion/libsvn_fs_fs/caching.c
URL: http://svn.apache.org/viewvc/subversion/branches/wc-collate-path/subversion/libsvn_fs_fs/caching.c?rev=1405866&r1=1405865&r2=1405866&view=diff
==============================================================================
--- subversion/branches/wc-collate-path/subversion/libsvn_fs_fs/caching.c (original)
+++ subversion/branches/wc-collate-path/subversion/libsvn_fs_fs/caching.c Mon Nov 5 16:30:51 2012
@@ -83,11 +83,19 @@ read_config(svn_memcache_t **memcache_p,
* Revprop caching significantly speeds up operations like
* svn ls -v. However, it requires synchronization that may
* not be available or efficient in the current server setup.
+ *
+ * If the caller chose option "2", enable revprop caching if
+ * the required API support is there to make it efficient.
*/
- *cache_revprops
- = svn_hash__get_bool(fs->config,
- SVN_FS_CONFIG_FSFS_CACHE_REVPROPS,
- FALSE);
+ if (strcmp(svn_hash__get_cstring(fs->config,
+ SVN_FS_CONFIG_FSFS_CACHE_REVPROPS,
+ ""), "2"))
+ *cache_revprops
+ = svn_hash__get_bool(fs->config,
+ SVN_FS_CONFIG_FSFS_CACHE_REVPROPS,
+ FALSE);
+ else
+ *cache_revprops = svn_named_atomic__is_efficient();
return svn_config_get_bool(ffd->config, fail_stop,
CONFIG_SECTION_CACHES, CONFIG_OPTION_FAIL_STOP,