You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2010/12/30 21:46:56 UTC
svn commit: r1053998 [1/4] - in /subversion/trunk: ./ build/generator/
contrib/server-side/ subversion/bindings/javahl/native/
subversion/bindings/javahl/src/org/apache/subversion/javahl/
subversion/bindings/javahl/src/org/tigris/subversion/javahl/ sub...
Author: hwright
Date: Thu Dec 30 20:46:50 2010
New Revision: 1053998
URL: http://svn.apache.org/viewvc?rev=1053998&view=rev
Log:
Just padding my stats.
(Actually, doing my regular trailing whitespace removal, similar to r875968.)
* everywhere:
for extsn in c h cpp java py pl rb; do
sed -i -e 's/[ \t]*$//' `find . -name "*.$extsn" | xargs grep '[ \t]$' -l`
done
Modified:
subversion/trunk/build/generator/gen_win.py
subversion/trunk/contrib/server-side/fsfsverify.py
subversion/trunk/subversion/bindings/javahl/native/Array.cpp
subversion/trunk/subversion/bindings/javahl/native/ClientContext.cpp
subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
subversion/trunk/subversion/bindings/javahl/native/StringArray.cpp
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ReposNotifyInformation.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Depth.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Revision.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java
subversion/trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNTests.java
subversion/trunk/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
subversion/trunk/subversion/bindings/swig/python/svn/core.py
subversion/trunk/subversion/bindings/swig/python/tests/core.py
subversion/trunk/subversion/bindings/swig/python/tests/delta.py
subversion/trunk/subversion/bindings/swig/python/tests/ra.py
subversion/trunk/subversion/bindings/swig/python/tests/repository.py
subversion/trunk/subversion/bindings/swig/python/tests/utils.py
subversion/trunk/subversion/include/private/svn_mergeinfo_private.h
subversion/trunk/subversion/include/private/svn_repos_private.h
subversion/trunk/subversion/include/private/svn_wc_private.h
subversion/trunk/subversion/include/svn_client.h
subversion/trunk/subversion/include/svn_diff.h
subversion/trunk/subversion/include/svn_fs.h
subversion/trunk/subversion/include/svn_repos.h
subversion/trunk/subversion/include/svn_string.h
subversion/trunk/subversion/include/svn_wc.h
subversion/trunk/subversion/libsvn_auth_kwallet/kwallet.cpp
subversion/trunk/subversion/libsvn_client/cleanup.c
subversion/trunk/subversion/libsvn_client/copy.c
subversion/trunk/subversion/libsvn_client/deprecated.c
subversion/trunk/subversion/libsvn_client/diff.c
subversion/trunk/subversion/libsvn_client/export.c
subversion/trunk/subversion/libsvn_client/externals.c
subversion/trunk/subversion/libsvn_client/merge.c
subversion/trunk/subversion/libsvn_client/patch.c
subversion/trunk/subversion/libsvn_client/prop_commands.c
subversion/trunk/subversion/libsvn_client/ra.c
subversion/trunk/subversion/libsvn_client/relocate.c
subversion/trunk/subversion/libsvn_client/repos_diff.c
subversion/trunk/subversion/libsvn_client/repos_diff_summarize.c
subversion/trunk/subversion/libsvn_client/revert.c
subversion/trunk/subversion/libsvn_client/update.c
subversion/trunk/subversion/libsvn_delta/compose_delta.c
subversion/trunk/subversion/libsvn_diff/parse-diff.c
subversion/trunk/subversion/libsvn_fs_base/tree.c
subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
subversion/trunk/subversion/libsvn_fs_fs/lock.c
subversion/trunk/subversion/libsvn_fs_fs/tree.c
subversion/trunk/subversion/libsvn_ra/ra_loader.c
subversion/trunk/subversion/libsvn_ra/util.c
subversion/trunk/subversion/libsvn_ra_neon/fetch.c
subversion/trunk/subversion/libsvn_ra_neon/lock.c
subversion/trunk/subversion/libsvn_ra_neon/options.c
subversion/trunk/subversion/libsvn_ra_neon/util.c
subversion/trunk/subversion/libsvn_ra_serf/getlocks.c
subversion/trunk/subversion/libsvn_ra_serf/options.c
subversion/trunk/subversion/libsvn_ra_serf/update.c
subversion/trunk/subversion/libsvn_ra_serf/util.c
subversion/trunk/subversion/libsvn_ra_svn/marshal.c
subversion/trunk/subversion/libsvn_repos/deprecated.c
subversion/trunk/subversion/libsvn_repos/dump.c
subversion/trunk/subversion/libsvn_repos/fs-wrap.c
subversion/trunk/subversion/libsvn_repos/load-fs-vtable.c
subversion/trunk/subversion/libsvn_repos/reporter.c
subversion/trunk/subversion/libsvn_subr/dirent_uri.c
subversion/trunk/subversion/libsvn_subr/hash.c
subversion/trunk/subversion/libsvn_subr/io.c
subversion/trunk/subversion/libsvn_subr/iter.c
subversion/trunk/subversion/libsvn_subr/lock.c
subversion/trunk/subversion/libsvn_subr/mergeinfo.c
subversion/trunk/subversion/libsvn_subr/stream.c
subversion/trunk/subversion/libsvn_subr/subst.c
subversion/trunk/subversion/libsvn_subr/svn_string.c
subversion/trunk/subversion/libsvn_wc/adm_crawler.c
subversion/trunk/subversion/libsvn_wc/adm_ops.c
subversion/trunk/subversion/libsvn_wc/ambient_depth_filter_editor.c
subversion/trunk/subversion/libsvn_wc/conflicts.h
subversion/trunk/subversion/libsvn_wc/copy.c
subversion/trunk/subversion/libsvn_wc/deprecated.c
subversion/trunk/subversion/libsvn_wc/entries.c
subversion/trunk/subversion/libsvn_wc/lock.c
subversion/trunk/subversion/libsvn_wc/lock.h
subversion/trunk/subversion/libsvn_wc/node.c
subversion/trunk/subversion/libsvn_wc/props.c
subversion/trunk/subversion/libsvn_wc/relocate.c
subversion/trunk/subversion/libsvn_wc/revision_status.c
subversion/trunk/subversion/libsvn_wc/status.c
subversion/trunk/subversion/libsvn_wc/update_editor.c
subversion/trunk/subversion/libsvn_wc/util.c
subversion/trunk/subversion/libsvn_wc/wc.h
subversion/trunk/subversion/libsvn_wc/wc_db.c
subversion/trunk/subversion/libsvn_wc/wc_db.h
subversion/trunk/subversion/libsvn_wc/workqueue.c
subversion/trunk/subversion/mod_authz_svn/mod_authz_svn.c
subversion/trunk/subversion/mod_dav_svn/deadprops.c
subversion/trunk/subversion/mod_dav_svn/repos.c
subversion/trunk/subversion/mod_dav_svn/util.c
subversion/trunk/subversion/svn/commit-cmd.c
subversion/trunk/subversion/svn/log-cmd.c
subversion/trunk/subversion/svn/main.c
subversion/trunk/subversion/svn/notify.c
subversion/trunk/subversion/svn/props.c
subversion/trunk/subversion/svn/resolve-cmd.c
subversion/trunk/subversion/svn/resolved-cmd.c
subversion/trunk/subversion/svn/update-cmd.c
subversion/trunk/subversion/svn/util.c
subversion/trunk/subversion/svnadmin/main.c
subversion/trunk/subversion/svnrdump/load_editor.c
subversion/trunk/subversion/svnrdump/svnrdump.c
subversion/trunk/subversion/svnserve/serve.c
subversion/trunk/subversion/svnsync/main.c
subversion/trunk/subversion/tests/cmdline/atomic-ra-revprop-change.c
subversion/trunk/subversion/tests/cmdline/authz_tests.py
subversion/trunk/subversion/tests/cmdline/basic_tests.py
subversion/trunk/subversion/tests/cmdline/commit_tests.py
subversion/trunk/subversion/tests/cmdline/copy_tests.py
subversion/trunk/subversion/tests/cmdline/depth_tests.py
subversion/trunk/subversion/tests/cmdline/diff_tests.py
subversion/trunk/subversion/tests/cmdline/export_tests.py
subversion/trunk/subversion/tests/cmdline/externals_tests.py
subversion/trunk/subversion/tests/cmdline/info_tests.py
subversion/trunk/subversion/tests/cmdline/input_validation_tests.py
subversion/trunk/subversion/tests/cmdline/merge_authz_tests.py
subversion/trunk/subversion/tests/cmdline/merge_reintegrate_tests.py
subversion/trunk/subversion/tests/cmdline/merge_tests.py
subversion/trunk/subversion/tests/cmdline/mergeinfo_tests.py
subversion/trunk/subversion/tests/cmdline/obliterate_tests.py
subversion/trunk/subversion/tests/cmdline/patch_tests.py
subversion/trunk/subversion/tests/cmdline/prop_tests.py
subversion/trunk/subversion/tests/cmdline/redirect_tests.py
subversion/trunk/subversion/tests/cmdline/resolve_tests.py
subversion/trunk/subversion/tests/cmdline/revert_tests.py
subversion/trunk/subversion/tests/cmdline/svnadmin_tests.py
subversion/trunk/subversion/tests/cmdline/svndumpfilter_tests.py
subversion/trunk/subversion/tests/cmdline/svnlook_tests.py
subversion/trunk/subversion/tests/cmdline/svnrdump_tests.py
subversion/trunk/subversion/tests/cmdline/svnsync_tests.py
subversion/trunk/subversion/tests/cmdline/svntest/actions.py
subversion/trunk/subversion/tests/cmdline/svntest/main.py
subversion/trunk/subversion/tests/cmdline/svntest/sandbox.py
subversion/trunk/subversion/tests/cmdline/svnversion_tests.py
subversion/trunk/subversion/tests/cmdline/switch_tests.py
subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py
subversion/trunk/subversion/tests/cmdline/update_tests.py
subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
subversion/trunk/subversion/tests/libsvn_diff/parse-diff-test.c
subversion/trunk/subversion/tests/libsvn_subr/dirent_uri-test.c
subversion/trunk/subversion/tests/libsvn_subr/mergeinfo-test.c
subversion/trunk/subversion/tests/libsvn_subr/stream-test.c
subversion/trunk/subversion/tests/libsvn_wc/entries-compat.c
subversion/trunk/subversion/tests/manual/tree-conflicts-add-vs-add.py
subversion/trunk/tools/client-side/svn-viewspec.py
subversion/trunk/tools/client-side/svnmucc/svnmucc.c
subversion/trunk/tools/dev/wc-ng/bump-to-19.py
subversion/trunk/tools/dev/wc-ng/populate-pristine.py
subversion/trunk/tools/diff/diff.c
subversion/trunk/tools/dist/collect_sigs.py
subversion/trunk/tools/hook-scripts/mailer/mailer.py
subversion/trunk/win-tests.py
Modified: subversion/trunk/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win.py?rev=1053998&r1=1053997&r2=1053998&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win.py (original)
+++ subversion/trunk/build/generator/gen_win.py Thu Dec 30 20:46:50 2010
@@ -589,11 +589,11 @@ class WinGeneratorBase(GeneratorBase):
cdesc = 'Generating %s ' % def_file
- sources.append(ProjectItem(path=gsrc, reldir=None,
+ sources.append(ProjectItem(path=gsrc, reldir=None,
custom_build=cbuild,
custom_target=def_file,
custom_desc=cdesc,
- user_deps=deps,
+ user_deps=deps,
extension=''))
sources.append(ProjectItem(path=def_file, reldir=None,
@@ -1553,24 +1553,24 @@ class WinGeneratorBase(GeneratorBase):
def _find_zlib(self):
"Find the ZLib library and version"
-
+
if not self.zlib_path:
self.zlib_version = '1'
return
-
+
header_file = os.path.join(self.zlib_path, 'zlib.h')
-
+
if not os.path.exists(header_file):
self.zlib_version = '1'
return
-
+
fp = open(header_file)
txt = fp.read()
fp.close()
vermatch = re.search(r'^\s*#define\s+ZLIB_VERSION\s+"(\d+)\.(\d+)\.(\d+)(?:\.\d)?"', txt, re.M)
version = tuple(map(int, vermatch.groups()))
-
+
self.zlib_version = '%d.%d.%d' % version
msg = 'Found ZLib version %s\n'
Modified: subversion/trunk/contrib/server-side/fsfsverify.py
URL: http://svn.apache.org/viewvc/subversion/trunk/contrib/server-side/fsfsverify.py?rev=1053998&r1=1053997&r2=1053998&view=diff
==============================================================================
--- subversion/trunk/contrib/server-side/fsfsverify.py (original)
+++ subversion/trunk/contrib/server-side/fsfsverify.py Thu Dec 30 20:46:50 2010
@@ -574,7 +574,7 @@ class Rep(object):
if header == 'DELTA':
line = f.readline()
digest = None
-
+
# This should be the start of the svndiff stream
actual_start = f.tell()
try:
@@ -698,12 +698,12 @@ class NodeRev(object):
length = int(values[2])
size = int(values[3])
digest = values[4]
-
+
if len(values) > 5:
sha1 = values[5]
else:
sha1 = None
-
+
if len(values) > 6:
uniquifier = values[6]
else:
@@ -749,10 +749,10 @@ class NodeRev(object):
offset = f.tell()
f.seek(self.text.offset)
self.dir = getDirHash(f)
-
+
for k,v in self.dir.items():
nodeType, nodeId = v
-
+
if nodeId.rev != self.id.rev:
if not os.path.exists(str(nodeId.rev)):
print "Can't check %s" % repr(nodeId)
@@ -763,7 +763,7 @@ class NodeRev(object):
else:
f.seek(nodeId.offset)
idLine = f.readline()
-
+
if idLine != ("id: %s\n" % nodeId):
raise DataCorrupt(
("Entry for '%s' at " % k ) +
Modified: subversion/trunk/subversion/bindings/javahl/native/Array.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/Array.cpp?rev=1053998&r1=1053997&r2=1053998&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/Array.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/Array.cpp Thu Dec 30 20:46:50 2010
@@ -40,7 +40,7 @@ Array::~Array()
{
JNIUtil::getEnv()->DeleteLocalRef(*it);
}
-
+
JNIUtil::getEnv()->DeleteLocalRef(m_objectArray);
}
}
Modified: subversion/trunk/subversion/bindings/javahl/native/ClientContext.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/ClientContext.cpp?rev=1053998&r1=1053997&r2=1053998&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/ClientContext.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/ClientContext.cpp Thu Dec 30 20:46:50 2010
@@ -341,7 +341,7 @@ ClientContext::progress(apr_off_t progre
POP_AND_RETURN_NOTHING();
env->CallVoidMethod(jctx, mid, jevent);
-
+
POP_AND_RETURN_NOTHING();
}
Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp?rev=1053998&r1=1053997&r2=1053998&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp Thu Dec 30 20:46:50 2010
@@ -567,7 +567,7 @@ void SVNClient::doImport(const char *pat
SVN_JNI_ERR(svn_client_import4(intPath.c_str(), intUrl.c_str(), depth,
noIgnore, ignoreUnknownNodeTypes,
revprops.hash(requestPool),
- CommitCallback::callback, callback,
+ CommitCallback::callback, callback,
ctx, requestPool.pool()), );
}
Modified: subversion/trunk/subversion/bindings/javahl/native/StringArray.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/StringArray.cpp?rev=1053998&r1=1053997&r2=1053998&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/StringArray.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/StringArray.cpp Thu Dec 30 20:46:50 2010
@@ -61,7 +61,7 @@ void
StringArray::init(void)
{
const std::vector<jobject> &jobjects = Array::vector();
-
+
for (std::vector<jobject>::const_iterator it = jobjects.begin();
it < jobjects.end(); ++it)
{
Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java?rev=1053998&r1=1053997&r2=1053998&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java Thu Dec 30 20:46:50 2010
@@ -115,7 +115,7 @@ public class ClientNotifyInformation ext
long oldRevision;
long hunkOriginalStart;
-
+
long hunkOriginalLength;
long hunkModifiedStart;
Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java?rev=1053998&r1=1053997&r2=1053998&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java Thu Dec 30 20:46:50 2010
@@ -913,7 +913,7 @@ public interface ISVNClient
*/
void upgrade(String path)
throws ClientException;
-
+
/**
* Apply a unidiff patch.
* @param patchPath the path of the patch
Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ReposNotifyInformation.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ReposNotifyInformation.java?rev=1053998&r1=1053997&r2=1053998&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ReposNotifyInformation.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ReposNotifyInformation.java Thu Dec 30 20:46:50 2010
@@ -57,15 +57,15 @@ public class ReposNotifyInformation exte
* The warning text.
*/
private String warning;
-
+
private long shard;
-
+
private long newRevision;
-
+
private long oldRevision;
-
+
private NodeAction nodeAction;
-
+
private String path;
/**
@@ -113,17 +113,17 @@ public class ReposNotifyInformation exte
{
return warning;
}
-
+
public long getShard()
{
return shard;
}
-
+
public long getNewRevision()
{
return newRevision;
}
-
+
public long getOldRevision()
{
return oldRevision;
@@ -133,12 +133,12 @@ public class ReposNotifyInformation exte
{
return nodeAction;
}
-
+
public String getPath()
{
return path;
}
-
+
/**
* The type of action triggering the notification
*/
@@ -192,7 +192,7 @@ public class ReposNotifyInformation exte
/** Upgrade has started. */
upgrade_start;
}
-
+
public enum NodeAction
{
change,
Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java?rev=1053998&r1=1053997&r2=1053998&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java Thu Dec 30 20:46:50 2010
@@ -615,7 +615,7 @@ public class SVNClient implements ISVNCl
Collection<String> changelists,
InfoCallback callback)
throws ClientException;
-
+
/**
* @since 1.7
*/
Modified: subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Depth.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Depth.java?rev=1053998&r1=1053997&r2=1053998&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Depth.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Depth.java Thu Dec 30 20:46:50 2010
@@ -121,7 +121,7 @@ public final class Depth
{
return (recurse ? unknown : immediates);
}
-
+
public static org.apache.subversion.javahl.types.Depth toADepth(int depth)
{
switch(depth)
Modified: subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info.java?rev=1053998&r1=1053997&r2=1053998&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Info.java Thu Dec 30 20:46:50 2010
@@ -157,13 +157,13 @@ public class Info implements java.io.Ser
checkAbsent(aInfo.getPath()), checkIncomplete(aInfo.getPath()),
aInfo.getCopyFromRev(), aInfo.getCopyFromUrl());
}
-
+
private static boolean checkAbsent(String path)
{
File f = new File(path);
return !f.exists();
}
-
+
/** See if the path is incomplete. We currently have no way of getting
* this information from the existing info struct, so just return false.
*/
Modified: subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Revision.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Revision.java?rev=1053998&r1=1053997&r2=1053998&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Revision.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Revision.java Thu Dec 30 20:46:50 2010
@@ -391,7 +391,7 @@ public class Revision implements java.io
return RevisionKind.working;
}
}
-
+
public static org.apache.subversion.javahl.Revision.Kind toAKind(int kind)
{
switch (kind)
Modified: subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java?rev=1053998&r1=1053997&r2=1053998&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java Thu Dec 30 20:46:50 2010
@@ -645,7 +645,7 @@ public class SVNAdmin
}
if (val != null)
- try
+ try
{
outputer.write(val.getBytes());
}
Modified: subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java?rev=1053998&r1=1053997&r2=1053998&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java (original)
+++ subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java Thu Dec 30 20:46:50 2010
@@ -2572,7 +2572,7 @@ public class BasicTests extends SVNTests
return thisTest;
}
-
+
/**
* Test the patch API. This doesn't yet test the results, it only ensures
* that execution goes down to the C layer and back.
@@ -2584,7 +2584,7 @@ public class BasicTests extends SVNTests
File patchInput = new File(super.localTmp, thisTest.testName);
final String iotaPath = thisTest.getWCPath().replace('\\', '/') + "/iota";
final String NL = System.getProperty("line.separator");
-
+
final String patchText = "Index: iota" + NL +
"===================================================================" + NL +
"--- iota\t(revision 1)" + NL +
@@ -2592,12 +2592,12 @@ public class BasicTests extends SVNTests
"@@ -1 +1,2 @@" + NL +
" This is the file 'iota'." + NL +
"+No, this is *really* the file 'iota'." + NL;
-
+
PrintWriter writer = new PrintWriter(new FileOutputStream(patchInput));
writer.print(patchText);
writer.flush();
writer.close();
-
+
client.patch(patchInput.getAbsolutePath(), iotaPath, false, 0,
false, true, true,
new PatchCallback() {
@@ -3493,13 +3493,13 @@ public class BasicTests extends SVNTests
Collection<String> changelists)
throws ClientException
{
- final Map<String, Map<String, byte[]>> propMap =
+ final Map<String, Map<String, byte[]>> propMap =
new HashMap<String, Map<String, byte[]>>();
-
+
client.properties(path, revision, revision, depth, changelists,
new ProplistCallback () {
public void singlePath(String path, Map<String, byte[]> props)
- { propMap.put(path, props); }
+ { propMap.put(path, props); }
});
return propMap.get(path);
@@ -3560,11 +3560,11 @@ public class BasicTests extends SVNTests
throws ClientException
{
final List<Info> infos = new ArrayList<Info>();
-
+
client.info2(pathOrUrl, revision, pegRevision, depth, changelists,
new InfoCallback () {
public void singleInfo(Info info)
- { infos.add(info); }
+ { infos.add(info); }
});
return infos.toArray(new Info[infos.size()]);
}
Modified: subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java?rev=1053998&r1=1053997&r2=1053998&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java (original)
+++ subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java Thu Dec 30 20:46:50 2010
@@ -240,7 +240,7 @@ class SVNTests extends TestCase
NodeKind.none, CommitItemStateFlags.Add);
client.doImport(greekFiles.getAbsolutePath(),
makeReposUrl(greekRepos).toString(),
- Depth.infinity, false, false, null,
+ Depth.infinity, false, false, null,
new MyCommitMessage(), null);
admin.dump(greekRepos, new FileOutputStream(greekDump),
null, null, false, false, null);
@@ -287,7 +287,7 @@ class SVNTests extends TestCase
private static class DefaultPromptUserPassword implements UserPasswordCallback
{
- public int askTrustSSLServer(String info, boolean allowPermanently)
+ public int askTrustSSLServer(String info, boolean allowPermanently)
{
return UserPasswordCallback.AcceptTemporary;
}
@@ -323,25 +323,25 @@ class SVNTests extends TestCase
}
public String askQuestion(String realm, String question,
- boolean showAnswer, boolean maySave)
+ boolean showAnswer, boolean maySave)
{
return "";
}
- public boolean userAllowedSave()
+ public boolean userAllowedSave()
{
return false;
}
}
- private static class DefaultProgressListener implements ProgressCallback
+ private static class DefaultProgressListener implements ProgressCallback
{
- public void onProgress(ProgressEvent event)
+ public void onProgress(ProgressEvent event)
{
// Do nothing, just receive the event
}
-
+
}
/**
* build a sample directory with test files to be used as import for
@@ -421,7 +421,7 @@ class SVNTests extends TestCase
* Create the url for the repository to be used for the tests.
* @param file the directory of the repository
* @return the URL for the repository
- * @throws SubversionException
+ * @throws SubversionException
*/
protected URI makeReposUrl(File file) throws SubversionException
{
Modified: subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java?rev=1053998&r1=1053997&r2=1053998&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java (original)
+++ subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java Thu Dec 30 20:46:50 2010
@@ -528,7 +528,7 @@ public class WC
// result array
for (Item item : items.values())
{
- Assert.assertTrue("item '" + item.myPath +
+ Assert.assertTrue("item '" + item.myPath +
"' in working copy not found in status",
item.touched);
}
Modified: subversion/trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNTests.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNTests.java?rev=1053998&r1=1053997&r2=1053998&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNTests.java (original)
+++ subversion/trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/SVNTests.java Thu Dec 30 20:46:50 2010
@@ -282,7 +282,7 @@ class SVNTests extends TestCase
private static class DefaultPromptUserPassword implements PromptUserPassword3
{
- public int askTrustSSLServer(String info, boolean allowPermanently)
+ public int askTrustSSLServer(String info, boolean allowPermanently)
{
return PromptUserPassword3.AcceptTemporary;
}
@@ -318,25 +318,25 @@ class SVNTests extends TestCase
}
public String askQuestion(String realm, String question,
- boolean showAnswer, boolean maySave)
+ boolean showAnswer, boolean maySave)
{
return "";
}
- public boolean userAllowedSave()
+ public boolean userAllowedSave()
{
return false;
}
}
- private static class DefaultProgressListener implements ProgressListener
+ private static class DefaultProgressListener implements ProgressListener
{
- public void onProgress(ProgressEvent event)
+ public void onProgress(ProgressEvent event)
{
// Do nothing, just receive the event
}
-
+
}
/**
Modified: subversion/trunk/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c?rev=1053998&r1=1053997&r2=1053998&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c (original)
+++ subversion/trunk/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c Thu Dec 30 20:46:50 2010
@@ -4115,7 +4115,7 @@ svn_swig_py_txdelta_window_t_ops_get(svn
{
PyObject *result = PyList_New(window->num_ops);
int i;
-
+
for (i = 0; i < window->num_ops; ++i)
PyList_SET_ITEM(result, i,
svn_swig_NewPointerObj(window->ops + i, op_type_info,
Modified: subversion/trunk/subversion/bindings/swig/python/svn/core.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/python/svn/core.py?rev=1053998&r1=1053997&r2=1053998&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/python/svn/core.py (original)
+++ subversion/trunk/subversion/bindings/swig/python/svn/core.py Thu Dec 30 20:46:50 2010
@@ -68,7 +68,7 @@ class SubversionException(Exception):
def __str__(self):
dump = '%d - %s' % (self.apr_err, self.message)
- if self.file != None:
+ if self.file != None:
dump = dump + '\n at %s:%d' % (self.file, self.line)
if self.child != None:
dump = dump + '\n' + self.child.__str__()
Modified: subversion/trunk/subversion/bindings/swig/python/tests/core.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/python/tests/core.py?rev=1053998&r1=1053997&r2=1053998&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/python/tests/core.py (original)
+++ subversion/trunk/subversion/bindings/swig/python/tests/core.py Thu Dec 30 20:46:50 2010
@@ -55,11 +55,11 @@ class SubversionCoreTestCase(unittest.Te
rev = svn.core.svn_opt_revision_t()
rev.kind = svn.core.svn_opt_revision_head
ctx = svn.client.create_context()
-
+
class Receiver:
def __call__(self, path, info, pool):
raise self.e
-
+
rec = Receiver()
args = (repos_uri, rev, rev, rec, svn.core.svn_depth_empty, None, ctx)
@@ -67,7 +67,7 @@ class SubversionCoreTestCase(unittest.Te
# ordinary Python exceptions must be passed through
rec.e = TypeError()
self.assertRaises(TypeError, svn.client.info2, *args)
-
+
# SubversionException will be translated into an svn_error_t, propagated
# through the call chain and translated back to SubversionException.
rec.e = svn.core.SubversionException("Bla bla bla.",
@@ -76,14 +76,14 @@ class SubversionCoreTestCase(unittest.Te
rec.e.child = svn.core.SubversionException("Yada yada.",
svn.core.SVN_ERR_INCOMPLETE_DATA)
self.assertRaises(svn.core.SubversionException, svn.client.info2, *args)
-
+
# It must remain unchanged through the process.
try:
svn.client.info2(*args)
except svn.core.SubversionException, exc:
# find the original exception
while exc.file != rec.e.file: exc = exc.child
-
+
self.assertEqual(exc.message, rec.e.message)
self.assertEqual(exc.apr_err, rec.e.apr_err)
self.assertEqual(exc.line, rec.e.line)
@@ -92,7 +92,7 @@ class SubversionCoreTestCase(unittest.Te
self.assertEqual(exc.child.child, None)
self.assertEqual(exc.child.file, None)
self.assertEqual(exc.child.line, 0)
-
+
# Incomplete SubversionExceptions must trigger Python exceptions, which
# will be passed through.
rec.e = svn.core.SubversionException("No fields except message.")
Modified: subversion/trunk/subversion/bindings/swig/python/tests/delta.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/python/tests/delta.py?rev=1053998&r1=1053997&r2=1053998&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/python/tests/delta.py (original)
+++ subversion/trunk/subversion/bindings/swig/python/tests/delta.py Thu Dec 30 20:46:50 2010
@@ -46,15 +46,15 @@ class DeltaTestCase(unittest.TestCase):
window_handler, baton = \
svn.delta.tx_apply(src_stream, target_stream, None)
window_handler(None, baton)
-
+
def testTxdeltaWindowT(self):
"""Test the svn_txdelta_window_t wrapper."""
a = StringIO("abc\ndef\n")
b = StringIO("def\nghi\n")
-
+
delta_stream = svn.delta.svn_txdelta(a, b)
window = svn.delta.svn_txdelta_next_window(delta_stream)
-
+
self.assert_(window.sview_offset + window.sview_len <= len(a.getvalue()))
self.assert_(window.tview_len <= len(b.getvalue()))
self.assert_(len(window.new_data) > 0)
Modified: subversion/trunk/subversion/bindings/swig/python/tests/ra.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/python/tests/ra.py?rev=1053998&r1=1053997&r2=1053998&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/python/tests/ra.py (original)
+++ subversion/trunk/subversion/bindings/swig/python/tests/ra.py Thu Dec 30 20:46:50 2010
@@ -28,7 +28,7 @@ if version_info[0] >= 3:
else:
# Python <3.0
from StringIO import StringIO
-
+
import utils
class SubversionRepositoryAccessTestCase(unittest.TestCase):
@@ -40,7 +40,7 @@ class SubversionRepositoryAccessTestCase
ra.initialize()
self.temper = utils.Temper()
# Isolate each test from the others with a fresh repository.
-
+
# Open repository directly for cross-checking
(self.repos, _, self.repos_uri) = self.temper.alloc_known_repo(
'trac/versioncontrol/tests/svnrepos.dump', suffix='-ra')
Modified: subversion/trunk/subversion/bindings/swig/python/tests/repository.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/python/tests/repository.py?rev=1053998&r1=1053997&r2=1053998&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/python/tests/repository.py (original)
+++ subversion/trunk/subversion/bindings/swig/python/tests/repository.py Thu Dec 30 20:46:50 2010
@@ -72,7 +72,7 @@ class SubversionRepositoryTestCase(unitt
revs.append(rev)
raise core.SubversionException(apr_err=core.SVN_ERR_CEASE_INVOCATION,
message="Hi from history_lookup")
-
+
repos.history2(self.fs, '/trunk/README2.txt', history_lookup, None, 0,
self.rev, True)
self.assertEqual(len(revs), 1)
Modified: subversion/trunk/subversion/bindings/swig/python/tests/utils.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/python/tests/utils.py?rev=1053998&r1=1053997&r2=1053998&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/python/tests/utils.py (original)
+++ subversion/trunk/subversion/bindings/swig/python/tests/utils.py Thu Dec 30 20:46:50 2010
@@ -64,7 +64,7 @@ class Temper(object):
repos.svn_repos_load_fs2(handle, open(dump_path, 'rb'), StringIO(),
repos.load_uuid_default, None, False, False, None)
return (handle, repo_path, repo_uri)
-
+
def file_uri_for_path(path):
"""Return the file: URI corresponding to the given path."""
uri_path = urllib.pathname2url(path)
Modified: subversion/trunk/subversion/include/private/svn_mergeinfo_private.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_mergeinfo_private.h?rev=1053998&r1=1053997&r2=1053998&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_mergeinfo_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_mergeinfo_private.h Thu Dec 30 20:46:50 2010
@@ -226,7 +226,7 @@ svn_rangelist__initialize(svn_revnum_t s
svn_boolean_t inheritable,
apr_pool_t *result_pool);
-/* Adjust in-place MERGEINFO's rangelists by OFFSET. If OFFSET is negative
+/* Adjust in-place MERGEINFO's rangelists by OFFSET. If OFFSET is negative
and would adjust any part of MERGEINFO's source revisions to 0 or less,
then those revisions are dropped. If all the source revisions for a merge
source path are dropped, then the path itself is dropped. If all merge
Modified: subversion/trunk/subversion/include/private/svn_repos_private.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_repos_private.h?rev=1053998&r1=1053997&r2=1053998&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_repos_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_repos_private.h Thu Dec 30 20:46:50 2010
@@ -74,7 +74,7 @@ svn_repos__obliterate_path_rev(svn_repos
* repository; return @c SVN_ERR_REPOS_BAD_ARGS if it isn't. For some
* "svn:" properties, also validate the @a value, and return
* @c SVN_ERR_BAD_PROPERTY_VALUE if it is not valid.
- *
+ *
* Use @a pool for temporary allocations.
*
* @since New in 1.7.
Modified: subversion/trunk/subversion/include/private/svn_wc_private.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_wc_private.h?rev=1053998&r1=1053997&r2=1053998&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_wc_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_wc_private.h Thu Dec 30 20:46:50 2010
@@ -187,7 +187,7 @@ svn_wc__cd_to_cd2(const svn_wc_conflict_
*/
svn_error_t *
svn_wc__status2_from_3(svn_wc_status2_t **status,
- const svn_wc_status3_t *old_status,
+ const svn_wc_status3_t *old_status,
svn_wc_context_t *wc_ctx,
const char *local_abspath,
apr_pool_t *result_pool,
@@ -324,7 +324,7 @@ svn_wc__node_get_url(const char **url,
* repos_relpath it will have in the repository.
*
* If @a local_abspath is not in the working copy, return @c
- * SVN_ERR_WC_PATH_NOT_FOUND.
+ * SVN_ERR_WC_PATH_NOT_FOUND.
* */
svn_error_t *
svn_wc__node_get_repos_relpath(const char **repos_relpath,
@@ -344,7 +344,7 @@ svn_wc__node_get_repos_relpath(const cha
* @a copyfrom_root_url and @a copyfrom_repos_relpath return the exact same
* information as @a copyfrom_url, just still separated as root and relpath.
*
- * If @a local_abspath is not copied, set @a *copyfrom_root_url,
+ * If @a local_abspath is not copied, set @a *copyfrom_root_url,
* @a *copyfrom_repos_relpath and @a copyfrom_url to NULL and
* @a *copyfrom_rev to @c SVN_INVALID_REVNUM.
*
@@ -467,7 +467,7 @@ svn_wc__node_get_base_rev(svn_revnum_t *
/* Get the working revision of @a local_abspath using @a wc_ctx. If @a
* local_abspath is not in the working copy, return @c
- * SVN_ERR_WC_PATH_NOT_FOUND.
+ * SVN_ERR_WC_PATH_NOT_FOUND.
*
* This function is meant as a temporary solution for using the old-style
* semantics of entries. It will handle any uncommitted changes (delete,
@@ -477,24 +477,24 @@ svn_wc__node_get_base_rev(svn_revnum_t *
* the path that was deleted. But if the delete is below an add, the
* revision is set to SVN_INVALID_REVNUM. For an add, copy or move we return
* SVN_INVALID_REVNUM. In case of a replacement, we return the BASE
- * revision.
+ * revision.
*
* The @a changed_rev is set to the latest committed change to @a
* local_abspath before or equal to @a revision, unless the node is
* copied-here or moved-here. Then it is the revision of the latest committed
* change before or equal to the copyfrom_rev. NOTE, that we use
- * SVN_INVALID_REVNUM for a scheduled copy or move.
+ * SVN_INVALID_REVNUM for a scheduled copy or move.
*
* The @a changed_date and @a changed_author are the ones associated with @a
- * changed_rev.
+ * changed_rev.
*/
svn_error_t *
svn_wc__node_get_working_rev_info(svn_revnum_t *revision,
- svn_revnum_t *changed_rev,
- apr_time_t *changed_date,
+ svn_revnum_t *changed_rev,
+ apr_time_t *changed_date,
const char **changed_author,
- svn_wc_context_t *wc_ctx,
- const char *local_abspath,
+ svn_wc_context_t *wc_ctx,
+ const char *local_abspath,
apr_pool_t *scratch_pool,
apr_pool_t *result_pool);
Modified: subversion/trunk/subversion/include/svn_client.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_client.h?rev=1053998&r1=1053997&r2=1053998&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_client.h (original)
+++ subversion/trunk/subversion/include/svn_client.h Thu Dec 30 20:46:50 2010
@@ -679,9 +679,9 @@ typedef svn_error_t *(*svn_client_get_co
* which has the revision properties @a rev_props, and that the contents were
* @a line.
*
- * @a start_revnum and @a end_revnum contain the start and end revision
+ * @a start_revnum and @a end_revnum contain the start and end revision
* number of the entire blame operation, as determined from the repository
- * inside svn_client_blame5(). This can be useful for the blame receiver
+ * inside svn_client_blame5(). This can be useful for the blame receiver
* to format the blame output.
*
* If svn_client_blame5() was called with @a include_merged_revisions set to
@@ -2030,7 +2030,7 @@ typedef struct svn_client_status_t
/** The URL of the repository */
const char *repos_root_url;
- /** The in-repository path relative to the repository root.
+ /** The in-repository path relative to the repository root.
* Use svn_path_url_component2() to join this value to the
* repos_root_url to get the full URL.
*/
@@ -4129,7 +4129,7 @@ svn_client_propset4(const char *propname
const apr_array_header_t *changelists,
const apr_hash_t *revprop_table,
svn_commit_callback2_t commit_callback,
- void *commit_baton,
+ void *commit_baton,
svn_client_ctx_t *ctx,
apr_pool_t *pool);
Modified: subversion/trunk/subversion/include/svn_diff.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_diff.h?rev=1053998&r1=1053997&r2=1053998&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_diff.h (original)
+++ subversion/trunk/subversion/include/svn_diff.h Thu Dec 30 20:46:50 2010
@@ -941,7 +941,7 @@ svn_diff_hunk_get_trailing_context(const
/**
* Data type to manage parsing of properties in patches.
- *
+ *
* @since New in 1.7. */
typedef struct svn_prop_patch_t {
const char *name;
@@ -1000,7 +1000,7 @@ typedef struct svn_patch_t {
* whitespace to be parsed.
* Allocate results in @a result_pool.
* Use @a scratch_pool for all other allocations.
- *
+ *
* @since New in 1.7. */
svn_error_t *
svn_diff_parse_next_patch(svn_patch_t **patch,
Modified: subversion/trunk/subversion/include/svn_fs.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_fs.h?rev=1053998&r1=1053997&r2=1053998&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_fs.h (original)
+++ subversion/trunk/subversion/include/svn_fs.h Thu Dec 30 20:46:50 2010
@@ -1959,7 +1959,7 @@ svn_fs_change_rev_prop2(svn_fs_t *fs,
apr_pool_t *pool);
-/**
+/**
* Similar to svn_fs_change_rev_prop2(), but with @a old_value_p passed as
* @c NULL.
*
@@ -2194,7 +2194,7 @@ 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.
*
Modified: subversion/trunk/subversion/include/svn_repos.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_repos.h?rev=1053998&r1=1053997&r2=1053998&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_repos.h (original)
+++ subversion/trunk/subversion/include/svn_repos.h Thu Dec 30 20:46:50 2010
@@ -2010,7 +2010,7 @@ svn_repos_fs_get_locks2(apr_hash_t **loc
void *authz_read_baton,
apr_pool_t *pool);
-/**
+/**
* Similar to svn_repos_fs_get_locks2(), but with @a depth always
* passed as svn_depth_infinity.
*
Modified: subversion/trunk/subversion/include/svn_string.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_string.h?rev=1053998&r1=1053997&r2=1053998&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_string.h (original)
+++ subversion/trunk/subversion/include/svn_string.h Thu Dec 30 20:46:50 2010
@@ -405,7 +405,7 @@ svn_cstring_casecmp(const char *str1, co
* Parse the C string @a str into a 64 bit number, and return it in @a *n.
* Assume that the number is represented in base @a base.
* Raise an error if conversion fails (e.g. due to overflow), or if the
- * converted number is smaller than @a minval or larger than @a maxval.
+ * converted number is smaller than @a minval or larger than @a maxval.
*
* @since New in 1.7.
*/
@@ -438,7 +438,7 @@ svn_cstring_atoi(int *n, const char *str
* Parse the C string @a str into an unsigned 64 bit number, and return
* it in @a *n. Assume that the number is represented in base @a base.
* Raise an error if conversion fails (e.g. due to overflow), or if the
- * converted number is smaller than @a minval or larger than @a maxval.
+ * converted number is smaller than @a minval or larger than @a maxval.
*
* @since New in 1.7.
*/
Modified: subversion/trunk/subversion/include/svn_wc.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_wc.h?rev=1053998&r1=1053997&r2=1053998&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_wc.h (original)
+++ subversion/trunk/subversion/include/svn_wc.h Thu Dec 30 20:46:50 2010
@@ -3400,7 +3400,7 @@ typedef struct svn_wc_status3_t
/** The URL of the repository */
const char *repos_root_url;
- /** The in-repository path relative to the repository root.
+ /** The in-repository path relative to the repository root.
* Use svn_path_url_component2() to join this value to the
* repos_root_url to get the full URL.
*/
@@ -5277,7 +5277,7 @@ svn_wc_get_update_editor4(const svn_delt
/** Similar to svn_wc_get_update_editor4, but uses access batons and relative
* path instead of a working copy context-abspath pair and
- * svn_wc_traversal_info_t instead of an externals callback. Also,
+ * svn_wc_traversal_info_t instead of an externals callback. Also,
* @a fetch_func and @a fetch_baton are ignored.
*
* If @a ti is non-NULL, record traversal info in @a ti, for use by
@@ -5580,7 +5580,7 @@ svn_wc_get_pristine_props(apr_hash_t **p
const char *local_abspath,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
-
+
/** Set @a *value to the value of property @a name for @a local_abspath,
* allocating @a *value in @a result_pool. If no such prop, set @a *value
Modified: subversion/trunk/subversion/libsvn_auth_kwallet/kwallet.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_auth_kwallet/kwallet.cpp?rev=1053998&r1=1053997&r2=1053998&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_auth_kwallet/kwallet.cpp (original)
+++ subversion/trunk/subversion/libsvn_auth_kwallet/kwallet.cpp Thu Dec 30 20:46:50 2010
@@ -120,7 +120,7 @@ get_wid(void)
{
apr_int64_t wid_env;
svn_error_t *err;
-
+
err = svn_cstring_atoi64(&wid_env, wid_env_string);
if (err)
svn_error_clear(err);
Modified: subversion/trunk/subversion/libsvn_client/cleanup.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/cleanup.c?rev=1053998&r1=1053997&r2=1053998&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/cleanup.c (original)
+++ subversion/trunk/subversion/libsvn_client/cleanup.c Thu Dec 30 20:46:50 2010
@@ -174,7 +174,7 @@ svn_client_upgrade(const char *path,
item = APR_ARRAY_IDX(externals_p, i, svn_wc_external_item2_t*);
- external_path = svn_dirent_join(externals_parent, item->target_dir,
+ external_path = svn_dirent_join(externals_parent, item->target_dir,
iterpool);
SVN_ERR(svn_dirent_get_absolute(&external_abspath, external_path,
Modified: subversion/trunk/subversion/libsvn_client/copy.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/copy.c?rev=1053998&r1=1053997&r2=1053998&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/copy.c (original)
+++ subversion/trunk/subversion/libsvn_client/copy.c Thu Dec 30 20:46:50 2010
@@ -824,7 +824,7 @@ repos_to_repos_copy(const apr_array_head
*and* destinations might be an optimization when the user is
authorized to access all that stuff, but could cause the
operation to fail altogether otherwise. See issue #3242. */
- SVN_ERR(get_copy_pair_ancestors(copy_pairs, NULL, &top_url_dst, &top_url_all,
+ SVN_ERR(get_copy_pair_ancestors(copy_pairs, NULL, &top_url_dst, &top_url_all,
pool));
top_url = is_move ? top_url_all : top_url_dst;
@@ -1629,7 +1629,7 @@ repos_to_wc_copy_locked(const apr_array_
### simplify the conditions? */
/* Hidden by client exclusion */
- SVN_ERR(svn_wc__node_get_depth(&node_depth, ctx->wc_ctx,
+ SVN_ERR(svn_wc__node_get_depth(&node_depth, ctx->wc_ctx,
pair->dst_abspath_or_url, iterpool));
if (node_depth == svn_depth_exclude)
{
@@ -1661,7 +1661,7 @@ repos_to_wc_copy_locked(const apr_array_
SVN_ERR(svn_wc__node_is_status_deleted(&is_deleted, ctx->wc_ctx,
pair->dst_abspath_or_url,
iterpool));
- SVN_ERR(svn_wc__node_is_status_present(&is_present,
+ SVN_ERR(svn_wc__node_is_status_present(&is_present,
ctx->wc_ctx,
pair->dst_abspath_or_url,
iterpool));
@@ -1953,7 +1953,7 @@ try_copy(const apr_array_header_t *sourc
src_basename = svn_dirent_basename(pair->src_abspath_or_url,
iterpool);
}
-
+
pair->src_op_revision = *source->revision;
pair->src_peg_revision = *source->peg_revision;
Modified: subversion/trunk/subversion/libsvn_client/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/deprecated.c?rev=1053998&r1=1053997&r2=1053998&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/deprecated.c (original)
+++ subversion/trunk/subversion/libsvn_client/deprecated.c Thu Dec 30 20:46:50 2010
@@ -1835,7 +1835,7 @@ svn_client_update(svn_revnum_t *result_r
{
apr_array_header_t *paths = apr_array_make(pool, 1, sizeof(const char *));
apr_array_header_t *result_revs;
-
+
APR_ARRAY_PUSH(paths, const char *) = path;
SVN_ERR(svn_client_update2(&result_revs, paths, revision, recurse, FALSE,
@@ -1890,7 +1890,7 @@ svn_client_checkout2(svn_revnum_t *resul
apr_pool_t *pool)
{
return svn_error_return(svn_client_checkout3(result_rev, URL, path,
- peg_revision, revision,
+ peg_revision, revision,
SVN_DEPTH_INFINITY_OR_FILES(recurse),
ignore_externals, FALSE, ctx, pool));
}
Modified: subversion/trunk/subversion/libsvn_client/diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/diff.c?rev=1053998&r1=1053997&r2=1053998&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/diff.c Thu Dec 30 20:46:50 2010
@@ -367,7 +367,7 @@ diff_label(const char *path,
* PATH2 to the stream OS using HEADER_ENCODING.
* All allocations are done in RESULT_POOL. */
static svn_error_t *
-print_git_diff_header_added(svn_stream_t *os, const char *header_encoding,
+print_git_diff_header_added(svn_stream_t *os, const char *header_encoding,
const char *path1, const char *path2,
apr_pool_t *result_pool)
{
@@ -383,7 +383,7 @@ print_git_diff_header_added(svn_stream_t
* PATH2 to the stream OS using HEADER_ENCODING.
* All allocations are done in RESULT_POOL. */
static svn_error_t *
-print_git_diff_header_deleted(svn_stream_t *os, const char *header_encoding,
+print_git_diff_header_deleted(svn_stream_t *os, const char *header_encoding,
const char *path1, const char *path2,
apr_pool_t *result_pool)
{
@@ -399,7 +399,7 @@ print_git_diff_header_deleted(svn_stream
/* Print a git diff header for a copy from COPYFROM_PATH to PATH to the stream
* OS using HEADER_ENCODING. All allocations are done in RESULT_POOL. */
static svn_error_t *
-print_git_diff_header_copied(svn_stream_t *os, const char *header_encoding,
+print_git_diff_header_copied(svn_stream_t *os, const char *header_encoding,
const char *copyfrom_path, const char *path,
apr_pool_t *result_pool)
{
@@ -425,7 +425,7 @@ print_git_diff_header_renamed(svn_stream
"diff --git a/%s b/%s%s",
copyfrom_path, path, APR_EOL_STR));
SVN_ERR(svn_stream_printf_from_utf8(os, header_encoding, result_pool,
- "rename from %s%s", copyfrom_path,
+ "rename from %s%s", copyfrom_path,
APR_EOL_STR));
SVN_ERR(svn_stream_printf_from_utf8(os, header_encoding, result_pool,
"rename to %s%s", path, APR_EOL_STR));
@@ -436,7 +436,7 @@ print_git_diff_header_renamed(svn_stream
* PATH2 to the stream OS using HEADER_ENCODING.
* All allocations are done in RESULT_POOL. */
static svn_error_t *
-print_git_diff_header_modified(svn_stream_t *os, const char *header_encoding,
+print_git_diff_header_modified(svn_stream_t *os, const char *header_encoding,
const char *path1, const char *path2,
apr_pool_t *result_pool)
{
@@ -531,12 +531,12 @@ print_git_diff_header(svn_stream_t *os,
passed to svn_client_diff5, which is probably stdout.
### FIXME needs proper docstring
-
+
If USE_GIT_DIFF_FORMAT is TRUE, pring git diff headers, which always
show paths relative to the repository root. RA_SESSION and WC_CTX are
needed to normalize paths relative the repository root, and are ignored
if USE_GIT_DIFF_FORMAT is FALSE.
-
+
WC_ROOT_ABSPATH is the absolute path to the root directory of a working
copy involved in a repos-wc diff, and may be NULL. */
static svn_error_t *
@@ -595,8 +595,8 @@ display_prop_diffs(const apr_array_heade
* ### diff_content_changed() does not! */
SVN_ERR(file_printf_from_utf8(file, encoding,
- "Index: %s" APR_EOL_STR
- "%s" APR_EOL_STR,
+ "Index: %s" APR_EOL_STR
+ "%s" APR_EOL_STR,
path, equal_string));
if (use_git_diff_format)
@@ -778,7 +778,7 @@ struct diff_cmd_baton {
* directory of the working copy involved in the diff. */
const char *wc_root_abspath;
- /* A hashtable using the visited paths as keys.
+ /* A hashtable using the visited paths as keys.
* ### This is needed for us to know if we need to print a diff header for
* ### a path that has property changes. */
apr_hash_t *visited_paths;
@@ -1137,7 +1137,7 @@ diff_file_deleted_with_diff(const char *
if (tmpfile1)
SVN_ERR(diff_content_changed(path,
- tmpfile1, tmpfile2, diff_cmd_baton->revnum1,
+ tmpfile1, tmpfile2, diff_cmd_baton->revnum1,
diff_cmd_baton->revnum2,
mimetype1, mimetype2,
svn_diff_op_deleted, NULL, diff_baton));
@@ -1371,7 +1371,7 @@ find_wc_root(const char *local_abspath,
* and REVISION2 are local. If PEG_REVISION is not unspecified, ensure that
* at least one of the two revisions is non-local.
* If PATH1 can only be found in the repository, set *IS_REPOS1 to TRUE.
- * If PATH2 can only be found in the repository, set *IS_REPOS2 to TRUE. */
+ * If PATH2 can only be found in the repository, set *IS_REPOS2 to TRUE. */
static svn_error_t *
check_paths(svn_boolean_t *is_repos1,
svn_boolean_t *is_repos2,
@@ -2072,7 +2072,7 @@ set_up_diff_cmd_and_options(struct diff_
apr_hash_t *config, apr_pool_t *pool)
{
const char *diff_cmd = NULL;
-
+
/* See if there is a diff command and/or diff arguments. */
if (config)
{
@@ -2092,7 +2092,7 @@ set_up_diff_cmd_and_options(struct diff_
if (options == NULL)
options = apr_array_make(pool, 0, sizeof(const char *));
-
+
if (diff_cmd)
SVN_ERR(svn_path_cstring_to_utf8(&diff_cmd_baton->diff_cmd, diff_cmd,
pool));
@@ -2264,7 +2264,7 @@ svn_client_diff_peg5(const apr_array_hea
diff_cmd_baton.orig_path_1 = path;
diff_cmd_baton.orig_path_2 = path;
- SVN_ERR(set_up_diff_cmd_and_options(&diff_cmd_baton, options,
+ SVN_ERR(set_up_diff_cmd_and_options(&diff_cmd_baton, options,
ctx->config, pool));
diff_cmd_baton.pool = pool;
diff_cmd_baton.outfile = outfile;
Modified: subversion/trunk/subversion/libsvn_client/export.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/export.c?rev=1053998&r1=1053997&r2=1053998&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/export.c (original)
+++ subversion/trunk/subversion/libsvn_client/export.c Thu Dec 30 20:46:50 2010
@@ -111,7 +111,7 @@ append_basename_if_dir(const char **appe
if (local_kind == svn_node_dir)
{
const char *basename2; /* _2 because it shadows basename() */
-
+
if (is_uri)
basename2 = svn_path_uri_decode(svn_uri_basename(basename_of, NULL), pool);
else
@@ -161,10 +161,10 @@ copy_one_versioned_file(const char *from
/* Only export 'added' files when the revision is WORKING. This is not
WORKING, so skip the 'added' files, since they didn't exist
in the BASE revision and don't have an associated text-base.
-
+
'replaced' files are technically the same as 'added' files.
### TODO: Handle replaced nodes properly.
- ### svn_opt_revision_base refers to the "new"
+ ### svn_opt_revision_base refers to the "new"
### base of the node. That means, if a node is locally
### replaced, export skips this node, as if it was locally
### added, because svn_opt_revision_base refers to the base
@@ -268,7 +268,7 @@ copy_one_versioned_file(const char *from
suffix = "";
}
- SVN_ERR(svn_wc__node_get_url(&url, wc_ctx, from_abspath,
+ SVN_ERR(svn_wc__node_get_url(&url, wc_ctx, from_abspath,
scratch_pool, scratch_pool));
SVN_ERR(svn_subst_build_keywords2
@@ -330,7 +330,7 @@ copy_versioned_files(const char *from,
const char *to_abspath;
svn_node_kind_t from_kind;
svn_depth_t node_depth;
-
+
SVN_ERR(svn_dirent_get_absolute(&from_abspath, from, pool));
SVN_ERR(svn_dirent_get_absolute(&to_abspath, to, pool));
@@ -1042,12 +1042,12 @@ svn_client_export5(svn_revnum_t *result_
}
else
{
- SVN_ERR(append_basename_if_dir(&to_path, from_path_or_url,
+ SVN_ERR(append_basename_if_dir(&to_path, from_path_or_url,
TRUE, pool));
eb->root_path = to_path;
}
-
+
/* Since you cannot actually root an editor at a file, we
* manually drive a few functions of our editor. */
Modified: subversion/trunk/subversion/libsvn_client/externals.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/externals.c?rev=1053998&r1=1053997&r2=1053998&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/externals.c (original)
+++ subversion/trunk/subversion/libsvn_client/externals.c Thu Dec 30 20:46:50 2010
@@ -279,7 +279,7 @@ switch_dir_external(const char *path,
/* Buh-bye, old and busted ... */
SVN_ERR(svn_wc__acquire_write_lock(NULL, ctx->wc_ctx, local_abspath,
FALSE, pool, pool));
-
+
SVN_ERR(relegate_dir_external(&baton, pool, pool));
}
else
@@ -858,7 +858,7 @@ handle_external_item_change(const void *
SVN_ERR(svn_client_export4(NULL, new_item->url, local_abspath,
&(new_item->peg_revision),
&(new_item->revision),
- TRUE, FALSE, svn_depth_infinity,
+ TRUE, FALSE, svn_depth_infinity,
ib->native_eol,
ib->ctx, ib->iter_pool));
else
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1053998&r1=1053997&r2=1053998&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Thu Dec 30 20:46:50 2010
@@ -1759,7 +1759,7 @@ merge_file_added(const char *local_dir_a
SVN_ERR(svn_wc_read_kind(&wc_kind, merge_b->ctx->wc_ctx,
mine_abspath, FALSE, subpool));
- if ((wc_kind != svn_node_none)
+ if ((wc_kind != svn_node_none)
&& dry_run_deleted_p(merge_b, mine_abspath))
*content_state = svn_wc_notify_state_changed;
else
@@ -2492,7 +2492,7 @@ merge_dir_opened(const char *local_dir_a
svn_pool_destroy(subpool);
return SVN_NO_ERROR;
}
-
+
/* Find out if this path is deleted. */
err = svn_wc__node_is_status_deleted(&is_deleted, merge_b->ctx->wc_ctx,
local_abspath, subpool);
@@ -3335,7 +3335,7 @@ get_invalid_inherited_mergeinfo(svn_merg
svn_revnum_t base_revision;
svn_boolean_t validate_inherited_mergeinfo;
- /* Our starting assumptions. */
+ /* Our starting assumptions. */
*invalid_inherited_mergeinfo = NULL;
*validated = TRUE;
@@ -3546,7 +3546,7 @@ get_full_mergeinfo(svn_mergeinfo_t *reco
/* Return RA_SESSION back to where it was when we were called. */
SVN_ERR(svn_client__ensure_ra_session_url(&session_url,
ra_session, session_url,
- scratch_pool));
+ scratch_pool));
}
} /*if (implicit_mergeinfo) */
@@ -4321,7 +4321,7 @@ populate_remaining_ranges(apr_array_head
CHILDREN_WITH_MERGEINFO, see the global comment
'THE CHILDREN_WITH_MERGEINFO ARRAY'. */
SVN_ERR_ASSERT(parent);
-
+
child_inherits_implicit = (parent && !child->switched);
SVN_ERR(ensure_implicit_mergeinfo(parent, child,
child_inherits_implicit,
@@ -5495,7 +5495,7 @@ record_missing_subtree_roots(const char
if (kind == svn_node_dir)
{
/* If SUBTREE_DIRENTS is empty LOCAL_ABSPATH is merge target. */
- if (apr_hash_count(subtree_dirents) == 0
+ if (apr_hash_count(subtree_dirents) == 0
|| apr_hash_get(subtree_dirents,
svn_dirent_dirname(local_abspath,
scratch_pool),
@@ -5525,7 +5525,7 @@ record_missing_subtree_roots(const char
apr_hash_set(subtree_dirents,
apr_pstrdup(result_pool, local_abspath),
APR_HASH_KEY_STRING, dirents);
- }
+ }
}
}
else /* kind != svn_node_dir */
@@ -8256,9 +8256,9 @@ do_directory_merge(svn_mergeinfo_catalog
NOTIFY_B->CHILDREN_WITH_MERGEINFO to find the oldest starting
revision that actually needs to be merged (for reverse merges this is
the youngest starting revision).
-
+
We'll do this twice, right now for the start of the mergeinfo we will
- ultimately record to describe this merge and then later for the
+ ultimately record to describe this merge and then later for the
start of the actual editor drive. */
new_range_start = get_most_inclusive_start_rev(
notify_b->children_with_mergeinfo, is_rollback);
@@ -8934,7 +8934,7 @@ merge_cousins_and_supplement_mergeinfo(c
calculated. (We know that each tong in our fork of our merge
source history tree has an ancestral relationship with the common
ancestral, so we force ancestral=TRUE here.)
-
+
Issue #3648: We don't actually perform these two record-only merges
on the WC at first, but rather see what each would do and store that
in two mergeinfo catalogs. We then merge the catalogs together and
@@ -10256,7 +10256,7 @@ calculate_left_hand_side(const char **ur
youngest_rev.kind = svn_opt_revision_number;
youngest_rev.value.number = youngest_merged_rev;
-
+
unspecified_rev.kind = svn_opt_revision_unspecified;
*rev_left = youngest_rev.value.number;
@@ -10634,7 +10634,7 @@ merge_peg_locked(const char *source,
svn_node_kind_t target_kind;
SVN_ERR_ASSERT(svn_dirent_is_absolute(target_abspath));
-
+
/* Make sure the target is really there. */
SVN_ERR(svn_io_check_path(target_abspath, &target_kind, scratch_pool));
if (target_kind == svn_node_none)