You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by vm...@apache.org on 2012/12/27 04:42:19 UTC
svn commit: r1426114 - in /subversion/branches/javahl-ra: ./
contrib/client-side/svnmerge/ subversion/bindings/javahl/native/
subversion/bindings/swig/perl/native/ subversion/libsvn_subr/
subversion/tests/libsvn_subr/ tools/server-side/
Author: vmpn
Date: Thu Dec 27 03:42:18 2012
New Revision: 1426114
URL: http://svn.apache.org/viewvc?rev=1426114&view=rev
Log:
On the javahl-ra branch:
Bring up-to-date with JavaHL changes on trunk@1409228
Modified:
subversion/branches/javahl-ra/ (props changed)
subversion/branches/javahl-ra/contrib/client-side/svnmerge/svnmerge_test.py
subversion/branches/javahl-ra/subversion/bindings/javahl/native/Path.cpp
subversion/branches/javahl-ra/subversion/bindings/javahl/native/Path.h
subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNClient.cpp
subversion/branches/javahl-ra/subversion/bindings/javahl/native/Targets.cpp
subversion/branches/javahl-ra/subversion/bindings/javahl/native/Targets.h
subversion/branches/javahl-ra/subversion/bindings/swig/perl/native/Repos.pm
subversion/branches/javahl-ra/subversion/libsvn_subr/cache_config.c
subversion/branches/javahl-ra/subversion/tests/libsvn_subr/stream-test.c
subversion/branches/javahl-ra/tools/server-side/svn-backup-dumps.py
Propchange: subversion/branches/javahl-ra/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1409228
Modified: subversion/branches/javahl-ra/contrib/client-side/svnmerge/svnmerge_test.py
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/contrib/client-side/svnmerge/svnmerge_test.py?rev=1426114&r1=1426113&r2=1426114&view=diff
==============================================================================
--- subversion/branches/javahl-ra/contrib/client-side/svnmerge/svnmerge_test.py (original)
+++ subversion/branches/javahl-ra/contrib/client-side/svnmerge/svnmerge_test.py Thu Dec 27 03:42:18 2012
@@ -1139,7 +1139,7 @@ D test3"""
def testMergeAndRollbackEmptyRevisionRange(self):
"""Init svnmerge, modify source head, merge, rollback where no merge
- occured."""
+ occurred."""
# Initialize svnmerge
self.svnmerge2(["init", self.test_repo_url + "/trunk"])
Modified: subversion/branches/javahl-ra/subversion/bindings/javahl/native/Path.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/Path.cpp?rev=1426114&r1=1426113&r2=1426114&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/bindings/javahl/native/Path.cpp (original)
+++ subversion/branches/javahl-ra/subversion/bindings/javahl/native/Path.cpp Thu Dec 27 03:42:18 2012
@@ -73,12 +73,12 @@ Path::init(const char *pi_path, SVN::Poo
{
if (*pi_path == 0)
{
- m_error_occured = NULL;
+ m_error_occurred = NULL;
m_path = "";
}
else
{
- m_error_occured = JNIUtil::preprocessPath(pi_path, in_pool.getPool());
+ m_error_occurred = JNIUtil::preprocessPath(pi_path, in_pool.getPool());
m_path = pi_path;
}
@@ -108,15 +108,15 @@ Path::c_str() const
Path&
Path::operator=(const Path &pi_path)
{
- m_error_occured = NULL;
+ m_error_occurred = NULL;
m_path = pi_path.m_path;
return *this;
}
- svn_error_t *Path::error_occured() const
+ svn_error_t *Path::error_occurred() const
{
- return m_error_occured;
+ return m_error_occurred;
}
jboolean Path::isValid(const char *p)
Modified: subversion/branches/javahl-ra/subversion/bindings/javahl/native/Path.h
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/Path.h?rev=1426114&r1=1426113&r2=1426114&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/bindings/javahl/native/Path.h (original)
+++ subversion/branches/javahl-ra/subversion/bindings/javahl/native/Path.h Thu Dec 27 03:42:18 2012
@@ -41,7 +41,7 @@ class Path
// The path to be stored.
std::string m_path;
- svn_error_t *m_error_occured;
+ svn_error_t *m_error_occurred;
/**
* Initialize the class.
@@ -90,7 +90,7 @@ class Path
*/
const char *c_str() const;
- svn_error_t *error_occured() const;
+ svn_error_t *error_occurred() const;
/**
* Returns whether @a path is non-NULL and passes the @c
Modified: subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNClient.cpp?rev=1426114&r1=1426113&r2=1426114&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNClient.cpp Thu Dec 27 03:42:18 2012
@@ -131,7 +131,7 @@ void SVNClient::list(const char *url, Re
SVN_JNI_NULL_PTR_EX(url, "path or url", );
Path urlPath(url, subPool);
- SVN_JNI_ERR(urlPath.error_occured(), );
+ SVN_JNI_ERR(urlPath.error_occurred(), );
SVN_JNI_ERR(svn_client_list2(urlPath.c_str(),
pegRevision.revision(),
@@ -162,7 +162,7 @@ SVNClient::status(const char *path, svn_
callback->setWcCtx(ctx->wc_ctx);
Path checkedPath(path, subPool);
- SVN_JNI_ERR(checkedPath.error_occured(), );
+ SVN_JNI_ERR(checkedPath.error_occurred(), );
rev.kind = svn_opt_revision_unspecified;
@@ -229,7 +229,7 @@ void SVNClient::logMessages(const char *
Targets target(path, subPool);
const apr_array_header_t *targets = target.array(subPool);
- SVN_JNI_ERR(target.error_occured(), );
+ SVN_JNI_ERR(target.error_occurred(), );
apr_array_header_t *ranges =
rev_range_vector_to_apr_array(logRanges, subPool);
@@ -256,8 +256,8 @@ jlong SVNClient::checkout(const char *mo
Path url(moduleName, subPool);
Path path(destPath, subPool);
- SVN_JNI_ERR(url.error_occured(), -1);
- SVN_JNI_ERR(path.error_occured(), -1);
+ SVN_JNI_ERR(url.error_occurred(), -1);
+ SVN_JNI_ERR(path.error_occurred(), -1);
svn_revnum_t rev;
svn_client_ctx_t *ctx = context.getContext(NULL, subPool);
@@ -288,7 +288,7 @@ void SVNClient::remove(Targets &targets,
return;
const apr_array_header_t *targets2 = targets.array(subPool);
- SVN_JNI_ERR(targets.error_occured(), );
+ SVN_JNI_ERR(targets.error_occurred(), );
SVN_JNI_ERR(svn_client_delete4(targets2, force, keep_local,
revprops.hash(subPool),
@@ -309,7 +309,7 @@ void SVNClient::revert(const char *path,
Targets target(path, subPool);
const apr_array_header_t *targets = target.array(subPool);
- SVN_JNI_ERR(target.error_occured(), );
+ SVN_JNI_ERR(target.error_occurred(), );
SVN_JNI_ERR(svn_client_revert2(targets, depth,
changelists.array(subPool), ctx,
subPool.getPool()), );
@@ -324,7 +324,7 @@ void SVNClient::add(const char *path,
SVN_JNI_NULL_PTR_EX(path, "path", );
Path intPath(path, subPool);
- SVN_JNI_ERR(intPath.error_occured(), );
+ SVN_JNI_ERR(intPath.error_occurred(), );
svn_client_ctx_t *ctx = context.getContext(NULL, subPool);
if (ctx == NULL)
return;
@@ -347,7 +347,7 @@ jlongArray SVNClient::update(Targets &ta
return NULL;
const apr_array_header_t *array = targets.array(subPool);
- SVN_JNI_ERR(targets.error_occured(), NULL);
+ SVN_JNI_ERR(targets.error_occurred(), NULL);
SVN_JNI_ERR(svn_client_update4(&revs, array,
revision.revision(),
depth,
@@ -383,7 +383,7 @@ void SVNClient::commit(Targets &targets,
{
SVN::Pool subPool(pool);
const apr_array_header_t *targets2 = targets.array(subPool);
- SVN_JNI_ERR(targets.error_occured(), );
+ SVN_JNI_ERR(targets.error_occurred(), );
svn_client_ctx_t *ctx = context.getContext(message, subPool);
if (ctx == NULL)
return;
@@ -413,7 +413,7 @@ void SVNClient::copy(CopySources ©So
}
SVN_JNI_NULL_PTR_EX(destPath, "destPath", );
Path destinationPath(destPath, subPool);
- SVN_JNI_ERR(destinationPath.error_occured(), );
+ SVN_JNI_ERR(destinationPath.error_occurred(), );
svn_client_ctx_t *ctx = context.getContext(message, subPool);
if (ctx == NULL)
@@ -434,10 +434,10 @@ void SVNClient::move(Targets &srcPaths,
SVN::Pool subPool(pool);
const apr_array_header_t *srcs = srcPaths.array(subPool);
- SVN_JNI_ERR(srcPaths.error_occured(), );
+ SVN_JNI_ERR(srcPaths.error_occurred(), );
SVN_JNI_NULL_PTR_EX(destPath, "destPath", );
Path destinationPath(destPath, subPool);
- SVN_JNI_ERR(destinationPath.error_occured(), );
+ SVN_JNI_ERR(destinationPath.error_occurred(), );
svn_client_ctx_t *ctx = context.getContext(message, subPool);
if (ctx == NULL)
@@ -460,7 +460,7 @@ void SVNClient::mkdir(Targets &targets,
return;
const apr_array_header_t *targets2 = targets.array(subPool);
- SVN_JNI_ERR(targets.error_occured(), );
+ SVN_JNI_ERR(targets.error_occurred(), );
SVN_JNI_ERR(svn_client_mkdir4(targets2, makeParents,
revprops.hash(subPool),
@@ -473,7 +473,7 @@ void SVNClient::cleanup(const char *path
SVN::Pool subPool(pool);
SVN_JNI_NULL_PTR_EX(path, "path", );
Path intPath(path, subPool);
- SVN_JNI_ERR(intPath.error_occured(), );
+ SVN_JNI_ERR(intPath.error_occurred(), );
svn_client_ctx_t *ctx = context.getContext(NULL, subPool);
if (ctx == NULL)
@@ -488,7 +488,7 @@ void SVNClient::resolve(const char *path
SVN::Pool subPool(pool);
SVN_JNI_NULL_PTR_EX(path, "path", );
Path intPath(path, subPool);
- SVN_JNI_ERR(intPath.error_occured(), );
+ SVN_JNI_ERR(intPath.error_occurred(), );
svn_client_ctx_t *ctx = context.getContext(NULL, subPool);
if (ctx == NULL)
return;
@@ -506,9 +506,9 @@ jlong SVNClient::doExport(const char *sr
SVN_JNI_NULL_PTR_EX(srcPath, "srcPath", -1);
SVN_JNI_NULL_PTR_EX(destPath, "destPath", -1);
Path sourcePath(srcPath, subPool);
- SVN_JNI_ERR(sourcePath.error_occured(), -1);
+ SVN_JNI_ERR(sourcePath.error_occurred(), -1);
Path destinationPath(destPath, subPool);
- SVN_JNI_ERR(destinationPath.error_occured(), -1);
+ SVN_JNI_ERR(destinationPath.error_occurred(), -1);
svn_revnum_t rev;
svn_client_ctx_t *ctx = context.getContext(NULL, subPool);
if (ctx == NULL)
@@ -539,9 +539,9 @@ jlong SVNClient::doSwitch(const char *pa
SVN_JNI_NULL_PTR_EX(path, "path", -1);
SVN_JNI_NULL_PTR_EX(url, "url", -1);
Path intUrl(url, subPool);
- SVN_JNI_ERR(intUrl.error_occured(), -1);
+ SVN_JNI_ERR(intUrl.error_occurred(), -1);
Path intPath(path, subPool);
- SVN_JNI_ERR(intPath.error_occured(), -1);
+ SVN_JNI_ERR(intPath.error_occurred(), -1);
svn_revnum_t rev;
svn_client_ctx_t *ctx = context.getContext(NULL, subPool);
@@ -575,9 +575,9 @@ void SVNClient::doImport(const char *pat
SVN_JNI_NULL_PTR_EX(path, "path", );
SVN_JNI_NULL_PTR_EX(url, "url", );
Path intPath(path, subPool);
- SVN_JNI_ERR(intPath.error_occured(), );
+ SVN_JNI_ERR(intPath.error_occurred(), );
Path intUrl(url, subPool);
- SVN_JNI_ERR(intUrl.error_occured(), );
+ SVN_JNI_ERR(intUrl.error_occurred(), );
svn_client_ctx_t *ctx = context.getContext(message, subPool);
if (ctx == NULL)
@@ -618,13 +618,13 @@ void SVNClient::merge(const char *path1,
SVN_JNI_NULL_PTR_EX(path2, "path2", );
SVN_JNI_NULL_PTR_EX(localPath, "localPath", );
Path intLocalPath(localPath, subPool);
- SVN_JNI_ERR(intLocalPath.error_occured(), );
+ SVN_JNI_ERR(intLocalPath.error_occurred(), );
Path srcPath1(path1, subPool);
- SVN_JNI_ERR(srcPath1.error_occured(), );
+ SVN_JNI_ERR(srcPath1.error_occurred(), );
Path srcPath2(path2, subPool);
- SVN_JNI_ERR(srcPath2.error_occured(), );
+ SVN_JNI_ERR(srcPath2.error_occurred(), );
svn_client_ctx_t *ctx = context.getContext(NULL, subPool);
if (ctx == NULL)
@@ -647,10 +647,10 @@ void SVNClient::merge(const char *path,
SVN_JNI_NULL_PTR_EX(path, "path", );
SVN_JNI_NULL_PTR_EX(localPath, "localPath", );
Path intLocalPath(localPath, subPool);
- SVN_JNI_ERR(intLocalPath.error_occured(), );
+ SVN_JNI_ERR(intLocalPath.error_occurred(), );
Path srcPath(path, subPool);
- SVN_JNI_ERR(srcPath.error_occured(), );
+ SVN_JNI_ERR(srcPath.error_occurred(), );
svn_client_ctx_t *ctx = context.getContext(NULL, subPool);
if (ctx == NULL)
@@ -678,10 +678,10 @@ void SVNClient::mergeReintegrate(const c
SVN_JNI_NULL_PTR_EX(path, "path", );
SVN_JNI_NULL_PTR_EX(localPath, "localPath", );
Path intLocalPath(localPath, subPool);
- SVN_JNI_ERR(intLocalPath.error_occured(), );
+ SVN_JNI_ERR(intLocalPath.error_occurred(), );
Path srcPath(path, subPool);
- SVN_JNI_ERR(srcPath.error_occured(), );
+ SVN_JNI_ERR(srcPath.error_occurred(), );
svn_client_ctx_t *ctx = context.getContext(NULL, subPool);
if (ctx == NULL)
@@ -706,7 +706,7 @@ SVNClient::getMergeinfo(const char *targ
svn_mergeinfo_t mergeinfo;
Path intLocalTarget(target, subPool);
- SVN_JNI_ERR(intLocalTarget.error_occured(), NULL);
+ SVN_JNI_ERR(intLocalTarget.error_occurred(), NULL);
SVN_JNI_ERR(svn_client_mergeinfo_get_merged(&mergeinfo,
intLocalTarget.c_str(),
pegRevision.revision(), ctx,
@@ -784,11 +784,11 @@ void SVNClient::getMergeinfoLog(int type
SVN_JNI_NULL_PTR_EX(pathOrURL, "path or url", );
Path urlPath(pathOrURL, subPool);
- SVN_JNI_ERR(urlPath.error_occured(), );
+ SVN_JNI_ERR(urlPath.error_occurred(), );
SVN_JNI_NULL_PTR_EX(mergeSourceURL, "merge source url", );
Path srcURL(mergeSourceURL, subPool);
- SVN_JNI_ERR(srcURL.error_occured(), );
+ SVN_JNI_ERR(srcURL.error_occurred(), );
SVN_JNI_ERR(svn_client_mergeinfo_log((type == 1),
urlPath.c_str(),
@@ -817,7 +817,7 @@ jbyteArray SVNClient::propertyGet(const
SVN_JNI_NULL_PTR_EX(path, "path", NULL);
SVN_JNI_NULL_PTR_EX(name, "name", NULL);
Path intPath(path, subPool);
- SVN_JNI_ERR(intPath.error_occured(), NULL);
+ SVN_JNI_ERR(intPath.error_occurred(), NULL);
svn_client_ctx_t *ctx = context.getContext(NULL, subPool);
if (ctx == NULL)
@@ -853,7 +853,7 @@ void SVNClient::properties(const char *p
SVN::Pool subPool(pool);
SVN_JNI_NULL_PTR_EX(path, "path", );
Path intPath(path, subPool);
- SVN_JNI_ERR(intPath.error_occured(), );
+ SVN_JNI_ERR(intPath.error_occurred(), );
svn_client_ctx_t *ctx = context.getContext(NULL, subPool);
if (ctx == NULL)
@@ -915,7 +915,7 @@ void SVNClient::propertySetRemote(const
subPool.getPool());
Path intPath(path, subPool);
- SVN_JNI_ERR(intPath.error_occured(), );
+ SVN_JNI_ERR(intPath.error_occurred(), );
svn_client_ctx_t *ctx = context.getContext(message, subPool);
if (ctx == NULL)
@@ -951,7 +951,7 @@ void SVNClient::diff(const char *target1
return;
Path path1(target1, subPool);
- SVN_JNI_ERR(path1.error_occured(), );
+ SVN_JNI_ERR(path1.error_occurred(), );
// We don't use any options to diff.
apr_array_header_t *diffOptions = apr_array_make(subPool.getPool(),
@@ -985,7 +985,7 @@ void SVNClient::diff(const char *target1
{
// "Regular" diff (without a peg revision).
Path path2(target2, subPool);
- SVN_JNI_ERR(path2.error_occured(), );
+ SVN_JNI_ERR(path2.error_occurred(), );
SVN_JNI_ERR(svn_client_diff6(diffOptions,
path1.c_str(),
@@ -1053,9 +1053,9 @@ SVNClient::diffSummarize(const char *tar
return;
Path path1(target1, subPool);
- SVN_JNI_ERR(path1.error_occured(), );
+ SVN_JNI_ERR(path1.error_occurred(), );
Path path2(target2, subPool);
- SVN_JNI_ERR(path2.error_occured(), );
+ SVN_JNI_ERR(path2.error_occurred(), );
SVN_JNI_ERR(svn_client_diff_summarize2(path1.c_str(), revision1.revision(),
path2.c_str(), revision2.revision(),
@@ -1082,7 +1082,7 @@ SVNClient::diffSummarize(const char *tar
return;
Path path(target, subPool);
- SVN_JNI_ERR(path.error_occured(), );
+ SVN_JNI_ERR(path.error_occurred(), );
SVN_JNI_ERR(svn_client_diff_summarize_peg2(path.c_str(),
pegRevision.revision(),
@@ -1103,7 +1103,7 @@ void SVNClient::streamFileContent(const
SVN::Pool subPool(pool);
SVN_JNI_NULL_PTR_EX(path, "path", );
Path intPath(path, subPool);
- SVN_JNI_ERR(intPath.error_occured(), );
+ SVN_JNI_ERR(intPath.error_occurred(), );
svn_client_ctx_t *ctx = context.getContext(NULL, subPool);
if (ctx == NULL)
@@ -1122,7 +1122,7 @@ jbyteArray SVNClient::revProperty(const
SVN_JNI_NULL_PTR_EX(path, "path", NULL);
SVN_JNI_NULL_PTR_EX(name, "name", NULL);
Path intPath(path, subPool);
- SVN_JNI_ERR(intPath.error_occured(), NULL);
+ SVN_JNI_ERR(intPath.error_occurred(), NULL);
svn_client_ctx_t *ctx = context.getContext(NULL, subPool);
if (ctx == NULL)
@@ -1160,13 +1160,13 @@ void SVNClient::relocate(const char *fro
SVN_JNI_NULL_PTR_EX(from, "from", );
SVN_JNI_NULL_PTR_EX(to, "to", );
Path intPath(path, subPool);
- SVN_JNI_ERR(intPath.error_occured(), );
+ SVN_JNI_ERR(intPath.error_occurred(), );
Path intFrom(from, subPool);
- SVN_JNI_ERR(intFrom.error_occured(), );
+ SVN_JNI_ERR(intFrom.error_occurred(), );
Path intTo(to, subPool);
- SVN_JNI_ERR(intTo.error_occured(), );
+ SVN_JNI_ERR(intTo.error_occurred(), );
svn_client_ctx_t *ctx = context.getContext(NULL, subPool);
if (ctx == NULL)
@@ -1185,7 +1185,7 @@ void SVNClient::blame(const char *path,
SVN::Pool subPool(pool);
SVN_JNI_NULL_PTR_EX(path, "path", );
Path intPath(path, subPool);
- SVN_JNI_ERR(intPath.error_occured(), );
+ SVN_JNI_ERR(intPath.error_occurred(), );
svn_client_ctx_t *ctx = context.getContext(NULL, subPool);
if (ctx == NULL)
@@ -1207,7 +1207,7 @@ void SVNClient::addToChangelist(Targets
svn_client_ctx_t *ctx = context.getContext(NULL, subPool);
const apr_array_header_t *srcs = srcPaths.array(subPool);
- SVN_JNI_ERR(srcPaths.error_occured(), );
+ SVN_JNI_ERR(srcPaths.error_occurred(), );
SVN_JNI_ERR(svn_client_add_to_changelist(srcs, changelist, depth,
changelists.array(subPool),
@@ -1221,7 +1221,7 @@ void SVNClient::removeFromChangelists(Ta
svn_client_ctx_t *ctx = context.getContext(NULL, subPool);
const apr_array_header_t *srcs = srcPaths.array(subPool);
- SVN_JNI_ERR(srcPaths.error_occured(), );
+ SVN_JNI_ERR(srcPaths.error_occurred(), );
SVN_JNI_ERR(svn_client_remove_from_changelists(srcs, depth,
changelists.array(subPool),
@@ -1247,7 +1247,7 @@ void SVNClient::lock(Targets &targets, c
{
SVN::Pool subPool(pool);
const apr_array_header_t *targetsApr = targets.array(subPool);
- SVN_JNI_ERR(targets.error_occured(), );
+ SVN_JNI_ERR(targets.error_occurred(), );
svn_client_ctx_t *ctx = context.getContext(NULL, subPool);
SVN_JNI_ERR(svn_client_lock(targetsApr, comment, force, ctx,
@@ -1259,7 +1259,7 @@ void SVNClient::unlock(Targets &targets,
SVN::Pool subPool(pool);
const apr_array_header_t *targetsApr = targets.array(subPool);
- SVN_JNI_ERR(targets.error_occured(), );
+ SVN_JNI_ERR(targets.error_occurred(), );
svn_client_ctx_t *ctx = context.getContext(NULL, subPool);
SVN_JNI_ERR(svn_client_unlock(
targetsApr, force, ctx, subPool.getPool()), );
@@ -1273,7 +1273,7 @@ void SVNClient::setRevProperty(const cha
SVN_JNI_NULL_PTR_EX(path, "path", );
SVN_JNI_NULL_PTR_EX(name, "name", );
Path intPath(path, subPool);
- SVN_JNI_ERR(intPath.error_occured(), );
+ SVN_JNI_ERR(intPath.error_occurred(), );
svn_client_ctx_t *ctx = context.getContext(NULL, subPool);
if (ctx == NULL)
@@ -1311,7 +1311,7 @@ jstring SVNClient::getVersionInfo(const
SVN_JNI_NULL_PTR_EX(path, "path", NULL);
Path intPath(path, subPool);
- SVN_JNI_ERR(intPath.error_occured(), NULL);
+ SVN_JNI_ERR(intPath.error_occurred(), NULL);
int wc_format;
svn_client_ctx_t *ctx = context.getContext(NULL, subPool);
@@ -1378,7 +1378,7 @@ void SVNClient::upgrade(const char *path
return;
Path checkedPath(path, subPool);
- SVN_JNI_ERR(checkedPath.error_occured(), );
+ SVN_JNI_ERR(checkedPath.error_occurred(), );
SVN_JNI_ERR(svn_client_upgrade(path, ctx, subPool.getPool()), );
}
@@ -1389,7 +1389,7 @@ jobject SVNClient::revProperties(const c
SVN::Pool subPool(pool);
SVN_JNI_NULL_PTR_EX(path, "path", NULL);
Path intPath(path, subPool);
- SVN_JNI_ERR(intPath.error_occured(), NULL);
+ SVN_JNI_ERR(intPath.error_occurred(), NULL);
svn_client_ctx_t *ctx = context.getContext(NULL, subPool);
const char *URL;
@@ -1428,7 +1428,7 @@ SVNClient::info2(const char *path, Revis
return;
Path checkedPath(path, subPool);
- SVN_JNI_ERR(checkedPath.error_occured(), );
+ SVN_JNI_ERR(checkedPath.error_occurred(), );
SVN_JNI_ERR(svn_client_info3(checkedPath.c_str(),
pegRevision.revision(),
@@ -1453,9 +1453,9 @@ SVNClient::patch(const char *patchPath,
return;
Path checkedPatchPath(patchPath, subPool);
- SVN_JNI_ERR(checkedPatchPath.error_occured(), );
+ SVN_JNI_ERR(checkedPatchPath.error_occurred(), );
Path checkedTargetPath(targetPath, subPool);
- SVN_JNI_ERR(checkedTargetPath.error_occured(), );
+ SVN_JNI_ERR(checkedTargetPath.error_occurred(), );
// Should parameterize the following, instead of defaulting to FALSE
SVN_JNI_ERR(svn_client_patch(checkedPatchPath.c_str(),
Modified: subversion/branches/javahl-ra/subversion/bindings/javahl/native/Targets.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/Targets.cpp?rev=1426114&r1=1426113&r2=1426114&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/bindings/javahl/native/Targets.cpp (original)
+++ subversion/branches/javahl-ra/subversion/bindings/javahl/native/Targets.cpp Thu Dec 27 03:42:18 2012
@@ -41,7 +41,7 @@ Targets::Targets(const char *path, SVN::
{
m_strArray = NULL;
m_targets.push_back(apr_pstrdup(m_subpool.getPool(), path));
- m_error_occured = NULL;
+ m_error_occurred = NULL;
}
void Targets::add(const char *path)
@@ -62,7 +62,7 @@ const apr_array_header_t *Targets::array
svn_error_t *err = JNIUtil::preprocessPath(tt, pool.getPool());
if (err != NULL)
{
- m_error_occured = err;
+ m_error_occurred = err;
break;
}
m_targets.push_back(tt);
@@ -83,7 +83,7 @@ const apr_array_header_t *Targets::array
svn_error_t *err = JNIUtil::preprocessPath(target, pool.getPool());
if (err != NULL)
{
- m_error_occured = err;
+ m_error_occurred = err;
break;
}
APR_ARRAY_PUSH(apr_targets, const char *) = target;
@@ -96,10 +96,10 @@ Targets::Targets(StringArray &strArray,
: m_subpool(in_pool)
{
m_strArray = &strArray;
- m_error_occured = NULL;
+ m_error_occurred = NULL;
}
-svn_error_t *Targets::error_occured()
+svn_error_t *Targets::error_occurred()
{
- return m_error_occured;
+ return m_error_occurred;
}
Modified: subversion/branches/javahl-ra/subversion/bindings/javahl/native/Targets.h
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/Targets.h?rev=1426114&r1=1426113&r2=1426114&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/bindings/javahl/native/Targets.h (original)
+++ subversion/branches/javahl-ra/subversion/bindings/javahl/native/Targets.h Thu Dec 27 03:42:18 2012
@@ -43,14 +43,14 @@ class Targets
SVN::Pool m_subpool;
std::vector<const char*> m_targets;
StringArray *m_strArray;
- svn_error_t *m_error_occured;
+ svn_error_t *m_error_occurred;
public:
Targets(StringArray &strArray, SVN::Pool &in_pool);
Targets(const char *path, SVN::Pool &in_pool);
void add(const char *path);
~Targets();
const apr_array_header_t *array(const SVN::Pool &pool);
- svn_error_t *error_occured();
+ svn_error_t *error_occurred();
};
#endif // TARGETS_H
Modified: subversion/branches/javahl-ra/subversion/bindings/swig/perl/native/Repos.pm
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/swig/perl/native/Repos.pm?rev=1426114&r1=1426113&r2=1426114&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/bindings/swig/perl/native/Repos.pm (original)
+++ subversion/branches/javahl-ra/subversion/bindings/swig/perl/native/Repos.pm Thu Dec 27 03:42:18 2012
@@ -183,11 +183,11 @@ of paths that have changed in this revis
=item $rev
-The revision this change occured in.
+The revision this change occurred in.
=item $date
-The date and time the revision occured.
+The date and time the revision occurred.
=item $msg
Modified: subversion/branches/javahl-ra/subversion/libsvn_subr/cache_config.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/libsvn_subr/cache_config.c?rev=1426114&r1=1426113&r2=1426114&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/libsvn_subr/cache_config.c (original)
+++ subversion/branches/javahl-ra/subversion/libsvn_subr/cache_config.c Thu Dec 27 03:42:18 2012
@@ -124,7 +124,7 @@ svn_cache__get_global_membuffer_cache(vo
FALSE,
pool);
- /* Some error occured. Most likely it's an OOM error but we don't
+ /* Some error occurred. Most likely it's an OOM error but we don't
* really care. Simply release all cache memory and disable caching
*/
if (err)
Modified: subversion/branches/javahl-ra/subversion/tests/libsvn_subr/stream-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/tests/libsvn_subr/stream-test.c?rev=1426114&r1=1426113&r2=1426114&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/tests/libsvn_subr/stream-test.c (original)
+++ subversion/branches/javahl-ra/subversion/tests/libsvn_subr/stream-test.c Thu Dec 27 03:42:18 2012
@@ -576,7 +576,7 @@ test_stream_base64(apr_pool_t *pool)
The two data writes caused the base 64 code to allocate a buffer
that was a byte short but exactly matched a stringbuf blocksize.
That meant the stringbuf didn't overallocate and a write beyond
- the end of the buffer occured.
+ the end of the buffer occurred.
*/
static svn_error_t *
test_stream_base64_2(apr_pool_t *pool)
Modified: subversion/branches/javahl-ra/tools/server-side/svn-backup-dumps.py
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/tools/server-side/svn-backup-dumps.py?rev=1426114&r1=1426113&r2=1426114&view=diff
==============================================================================
--- subversion/branches/javahl-ra/tools/server-side/svn-backup-dumps.py (original)
+++ subversion/branches/javahl-ra/tools/server-side/svn-backup-dumps.py Thu Dec 27 03:42:18 2012
@@ -686,7 +686,7 @@ if __name__ == "__main__":
print("Everything OK.")
sys.exit(0)
else:
- print("An error occured!")
+ print("An error occurred!")
sys.exit(1)
# vim:et:ts=4:sw=4