Author: rhuijben
Date: Fri Feb 13 21:03:40 2015
New Revision: 1659683
URL: http://svn.apache.org/r1659683
Log:
Pre branch cleanup: Remove unneeded tab characters from source files.
* subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java
* subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
* subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
* subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h
* subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
* subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
* subversion/libsvn_subr/sorts.c
Replace tabs with spaces, trying to fix indenting.
Modified:
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
subversion/trunk/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h
subversion/trunk/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
subversion/trunk/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
subversion/trunk/subversion/libsvn_subr/sorts.c
Modified:
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java?rev=1659683&r1=1659682&r2=1659683&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java
(original)
+++
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java
Fri Feb 13 21:03:40 2015
@@ -34,138 +34,138 @@ import org.apache.subversion.javahl.type
public interface ISVNRepos {
- /**
- * interface to receive the messages
- */
- public static interface MessageReceiver
- {
- /**
- * receive one message line
- * @param message one line of message
- */
- public void receiveMessageLine(String message);
- }
-
- /**
- * release the native peer (should not depend on finalize)
- */
- public abstract void dispose();
-
- /**
- * Filesystem in a Berkeley DB
- */
- public static final String BDB = "bdb";
- /**
- * Filesystem in the filesystem
- */
- public static final String FSFS = "fsfs";
-
- /**
- * @return Version information about the underlying native libraries.
- */
- public abstract Version getVersion();
-
- /**
- * create a subversion repository.
- * @param path the path where the repository will been
- * created.
- * @param disableFsyncCommit disable to fsync at the commit (BDB).
- * @param keepLog keep the log files (BDB).
- * @param configPath optional path for user configuration
files.
- * @param fstype the type of the filesystem (BDB or FSFS)
- * @throws ClientException throw in case of problem
- */
- public abstract void create(File path, boolean disableFsyncCommit,
- boolean keepLog, File configPath, String fstype)
- throws ClientException;
-
- /**
- * deltify the revisions in the repository
- * @param path the path to the repository
- * @param start start revision
- * @param end end revision
- * @throws ClientException throw in case of problem
- */
- public abstract void deltify(File path, Revision start, Revision end)
- throws ClientException;
-
- /**
- * dump the data in a repository
- * @param path the path to the repository
- * @param dataOut the data will be outputed here
- * @param start the first revision to be dumped
- * @param end the last revision to be dumped
- * @param incremental the dump will be incremantal
- * @param useDeltas the dump will contain deltas between nodes
+ /**
+ * interface to receive the messages
+ */
+ public static interface MessageReceiver
+ {
+ /**
+ * receive one message line
+ * @param message one line of message
+ */
+ public void receiveMessageLine(String message);
+ }
+
+ /**
+ * release the native peer (should not depend on finalize)
+ */
+ public abstract void dispose();
+
+ /**
+ * Filesystem in a Berkeley DB
+ */
+ public static final String BDB = "bdb";
+ /**
+ * Filesystem in the filesystem
+ */
+ public static final String FSFS = "fsfs";
+
+ /**
+ * @return Version information about the underlying native libraries.
+ */
+ public abstract Version getVersion();
+
+ /**
+ * create a subversion repository.
+ * @param path the path where the repository will been
+ * created.
+ * @param disableFsyncCommit disable to fsync at the commit (BDB).
+ * @param keepLog keep the log files (BDB).
+ * @param configPath optional path for user configuration files.
+ * @param fstype the type of the filesystem (BDB or FSFS)
+ * @throws ClientException throw in case of problem
+ */
+ public abstract void create(File path, boolean disableFsyncCommit,
+ boolean keepLog, File configPath, String fstype)
+ throws ClientException;
+
+ /**
+ * deltify the revisions in the repository
+ * @param path the path to the repository
+ * @param start start revision
+ * @param end end revision
+ * @throws ClientException throw in case of problem
+ */
+ public abstract void deltify(File path, Revision start, Revision end)
+ throws ClientException;
+
+ /**
+ * dump the data in a repository
+ * @param path the path to the repository
+ * @param dataOut the data will be outputed here
+ * @param start the first revision to be dumped
+ * @param end the last revision to be dumped
+ * @param incremental the dump will be incremantal
+ * @param useDeltas the dump will contain deltas between nodes
* @param callback the callback to receive notifications
- * @throws ClientException throw in case of problem
- */
- public abstract void dump(File path, OutputStream dataOut,
+ * @throws ClientException throw in case of problem
+ */
+ public abstract void dump(File path, OutputStream dataOut,
Revision start, Revision end, boolean incremental,
boolean useDeltas, ReposNotifyCallback callback)
- throws ClientException;
+ throws ClientException;
- /**
- * make a hot copy of the repository
- * @param path the path to the source repository
- * @param targetPath the path to the target repository
- * @param cleanLogs clean the unused log files in the source
- * repository
+ /**
+ * make a hot copy of the repository
+ * @param path the path to the source repository
+ * @param targetPath the path to the target repository
+ * @param cleanLogs clean the unused log files in the source
+ * repository
* @param callback the callback to receive notifications
- * @throws ClientException throw in case of problem
+ * @throws ClientException throw in case of problem
* @since 1.9
- */
- public abstract void hotcopy(File path, File targetPath,
+ */
+ public abstract void hotcopy(File path, File targetPath,
boolean cleanLogs, boolean incremental,
ReposNotifyCallback callback)
throws ClientException;
- public abstract void hotcopy(File path, File targetPath,
- boolean cleanLogs, boolean incremental)
+ public abstract void hotcopy(File path, File targetPath,
+ boolean cleanLogs, boolean incremental)
throws ClientException;
- public abstract void hotcopy(File path, File targetPath,
- boolean cleanLogs) throws ClientException;
+ public abstract void hotcopy(File path, File targetPath,
+ boolean cleanLogs) throws ClientException;
- /**
- * list all logfiles (BDB) in use or not)
- * @param path the path to the repository
- * @param receiver interface to receive the logfile names
- * @throws ClientException throw in case of problem
- */
- public abstract void listDBLogs(File path, MessageReceiver receiver)
- throws ClientException;
-
- /**
- * list unused logfiles
- * @param path the path to the repository
- * @param receiver interface to receive the logfile names
- * @throws ClientException throw in case of problem
- */
- public abstract void listUnusedDBLogs(File path, MessageReceiver
receiver)
- throws ClientException;
-
-
- /**
- * load the data of a dump into a repository
- * @param path the path to the repository
- * @param dataInput the data input source
+ /**
+ * list all logfiles (BDB) in use or not)
+ * @param path the path to the repository
+ * @param receiver interface to receive the logfile names
+ * @throws ClientException throw in case of problem
+ */
+ public abstract void listDBLogs(File path, MessageReceiver receiver)
+ throws ClientException;
+
+ /**
+ * list unused logfiles
+ * @param path the path to the repository
+ * @param receiver interface to receive the logfile names
+ * @throws ClientException throw in case of problem
+ */
+ public abstract void listUnusedDBLogs(File path, MessageReceiver receiver)
+ throws ClientException;
+
+
+ /**
+ * load the data of a dump into a repository
+ * @param path the path to the repository
+ * @param dataInput the data input source
* @param start the first revision to load
* @param end the last revision to load
- * @param ignoreUUID ignore any UUID found in the input stream
- * @param forceUUID set the repository UUID to any found in the
- * stream
- * @param usePreCommitHook use the pre-commit hook when processing
commits
- * @param usePostCommitHook use the post-commit hook when processing
commits
+ * @param ignoreUUID ignore any UUID found in the input stream
+ * @param forceUUID set the repository UUID to any found in the
+ * stream
+ * @param usePreCommitHook use the pre-commit hook when processing commits
+ * @param usePostCommitHook use the post-commit hook when processing
commits
* @param validateProps validate "svn:" revision and node
properties
* @param ignoreDates ignore revision datestamps in the dump
stream
- * @param relativePath the directory in the repository, where the
data
- * in put optional.
- * @param callback the target for processing messages
- * @throws ClientException throw in case of problem
+ * @param relativePath the directory in the repository, where the data
+ * in put optional.
+ * @param callback the target for processing messages
+ * @throws ClientException throw in case of problem
* @since 1.9
- */
- public abstract void load(File path, InputStream dataInput,
+ */
+ public abstract void load(File path, InputStream dataInput,
Revision start, Revision end,
boolean ignoreUUID, boolean forceUUID,
boolean usePreCommitHook,
@@ -176,27 +176,27 @@ public interface ISVNRepos {
ReposNotifyCallback callback)
throws ClientException;
- /**
- * Load the data of a dump into a repository. Sets
+ /**
+ * Load the data of a dump into a repository. Sets
* <code>validateProps</code> and <code>ignoreDates</code> to
* <code>false</code>.
*
- * @param path the path to the repository
- * @param dataInput the data input source
+ * @param path the path to the repository
+ * @param dataInput the data input source
* @param start the first revision to load
* @param end the last revision to load
- * @param ignoreUUID ignore any UUID found in the input stream
- * @param forceUUID set the repository UUID to any found in the
- * stream
- * @param usePreCommitHook use the pre-commit hook when processing
commits
- * @param usePostCommitHook use the post-commit hook when processing
commits
- * @param relativePath the directory in the repository, where the
data
- * in put optional.
- * @param callback the target for processing messages
- * @throws ClientException throw in case of problem
+ * @param ignoreUUID ignore any UUID found in the input stream
+ * @param forceUUID set the repository UUID to any found in the
+ * stream
+ * @param usePreCommitHook use the pre-commit hook when processing commits
+ * @param usePostCommitHook use the post-commit hook when processing
commits
+ * @param relativePath the directory in the repository, where the data
+ * in put optional.
+ * @param callback the target for processing messages
+ * @throws ClientException throw in case of problem
* @since 1.8
- */
- public abstract void load(File path, InputStream dataInput,
+ */
+ public abstract void load(File path, InputStream dataInput,
Revision start, Revision end,
boolean ignoreUUID, boolean forceUUID,
boolean usePreCommitHook,
@@ -205,163 +205,163 @@ public interface ISVNRepos {
ReposNotifyCallback callback)
throws ClientException;
- /**
- * load the data of a dump into a repository
- * @param path the path to the repository
- * @param dataInput the data input source
- * @param ignoreUUID ignore any UUID found in the input stream
- * @param forceUUID set the repository UUID to any found in the
- * stream
- * @param usePreCommitHook use the pre-commit hook when processing
commits
- * @param usePostCommitHook use the post-commit hook when processing
commits
- * @param relativePath the directory in the repository, where the
data
- * in put optional.
- * @param callback the target for processing messages
- * @throws ClientException throw in case of problem
+ /**
+ * load the data of a dump into a repository
+ * @param path the path to the repository
+ * @param dataInput the data input source
+ * @param ignoreUUID ignore any UUID found in the input stream
+ * @param forceUUID set the repository UUID to any found in the
+ * stream
+ * @param usePreCommitHook use the pre-commit hook when processing commits
+ * @param usePostCommitHook use the post-commit hook when processing
commits
+ * @param relativePath the directory in the repository, where the data
+ * in put optional.
+ * @param callback the target for processing messages
+ * @throws ClientException throw in case of problem
* @note behaves like the 1.8 vesion with the revision
* parameters set to Revision.START and Revision.HEAD.
- */
- public abstract void load(File path, InputStream dataInput,
- boolean ignoreUUID, boolean forceUUID, boolean
usePreCommitHook,
+ */
+ public abstract void load(File path, InputStream dataInput,
+ boolean ignoreUUID, boolean forceUUID, boolean usePreCommitHook,
boolean usePostCommitHook, String relativePath,
ReposNotifyCallback callback)
throws ClientException;
- /**
- * list all open transactions in a repository
- * @param path the path to the repository
- * @param receiver receives one transaction name per call
- * @throws ClientException throw in case of problem
- */
- public abstract void lstxns(File path, MessageReceiver receiver)
- throws ClientException;
-
- /**
- * recover the filesystem backend of a repository
- * @param path the path to the repository
+ /**
+ * list all open transactions in a repository
+ * @param path the path to the repository
+ * @param receiver receives one transaction name per call
+ * @throws ClientException throw in case of problem
+ */
+ public abstract void lstxns(File path, MessageReceiver receiver)
+ throws ClientException;
+
+ /**
+ * recover the filesystem backend of a repository
+ * @param path the path to the repository
* @return youngest revision
- * @throws ClientException throw in case of problem
- */
- public abstract long recover(File path, ReposNotifyCallback callback)
- throws ClientException;
-
- /**
- * Take an exclusive lock on each of the listed repositories
- * to prevent commits; then, while holding all the locks, call
- * the action.invoke().
- *
- * The repositories may or may not be readable by Subversion
- * while frozen, depending on implementation details of the
- * repository's filesystem backend.
- *
- * Repositories are locked in the listed order.
- * @param action describes the action to perform
- * @param paths the set of repository paths
- * @throws ClientException
+ * @throws ClientException throw in case of problem
+ */
+ public abstract long recover(File path, ReposNotifyCallback callback)
+ throws ClientException;
+
+ /**
+ * Take an exclusive lock on each of the listed repositories
+ * to prevent commits; then, while holding all the locks, call
+ * the action.invoke().
+ *
+ * The repositories may or may not be readable by Subversion
+ * while frozen, depending on implementation details of the
+ * repository's filesystem backend.
+ *
+ * Repositories are locked in the listed order.
+ * @param action describes the action to perform
+ * @param paths the set of repository paths
+ * @throws ClientException
* @since 1.8
- */
- public abstract void freeze(ReposFreezeAction action,
- File... paths)
- throws ClientException;
-
- /**
- * remove open transaction in a repository
- * @param path the path to the repository
- * @param transactions the transactions to be removed
- * @throws ClientException throw in case of problem
- */
- public abstract void rmtxns(File path, String[] transactions)
- throws ClientException;
-
- /**
- * Change the value of the revision property <code>propName</code>
- * to <code>propValue</code>. By default, does not run
- * pre-/post-revprop-change hook scripts.
- *
- * @param path The path to the repository.
- * @param rev The revision for which to change a property value.
- * @param propName The name of the property to change.
- * @param propValue The new value to set for the property.
- * @param usePreRevPropChangeHook Whether to run the
- * <i>pre-revprop-change</i> hook script.
- * @param usePostRevPropChangeHook Whether to run the
- * <i>post-revprop-change</i> hook script.
- * @throws SubversionException If a problem occurs.
- */
- public abstract void setRevProp(File path, Revision rev, String
propName,
- String propValue, boolean usePreRevPropChangeHook,
- boolean usePostRevPropChangeHook) throws
SubversionException;
-
- /**
- * Verify the repository at <code>path</code> between revisions
- * <code>start</code> and <code>end</code>.
- *
- * @param path the path to the repository
- * @param start the first revision
- * @param end the last revision
+ */
+ public abstract void freeze(ReposFreezeAction action,
+ File... paths)
+ throws ClientException;
+
+ /**
+ * remove open transaction in a repository
+ * @param path the path to the repository
+ * @param transactions the transactions to be removed
+ * @throws ClientException throw in case of problem
+ */
+ public abstract void rmtxns(File path, String[] transactions)
+ throws ClientException;
+
+ /**
+ * Change the value of the revision property <code>propName</code>
+ * to <code>propValue</code>. By default, does not run
+ * pre-/post-revprop-change hook scripts.
+ *
+ * @param path The path to the repository.
+ * @param rev The revision for which to change a property value.
+ * @param propName The name of the property to change.
+ * @param propValue The new value to set for the property.
+ * @param usePreRevPropChangeHook Whether to run the
+ * <i>pre-revprop-change</i> hook script.
+ * @param usePostRevPropChangeHook Whether to run the
+ * <i>post-revprop-change</i> hook script.
+ * @throws SubversionException If a problem occurs.
+ */
+ public abstract void setRevProp(File path, Revision rev, String propName,
+ String propValue, boolean usePreRevPropChangeHook,
+ boolean usePostRevPropChangeHook) throws SubversionException;
+
+ /**
+ * Verify the repository at <code>path</code> between revisions
+ * <code>start</code> and <code>end</code>.
+ *
+ * @param path the path to the repository
+ * @param start the first revision
+ * @param end the last revision
* @param keepGoing continue verification even if a revision
is bad
* @param checkNormalization report directory entry and mergeinfo name
collisions
* caused by denormalized Unicode
representations
* @param metadataOnly check only metadata, not file contents
* @param callback the callback to receive notifications
- * @throws ClientException If an error occurred.
+ * @throws ClientException If an error occurred.
* @since 1.9
- */
- public abstract void verify(File path, Revision start, Revision end,
+ */
+ public abstract void verify(File path, Revision start, Revision end,
boolean keepGoing, boolean checkNormalization,
boolean metadataOnly,
ReposNotifyCallback callback)
throws ClientException;
- /**
- * Verify the repository at <code>path</code> between revisions
- * <code>start</code> and <code>end</code>.
- *
- * @param path the path to the repository
- * @param start the first revision
- * @param end the last revision
+ /**
+ * Verify the repository at <code>path</code> between revisions
+ * <code>start</code> and <code>end</code>.
+ *
+ * @param path the path to the repository
+ * @param start the first revision
+ * @param end the last revision
* @param callback the callback to receive notifications
- * @throws ClientException If an error occurred.
- */
- public abstract void verify(File path, Revision start, Revision end,
+ * @throws ClientException If an error occurred.
+ */
+ public abstract void verify(File path, Revision start, Revision end,
ReposNotifyCallback callback)
throws ClientException;
- /**
- * list all locks in the repository
- * @param path the path to the repository
+ /**
+ * list all locks in the repository
+ * @param path the path to the repository
* @param depth the depth to recurse
- * @throws ClientException throw in case of problem
- */
- public abstract Set<Lock> lslocks(File path, Depth depth)
+ * @throws ClientException throw in case of problem
+ */
+ public abstract Set<Lock> lslocks(File path, Depth depth)
throws ClientException;
- /**
- * remove multiple locks from the repository
- * @param path the path to the repository
- * @param locks the name of the locked items
- * @throws ClientException throw in case of problem
- */
- public abstract void rmlocks(File path, String[] locks)
- throws ClientException;
+ /**
+ * remove multiple locks from the repository
+ * @param path the path to the repository
+ * @param locks the name of the locked items
+ * @throws ClientException throw in case of problem
+ */
+ public abstract void rmlocks(File path, String[] locks)
+ throws ClientException;
/**
* upgrade the repository format
* @param path the path to the repository
* @param callback for notification
- * @throws ClientException throw in case of problem
+ * @throws ClientException throw in case of problem
*/
public abstract void upgrade(File path, ReposNotifyCallback callback)
- throws ClientException;
+ throws ClientException;
/**
* pack the repository
* @param path the path to the repository
* @param callback for notification
- * @throws ClientException throw in case of problem
+ * @throws ClientException throw in case of problem
*/
public abstract void pack(File path, ReposNotifyCallback callback)
- throws ClientException;
+ throws ClientException;
/**
* cancel the active operation
Modified:
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java?rev=1659683&r1=1659682&r2=1659683&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
(original)
+++
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
Fri Feb 13 21:03:40 2015
@@ -2418,18 +2418,18 @@ public class SVNClient implements SVNCli
{
try
{
- final List<org.apache.subversion.javahl.types.Info> infos =
- new
ArrayList<org.apache.subversion.javahl.types.Info>();
- aSVNClient.info2(path,
-
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()
- {
- public void
singleInfo(org.apache.subversion.javahl.types.Info info) {
- infos.add(info);
- }
- });
+ final List<org.apache.subversion.javahl.types.Info> infos =
+ new ArrayList<org.apache.subversion.javahl.types.Info>();
+ aSVNClient.info2(path,
+ 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()
+ {
+ public void singleInfo(org.apache.subversion.javahl.types.Info
info) {
+ infos.add(info);
+ }
+ });
return new Info(infos.get(0));
}
catch (org.apache.subversion.javahl.ClientException ex)
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=1659683&r1=1659682&r2=1659683&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
Fri Feb 13 21:03:40 2015
@@ -269,7 +269,7 @@ public class BasicTests extends SVNTests
}
catch(JNIError e)
{
- return; // Test passes!
+ return; // Test passes!
}
fail("A JNIError should have been thrown here.");
}
@@ -3218,7 +3218,7 @@ public class BasicTests extends SVNTests
// Do nothing, right now.
return false;
}
- });
+ });
}
/**
Modified:
subversion/trunk/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h?rev=1659683&r1=1659682&r2=1659683&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h
(original)
+++
subversion/trunk/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h
Fri Feb 13 21:03:40 2015
@@ -135,9 +135,9 @@ svn_error_t * svn_swig_pl_thunk_client_d
/* thunked commit editor callback. */
svn_error_t *svn_swig_pl_thunk_commit_callback(svn_revnum_t new_revision,
- const char *date,
- const char *author,
- void *baton);
+ const char *date,
+ const char *author,
+ void *baton);
/* thunked commit editor callback2. */
svn_error_t *svn_swig_pl_thunk_commit_callback2(const svn_commit_info_t
*commit_info,
@@ -219,12 +219,12 @@ svn_error_t *thunk_get_wc_prop(void *bat
/* Thunked version of svn_wc_notify_func_t callback type */
void svn_swig_pl_notify_func(void * baton,
const char *path,
- svn_wc_notify_action_t action,
- svn_node_kind_t kind,
- const char *mime_type,
- svn_wc_notify_state_t content_state,
- svn_wc_notify_state_t prop_state,
- svn_revnum_t revision);
+ svn_wc_notify_action_t action,
+ svn_node_kind_t kind,
+ const char *mime_type,
+ svn_wc_notify_state_t content_state,
+ svn_wc_notify_state_t prop_state,
+ svn_revnum_t revision);
/* Thunked version of svn_client_get_commit_log3_t callback type. */
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=1659683&r1=1659682&r2=1659683&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
Fri Feb 13 21:03:40 2015
@@ -1417,62 +1417,62 @@ commit_item_array_to_list(const apr_arra
}
-
+
/*** Errors ***/
/* Convert a given SubversionException to an svn_error_t. On failure returns
NULL and sets a Python exception. */
static svn_error_t *exception_to_error(PyObject * exc)
{
- const char *message, *file = NULL;
- apr_status_t apr_err;
- long line = 0;
- PyObject *apr_err_ob = NULL, *child_ob = NULL, *message_ob = NULL;
- PyObject *file_ob = NULL, *line_ob = NULL;
+ const char *message, *file = NULL;
+ apr_status_t apr_err;
+ long line = 0;
+ PyObject *apr_err_ob = NULL, *child_ob = NULL, *message_ob = NULL;
+ PyObject *file_ob = NULL, *line_ob = NULL;
svn_error_t *rv = NULL, *child = NULL;
- if ((apr_err_ob = PyObject_GetAttrString(exc, "apr_err")) == NULL)
- goto finished;
- apr_err = (apr_status_t) PyInt_AsLong(apr_err_ob);
- if (PyErr_Occurred()) goto finished;
-
- if ((message_ob = PyObject_GetAttrString(exc, "message")) == NULL)
- goto finished;
- message = PyString_AsString(message_ob);
- if (PyErr_Occurred()) goto finished;
-
- if ((file_ob = PyObject_GetAttrString(exc, "file")) == NULL)
- goto finished;
- if (file_ob != Py_None)
- file = PyString_AsString(file_ob);
- if (PyErr_Occurred()) goto finished;
-
- if ((line_ob = PyObject_GetAttrString(exc, "line")) == NULL)
- goto finished;
- if (line_ob != Py_None)
- line = PyInt_AsLong(line_ob);
- if (PyErr_Occurred()) goto finished;
-
- if ((child_ob = PyObject_GetAttrString(exc, "child")) == NULL)
- goto finished;
- /* We could check if the child is a Subversion exception too,
- but let's just apply duck typing. */
- if (child_ob != Py_None)
- child = exception_to_error(child_ob);
- if (PyErr_Occurred()) goto finished;
-
- rv = svn_error_create(apr_err, child, message);
- /* Somewhat hacky, but we need to preserve original file/line info. */
- rv->file = file ? apr_pstrdup(rv->pool, file) : NULL;
- rv->line = line;
+ if ((apr_err_ob = PyObject_GetAttrString(exc, "apr_err")) == NULL)
+ goto finished;
+ apr_err = (apr_status_t) PyInt_AsLong(apr_err_ob);
+ if (PyErr_Occurred()) goto finished;
+
+ if ((message_ob = PyObject_GetAttrString(exc, "message")) == NULL)
+ goto finished;
+ message = PyString_AsString(message_ob);
+ if (PyErr_Occurred()) goto finished;
+
+ if ((file_ob = PyObject_GetAttrString(exc, "file")) == NULL)
+ goto finished;
+ if (file_ob != Py_None)
+ file = PyString_AsString(file_ob);
+ if (PyErr_Occurred()) goto finished;
+
+ if ((line_ob = PyObject_GetAttrString(exc, "line")) == NULL)
+ goto finished;
+ if (line_ob != Py_None)
+ line = PyInt_AsLong(line_ob);
+ if (PyErr_Occurred()) goto finished;
+
+ if ((child_ob = PyObject_GetAttrString(exc, "child")) == NULL)
+ goto finished;
+ /* We could check if the child is a Subversion exception too,
+ but let's just apply duck typing. */
+ if (child_ob != Py_None)
+ child = exception_to_error(child_ob);
+ if (PyErr_Occurred()) goto finished;
+
+ rv = svn_error_create(apr_err, child, message);
+ /* Somewhat hacky, but we need to preserve original file/line info. */
+ rv->file = file ? apr_pstrdup(rv->pool, file) : NULL;
+ rv->line = line;
finished:
- Py_XDECREF(child_ob);
- Py_XDECREF(line_ob);
- Py_XDECREF(file_ob);
- Py_XDECREF(message_ob);
- Py_XDECREF(apr_err_ob);
- return rv;
+ Py_XDECREF(child_ob);
+ Py_XDECREF(line_ob);
+ Py_XDECREF(file_ob);
+ Py_XDECREF(message_ob);
+ Py_XDECREF(apr_err_ob);
+ return rv;
}
/* If the currently set Python exception is a valid SubversionException,
@@ -3761,7 +3761,7 @@ ra_callbacks_open_tmp_file(apr_file_t **
*fp = svn_swig_py_make_file(result, pool);
if (*fp == NULL)
{
- err = callback_exception_error();
+ err = callback_exception_error();
}
}
@@ -3811,7 +3811,7 @@ ra_callbacks_get_wc_prop(void *baton,
Py_ssize_t len;
if (PyString_AsStringAndSize(result, &buf, &len) == -1)
{
- err = callback_exception_error();
+ err = callback_exception_error();
}
else
{
@@ -4053,7 +4053,7 @@ ra_callbacks_get_client_string(void *bat
{
if ((*name = PyString_AsString(result)) == NULL)
{
- err = callback_exception_error();
+ err = callback_exception_error();
}
}
Modified:
subversion/trunk/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c?rev=1659683&r1=1659682&r2=1659683&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
(original)
+++
subversion/trunk/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
Fri Feb 13 21:03:40 2015
@@ -481,9 +481,9 @@ static void
check_apr_status(apr_status_t status, VALUE exception_class, const char
*format)
{
if (status != APR_SUCCESS) {
- char buffer[1024];
- apr_strerror(status, buffer, sizeof(buffer) - 1);
- rb_raise(exception_class, format, buffer);
+ char buffer[1024];
+ apr_strerror(status, buffer, sizeof(buffer) - 1);
+ rb_raise(exception_class, format, buffer);
}
}
@@ -526,8 +526,8 @@ svn_swig_rb_destroyer_destroy(VALUE self
objects[0] = target;
if (find_swig_type_object(1, objects) && DATA_PTR(target)) {
- svn_swig_rb_destroy_internal_pool(target);
- DATA_PTR(target) = NULL;
+ svn_swig_rb_destroy_internal_pool(target);
+ DATA_PTR(target) = NULL;
}
return Qnil;
@@ -545,9 +545,9 @@ svn_swig_rb_initialize(void)
}
check_apr_status(apr_allocator_create(&swig_rb_allocator),
- rb_eLoadError, "failed to create allocator: %s");
+ rb_eLoadError, "failed to create allocator: %s");
apr_allocator_max_free_set(swig_rb_allocator,
- SVN_ALLOCATOR_RECOMMENDED_MAX_FREE);
+ SVN_ALLOCATOR_RECOMMENDED_MAX_FREE);
swig_rb_pool = svn_pool_create_ex(NULL, swig_rb_allocator);
apr_pool_tag(swig_rb_pool, "svn-ruby-pool");
@@ -556,8 +556,8 @@ svn_swig_rb_initialize(void)
apr_thread_mutex_t *mutex;
check_apr_status(apr_thread_mutex_create(&mutex, APR_THREAD_MUTEX_DEFAULT,
- swig_rb_pool),
- rb_eLoadError, "failed to create allocator: %s");
+ swig_rb_pool),
+ rb_eLoadError, "failed to create
allocator: %s");
apr_allocator_mutex_set(swig_rb_allocator, mutex);
}
#endif
@@ -590,7 +590,7 @@ svn_swig_rb_initialize(void)
mSvnDestroyer = rb_define_module_under(rb_svn(), "Destroyer");
rb_define_module_function(mSvnDestroyer, "destroy",
- svn_swig_rb_destroyer_destroy, 1);
+ svn_swig_rb_destroyer_destroy, 1);
}
apr_pool_t *
@@ -869,7 +869,7 @@ svn_swig_rb_raise_svn_repos_already_clos
VALUE
svn_swig_rb_svn_error_new(VALUE code, VALUE message, VALUE file, VALUE line,
- VALUE child)
+ VALUE child)
{
return rb_funcall(rb_svn_error_svn_error(),
id_new_corresponding_error,
Modified: subversion/trunk/subversion/libsvn_subr/sorts.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/sorts.c?rev=1659683&r1=1659682&r2=1659683&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/sorts.c (original)
+++ subversion/trunk/subversion/libsvn_subr/sorts.c Fri Feb 13 21:03:40 2015
@@ -268,10 +268,10 @@ svn_sort__array_lookup(const apr_array_h
/* Intend to insert at a position inside the array, i.e. not
* at one of the boundaries. The predecessor must be smaller
* and the current entry at IDX must be larger than KEY. */
- void *previous;
+ void *previous;
*hint = idx;
- previous = array->elts + (idx-1) * array->elt_size;
+ previous = array->elts + (idx-1) * array->elt_size;
result = array->elts + idx * array->elt_size;
if (compare_func(previous, key) && !compare_func(result, key))
return result;
