You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by jc...@apache.org on 2011/01/09 23:39:43 UTC
svn commit: r1057044 [1/4] - in
/subversion/branches/diff-optimizations-bytes: ./ build/
contrib/client-side/svnmerge/ contrib/hook-scripts/
notes/commit-access-templates/ subversion/bindings/javahl/native/
subversion/bindings/javahl/src/org/apache/sub...
Author: jcorvel
Date: Sun Jan 9 22:39:40 2011
New Revision: 1057044
URL: http://svn.apache.org/viewvc?rev=1057044&view=rev
Log:
On the diff-optimizations-bytes branch:
Bring up to date with trunk.
Resolved bogus text-conflict in tools/po/l10n-report.py (probably because of
issue #3657, combined with the svn:keywords change of r1055452) with
theirs-full.
Added:
subversion/branches/diff-optimizations-bytes/notes/commit-access-templates/pmc-member.tmpl
- copied unchanged from r1057038, subversion/trunk/notes/commit-access-templates/pmc-member.tmpl
subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/ChangePath.java
- copied unchanged from r1057038, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/ChangePath.java
subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/ConflictVersion.java
- copied unchanged from r1057038, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/ConflictVersion.java
subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/DirEntry.java
- copied unchanged from r1057038, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/DirEntry.java
subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Lock.java
- copied unchanged from r1057038, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Lock.java
subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/LogDate.java
- copied unchanged from r1057038, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/LogDate.java
subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Revision.java
- copied unchanged from r1057038, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Revision.java
subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Status.java
- copied unchanged from r1057038, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Status.java
Removed:
subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/ChangePath.java
subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictVersion.java
subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/DirEntry.java
subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/Lock.java
subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/LogDate.java
subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/Revision.java
subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/Status.java
Modified:
subversion/branches/diff-optimizations-bytes/ (props changed)
subversion/branches/diff-optimizations-bytes/CHANGES
subversion/branches/diff-optimizations-bytes/COMMITTERS
subversion/branches/diff-optimizations-bytes/build/run_tests.py
subversion/branches/diff-optimizations-bytes/contrib/client-side/svnmerge/svnmerge.py
subversion/branches/diff-optimizations-bytes/contrib/hook-scripts/remove-zombie-locks.py
subversion/branches/diff-optimizations-bytes/notes/commit-access-templates/full-committer.tmpl
subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/native/CopySources.cpp
subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/native/CreateJ.cpp
subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/native/EnumMapper.cpp
subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/native/ListCallback.cpp
subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/native/Revision.cpp
subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/native/RevisionRange.cpp
subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/native/StatusCallback.cpp
subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java
subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitInfo.java
subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java
subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/CopySource.java
subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/RevisionRange.java
subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ListCallback.java
subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/LogMessageCallback.java
subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/StatusCallback.java
subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ChangePath.java
subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictVersion.java
subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/tigris/subversion/javahl/DirEntry.java
subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Lock.java
subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Revision.java
subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java
subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Status.java
subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java
subversion/branches/diff-optimizations-bytes/subversion/include/private/svn_adler32.h (props changed)
subversion/branches/diff-optimizations-bytes/subversion/include/svn_client.h
subversion/branches/diff-optimizations-bytes/subversion/include/svn_diff.h
subversion/branches/diff-optimizations-bytes/subversion/include/svn_fs.h
subversion/branches/diff-optimizations-bytes/subversion/include/svn_io.h
subversion/branches/diff-optimizations-bytes/subversion/include/svn_repos.h
subversion/branches/diff-optimizations-bytes/subversion/libsvn_client/locking_commands.c
subversion/branches/diff-optimizations-bytes/subversion/libsvn_client/merge.c
subversion/branches/diff-optimizations-bytes/subversion/libsvn_client/mergeinfo.h
subversion/branches/diff-optimizations-bytes/subversion/libsvn_client/patch.c
subversion/branches/diff-optimizations-bytes/subversion/libsvn_client/repos_diff.c
subversion/branches/diff-optimizations-bytes/subversion/libsvn_delta/xdelta.c
subversion/branches/diff-optimizations-bytes/subversion/libsvn_diff/parse-diff.c
subversion/branches/diff-optimizations-bytes/subversion/libsvn_fs_base/lock.c
subversion/branches/diff-optimizations-bytes/subversion/libsvn_ra/compat.c
subversion/branches/diff-optimizations-bytes/subversion/libsvn_ra_neon/fetch.c
subversion/branches/diff-optimizations-bytes/subversion/libsvn_ra_neon/file_revs.c
subversion/branches/diff-optimizations-bytes/subversion/libsvn_ra_neon/get_locations.c
subversion/branches/diff-optimizations-bytes/subversion/libsvn_ra_neon/lock.c
subversion/branches/diff-optimizations-bytes/subversion/libsvn_ra_neon/log.c
subversion/branches/diff-optimizations-bytes/subversion/libsvn_ra_neon/mergeinfo.c
subversion/branches/diff-optimizations-bytes/subversion/libsvn_ra_neon/props.c
subversion/branches/diff-optimizations-bytes/subversion/libsvn_subr/adler32.c (contents, props changed)
subversion/branches/diff-optimizations-bytes/subversion/libsvn_subr/io.c
subversion/branches/diff-optimizations-bytes/subversion/libsvn_subr/stream.c
subversion/branches/diff-optimizations-bytes/subversion/libsvn_wc/update_editor.c
subversion/branches/diff-optimizations-bytes/subversion/libsvn_wc/wc-metadata.sql
subversion/branches/diff-optimizations-bytes/subversion/libsvn_wc/wc-queries.sql
subversion/branches/diff-optimizations-bytes/subversion/libsvn_wc/wc_db.c
subversion/branches/diff-optimizations-bytes/subversion/po/zh_CN.po
subversion/branches/diff-optimizations-bytes/subversion/svn/info-cmd.c
subversion/branches/diff-optimizations-bytes/subversion/svn/main.c
subversion/branches/diff-optimizations-bytes/subversion/svn/propset-cmd.c
subversion/branches/diff-optimizations-bytes/subversion/svnadmin/main.c
subversion/branches/diff-optimizations-bytes/subversion/svndumpfilter/main.c
subversion/branches/diff-optimizations-bytes/subversion/svnlook/main.c
subversion/branches/diff-optimizations-bytes/subversion/svnrdump/svnrdump.c
subversion/branches/diff-optimizations-bytes/subversion/svnserve/main.c
subversion/branches/diff-optimizations-bytes/subversion/svnsync/main.c
subversion/branches/diff-optimizations-bytes/subversion/svnversion/main.c
subversion/branches/diff-optimizations-bytes/subversion/tests/cmdline/basic_tests.py
subversion/branches/diff-optimizations-bytes/subversion/tests/cmdline/dav-mirror-autocheck.sh
subversion/branches/diff-optimizations-bytes/subversion/tests/cmdline/davautocheck.sh
subversion/branches/diff-optimizations-bytes/subversion/tests/cmdline/entries-dump.c
subversion/branches/diff-optimizations-bytes/subversion/tests/cmdline/merge_tests.py
subversion/branches/diff-optimizations-bytes/subversion/tests/cmdline/svnserveautocheck.sh
subversion/branches/diff-optimizations-bytes/subversion/tests/libsvn_diff/parse-diff-test.c
subversion/branches/diff-optimizations-bytes/subversion/tests/libsvn_ra_local/ra-local-test.c
subversion/branches/diff-optimizations-bytes/subversion/tests/libsvn_repos/dir-delta-editor.c
subversion/branches/diff-optimizations-bytes/subversion/tests/libsvn_subr/mergeinfo-test.c
subversion/branches/diff-optimizations-bytes/subversion/tests/libsvn_subr/stream-test.c
subversion/branches/diff-optimizations-bytes/subversion/tests/libsvn_subr/target-test.c
subversion/branches/diff-optimizations-bytes/tools/po/l10n-report.py (contents, props changed)
Propchange: subversion/branches/diff-optimizations-bytes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 9 22:39:40 2011
@@ -40,4 +40,4 @@
/subversion/branches/tc_url_rev:874351-874483
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
-/subversion/trunk:1031270-1054461
+/subversion/trunk:1031270-1057038
Modified: subversion/branches/diff-optimizations-bytes/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/CHANGES?rev=1057044&r1=1057043&r2=1057044&view=diff
==============================================================================
--- subversion/branches/diff-optimizations-bytes/CHANGES (original)
+++ subversion/branches/diff-optimizations-bytes/CHANGES Sun Jan 9 22:39:40 2011
@@ -9,7 +9,9 @@ http://svn.apache.org/repos/asf/subversi
* fix 'svn export' regression from 1.6.13 (r1032970)
* fix 'svn export' mistakenly uri-encodes paths (issue #3745)
* fix server-side memory leaks triggered by 'blame -g' (r1032808)
+ This has been tracked as CVE-2010-4644
* prevent crash in mod_dav_svn when using SVNParentPath (r1033166)
+ This has been tracked as CVE-2010-4539
* allow 'log -g' to continue in the face of invalid mergeinfo (r1028108)
* filter unreadable paths for 'svn ls' and 'svn co' (r997026, -070, -474)
* fix abort in 'svn blame -g' (issue #3666)
Modified: subversion/branches/diff-optimizations-bytes/COMMITTERS
URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/COMMITTERS?rev=1057044&r1=1057043&r2=1057044&view=diff
==============================================================================
--- subversion/branches/diff-optimizations-bytes/COMMITTERS [UTF-8] (original)
+++ subversion/branches/diff-optimizations-bytes/COMMITTERS [UTF-8] Sun Jan 9 22:39:40 2011
@@ -209,4 +209,4 @@ giorgio_valoti Giorgio Valoti <giorgio
## Local Variables:
## coding:utf-8
## End:
-## vim:encoding=utf8
+## vim:fileencoding=utf8
Modified: subversion/branches/diff-optimizations-bytes/build/run_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/build/run_tests.py?rev=1057044&r1=1057043&r2=1057044&view=diff
==============================================================================
--- subversion/branches/diff-optimizations-bytes/build/run_tests.py (original)
+++ subversion/branches/diff-optimizations-bytes/build/run_tests.py Sun Jan 9 22:39:40 2011
@@ -53,6 +53,10 @@ try:
except AttributeError:
my_getopt = getopt.getopt
+# Ensure the compiled C tests use a known locale (Python tests set the locale
+# explicitly).
+os.environ['LC_ALL'] = 'C'
+
class TextColors:
'''Some ANSI terminal constants for output color'''
ENDC = '\033[0;m'
Modified: subversion/branches/diff-optimizations-bytes/contrib/client-side/svnmerge/svnmerge.py
URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/contrib/client-side/svnmerge/svnmerge.py?rev=1057044&r1=1057043&r2=1057044&view=diff
==============================================================================
--- subversion/branches/diff-optimizations-bytes/contrib/client-side/svnmerge/svnmerge.py (original)
+++ subversion/branches/diff-optimizations-bytes/contrib/client-side/svnmerge/svnmerge.py Sun Jan 9 22:39:40 2011
@@ -746,10 +746,10 @@ class RevisionSet:
for R in parm.split(","):
rev_or_revs = re.split(revision_range_split_re, R)
if len(rev_or_revs) == 1:
- self._revs[int(rev_or_revs[0])] = 1
+ self._revs[int(lstrip(rev_or_revs[0], 'r'))] = 1
elif len(rev_or_revs) == 2:
- for rev in range(int(rev_or_revs[0]),
- int(rev_or_revs[1])+1):
+ for rev in range(int(lstrip(rev_or_revs[0], 'r')),
+ int(lstrip(rev_or_revs[1], 'r'))+1):
self._revs[rev] = 1
else:
raise ValueError, 'Ill formatted revision range: ' + R
Modified: subversion/branches/diff-optimizations-bytes/contrib/hook-scripts/remove-zombie-locks.py
URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/contrib/hook-scripts/remove-zombie-locks.py?rev=1057044&r1=1057043&r2=1057044&view=diff
==============================================================================
--- subversion/branches/diff-optimizations-bytes/contrib/hook-scripts/remove-zombie-locks.py (original)
+++ subversion/branches/diff-optimizations-bytes/contrib/hook-scripts/remove-zombie-locks.py Sun Jan 9 22:39:40 2011
@@ -20,7 +20,7 @@ remove-zombie-locks.py - remove zombie l
Usage: remove-zombie-locks.py REPOS-PATH <REVISION|all>
- When REVISION (an interger) is specified this script scans a commited
+ When REVISION (an interger) is specified this script scans a committed
revision for deleted files and checks if a lock exists for any of these
files. If any locks exist they are forcibly removed.
@@ -123,24 +123,34 @@ class RepositoryZombieLockRemover:
print "Removing all zombie locks from repository at %s\n" \
"This may take several minutes..." % self.repos_path
- # Subversion's Berkeley DB implementation doesn't allow reentry of
- # its BDB-transaction-using APIs from within BDB-transaction-using
- # APIs (such as svn_fs_get_locks()). So we have do this in two
- # steps, first harvest the locks, then checking/removing them.
- if self.fs_type == svn.fs.SVN_FS_TYPE_BDB:
- self.locks = []
- def bdb_lock_callback(lock, callback_pool):
- self.locks.append(lock)
- svn.fs.svn_fs_get_locks(self.fs_ptr, self.repos_subpath,
- bdb_lock_callback, self.pool)
- subpool = svn.core.svn_pool_create(self.pool)
- for lock in self.locks:
- svn.core.svn_pool_clear(subpool)
- self.unlock_nonexistant_files(lock, subpool)
- svn.core.svn_pool_destroy(subpool)
+ # Try to use svn_fs_get_locks2() if it's present, as it's believed
+ # to be problem-free.
+ #
+ # If not, use svn_fs_get_locks(). But note that Subversion's
+ # Berkeley DB implementation of svn_fs_get_locks() in 1.6 and
+ # prior doesn't allow reentry of its BDB-transaction-using APIs
+ # from within BDB-transaction-using APIs (such as
+ # svn_fs_get_locks()). So we have do this in two steps, first
+ # harvest the locks, then checking/removing them.
+ if hasattr(svn.fs, 'svn_fs_get_locks2'):
+ svn.fs.svn_fs_get_locks2(self.fs_ptr, self.repos_subpath,
+ svn.core.svn_depth_infinity,
+ self.unlock_nonexistant_files, self.pool)
else:
- svn.fs.svn_fs_get_locks(self.fs_ptr, self.repos_subpath,
- self.unlock_nonexistant_files, self.pool)
+ if self.fs_type == svn.fs.SVN_FS_TYPE_BDB:
+ self.locks = []
+ def bdb_lock_callback(lock, callback_pool):
+ self.locks.append(lock)
+ svn.fs.svn_fs_get_locks(self.fs_ptr, self.repos_subpath,
+ bdb_lock_callback, self.pool)
+ subpool = svn.core.svn_pool_create(self.pool)
+ for lock in self.locks:
+ svn.core.svn_pool_clear(subpool)
+ self.unlock_nonexistant_files(lock, subpool)
+ svn.core.svn_pool_destroy(subpool)
+ else:
+ svn.fs.svn_fs_get_locks(self.fs_ptr, self.repos_subpath,
+ self.unlock_nonexistant_files, self.pool)
print "Done."
Modified: subversion/branches/diff-optimizations-bytes/notes/commit-access-templates/full-committer.tmpl
URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/notes/commit-access-templates/full-committer.tmpl?rev=1057044&r1=1057043&r2=1057044&view=diff
==============================================================================
--- subversion/branches/diff-optimizations-bytes/notes/commit-access-templates/full-committer.tmpl (original)
+++ subversion/branches/diff-optimizations-bytes/notes/commit-access-templates/full-committer.tmpl Sun Jan 9 22:39:40 2011
@@ -30,7 +30,8 @@ modify the COMMITTERS file appropriately
of your new username and password.
Please remember to subscribe to the private (PMC) mailing list by
-emailing <private-subscribe{AT}subversion.apache.org>.
+emailing <private-subscribe{AT}subversion.apache.org>, and to checkout
+a working copy of https://svn.apache.org/repos/private/pmc/subversion/.
Remember that you can still post patches for review before committing,
when you want to. Commit access just means that you can rely on your
Modified: subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/native/CopySources.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/native/CopySources.cpp?rev=1057044&r1=1057043&r2=1057044&view=diff
==============================================================================
--- subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/native/CopySources.cpp (original)
+++ subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/native/CopySources.cpp Sun Jan 9 22:39:40 2011
@@ -69,8 +69,8 @@ CopySources::makeJCopySource(const char
{
ctor = env->GetMethodID(clazz, "<init>",
"(Ljava/lang/String;"
- "L" JAVA_PACKAGE "/Revision;"
- "L" JAVA_PACKAGE "/Revision;)V");
+ "L" JAVA_PACKAGE "/types/Revision;"
+ "L" JAVA_PACKAGE "/types/Revision;)V");
if (JNIUtil::isExceptionThrown())
POP_AND_RETURN_NULL;
}
@@ -131,7 +131,7 @@ CopySources::array(SVN::Pool &pool)
if (getRevision == 0)
{
getRevision = env->GetMethodID(clazz, "getRevision",
- "()L"JAVA_PACKAGE"/Revision;");
+ "()L"JAVA_PACKAGE"/types/Revision;");
if (JNIUtil::isJavaExceptionThrown() || getRevision == 0)
return NULL;
}
@@ -152,7 +152,7 @@ CopySources::array(SVN::Pool &pool)
if (getPegRevision == 0)
{
getPegRevision = env->GetMethodID(clazz, "getPegRevision",
- "()L"JAVA_PACKAGE"/Revision;");
+ "()L"JAVA_PACKAGE"/types/Revision;");
if (JNIUtil::isJavaExceptionThrown() || getPegRevision == 0)
return NULL;
}
Modified: subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/native/CreateJ.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/native/CreateJ.cpp?rev=1057044&r1=1057043&r2=1057044&view=diff
==============================================================================
--- subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/native/CreateJ.cpp (original)
+++ subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/native/CreateJ.cpp Sun Jan 9 22:39:40 2011
@@ -31,7 +31,7 @@
#include "EnumMapper.h"
#include "RevisionRange.h"
#include "CreateJ.h"
-#include "../include/org_apache_subversion_javahl_Revision.h"
+#include "../include/org_apache_subversion_javahl_types_Revision.h"
#include "../include/org_apache_subversion_javahl_CommitItemStateFlags.h"
#include "svn_path.h"
@@ -67,8 +67,8 @@ CreateJ::ConflictDescriptor(const svn_wc
"L"JAVA_PACKAGE"/ConflictDescriptor$Operation;"
"Ljava/lang/String;Ljava/lang/String;"
"Ljava/lang/String;Ljava/lang/String;"
- "L"JAVA_PACKAGE"/ConflictVersion;"
- "L"JAVA_PACKAGE"/ConflictVersion;)V");
+ "L"JAVA_PACKAGE"/types/ConflictVersion;"
+ "L"JAVA_PACKAGE"/types/ConflictVersion;)V");
if (JNIUtil::isJavaExceptionThrown() || ctor == 0)
POP_AND_RETURN_NULL;
}
@@ -143,7 +143,7 @@ CreateJ::ConflictVersion(const svn_wc_co
return NULL;
// Create an instance of the conflict version.
- jclass clazz = env->FindClass(JAVA_PACKAGE "/ConflictVersion");
+ jclass clazz = env->FindClass(JAVA_PACKAGE "/types/ConflictVersion");
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NULL;
@@ -200,7 +200,7 @@ CreateJ::Info(const char *path, const sv
"L"JAVA_PACKAGE"/types/NodeKind;"
"Ljava/lang/String;Ljava/lang/String;"
"JJLjava/lang/String;"
- "L"JAVA_PACKAGE"/Lock;Z"
+ "L"JAVA_PACKAGE"/types/Lock;Z"
"L"JAVA_PACKAGE"/Info$ScheduleKind;"
"Ljava/lang/String;JJJ"
"Ljava/lang/String;Ljava/lang/String;"
@@ -318,7 +318,7 @@ CreateJ::Lock(const svn_lock_t *lock)
if (JNIUtil::isJavaExceptionThrown())
return NULL;
- jclass clazz = env->FindClass(JAVA_PACKAGE"/Lock");
+ jclass clazz = env->FindClass(JAVA_PACKAGE"/types/Lock");
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NULL;
@@ -366,7 +366,7 @@ CreateJ::ChangedPath(const char *path, s
if (JNIUtil::isJavaExceptionThrown())
return NULL;
- jclass clazzCP = env->FindClass(JAVA_PACKAGE"/ChangePath");
+ jclass clazzCP = env->FindClass(JAVA_PACKAGE"/types/ChangePath");
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN(SVN_NO_ERROR);
@@ -376,7 +376,7 @@ CreateJ::ChangedPath(const char *path, s
midCP = env->GetMethodID(clazzCP,
"<init>",
"(Ljava/lang/String;JLjava/lang/String;"
- "L"JAVA_PACKAGE"/ChangePath$Action;"
+ "L"JAVA_PACKAGE"/types/ChangePath$Action;"
"L"JAVA_PACKAGE"/types/NodeKind;"
"L"JAVA_PACKAGE"/types/Tristate;"
"L"JAVA_PACKAGE"/types/Tristate;)V");
@@ -423,7 +423,7 @@ CreateJ::Status(svn_wc_context_t *wc_ctx
if (JNIUtil::isJavaExceptionThrown())
return NULL;
- jclass clazz = env->FindClass(JAVA_PACKAGE"/Status");
+ jclass clazz = env->FindClass(JAVA_PACKAGE"/types/Status");
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NULL;
@@ -434,16 +434,16 @@ CreateJ::Status(svn_wc_context_t *wc_ctx
"(Ljava/lang/String;Ljava/lang/String;"
"L"JAVA_PACKAGE"/types/NodeKind;"
"JJJLjava/lang/String;"
- "L"JAVA_PACKAGE"/Status$Kind;"
- "L"JAVA_PACKAGE"/Status$Kind;"
- "L"JAVA_PACKAGE"/Status$Kind;"
- "L"JAVA_PACKAGE"/Status$Kind;"
+ "L"JAVA_PACKAGE"/types/Status$Kind;"
+ "L"JAVA_PACKAGE"/types/Status$Kind;"
+ "L"JAVA_PACKAGE"/types/Status$Kind;"
+ "L"JAVA_PACKAGE"/types/Status$Kind;"
"ZZZL"JAVA_PACKAGE"/ConflictDescriptor;"
"Ljava/lang/String;Ljava/lang/String;"
"Ljava/lang/String;Ljava/lang/String;"
"JZZLjava/lang/String;Ljava/lang/String;"
"Ljava/lang/String;"
- "JL"JAVA_PACKAGE"/Lock;"
+ "JL"JAVA_PACKAGE"/types/Lock;"
"JJL"JAVA_PACKAGE"/types/NodeKind;"
"Ljava/lang/String;Ljava/lang/String;)V");
if (JNIUtil::isJavaExceptionThrown())
@@ -455,9 +455,10 @@ CreateJ::Status(svn_wc_context_t *wc_ctx
jstring jUrl = NULL;
jobject jNodeKind = NULL;
- jlong jRevision = org_apache_subversion_javahl_Revision_SVN_INVALID_REVNUM;
+ jlong jRevision =
+ org_apache_subversion_javahl_types_Revision_SVN_INVALID_REVNUM;
jlong jLastChangedRevision =
- org_apache_subversion_javahl_Revision_SVN_INVALID_REVNUM;
+ org_apache_subversion_javahl_types_Revision_SVN_INVALID_REVNUM;
jlong jLastChangedDate = 0;
jstring jLastCommitAuthor = NULL;
jobject jTextType = NULL;
@@ -475,14 +476,14 @@ CreateJ::Status(svn_wc_context_t *wc_ctx
jstring jConflictWorking = NULL;
jstring jURLCopiedFrom = NULL;
jlong jRevisionCopiedFrom =
- org_apache_subversion_javahl_Revision_SVN_INVALID_REVNUM;
+ org_apache_subversion_javahl_types_Revision_SVN_INVALID_REVNUM;
jstring jLockToken = NULL;
jstring jLockComment = NULL;
jstring jLockOwner = NULL;
jlong jLockCreationDate = 0;
jobject jLock = NULL;
jlong jOODLastCmtRevision =
- org_apache_subversion_javahl_Revision_SVN_INVALID_REVNUM;
+ org_apache_subversion_javahl_types_Revision_SVN_INVALID_REVNUM;
jlong jOODLastCmtDate = 0;
jobject jOODKind = NULL;
jstring jOODLastCmtAuthor = NULL;
@@ -699,7 +700,7 @@ CreateJ::ClientNotifyInformation(const s
"L"JAVA_PACKAGE"/ClientNotifyInformation$Action;"
"L"JAVA_PACKAGE"/types/NodeKind;"
"Ljava/lang/String;"
- "L"JAVA_PACKAGE"/Lock;"
+ "L"JAVA_PACKAGE"/types/Lock;"
"Ljava/lang/String;"
"L"JAVA_PACKAGE"/ClientNotifyInformation$Status;"
"L"JAVA_PACKAGE"/ClientNotifyInformation$Status;"
Modified: subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/native/EnumMapper.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/native/EnumMapper.cpp?rev=1057044&r1=1057043&r2=1057044&view=diff
==============================================================================
--- subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/native/EnumMapper.cpp (original)
+++ subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/native/EnumMapper.cpp Sun Jan 9 22:39:40 2011
@@ -63,13 +63,13 @@ jobject EnumMapper::mapChangePathAction(
switch (action)
{
case 'A':
- return mapEnum(JAVA_PACKAGE"/ChangePath$Action", 0);
+ return mapEnum(JAVA_PACKAGE"/types/ChangePath$Action", 0);
case 'D':
- return mapEnum(JAVA_PACKAGE"/ChangePath$Action", 1);
+ return mapEnum(JAVA_PACKAGE"/types/ChangePath$Action", 1);
case 'R':
- return mapEnum(JAVA_PACKAGE"/ChangePath$Action", 2);
+ return mapEnum(JAVA_PACKAGE"/types/ChangePath$Action", 2);
case 'M':
- return mapEnum(JAVA_PACKAGE"/ChangePath$Action", 3);
+ return mapEnum(JAVA_PACKAGE"/types/ChangePath$Action", 3);
default:
return NULL;
}
@@ -142,7 +142,7 @@ 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"/Status$Kind", ((int) svnKind) - 1);
+ return mapEnum(JAVA_PACKAGE"/types/Status$Kind", ((int) svnKind) - 1);
}
jobject EnumMapper::mapConflictKind(svn_wc_conflict_kind_t kind)
@@ -207,7 +207,7 @@ svn_wc_conflict_choice_t EnumMapper::toC
svn_opt_revision_kind EnumMapper::toRevisionKind(jobject jkind)
{
- return (svn_opt_revision_kind) getOrdinal(JAVA_PACKAGE"/Revision$Kind",
+ return (svn_opt_revision_kind) getOrdinal(JAVA_PACKAGE"/types/Revision$Kind",
jkind);
}
Modified: subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/native/ListCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/native/ListCallback.cpp?rev=1057044&r1=1057043&r2=1057044&view=diff
==============================================================================
--- subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/native/ListCallback.cpp (original)
+++ subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/native/ListCallback.cpp Sun Jan 9 22:39:40 2011
@@ -90,8 +90,8 @@ ListCallback::doList(const char *path,
POP_AND_RETURN(SVN_NO_ERROR);
mid = env->GetMethodID(clazz, "doEntry",
- "(L"JAVA_PACKAGE"/DirEntry;"
- "L"JAVA_PACKAGE"/Lock;)V");
+ "(L"JAVA_PACKAGE"/types/DirEntry;"
+ "L"JAVA_PACKAGE"/types/Lock;)V");
if (JNIUtil::isJavaExceptionThrown() || mid == 0)
POP_AND_RETURN(SVN_NO_ERROR);
}
@@ -131,7 +131,7 @@ ListCallback::createJavaDirEntry(const c
if (JNIUtil::isJavaExceptionThrown())
return SVN_NO_ERROR;
- jclass clazz = env->FindClass(JAVA_PACKAGE"/DirEntry");
+ jclass clazz = env->FindClass(JAVA_PACKAGE"/types/DirEntry");
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NULL;
Modified: subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/native/Revision.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/native/Revision.cpp?rev=1057044&r1=1057043&r2=1057044&view=diff
==============================================================================
--- subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/native/Revision.cpp (original)
+++ subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/native/Revision.cpp Sun Jan 9 22:39:40 2011
@@ -57,12 +57,12 @@ Revision::Revision(jobject jthis, bool h
static jfieldID fid = 0;
if (fid == 0)
{
- jclass clazz = env->FindClass(JAVA_PACKAGE"/Revision");
+ jclass clazz = env->FindClass(JAVA_PACKAGE"/types/Revision");
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NOTHING();
fid = env->GetFieldID(clazz, "revKind",
- "L"JAVA_PACKAGE"/Revision$Kind;");
+ "L"JAVA_PACKAGE"/types/Revision$Kind;");
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NOTHING();
}
@@ -81,7 +81,7 @@ Revision::Revision(jobject jthis, bool h
if (fidNum == 0)
{
jclass clazz =
- env->FindClass(JAVA_PACKAGE"/Revision$Number");
+ env->FindClass(JAVA_PACKAGE"/types/Revision$Number");
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NOTHING();
@@ -99,7 +99,7 @@ Revision::Revision(jobject jthis, bool h
if (fidDate == 0)
{
jclass clazz =
- env->FindClass(JAVA_PACKAGE"/Revision$DateSpec");
+ env->FindClass(JAVA_PACKAGE"/types/Revision$DateSpec");
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NOTHING();
@@ -166,7 +166,7 @@ Revision::makeJRevision(svn_revnum_t rev
if (getInstance == 0)
{
getInstance = env->GetStaticMethodID(clazz, "getInstance",
- "(J)L" JAVA_PACKAGE "/Revision;");
+ "(J)L" JAVA_PACKAGE "/types/Revision;");
if (JNIUtil::isExceptionThrown())
return NULL;
}
Modified: subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/native/RevisionRange.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/native/RevisionRange.cpp?rev=1057044&r1=1057043&r2=1057044&view=diff
==============================================================================
--- subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/native/RevisionRange.cpp (original)
+++ subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/native/RevisionRange.cpp Sun Jan 9 22:39:40 2011
@@ -56,7 +56,7 @@ const svn_opt_revision_range_t *Revision
if (fmid == 0)
{
fmid = env->GetMethodID(clazz, "getFromRevision",
- "()L"JAVA_PACKAGE"/Revision;");
+ "()L"JAVA_PACKAGE"/types/Revision;");
if (JNIUtil::isJavaExceptionThrown())
return NULL;
}
@@ -65,7 +65,7 @@ const svn_opt_revision_range_t *Revision
if (tmid == 0)
{
tmid = env->GetMethodID(clazz, "getToRevision",
- "()L"JAVA_PACKAGE"/Revision;");
+ "()L"JAVA_PACKAGE"/types/Revision;");
if (JNIUtil::isJavaExceptionThrown())
return NULL;
}
Modified: subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/native/StatusCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/native/StatusCallback.cpp?rev=1057044&r1=1057043&r2=1057044&view=diff
==============================================================================
--- subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/native/StatusCallback.cpp (original)
+++ subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/native/StatusCallback.cpp Sun Jan 9 22:39:40 2011
@@ -85,7 +85,7 @@ StatusCallback::doStatus(const char *loc
POP_AND_RETURN(SVN_NO_ERROR);
mid = env->GetMethodID(clazz, "doStatus",
- "(L"JAVA_PACKAGE"/Status;)V");
+ "(L"JAVA_PACKAGE"/types/Status;)V");
if (JNIUtil::isJavaExceptionThrown() || mid == 0)
POP_AND_RETURN(SVN_NO_ERROR);
}
Modified: subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp?rev=1057044&r1=1057043&r2=1057044&view=diff
==============================================================================
--- subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp (original)
+++ subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp Sun Jan 9 22:39:40 2011
@@ -761,7 +761,7 @@ Java_org_apache_subversion_javahl_SVNCli
}
JNIEXPORT void JNICALL
-Java_org_apache_subversion_javahl_SVNClient_merge__Ljava_lang_String_2Lorg_apache_subversion_javahl_Revision_2Ljava_lang_String_2Lorg_apache_subversion_javahl_Revision_2Ljava_lang_String_2ZLorg_apache_subversion_javahl_types_Depth_2ZZZ
+Java_org_apache_subversion_javahl_SVNClient_merge__Ljava_lang_String_2Lorg_apache_subversion_javahl_types_Revision_2Ljava_lang_String_2Lorg_apache_subversion_javahl_types_Revision_2Ljava_lang_String_2ZLorg_apache_subversion_javahl_types_Depth_2ZZZ
(JNIEnv *env, jobject jthis, jstring jpath1, jobject jrevision1,
jstring jpath2, jobject jrevision2, jstring jlocalPath, jboolean jforce,
jobject jdepth, jboolean jignoreAncestry, jboolean jdryRun,
@@ -801,7 +801,7 @@ Java_org_apache_subversion_javahl_SVNCli
}
JNIEXPORT void JNICALL
-Java_org_apache_subversion_javahl_SVNClient_merge__Ljava_lang_String_2Lorg_apache_subversion_javahl_Revision_2Ljava_util_List_2Ljava_lang_String_2ZLorg_apache_subversion_javahl_types_Depth_2ZZZ
+Java_org_apache_subversion_javahl_SVNClient_merge__Ljava_lang_String_2Lorg_apache_subversion_javahl_types_Revision_2Ljava_util_List_2Ljava_lang_String_2ZLorg_apache_subversion_javahl_types_Depth_2ZZZ
(JNIEnv *env, jobject jthis, jstring jpath, jobject jpegRevision,
jobject jranges, jstring jlocalPath, jboolean jforce, jobject jdepth,
jboolean jignoreAncestry, jboolean jdryRun, jboolean jrecordOnly)
@@ -1129,7 +1129,7 @@ JNIEXPORT void JNICALL Java_org_apache_s
}
JNIEXPORT void JNICALL
-Java_org_apache_subversion_javahl_SVNClient_diff__Ljava_lang_String_2Lorg_apache_subversion_javahl_Revision_2Ljava_lang_String_2Lorg_apache_subversion_javahl_Revision_2Ljava_lang_String_2Ljava_lang_String_2Lorg_apache_subversion_javahl_types_Depth_2Ljava_util_Collection_2ZZZZ
+Java_org_apache_subversion_javahl_SVNClient_diff__Ljava_lang_String_2Lorg_apache_subversion_javahl_types_Revision_2Ljava_lang_String_2Lorg_apache_subversion_javahl_types_Revision_2Ljava_lang_String_2Ljava_lang_String_2Lorg_apache_subversion_javahl_types_Depth_2Ljava_util_Collection_2ZZZZ
(JNIEnv *env, jobject jthis, jstring jtarget1, jobject jrevision1,
jstring jtarget2, jobject jrevision2, jstring jrelativeToDir,
jstring joutfileName, jobject jdepth, jobject jchangelists,
@@ -1179,7 +1179,7 @@ Java_org_apache_subversion_javahl_SVNCli
}
JNIEXPORT void JNICALL
-Java_org_apache_subversion_javahl_SVNClient_diff__Ljava_lang_String_2Lorg_apache_subversion_javahl_Revision_2Lorg_apache_subversion_javahl_Revision_2Lorg_apache_subversion_javahl_Revision_2Ljava_lang_String_2Ljava_lang_String_2Lorg_apache_subversion_javahl_types_Depth_2Ljava_util_Collection_2ZZZZ
+Java_org_apache_subversion_javahl_SVNClient_diff__Ljava_lang_String_2Lorg_apache_subversion_javahl_types_Revision_2Lorg_apache_subversion_javahl_types_Revision_2Lorg_apache_subversion_javahl_types_Revision_2Ljava_lang_String_2Ljava_lang_String_2Lorg_apache_subversion_javahl_types_Depth_2Ljava_util_Collection_2ZZZZ
(JNIEnv *env, jobject jthis, jstring jtarget, jobject jpegRevision,
jobject jstartRevision, jobject jendRevision, jstring jrelativeToDir,
jstring joutfileName, jobject jdepth, jobject jchangelists,
@@ -1229,7 +1229,7 @@ Java_org_apache_subversion_javahl_SVNCli
}
JNIEXPORT void JNICALL
-Java_org_apache_subversion_javahl_SVNClient_diffSummarize__Ljava_lang_String_2Lorg_apache_subversion_javahl_Revision_2Ljava_lang_String_2Lorg_apache_subversion_javahl_Revision_2Lorg_apache_subversion_javahl_types_Depth_2Ljava_util_Collection_2ZLorg_apache_subversion_javahl_callback_DiffSummaryCallback_2
+Java_org_apache_subversion_javahl_SVNClient_diffSummarize__Ljava_lang_String_2Lorg_apache_subversion_javahl_types_Revision_2Ljava_lang_String_2Lorg_apache_subversion_javahl_types_Revision_2Lorg_apache_subversion_javahl_types_Depth_2Ljava_util_Collection_2ZLorg_apache_subversion_javahl_callback_DiffSummaryCallback_2
(JNIEnv *env, jobject jthis, jstring jtarget1, jobject jrevision1,
jstring jtarget2, jobject jrevision2, jobject jdepth, jobject jchangelists,
jboolean jignoreAncestry, jobject jdiffSummaryReceiver)
@@ -1272,7 +1272,7 @@ Java_org_apache_subversion_javahl_SVNCli
}
JNIEXPORT void JNICALL
-Java_org_apache_subversion_javahl_SVNClient_diffSummarize__Ljava_lang_String_2Lorg_apache_subversion_javahl_Revision_2Lorg_apache_subversion_javahl_Revision_2Lorg_apache_subversion_javahl_Revision_2Lorg_apache_subversion_javahl_types_Depth_2Ljava_util_Collection_2ZLorg_apache_subversion_javahl_callback_DiffSummaryCallback_2
+Java_org_apache_subversion_javahl_SVNClient_diffSummarize__Ljava_lang_String_2Lorg_apache_subversion_javahl_types_Revision_2Lorg_apache_subversion_javahl_types_Revision_2Lorg_apache_subversion_javahl_types_Revision_2Lorg_apache_subversion_javahl_types_Depth_2Ljava_util_Collection_2ZLorg_apache_subversion_javahl_callback_DiffSummaryCallback_2
(JNIEnv *env, jobject jthis, jstring jtarget, jobject jPegRevision,
jobject jStartRevision, jobject jEndRevision, jobject jdepth,
jobject jchangelists, jboolean jignoreAncestry,
Modified: subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java
URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java?rev=1057044&r1=1057043&r2=1057044&view=diff
==============================================================================
--- subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java (original)
+++ subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java Sun Jan 9 22:39:40 2011
@@ -26,7 +26,7 @@ package org.apache.subversion.javahl;
import java.util.Map;
import java.util.EventObject;
import org.apache.subversion.javahl.callback.ClientNotifyCallback;
-import org.apache.subversion.javahl.types.NodeKind;
+import org.apache.subversion.javahl.types.*;
/**
* The event passed to the {@link ClientNotifyCallback#onNotify}
Modified: subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitInfo.java
URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitInfo.java?rev=1057044&r1=1057043&r2=1057044&view=diff
==============================================================================
--- subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitInfo.java (original)
+++ subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitInfo.java Sun Jan 9 22:39:40 2011
@@ -25,6 +25,8 @@ package org.apache.subversion.javahl;
import java.util.Date;
+import org.apache.subversion.javahl.types.LogDate;
+
/**
* This class describes a item which will be commited.
*/
Modified: subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java
URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java?rev=1057044&r1=1057043&r2=1057044&view=diff
==============================================================================
--- subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java (original)
+++ subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java Sun Jan 9 22:39:40 2011
@@ -23,7 +23,7 @@
package org.apache.subversion.javahl;
-import org.apache.subversion.javahl.types.NodeKind;
+import org.apache.subversion.javahl.types.*;
/**
* The description of a merge conflict, encountered during
Modified: subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/CopySource.java
URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/CopySource.java?rev=1057044&r1=1057043&r2=1057044&view=diff
==============================================================================
--- subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/CopySource.java (original)
+++ subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/CopySource.java Sun Jan 9 22:39:40 2011
@@ -23,6 +23,8 @@
package org.apache.subversion.javahl;
+import org.apache.subversion.javahl.types.Revision;
+
/**
* A description of a copy source.
*/
@@ -58,7 +60,7 @@ public class CopySource implements java.
* @param path
* @param revision The source revision.
* @param pegRevision The peg revision. Typically interpreted as
- * {@link org.apache.subversion.javahl.Revision#HEAD} when
+ * {@link org.apache.subversion.javahl.types.Revision#HEAD} when
* <code>null</code>.
*/
public CopySource(String path, Revision revision, Revision pegRevision)
Modified: subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/RevisionRange.java
URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/RevisionRange.java?rev=1057044&r1=1057043&r2=1057044&view=diff
==============================================================================
--- subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/RevisionRange.java (original)
+++ subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/RevisionRange.java Sun Jan 9 22:39:40 2011
@@ -23,6 +23,8 @@
package org.apache.subversion.javahl;
+import org.apache.subversion.javahl.types.Revision;
+
/**
* Object that describes a revision range
*
Modified: subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ListCallback.java
URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ListCallback.java?rev=1057044&r1=1057043&r2=1057044&view=diff
==============================================================================
--- subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ListCallback.java (original)
+++ subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ListCallback.java Sun Jan 9 22:39:40 2011
@@ -23,9 +23,9 @@
package org.apache.subversion.javahl.callback;
-import org.apache.subversion.javahl.Lock;
-import org.apache.subversion.javahl.DirEntry;
import org.apache.subversion.javahl.ISVNClient;
+import org.apache.subversion.javahl.types.DirEntry;
+import org.apache.subversion.javahl.types.Lock;
/**
* This interface is used to receive every single line for a file on a
Modified: subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/LogMessageCallback.java
URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/LogMessageCallback.java?rev=1057044&r1=1057043&r2=1057044&view=diff
==============================================================================
--- subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/LogMessageCallback.java (original)
+++ subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/LogMessageCallback.java Sun Jan 9 22:39:40 2011
@@ -23,8 +23,8 @@
package org.apache.subversion.javahl.callback;
-import org.apache.subversion.javahl.ChangePath;
import org.apache.subversion.javahl.ISVNClient;
+import org.apache.subversion.javahl.types.ChangePath;
import java.util.Map;
import java.util.Set;
Modified: subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/StatusCallback.java
URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/StatusCallback.java?rev=1057044&r1=1057043&r2=1057044&view=diff
==============================================================================
--- subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/StatusCallback.java (original)
+++ subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/StatusCallback.java Sun Jan 9 22:39:40 2011
@@ -23,8 +23,8 @@
package org.apache.subversion.javahl.callback;
-import org.apache.subversion.javahl.Status;
import org.apache.subversion.javahl.ISVNClient;
+import org.apache.subversion.javahl.types.Status;
/**
* This interface is used to receive every status item for
Modified: subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ChangePath.java
URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ChangePath.java?rev=1057044&r1=1057043&r2=1057044&view=diff
==============================================================================
--- subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ChangePath.java (original)
+++ subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ChangePath.java Sun Jan 9 22:39:40 2011
@@ -55,14 +55,14 @@ public class ChangePath implements java.
/**
* A backward-compat constructor.
*/
- public ChangePath(org.apache.subversion.javahl.ChangePath aChangePath)
+ public ChangePath(org.apache.subversion.javahl.types.ChangePath aChangePath)
{
this(aChangePath.getPath(), aChangePath.getCopySrcRevision(),
aChangePath.getCopySrcPath(),
- ((aChangePath.getAction() == org.apache.subversion.javahl.ChangePath.Action.add) ? 'A' :
- ((aChangePath.getAction() == org.apache.subversion.javahl.ChangePath.Action.delete) ? 'D' :
- ((aChangePath.getAction() == org.apache.subversion.javahl.ChangePath.Action.replace) ? 'R' :
- ((aChangePath.getAction() == org.apache.subversion.javahl.ChangePath.Action.modify) ? 'M' :
+ ((aChangePath.getAction() == org.apache.subversion.javahl.types.ChangePath.Action.add) ? 'A' :
+ ((aChangePath.getAction() == org.apache.subversion.javahl.types.ChangePath.Action.delete) ? 'D' :
+ ((aChangePath.getAction() == org.apache.subversion.javahl.types.ChangePath.Action.replace) ? 'R' :
+ ((aChangePath.getAction() == org.apache.subversion.javahl.types.ChangePath.Action.modify) ? 'M' :
' ')))),
NodeKind.fromApache(aChangePath.getNodeKind()));
}
Modified: subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictVersion.java
URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictVersion.java?rev=1057044&r1=1057043&r2=1057044&view=diff
==============================================================================
--- subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictVersion.java (original)
+++ subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictVersion.java Sun Jan 9 22:39:40 2011
@@ -53,7 +53,7 @@ public class ConflictVersion
/**
* A backward-compat constructor.
*/
- public ConflictVersion(org.apache.subversion.javahl.ConflictVersion aVer)
+ public ConflictVersion(org.apache.subversion.javahl.types.ConflictVersion aVer)
{
this(aVer.getReposURL(), aVer.getPegRevision(), aVer.getPathInRepos(),
NodeKind.fromApache(aVer.getNodeKind()));
Modified: subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/tigris/subversion/javahl/DirEntry.java
URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/tigris/subversion/javahl/DirEntry.java?rev=1057044&r1=1057043&r2=1057044&view=diff
==============================================================================
--- subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/tigris/subversion/javahl/DirEntry.java (original)
+++ subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/tigris/subversion/javahl/DirEntry.java Sun Jan 9 22:39:40 2011
@@ -150,7 +150,7 @@ public class DirEntry implements java.io
/**
* A backward-compat constructor
*/
- DirEntry(org.apache.subversion.javahl.DirEntry aEntry)
+ DirEntry(org.apache.subversion.javahl.types.DirEntry aEntry)
{
this(aEntry.getPath(), aEntry.getAbsPath(),
NodeKind.fromApache(aEntry.getNodeKind()),
Modified: subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Lock.java
URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Lock.java?rev=1057044&r1=1057043&r2=1057044&view=diff
==============================================================================
--- subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Lock.java (original)
+++ subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Lock.java Sun Jan 9 22:39:40 2011
@@ -91,7 +91,7 @@ public class Lock implements java.io.Ser
this.expirationDate = expirationDate;
}
- Lock(org.apache.subversion.javahl.Lock aLock)
+ Lock(org.apache.subversion.javahl.types.Lock aLock)
{
this(aLock.getOwner(), aLock.getPath(), aLock.getToken(),
aLock.getComment(),
Modified: subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Revision.java
URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Revision.java?rev=1057044&r1=1057043&r2=1057044&view=diff
==============================================================================
--- subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Revision.java (original)
+++ subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Revision.java Sun Jan 9 22:39:40 2011
@@ -155,22 +155,22 @@ public class Revision implements java.io
return new Revision.DateSpec(revisionDate);
}
- public org.apache.subversion.javahl.Revision toApache()
+ public org.apache.subversion.javahl.types.Revision toApache()
{
- return new org.apache.subversion.javahl.Revision(Kind.toAKind(revKind));
+ return new org.apache.subversion.javahl.types.Revision(Kind.toAKind(revKind));
}
public static Revision createFromApache(
- org.apache.subversion.javahl.Revision aRev)
+ org.apache.subversion.javahl.types.Revision aRev)
{
- org.apache.subversion.javahl.Revision.Kind kind = aRev.getKind();
+ org.apache.subversion.javahl.types.Revision.Kind kind = aRev.getKind();
switch (kind)
{
case number:
- return getInstance(((org.apache.subversion.javahl.Revision.Number) aRev).getNumber());
+ return getInstance(((org.apache.subversion.javahl.types.Revision.Number) aRev).getNumber());
case date:
- return getInstance(((org.apache.subversion.javahl.Revision.DateSpec) aRev).getDate());
+ return getInstance(((org.apache.subversion.javahl.types.Revision.DateSpec) aRev).getDate());
default:
return getInstance(Kind.fromAKind(kind));
}
@@ -278,9 +278,9 @@ public class Revision implements java.io
return (int)(revNumber ^ (revNumber >>> 32));
}
- public org.apache.subversion.javahl.Revision toApache()
+ public org.apache.subversion.javahl.types.Revision toApache()
{
- return org.apache.subversion.javahl.Revision.getInstance(revNumber);
+ return org.apache.subversion.javahl.types.Revision.getInstance(revNumber);
}
}
@@ -349,9 +349,9 @@ public class Revision implements java.io
return revDate.hashCode();
}
- public org.apache.subversion.javahl.Revision toApache()
+ public org.apache.subversion.javahl.types.Revision toApache()
{
- return org.apache.subversion.javahl.Revision.getInstance(revDate);
+ return org.apache.subversion.javahl.types.Revision.getInstance(revDate);
}
}
@@ -368,7 +368,7 @@ public class Revision implements java.io
*/
public static final class Kind implements RevisionKind
{
- public static int fromAKind(org.apache.subversion.javahl.Revision.Kind aKind)
+ public static int fromAKind(org.apache.subversion.javahl.types.Revision.Kind aKind)
{
switch (aKind)
{
@@ -392,27 +392,27 @@ public class Revision implements java.io
}
}
- public static org.apache.subversion.javahl.Revision.Kind toAKind(int kind)
+ public static org.apache.subversion.javahl.types.Revision.Kind toAKind(int kind)
{
switch (kind)
{
default:
case RevisionKind.unspecified:
- return org.apache.subversion.javahl.Revision.Kind.unspecified;
+ return org.apache.subversion.javahl.types.Revision.Kind.unspecified;
case RevisionKind.number:
- return org.apache.subversion.javahl.Revision.Kind.number;
+ return org.apache.subversion.javahl.types.Revision.Kind.number;
case RevisionKind.date:
- return org.apache.subversion.javahl.Revision.Kind.date;
+ return org.apache.subversion.javahl.types.Revision.Kind.date;
case RevisionKind.committed:
- return org.apache.subversion.javahl.Revision.Kind.committed;
+ return org.apache.subversion.javahl.types.Revision.Kind.committed;
case RevisionKind.previous:
- return org.apache.subversion.javahl.Revision.Kind.previous;
+ return org.apache.subversion.javahl.types.Revision.Kind.previous;
case RevisionKind.base:
- return org.apache.subversion.javahl.Revision.Kind.base;
+ return org.apache.subversion.javahl.types.Revision.Kind.base;
case RevisionKind.head:
- return org.apache.subversion.javahl.Revision.Kind.head;
+ return org.apache.subversion.javahl.types.Revision.Kind.head;
case RevisionKind.working:
- return org.apache.subversion.javahl.Revision.Kind.working;
+ return org.apache.subversion.javahl.types.Revision.Kind.working;
}
}
}
Modified: subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java
URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java?rev=1057044&r1=1057043&r2=1057044&view=diff
==============================================================================
--- subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java (original)
+++ subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java Sun Jan 9 22:39:40 2011
@@ -458,7 +458,7 @@ public class SVNAdmin
{
try
{
- Set<org.apache.subversion.javahl.Lock> aLocks =
+ Set<org.apache.subversion.javahl.types.Lock> aLocks =
aSVNAdmin.lslocks(
new File(path),
Depth.toADepth(
@@ -466,7 +466,7 @@ public class SVNAdmin
Lock[] locks = new Lock[aLocks.size()];
int i = 0;
- for (org.apache.subversion.javahl.Lock lock : aLocks)
+ for (org.apache.subversion.javahl.types.Lock lock : aLocks)
{
locks[i] = new Lock(lock);
i++;
Modified: subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java?rev=1057044&r1=1057043&r2=1057044&view=diff
==============================================================================
--- subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java (original)
+++ subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java Sun Jan 9 22:39:40 2011
@@ -194,7 +194,7 @@ public class SVNClient implements SVNCli
changelists == null ? null
: Arrays.asList(changelists),
new org.apache.subversion.javahl.callback.StatusCallback () {
- public void doStatus(org.apache.subversion.javahl.Status aStatus)
+ public void doStatus(org.apache.subversion.javahl.types.Status aStatus)
{ callback.doStatus(new Status(aStatus)); }
});
}
@@ -285,8 +285,8 @@ public class SVNClient implements SVNCli
pegRevision == null ? null : pegRevision.toApache(),
Depth.toADepth(depth), direntFields, fetchLocks,
new org.apache.subversion.javahl.callback.ListCallback () {
- public void doEntry(org.apache.subversion.javahl.DirEntry dirent,
- org.apache.subversion.javahl.Lock lock)
+ public void doEntry(org.apache.subversion.javahl.types.DirEntry dirent,
+ org.apache.subversion.javahl.types.Lock lock)
{
callback.doEntry(new DirEntry(dirent),
lock == null ? null : new Lock(lock));
@@ -529,7 +529,7 @@ public class SVNClient implements SVNCli
}
public void singleMessage(
- Set<org.apache.subversion.javahl.ChangePath> aChangedPaths,
+ Set<org.apache.subversion.javahl.types.ChangePath> aChangedPaths,
long revision, Map<String, byte[]> revprops,
boolean hasChildren)
{
@@ -542,7 +542,7 @@ public class SVNClient implements SVNCli
changedPaths = new ChangePath[aChangedPaths.size()];
int i = 0;
- for (org.apache.subversion.javahl.ChangePath cp
+ for (org.apache.subversion.javahl.types.ChangePath cp
: aChangedPaths)
{
changedPaths[i] = new ChangePath(cp);
@@ -1458,7 +1458,7 @@ public class SVNClient implements SVNCli
implements org.apache.subversion.javahl.callback.LogMessageCallback
{
public void singleMessage(
- Set<org.apache.subversion.javahl.ChangePath> aChangedPaths,
+ Set<org.apache.subversion.javahl.types.ChangePath> aChangedPaths,
long revision, Map<String, byte[]> revprops,
boolean hasChildren)
{
@@ -1469,7 +1469,7 @@ public class SVNClient implements SVNCli
changedPaths = new ChangePath[aChangedPaths.size()];
int i = 0;
- for (org.apache.subversion.javahl.ChangePath cp
+ for (org.apache.subversion.javahl.types.ChangePath cp
: aChangedPaths)
{
changedPaths[i] = new ChangePath(cp);
@@ -2353,8 +2353,8 @@ public class SVNClient implements SVNCli
final List<org.apache.subversion.javahl.Info> infos =
new ArrayList<org.apache.subversion.javahl.Info>();
aSVNClient.info2(path,
- org.apache.subversion.javahl.Revision.HEAD,
- org.apache.subversion.javahl.Revision.HEAD,
+ org.apache.subversion.javahl.types.Revision.HEAD,
+ org.apache.subversion.javahl.types.Revision.HEAD,
org.apache.subversion.javahl.types.Depth.empty,
null, new org.apache.subversion.javahl.callback.InfoCallback()
{
Modified: subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Status.java
URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Status.java?rev=1057044&r1=1057043&r2=1057044&view=diff
==============================================================================
--- subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Status.java (original)
+++ subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Status.java Sun Jan 9 22:39:40 2011
@@ -320,7 +320,7 @@ public class Status implements java.io.S
/**
* A backward-compat wrapper.
*/
- public Status(org.apache.subversion.javahl.Status aStatus)
+ public Status(org.apache.subversion.javahl.types.Status aStatus)
{
this(aStatus.getPath(), aStatus.getUrl(),
NodeKind.fromApache(aStatus.getNodeKind()),
@@ -871,7 +871,7 @@ public class Status implements java.io.S
}
private static int fromAStatusKind(
- org.apache.subversion.javahl.Status.Kind aKind)
+ org.apache.subversion.javahl.types.Status.Kind aKind)
{
if (aKind == null)
return StatusKind.none;
Modified: subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java
URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java?rev=1057044&r1=1057043&r2=1057044&view=diff
==============================================================================
--- subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java (original)
+++ subversion/branches/diff-optimizations-bytes/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java Sun Jan 9 22:39:40 2011
@@ -32,7 +32,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Date;
-import org.apache.subversion.javahl.types.NodeKind;
+import org.apache.subversion.javahl.types.*;
import junit.framework.Assert;
/**
Propchange: subversion/branches/diff-optimizations-bytes/subversion/include/private/svn_adler32.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 9 22:39:40 2011
@@ -40,4 +40,4 @@
/subversion/branches/tc_url_rev/subversion/libsvn_diff/diff.h:874351-874483
/subversion/branches/tree-conflicts/subversion/libsvn_diff/diff.h:868291-873154
/subversion/branches/tree-conflicts-notify/subversion/libsvn_diff/diff.h:873926-874008
-/subversion/trunk/subversion/include/private/svn_adler32.h:1054278-1054461
+/subversion/trunk/subversion/include/private/svn_adler32.h:1054278-1057038
Modified: subversion/branches/diff-optimizations-bytes/subversion/include/svn_client.h
URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/subversion/include/svn_client.h?rev=1057044&r1=1057043&r2=1057044&view=diff
==============================================================================
--- subversion/branches/diff-optimizations-bytes/subversion/include/svn_client.h (original)
+++ subversion/branches/diff-optimizations-bytes/subversion/include/svn_client.h Sun Jan 9 22:39:40 2011
@@ -1289,50 +1289,61 @@ svn_client_update(svn_revnum_t *result_r
* @{
*/
-/** Switch working tree @a path to @a url\@peg_revision at @a revision,
- * authenticating with the authentication baton cached in @a ctx. If
- * @a result_rev is not @c NULL, set @a *result_rev to the value of
- * the revision to which the working copy was actually switched.
- *
- * Summary of purpose: this is normally used to switch a working
- * directory over to another line of development, such as a branch or
- * a tag. Switching an existing working directory is more efficient
- * than checking out @a url from scratch.
- *
- * @a revision must be of kind #svn_opt_revision_number,
- * #svn_opt_revision_head, or #svn_opt_revision_date; otherwise,
- * return #SVN_ERR_CLIENT_BAD_REVISION.
- *
- * If @a depth is #svn_depth_infinity, switch fully recursively.
- * Else if it is #svn_depth_immediates, switch @a path and its file
- * children (if any), and switch subdirectories but do not update
- * them. Else if #svn_depth_files, switch just file children,
- * ignoring subdirectories completely. Else if #svn_depth_empty,
- * switch just @a path and touch nothing underneath it.
- *
- * If @a depth_is_sticky is set and @a depth is not
- * #svn_depth_unknown, then in addition to switching PATH, also set
- * its sticky ambient depth value to @a depth.
- *
- * If @a ignore_externals is set, don't process externals definitions
- * as part of this operation.
- *
- * If @a allow_unver_obstructions is TRUE then the switch tolerates
- * existing unversioned items that obstruct added paths. Only
- * obstructions of the same type (file or dir) as the added item are
- * tolerated. The text of obstructing files is left as-is, effectively
- * treating it as a user modification after the switch. Working
- * properties of obstructing items are set equal to the base properties.
- * If @a allow_unver_obstructions is FALSE then the switch will abort
- * if there are any unversioned obstructing items.
- *
- * If @a ctx->notify_func2 is non-NULL, invoke it with @a ctx->notify_baton2
- * on paths affected by the switch. Also invoke it for files may be restored
- * from the text-base because they were removed from the working copy.
+/**
+ * Switch an existing working copy directory to a different repository
+ * location.
+ *
+ * This is normally used to switch a working copy directory over to another
+ * line of development, such as a branch or a tag. Switching an existing
+ * working copy directory is more efficient than checking out @a URL from
+ * scratch.
+ *
+ * @param[out] result_rev If non-NULL, the value of the revision to which
+ * the working copy was actually switched.
+ * @param[in] path The directory to be switched. This need not be the
+ * root of a working copy.
+ * @param[in] url The repository URL to switch to.
+ * @param[in] peg_revision The peg revision.
+ * @param[in] revision The operative revision.
+ * @param[in] depth The depth of the operation. If #svn_depth_infinity,
+ * switch fully recursively. Else if #svn_depth_immediates,
+ * switch @a path and its file children (if any), and
+ * switch subdirectories but do not update them. Else if
+ * #svn_depth_files, switch just file children, ignoring
+ * subdirectories completely. Else if #svn_depth_empty,
+ * switch just @a path and touch nothing underneath it.
+ * @param[in] depth_is_sticky If @c TRUE, and @a depth is not
+ * #svn_depth_unknown, then in addition to switching @a path, also
+ * set its sticky ambient depth value to @a depth.
+ * @param[in] ignore_externals If @c TRUE, don't process externals
+ * definitions as part of this operation.
+ * @param[in] allow_unver_obstructions If @c TRUE, then tolerate existing
+ * unversioned items that obstruct incoming paths. Only
+ * obstructions of the same type (file or dir) as the added
+ * item are tolerated. The text of obstructing files is left
+ * as-is, effectively treating it as a user modification after
+ * the checkout. Working properties of obstructing items are
+ * set equal to the base properties. <br>
+ * If @c FALSE, then abort if there are any unversioned
+ * obstructing items.
+ * @param[in] ctx The standard client context, used for authentication and
+ * notification. The notifier is invoked for paths affected by
+ * the switch, and also for files which may be restored from the
+ * pristine store after being previously removed from the working
+ * copy.
+ * @param[in] pool Used for any temporary allocation.
*
- * Use @a pool for any temporary allocation.
+ * @return A pointer to an #svn_error_t of the type (this list is not
+ * exhaustive): <br>
+ * #SVN_ERR_CLIENT_BAD_REVISION if @a revision is not one of
+ * #svn_opt_revision_number, #svn_opt_revision_head, or
+ * #svn_opt_revision_date. <br>
+ * If no error occurred, return #SVN_NO_ERROR.
*
* @since New in 1.5.
+ *
+ * @see #svn_depth_t <br> #svn_client_ctx_t <br> @ref clnt_revisions for
+ * a discussion of operative and peg revisions.
*/
svn_error_t *
svn_client_switch2(svn_revnum_t *result_rev,
Modified: subversion/branches/diff-optimizations-bytes/subversion/include/svn_diff.h
URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/subversion/include/svn_diff.h?rev=1057044&r1=1057043&r2=1057044&view=diff
==============================================================================
--- subversion/branches/diff-optimizations-bytes/subversion/include/svn_diff.h (original)
+++ subversion/branches/diff-optimizations-bytes/subversion/include/svn_diff.h Sun Jan 9 22:39:40 2011
@@ -849,7 +849,7 @@ typedef struct svn_diff_hunk_t svn_diff_
* @since New in 1.7.
*/
svn_error_t *
-svn_diff_hunk_readline_diff_text(const svn_diff_hunk_t *hunk,
+svn_diff_hunk_readline_diff_text(svn_diff_hunk_t *hunk,
svn_stringbuf_t **stringbuf,
const char **eol,
svn_boolean_t *eof,
@@ -869,7 +869,7 @@ svn_diff_hunk_readline_diff_text(const s
* @since New in 1.7.
*/
svn_error_t *
-svn_diff_hunk_readline_original_text(const svn_diff_hunk_t *hunk,
+svn_diff_hunk_readline_original_text(svn_diff_hunk_t *hunk,
svn_stringbuf_t **stringbuf,
const char **eol,
svn_boolean_t *eof,
@@ -884,7 +884,7 @@ svn_diff_hunk_readline_original_text(con
* @since New in 1.7.
*/
svn_error_t *
-svn_diff_hunk_readline_modified_text(const svn_diff_hunk_t *hunk,
+svn_diff_hunk_readline_modified_text(svn_diff_hunk_t *hunk,
svn_stringbuf_t **stringbuf,
const char **eol,
svn_boolean_t *eof,
@@ -893,18 +893,18 @@ svn_diff_hunk_readline_modified_text(con
/** Reset the diff text of @a hunk so it can be read again from the start.
* @since New in 1.7. */
-svn_error_t *
-svn_diff_hunk_reset_diff_text(const svn_diff_hunk_t *hunk);
+void
+svn_diff_hunk_reset_diff_text(svn_diff_hunk_t *hunk);
/** Reset the original text of @a hunk so it can be read again from the start.
* @since New in 1.7. */
-svn_error_t *
-svn_diff_hunk_reset_original_text(const svn_diff_hunk_t *hunk);
+void
+svn_diff_hunk_reset_original_text(svn_diff_hunk_t *hunk);
/** Reset the modified text of @a hunk so it can be read again from the start.
* @since New in 1.7. */
-svn_error_t *
-svn_diff_hunk_reset_modified_text(const svn_diff_hunk_t *hunk);
+void
+svn_diff_hunk_reset_modified_text(svn_diff_hunk_t *hunk);
/** Return the line offset of the original hunk text,
* as parsed from the hunk header.
@@ -946,6 +946,7 @@ svn_diff_hunk_get_trailing_context(const
/**
* Data type to manage parsing of properties in patches.
+ * API users should not allocate structures of this type directly.
*
* @since New in 1.7. */
typedef struct svn_prop_patch_t {
@@ -962,15 +963,10 @@ typedef struct svn_prop_patch_t {
/**
* Data type to manage parsing of patches.
+ * API users should not allocate structures of this type directly.
*
* @since New in 1.7. */
typedef struct svn_patch_t {
- /** Path to the patch file. */
- const char *path;
-
- /** The patch file itself. */
- apr_file_t *patch_file;
-
/**
* The old and new file names as retrieved from the patch file.
* These paths are UTF-8 encoded and canonicalized, but otherwise
@@ -997,6 +993,20 @@ typedef struct svn_patch_t {
svn_boolean_t reverse;
} svn_patch_t;
+/* An opaque type representing an open patch file.
+ *
+ * @since New in 1.7. */
+typedef struct svn_patch_file_t svn_patch_file_t;
+
+/* Open @a patch_file at @a local_abspath.
+ * Allocate @a patch_file in @a result_pool.
+ *
+ * @since New in 1.7. */
+svn_error_t *
+svn_diff_open_patch_file(svn_patch_file_t **patch_file,
+ const char *local_abspath,
+ apr_pool_t *result_pool);
+
/**
* Return the next @a *patch in @a patch_file.
* If no patch can be found, set @a *patch to NULL.
@@ -1009,20 +1019,21 @@ typedef struct svn_patch_t {
* @since New in 1.7. */
svn_error_t *
svn_diff_parse_next_patch(svn_patch_t **patch,
- apr_file_t *patch_file,
+ svn_patch_file_t *patch_file,
svn_boolean_t reverse,
svn_boolean_t ignore_whitespace,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
/**
- * Dispose of @a patch, closing any streams used by it.
+ * Dispose of @a patch_file.
* Use @a scratch_pool for all temporary allocations.
*
* @since New in 1.7.
*/
svn_error_t *
-svn_diff_close_patch(const svn_patch_t *patch, apr_pool_t *scratch_pool);
+svn_diff_close_patch_file(svn_patch_file_t *patch_file,
+ apr_pool_t *scratch_pool);
#ifdef __cplusplus
}
Modified: subversion/branches/diff-optimizations-bytes/subversion/include/svn_fs.h
URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/subversion/include/svn_fs.h?rev=1057044&r1=1057043&r2=1057044&view=diff
==============================================================================
--- subversion/branches/diff-optimizations-bytes/subversion/include/svn_fs.h (original)
+++ subversion/branches/diff-optimizations-bytes/subversion/include/svn_fs.h Sun Jan 9 22:39:40 2011
@@ -2176,13 +2176,10 @@ typedef svn_error_t *(*svn_fs_get_locks_
* lock iteration will terminate and that error will be returned by
* this function.
*
- * @note On Berkeley-DB-backed filesystems, the @a get_locks_func
- * callback will be invoked from within a Berkeley-DB transaction trail.
- * Implementors of the callback are, as a result, forbidden from
- * calling any svn_fs API functions which might themselves attempt to
- * start a new Berkeley DB transaction (which is most of this svn_fs
- * API). Yes, this is a nasty implementation detail to have to be
- * aware of. We hope to fix this problem in the future.
+ * @note Over the course of this function's invocation, locks might be
+ * added, removed, or modified by concurrent processes. Callers need
+ * to anticipate and gracefully handle the transience of this
+ * information.
*
* @since New in 1.7.
*/
@@ -2194,9 +2191,17 @@ svn_fs_get_locks2(svn_fs_t *fs,
void *get_locks_baton,
apr_pool_t *pool);
-/**
- * Similar to svn_fs_get_locks2(), but with @a depth always passed as
- * svn_depth_infinity.
+/** Similar to svn_fs_get_locks2(), but with @a depth always passed as
+ * svn_depth_infinity, and with the following known problem (which is
+ * not present in svn_fs_get_locks2()):
+ *
+ * @note On Berkeley-DB-backed filesystems in Subversion 1.6 and
+ * prior, the @a get_locks_func callback will be invoked from within a
+ * Berkeley-DB transaction trail. Implementors of the callback are,
+ * as a result, forbidden from calling any svn_fs API functions which
+ * might themselves attempt to start a new Berkeley DB transaction
+ * (which is most of this svn_fs API). Yes, this is a nasty
+ * implementation detail to have to be aware of.
*
* @deprecated Provided for backward compatibility with the 1.6 API.
*/
Modified: subversion/branches/diff-optimizations-bytes/subversion/include/svn_io.h
URL: http://svn.apache.org/viewvc/subversion/branches/diff-optimizations-bytes/subversion/include/svn_io.h?rev=1057044&r1=1057043&r2=1057044&view=diff
==============================================================================
--- subversion/branches/diff-optimizations-bytes/subversion/include/svn_io.h (original)
+++ subversion/branches/diff-optimizations-bytes/subversion/include/svn_io.h Sun Jan 9 22:39:40 2011
@@ -930,40 +930,6 @@ svn_stream_t *
svn_stream_from_aprfile(apr_file_t *file,
apr_pool_t *pool);
-/** Create a stream for reading from a range of an APR file.
- * The stream cannot be written to.
- *
- * @a start and @a end specify the start and end offsets for read
- * operations from @a file, in bytes. @a start marks the first byte
- * to be read from the file. When the stream is first created, the
- * cursor of the underlying file is set to the @a start offset.
- * The byte at @a end, and any bytes past @a end, will never be read.
- *
- * The stream returns 0 bytes if a read operation occurs past of
- * the specified range. If the requested number of bytes in a read
- * operation is larger than the remaining bytes in the range, only
- * the remaining amount of bytes is returned.
- *
- * If @a file is @c NULL, or if @a start is not smaller than @a end,
- * or if @a start is negative, or if @a end is zero or negative,
- * or if the file cursor cannot be set to the @a start offset,
- * an empty stream created by svn_stream_empty() is returned.
- *
- * This function should normally be called with @a disown set to FALSE,
- * in which case closing the stream will also close the underlying file.
- *
- * If @a disown is TRUE, the stream will disown the underlying file,
- * meaning that svn_stream_close() will not close the file.
- *
- * @since New in 1.7.
- */
-svn_stream_t*
-svn_stream_from_aprfile_range_readonly(apr_file_t *file,
- svn_boolean_t disown,
- apr_off_t start,
- apr_off_t end,
- apr_pool_t *pool);
-
/** Set @a *out to a generic stream connected to stdout, allocated in
* @a pool. The stream and its underlying APR handle will be closed
* when @a pool is cleared or destroyed.