subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pbu...@apache.org
Subject svn commit: r1401527 [1/6] - in /subversion/branches/auto-props-sdc: ./ build/hudson/ contrib/server-side/fsfsfixer/ notes/ notes/api-errata/1.8/ notes/directory-index/ notes/obliterate/ notes/tree-conflicts/ subversion/bindings/javahl/native/ subversi...
Date Wed, 24 Oct 2012 01:27:21 GMT
Author: pburba
Date: Wed Oct 24 01:27:14 2012
New Revision: 1401527

URL: http://svn.apache.org/viewvc?rev=1401527&view=rev
Log:
On the auto-props-sdc branch: Sync with ^/subversion/trunk through r1401524.

Added:
    subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/ImportFilterCallback.cpp
      - copied unchanged from r1401524, subversion/trunk/subversion/bindings/javahl/native/ImportFilterCallback.cpp
    subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/ImportFilterCallback.h
      - copied unchanged from r1401524, subversion/trunk/subversion/bindings/javahl/native/ImportFilterCallback.h
    subversion/branches/auto-props-sdc/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ImportFilterCallback.java
      - copied unchanged from r1401524, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ImportFilterCallback.java
    subversion/branches/auto-props-sdc/subversion/libsvn_ra_serf/util_error.c
      - copied unchanged from r1401524, subversion/trunk/subversion/libsvn_ra_serf/util_error.c
    subversion/branches/auto-props-sdc/subversion/libsvn_wc/tree_conflict_editor.c
      - copied unchanged from r1401524, subversion/trunk/subversion/libsvn_wc/tree_conflict_editor.c
    subversion/branches/auto-props-sdc/subversion/tests/cmdline/merge_automatic_tests.py
      - copied unchanged from r1401524, subversion/trunk/subversion/tests/cmdline/merge_automatic_tests.py
Removed:
    subversion/branches/auto-props-sdc/subversion/tests/cmdline/merge_symmetric_tests.py
Modified:
    subversion/branches/auto-props-sdc/   (props changed)
    subversion/branches/auto-props-sdc/CHANGES
    subversion/branches/auto-props-sdc/Makefile.in
    subversion/branches/auto-props-sdc/build.conf
    subversion/branches/auto-props-sdc/build/hudson/README   (props changed)
    subversion/branches/auto-props-sdc/contrib/server-side/fsfsfixer/fix-repo
    subversion/branches/auto-props-sdc/notes/api-changes-1.7.txt   (props changed)
    subversion/branches/auto-props-sdc/notes/api-errata/1.8/fs001.txt   (props changed)
    subversion/branches/auto-props-sdc/notes/diff-data-flows.txt   (props changed)
    subversion/branches/auto-props-sdc/notes/directory-index/dirindex.py
    subversion/branches/auto-props-sdc/notes/directory-index/schema.sql
    subversion/branches/auto-props-sdc/notes/fsfs
    subversion/branches/auto-props-sdc/notes/obliterate/design-audit.html   (props changed)
    subversion/branches/auto-props-sdc/notes/obliterate/design-authz.html   (props changed)
    subversion/branches/auto-props-sdc/notes/obliterate/design-repos.html   (props changed)
    subversion/branches/auto-props-sdc/notes/obliterate/design-wc.html   (props changed)
    subversion/branches/auto-props-sdc/notes/obliterate/plan-milestones.html   (props changed)
    subversion/branches/auto-props-sdc/notes/ra-serf-testing.txt   (props changed)
    subversion/branches/auto-props-sdc/notes/tree-conflicts/all-add-vs-add-tree-conflicts.txt   (props changed)
    subversion/branches/auto-props-sdc/notes/wc_node_walkers.txt   (props changed)
    subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/BlameCallback.cpp
    subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/ChangelistCallback.cpp
    subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/ClientContext.cpp
    subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/CommitCallback.cpp
    subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/CommitMessage.cpp
    subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp
    subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/InfoCallback.cpp
    subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/InputStream.cpp
    subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/ListCallback.cpp
    subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/LogMessageCallback.cpp
    subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/OutputStream.cpp
    subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/PatchCallback.cpp
    subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/Prompter.cpp
    subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/ProplistCallback.cpp
    subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/ReposNotifyCallback.cpp
    subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/SVNClient.cpp
    subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/SVNClient.h
    subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/SVNRepos.cpp
    subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/SVNRepos.h
    subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/StatusCallback.cpp
    subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
    subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp
    subversion/branches/auto-props-sdc/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
    subversion/branches/auto-props-sdc/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java
    subversion/branches/auto-props-sdc/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
    subversion/branches/auto-props-sdc/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java
    subversion/branches/auto-props-sdc/subversion/bindings/swig/include/svn_types.swg
    subversion/branches/auto-props-sdc/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
    subversion/branches/auto-props-sdc/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h
    subversion/branches/auto-props-sdc/subversion/bindings/swig/perl/native/Client.pm
    subversion/branches/auto-props-sdc/subversion/bindings/swig/perl/native/Core.pm
    subversion/branches/auto-props-sdc/subversion/bindings/swig/perl/native/t/3client.t
    subversion/branches/auto-props-sdc/subversion/include/private/svn_client_private.h
    subversion/branches/auto-props-sdc/subversion/include/private/svn_mergeinfo_private.h
    subversion/branches/auto-props-sdc/subversion/include/private/svn_pseudo_md5.h   (props changed)
    subversion/branches/auto-props-sdc/subversion/include/private/svn_ra_private.h
    subversion/branches/auto-props-sdc/subversion/include/private/svn_string_private.h
    subversion/branches/auto-props-sdc/subversion/include/private/svn_subr_private.h
    subversion/branches/auto-props-sdc/subversion/include/private/svn_wc_private.h
    subversion/branches/auto-props-sdc/subversion/include/svn_client.h
    subversion/branches/auto-props-sdc/subversion/include/svn_config.h
    subversion/branches/auto-props-sdc/subversion/include/svn_error_codes.h
    subversion/branches/auto-props-sdc/subversion/include/svn_io.h
    subversion/branches/auto-props-sdc/subversion/include/svn_props.h
    subversion/branches/auto-props-sdc/subversion/include/svn_ra.h
    subversion/branches/auto-props-sdc/subversion/include/svn_ra_svn.h
    subversion/branches/auto-props-sdc/subversion/include/svn_repos.h
    subversion/branches/auto-props-sdc/subversion/libsvn_client/cat.c
    subversion/branches/auto-props-sdc/subversion/libsvn_client/commit_util.c
    subversion/branches/auto-props-sdc/subversion/libsvn_client/copy.c
    subversion/branches/auto-props-sdc/subversion/libsvn_client/ctx.c
    subversion/branches/auto-props-sdc/subversion/libsvn_client/merge.c
    subversion/branches/auto-props-sdc/subversion/libsvn_client/mergeinfo.c
    subversion/branches/auto-props-sdc/subversion/libsvn_client/update.c
    subversion/branches/auto-props-sdc/subversion/libsvn_delta/compat.c
    subversion/branches/auto-props-sdc/subversion/libsvn_delta/editor.c
    subversion/branches/auto-props-sdc/subversion/libsvn_delta/svndiff.c
    subversion/branches/auto-props-sdc/subversion/libsvn_delta/text_delta.c
    subversion/branches/auto-props-sdc/subversion/libsvn_diff/parse-diff.c
    subversion/branches/auto-props-sdc/subversion/libsvn_fs_fs/fs.h
    subversion/branches/auto-props-sdc/subversion/libsvn_fs_fs/fs_fs.c
    subversion/branches/auto-props-sdc/subversion/libsvn_fs_fs/structure
    subversion/branches/auto-props-sdc/subversion/libsvn_fs_fs/temp_serializer.c
    subversion/branches/auto-props-sdc/subversion/libsvn_fs_fs/tree.c
    subversion/branches/auto-props-sdc/subversion/libsvn_ra/compat.c
    subversion/branches/auto-props-sdc/subversion/libsvn_ra/deprecated.c
    subversion/branches/auto-props-sdc/subversion/libsvn_ra/editor.c
    subversion/branches/auto-props-sdc/subversion/libsvn_ra/ra_loader.c
    subversion/branches/auto-props-sdc/subversion/libsvn_ra/ra_loader.h
    subversion/branches/auto-props-sdc/subversion/libsvn_ra_serf/ra_serf.h
    subversion/branches/auto-props-sdc/subversion/libsvn_ra_serf/replay.c
    subversion/branches/auto-props-sdc/subversion/libsvn_ra_serf/sb_bucket.c
    subversion/branches/auto-props-sdc/subversion/libsvn_ra_serf/serf.c
    subversion/branches/auto-props-sdc/subversion/libsvn_ra_serf/update.c
    subversion/branches/auto-props-sdc/subversion/libsvn_ra_serf/util.c
    subversion/branches/auto-props-sdc/subversion/libsvn_ra_serf/xml.c
    subversion/branches/auto-props-sdc/subversion/libsvn_ra_svn/client.c
    subversion/branches/auto-props-sdc/subversion/libsvn_ra_svn/marshal.c
    subversion/branches/auto-props-sdc/subversion/libsvn_repos/commit.c
    subversion/branches/auto-props-sdc/subversion/libsvn_repos/deprecated.c
    subversion/branches/auto-props-sdc/subversion/libsvn_repos/fs-wrap.c
    subversion/branches/auto-props-sdc/subversion/libsvn_repos/replay.c
    subversion/branches/auto-props-sdc/subversion/libsvn_repos/reporter.c
    subversion/branches/auto-props-sdc/subversion/libsvn_subr/cache-membuffer.c
    subversion/branches/auto-props-sdc/subversion/libsvn_subr/cache_config.c
    subversion/branches/auto-props-sdc/subversion/libsvn_subr/config_file.c
    subversion/branches/auto-props-sdc/subversion/libsvn_subr/error.c
    subversion/branches/auto-props-sdc/subversion/libsvn_subr/gpg_agent.c
    subversion/branches/auto-props-sdc/subversion/libsvn_subr/mergeinfo.c
    subversion/branches/auto-props-sdc/subversion/libsvn_subr/named_atomic.c
    subversion/branches/auto-props-sdc/subversion/libsvn_subr/path.c
    subversion/branches/auto-props-sdc/subversion/libsvn_subr/pseudo_md5.c   (props changed)
    subversion/branches/auto-props-sdc/subversion/libsvn_subr/string.c
    subversion/branches/auto-props-sdc/subversion/libsvn_subr/subst.c
    subversion/branches/auto-props-sdc/subversion/libsvn_subr/sysinfo.c   (contents, props changed)
    subversion/branches/auto-props-sdc/subversion/libsvn_subr/sysinfo.h   (props changed)
    subversion/branches/auto-props-sdc/subversion/libsvn_subr/utf.c
    subversion/branches/auto-props-sdc/subversion/libsvn_subr/version.c
    subversion/branches/auto-props-sdc/subversion/libsvn_wc/conflicts.c
    subversion/branches/auto-props-sdc/subversion/libsvn_wc/conflicts.h
    subversion/branches/auto-props-sdc/subversion/libsvn_wc/node.c
    subversion/branches/auto-props-sdc/subversion/libsvn_wc/tree_conflicts.c
    subversion/branches/auto-props-sdc/subversion/libsvn_wc/update_editor.c
    subversion/branches/auto-props-sdc/subversion/libsvn_wc/wc-queries.sql
    subversion/branches/auto-props-sdc/subversion/libsvn_wc/wc_db.c
    subversion/branches/auto-props-sdc/subversion/libsvn_wc/wc_db.h
    subversion/branches/auto-props-sdc/subversion/libsvn_wc/wc_db_private.h
    subversion/branches/auto-props-sdc/subversion/libsvn_wc/wc_db_util.c
    subversion/branches/auto-props-sdc/subversion/libsvn_wc/wc_db_wcroot.c
    subversion/branches/auto-props-sdc/subversion/mod_dav_svn/dav_svn.h
    subversion/branches/auto-props-sdc/subversion/mod_dav_svn/deadprops.c
    subversion/branches/auto-props-sdc/subversion/mod_dav_svn/mod_dav_svn.c
    subversion/branches/auto-props-sdc/subversion/mod_dav_svn/reports/file-revs.c
    subversion/branches/auto-props-sdc/subversion/mod_dav_svn/reports/replay.c
    subversion/branches/auto-props-sdc/subversion/mod_dav_svn/reports/update.c
    subversion/branches/auto-props-sdc/subversion/mod_dav_svn/repos.c
    subversion/branches/auto-props-sdc/subversion/mod_dav_svn/version.c
    subversion/branches/auto-props-sdc/subversion/po/pl.po
    subversion/branches/auto-props-sdc/subversion/svn/conflict-callbacks.c
    subversion/branches/auto-props-sdc/subversion/svn/log-cmd.c
    subversion/branches/auto-props-sdc/subversion/svn/main.c
    subversion/branches/auto-props-sdc/subversion/svn/merge-cmd.c
    subversion/branches/auto-props-sdc/subversion/svn/mergeinfo-cmd.c
    subversion/branches/auto-props-sdc/subversion/svn/proplist-cmd.c
    subversion/branches/auto-props-sdc/subversion/svnadmin/main.c
    subversion/branches/auto-props-sdc/subversion/svnrdump/load_editor.c
    subversion/branches/auto-props-sdc/subversion/svnrdump/svnrdump.c
    subversion/branches/auto-props-sdc/subversion/svnserve/main.c
    subversion/branches/auto-props-sdc/subversion/svnserve/serve.c
    subversion/branches/auto-props-sdc/subversion/svnserve/server.h
    subversion/branches/auto-props-sdc/subversion/tests/cmdline/copy_tests.py
    subversion/branches/auto-props-sdc/subversion/tests/cmdline/patch_tests.py
    subversion/branches/auto-props-sdc/subversion/tests/cmdline/svnadmin_tests.py
    subversion/branches/auto-props-sdc/subversion/tests/cmdline/tree_conflict_tests.txt   (props changed)
    subversion/branches/auto-props-sdc/subversion/tests/cmdline/wc_tests.py   (props changed)
    subversion/branches/auto-props-sdc/subversion/tests/libsvn_delta/vdelta_1.txt   (props changed)
    subversion/branches/auto-props-sdc/subversion/tests/libsvn_subr/auth-test.c
    subversion/branches/auto-props-sdc/subversion/tests/libsvn_subr/compat-test.c
    subversion/branches/auto-props-sdc/subversion/tests/libsvn_wc/conflict-data-test.c
    subversion/branches/auto-props-sdc/subversion/tests/libsvn_wc/op-depth-test.c
    subversion/branches/auto-props-sdc/subversion/tests/libsvn_wc/utils.c
    subversion/branches/auto-props-sdc/tools/buildbot/master/public_html/index.html   (props changed)
    subversion/branches/auto-props-sdc/tools/buildbot/master/public_html/robots.txt   (props changed)
    subversion/branches/auto-props-sdc/tools/buildbot/slaves/win32-xp-VS2005/config.bat   (contents, props changed)
    subversion/branches/auto-props-sdc/tools/buildbot/slaves/win32-xp-VS2005/do_all.bat   (contents, props changed)
    subversion/branches/auto-props-sdc/tools/buildbot/slaves/win32-xp-VS2005/svnbuild.bat   (contents, props changed)
    subversion/branches/auto-props-sdc/tools/buildbot/slaves/win32-xp-VS2005/svncheck.bat   (contents, props changed)
    subversion/branches/auto-props-sdc/tools/buildbot/slaves/win32-xp-VS2005/svnclean.bat   (contents, props changed)
    subversion/branches/auto-props-sdc/tools/buildbot/slaves/win32-xp-VS2005/svnlog.bat   (contents, props changed)
    subversion/branches/auto-props-sdc/tools/buildbot/slaves/xp-vc60-ia32/svnbuild.bat   (contents, props changed)
    subversion/branches/auto-props-sdc/tools/buildbot/slaves/xp-vc60-ia32/svncheck.bat   (contents, props changed)
    subversion/branches/auto-props-sdc/tools/buildbot/slaves/xp-vc60-ia32/svnclean.bat   (contents, props changed)
    subversion/branches/auto-props-sdc/tools/buildbot/slaves/xp-vc60-ia32/svnlog.bat   (contents, props changed)
    subversion/branches/auto-props-sdc/tools/client-side/svn-bench/cl.h   (props changed)
    subversion/branches/auto-props-sdc/tools/client-side/svn-bench/client_errors.h   (props changed)
    subversion/branches/auto-props-sdc/tools/client-side/svn-bench/help-cmd.c   (props changed)
    subversion/branches/auto-props-sdc/tools/client-side/svn-bench/main.c   (contents, props changed)
    subversion/branches/auto-props-sdc/tools/client-side/svn-bench/notify.c   (props changed)
    subversion/branches/auto-props-sdc/tools/client-side/svn-bench/null-export-cmd.c   (props changed)
    subversion/branches/auto-props-sdc/tools/client-side/svn-bench/null-list-cmd.c   (props changed)
    subversion/branches/auto-props-sdc/tools/client-side/svn-bench/null-log-cmd.c   (props changed)
    subversion/branches/auto-props-sdc/tools/client-side/svn-bench/util.c   (props changed)
    subversion/branches/auto-props-sdc/tools/dev/benchmarks/suite1/run.bat   (contents, props changed)
    subversion/branches/auto-props-sdc/tools/dev/svnraisetreeconflict/main.c
    subversion/branches/auto-props-sdc/tools/hook-scripts/persist-ephemeral-txnprops.py
    subversion/branches/auto-props-sdc/tools/server-side/fsfs-reorg.c
    subversion/branches/auto-props-sdc/tools/server-side/svnpubsub/README.txt   (props changed)
    subversion/branches/auto-props-sdc/tools/server-side/svnpubsub/irkerbridge.py   (props changed)

Propchange: subversion/branches/auto-props-sdc/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1397077-1401524

Modified: subversion/branches/auto-props-sdc/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/auto-props-sdc/CHANGES?rev=1401527&r1=1401526&r2=1401527&view=diff
==============================================================================
--- subversion/branches/auto-props-sdc/CHANGES (original)
+++ subversion/branches/auto-props-sdc/CHANGES Wed Oct 24 01:27:14 2012
@@ -4,7 +4,7 @@ http://svn.apache.org/repos/asf/subversi
 
  User-visible changes:
   - General:
-    * remove extraneous externals output from 'svn status -q' (issue #1935)
+    *
 
   - Major new features:
     *
@@ -12,6 +12,7 @@ http://svn.apache.org/repos/asf/subversi
   - Minor new features and improvements:
     * new 'svnadmin load --revision' load filtering support (issue #3734)
     * new 'commit --include-externals' option (related to issues #1167, #3563)
+    * remove extraneous externals output from 'svn status -q' (issue #1935)
     * new 'svnadmin hotcopy --incremental' support for FSFS (issue #3815)
     * reject some attempts to merge between unrelated branches (r1215273)
     * support GPG agent for password storage on UNIX-like platforms (r1150783)

Modified: subversion/branches/auto-props-sdc/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/auto-props-sdc/Makefile.in?rev=1401527&r1=1401526&r2=1401527&view=diff
==============================================================================
--- subversion/branches/auto-props-sdc/Makefile.in (original)
+++ subversion/branches/auto-props-sdc/Makefile.in Wed Oct 24 01:27:14 2012
@@ -281,6 +281,19 @@ INSTALL_EXTRA_SWIG_PY=\
     compileall.compile_dir("$(DESTDIR)$(swig_pydir_extra)", 1, \
     "$(swig_pydir_extra)");'
 
+# export an env variable so that the tests can run without being installed
+TEST_SHLIB_VAR_SWIG_PY=\
+  if [ "@SVN_APR_SHLIB_PATH_VAR@" == "DYLD_LIBRARY_PATH" ]; then \
+    for d in $(SWIG_PY_DIR)/libsvn_swig_py $(SWIG_PY_DIR)/../../../libsvn_*; do \
+      if [ -n "$$DYLD_LIBRARY_PATH" ]; then \
+        @SVN_APR_SHLIB_PATH_VAR@="$$@SVN_APR_SHLIB_PATH_VAR@:$$d/.libs"; \
+      else \
+        @SVN_APR_SHLIB_PATH_VAR@="$$d/.libs"; \
+      fi; \
+    done; \
+    export @SVN_APR_SHLIB_PATH_VAR@; \
+  fi;
+
 # The path to generated and complementary source files for the SWIG
 # bindings.
 SWIG_PL_DIR = $(abs_builddir)/subversion/bindings/swig/perl
@@ -311,6 +324,19 @@ INSTALL_EXTRA_SWIG_RB=\
     $(INSTALL_DATA) "$$i" $(DESTDIR)$(SWIG_RB_SITE_LIB_DIR)/svn; \
   done
 
+# export an env variable so that the tests can run without being installed
+TEST_SHLIB_VAR_SWIG_RB=\
+  if [ "@SVN_APR_SHLIB_PATH_VAR@" == "DYLD_LIBRARY_PATH" ]; then \
+    for d in $(SWIG_PY_DIR)/libsvn_swig_rb $(SWIG_PY_DIR)/../../../libsvn_*; do \
+      if [ -n "$$DYLD_LIBRARY_PATH" ]; then \
+        @SVN_APR_SHLIB_PATH_VAR@="$$@SVN_APR_SHLIB_PATH_VAR@:$$d/.libs"; \
+      else \
+        @SVN_APR_SHLIB_PATH_VAR@="$$d/.libs"; \
+      fi; \
+    done; \
+    export @SVN_APR_SHLIB_PATH_VAR@; \
+  fi;
+ 
 APXS = @APXS@ 
 
 PYTHON = @PYTHON@
@@ -791,6 +817,7 @@ copy-swig-py: autogen-swig-py $(SWIG_PY_
 swig-py: autogen-swig-py copy-swig-py
 
 check-swig-py: swig-py
+	$(TEST_SHLIB_VAR_SWIG_PY) \
 	cd $(SWIG_PY_DIR); \
 	  $(PYTHON) $(SWIG_PY_SRC_DIR)/tests/run_all.py
 
@@ -813,6 +840,7 @@ extraclean-swig-py: clean-swig-py
 swig-rb: autogen-swig-rb
 
 check-swig-rb: swig-rb svnserve
+	$(TEST_SHLIB_VAR_SWIG_RB) \
 	cd $(SWIG_RB_DIR); \
 	  $(RUBY) -I $(SWIG_RB_SRC_DIR) \
 	    $(SWIG_RB_SRC_DIR)/test/run-test.rb \

Modified: subversion/branches/auto-props-sdc/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/auto-props-sdc/build.conf?rev=1401527&r1=1401526&r2=1401527&view=diff
==============================================================================
--- subversion/branches/auto-props-sdc/build.conf (original)
+++ subversion/branches/auto-props-sdc/build.conf Wed Oct 24 01:27:14 2012
@@ -64,9 +64,9 @@ test-scripts =
 
 bdb-test-scripts =
 
-swig-python-opts = -python -classic
-swig-perl-opts = -perl -nopm -noproxy
-swig-ruby-opts = -ruby
+swig-python-opts = $(CPPFLAGS) -python -classic
+swig-perl-opts = $(CPPFLAGS) -perl -nopm -noproxy
+swig-ruby-opts = $(CPPFLAGS) -ruby
 swig-languages = python perl ruby
 swig-dirs = 
         subversion/bindings/swig/python

Propchange: subversion/branches/auto-props-sdc/build/hudson/README
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: subversion/branches/auto-props-sdc/contrib/server-side/fsfsfixer/fix-repo
URL: http://svn.apache.org/viewvc/subversion/branches/auto-props-sdc/contrib/server-side/fsfsfixer/fix-repo?rev=1401527&r1=1401526&r2=1401527&view=diff
==============================================================================
--- subversion/branches/auto-props-sdc/contrib/server-side/fsfsfixer/fix-repo (original)
+++ subversion/branches/auto-props-sdc/contrib/server-side/fsfsfixer/fix-repo Wed Oct 24 01:27:14 2012
@@ -5,6 +5,7 @@ Usage: $0 REPO-DIR START-REV
 
 Backup your repository before running these scripts."
 
+THIS_DIR=`dirname "$0"`
 REPO_DIR="$1"
 START_REV="$2"
 
@@ -13,7 +14,7 @@ if [ ! -d "$REPO_DIR" ] || [ "$START_REV
   exit 1
 fi
 
-YOUNGEST="$(svnlook youngest "$REPO_DIR")"
+YOUNGEST=`svnlook youngest "$REPO_DIR"`
 
 if [ "$YOUNGEST" = "" ]; then
   echo "$0: error running 'svnlook youngest $REPO_DIR'"
@@ -25,6 +26,6 @@ echo "Verifying revisions $START_REV thr
 REV=$START_REV
 while [ $REV -le $YOUNGEST ]; do
   echo "=== r$REV"
-  ./fixer/fix-rev.py "$REPO_DIR" "$REV"
+  "$THIS_DIR"/fixer/fix-rev.py "$REPO_DIR" "$REV"
   REV=`expr $REV + 1`
 done

Propchange: subversion/branches/auto-props-sdc/notes/api-changes-1.7.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: subversion/branches/auto-props-sdc/notes/api-errata/1.8/fs001.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: subversion/branches/auto-props-sdc/notes/diff-data-flows.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: subversion/branches/auto-props-sdc/notes/directory-index/dirindex.py
URL: http://svn.apache.org/viewvc/subversion/branches/auto-props-sdc/notes/directory-index/dirindex.py?rev=1401527&r1=1401526&r2=1401527&view=diff
==============================================================================
--- subversion/branches/auto-props-sdc/notes/directory-index/dirindex.py (original)
+++ subversion/branches/auto-props-sdc/notes/directory-index/dirindex.py Wed Oct 24 01:27:14 2012
@@ -42,7 +42,6 @@ class SQLclass(object):
     def __init__(self):
         import cStringIO
         import pkgutil
-        import re
 
         comment_rx = re.compile(r"\s*--.*$")
         header_rx = re.compile(r"^---(?P<kind>STATEMENT|SCRIPT)"
@@ -215,7 +214,6 @@ class Txn(SQLobject):
             self.created = self._now()
         super(Txn, self)._put(cursor)
         if self.treeid is None:
-            SQL.TXN_UPDATE_INITIAL_TREEID(cursor, id = self.id)
             self.treeid = self.id
 
     @classmethod
@@ -253,49 +251,6 @@ class Txn(SQLobject):
         SQL.TXN_CLEANUP(cursor, id = self.id)
 
 
-class Branch(SQLobject):
-    """O/R mapping for the "branch" table."""
-
-    _columns = ("id", "treeid", "nodeid", "origin", "state")
-    _put_statement = SQL.BRANCH_INSERT
-    _get_statement = SQL.BRANCH_GET
-
-    # state
-    TRANSIENT = "T"
-    PERMANENT = "P"
-
-    def __init__(self, **kwargs):
-        super(Branch, self).__init__(**kwargs)
-        if self.state is None:
-            self.state = self.TRANSIENT
-
-    def _put(self, cursor):
-        super(Branch, self)._put(cursor)
-        if self.nodeid is None:
-            SQL.BRANCH_UPDATE_INITIAL_NODEID(cursor, id = self.id)
-            self.nodeid = self.id
-
-    @classmethod
-    def _update_treeid(cls, cursor, new_txn, old_txn):
-        SQL.BRANCH_UPDATE_TREEID(cursor,
-                                 new_treeid = new_txn.treeid,
-                                 old_treeid = old_txn.treeid)
-
-    @classmethod
-    def _history(cls, cursor, nodeid):
-        SQL.BRANCH_HISTORY(cursor, nodeid = nodeid)
-        for row in cursor:
-            yield cls._from_row(row)
-
-    @classmethod
-    def _commit(cls, cursor, txn):
-        SQL.BRANCH_COMMIT(cursor, treeid = txn.treeid)
-
-    @classmethod
-    def _cleanup(cls, cursor, txn):
-        SQL.BRANCH_CLEANUP(cursor, treeid = txn.treeid)
-
-
 class NodeRev(SQLobject):
     """O/R mapping for the noderev/string/nodeview table."""
 
@@ -330,8 +285,8 @@ class NodeRev(SQLobject):
             self.state = self.TRANSIENT
 
     def __str__(self):
-        return "%d %c %s%s" % (self.treeid, self.opcode, self.name,
-                               self._isdir and '/' or '')
+        return "%d(%d) %c %s%s" % (self.id, self.treeid, self.opcode,
+                                   self.name, self._isdir and '/' or '')
 
     # Opcode names
     __opnames = {ADD: "add",
@@ -384,6 +339,10 @@ class NodeRev(SQLobject):
                 assert self.dename is not None
                 self.denameid = self.__stringid(cursor, self.dename)
         super(NodeRev, self)._put(cursor)
+        if self.nodeid is None:
+            self.nodeid = self.id
+        if self.branch is None:
+            self.branch = self.id
 
     @classmethod
     def _update_treeid(cls, cursor, new_txn, old_txn):
@@ -472,10 +431,6 @@ class NodeRev(SQLobject):
         track.close(cls.__find(cursor, parent.branch, parts[-1], txn))
         return track
 
-    def _count_successors(self, cursor):
-        SQL.NODEREV_COUNT_SUCCESSORS(cursor, origin = self.id)
-        return int(cursor.fetchone()[0])
-
     def _listdir(self, cursor, txn):
         assert self._isdir
         if txn.state != txn.PERMANENT:
@@ -501,17 +456,13 @@ class NodeRev(SQLobject):
 
     def _branch(self, cursor, parent, txn, replaced=False):
         assert txn._uncommitted
-        branch = Branch(treeid = txn.treeid,
-                        nodeid = self.nodeid,
-                        origin = self.branch)
-        branch._put(cursor)
         if self._isdir:
             opcode = replaced and self.LAZY_BREPLACE or self.LAZY
         else:
             opcode = replaced and self.BREPLACE or self.BRANCH
         node = self._revise(opcode, txn)
         node.parent = parent.id
-        node.branch = branch.id
+        node.branch = None
         node._put(cursor)
         return node
 
@@ -519,7 +470,9 @@ class NodeRev(SQLobject):
         assert txn._uncommitted
         noderev = NodeRev._clone(self)
         noderev.treeid = txn.treeid
+        noderev.origin = self.id
         noderev.opcode = opcode
+        return noderev
 
     __readonly = frozenset(("name",))
     def __setitem__(self, key, value):
@@ -528,7 +481,10 @@ class NodeRev(SQLobject):
         if key == "dename":
             name = self.__normtext(value)
             value = self.__text(value)
-            super(NodeRev, self).__setitem__("name", name)
+            if name != self.name:
+                super(NodeRev, self).__setitem__("name", name)
+                super(NodeRev, self).__setitem__("nameid", None)
+            super(NodeRev, self).__setitem__("denameid", None)
         super(NodeRev, self).__setitem__(key, value)
 
     def __getitem__(self, key):
@@ -680,12 +636,10 @@ class Index(object):
     def commit_txn(self, txn, revision):
         txn._commit(self.cursor, revision)
         NodeRev._commit(self.cursor, txn)
-        Branch._commit(self.cursor, txn)
 
     def abort_txn(self, txn):
         txn._abort(self.cursor)
         NodeRev._cleanup(self.cursor, txn)
-        Branch._cleanup(self.cursor, txn)
         txn._cleanup(self.cursor)
 
     def listdir(self, txn, noderev):
@@ -743,11 +697,9 @@ class Index(object):
             newnode = origin._branch(self.cursor, parent.id, txn,
                                      replaced = (oldnode is not None))
         else:
-            branch = Branch(treeid = txn.treeid)
-            branch._put(self.cursor)
             newnode = NodeRev(treeid = txn.treeid,
-                              nodeid = branch.nodeid,
-                              branch = branch.id,
+                              nodeid = None,
+                              branch = None,
                               parent = parent.id,
                               kind = kind,
                               opcode = opcode)
@@ -777,6 +729,45 @@ class Tree(object):
         index.rollback()
 
 
+__greek_tree = {
+    'iota': 'file',
+    'A': {
+        'mu': 'file',
+        'B': {
+            'lambda': 'file',
+            'E': {
+                'alpha': 'file',
+                'beta': 'file'},
+            'F': 'dir'},
+        'C': 'dir',
+        'D': {
+            'G': {
+                'pi': 'file',
+                'rho': 'file',
+                'tau': 'file'},
+            'H': {
+                'chi': 'file',
+                'psi': 'file',
+                'omega': 'file'}
+            }
+        }
+    }
+def greektree(ix, tx):
+    def populate(track, items):
+        print 'Populating', track
+        for name, kind in items.iteritems():
+            if kind == 'file':
+                node = ix.add(tx, track, name, NodeRev.FILE)
+            else:
+                node = ix.add(tx, track, name, NodeRev.DIR)
+            print 'Added', node, 'node:', node.noderev
+            if isinstance(kind, dict):
+                populate(node, kind)
+
+    root = ix.lookup(tx)
+    populate(root, __greek_tree)
+
+
 def simpletest(database):
     ix = Index(database)
     ix.initialize()
@@ -789,37 +780,34 @@ def simpletest(database):
         print "root track:", root
         print "root noderev", root.noderev
 
-        print "Add A/foo"
+        print 'Create greek tree'
         tx = ix.new_txn(0)
         print "transaction:", tx
-        parent = ix.add(tx, root, "A", NodeRev.DIR)
-        print "A track:", parent
-        print "A noderev", parent.noderev
-
-        node = ix.add(tx, parent, "foo", NodeRev.FILE)
-        print "foo track:", node
-        print "foo noderev", node.noderev
+        greektree(ix, tx)
         ix.commit_txn(tx, 1)
         ix.commit()
 
+
+        def listdir(noderev, prefix):
+            for n in ix.listdir(tx, noderev):
+                print prefix, str(n)
+                if n._isdir:
+                    listdir(n, prefix + "  ")
+
         print "List contents"
         tx = ix.get_txn()
         print "transaction:", tx
         root = ix.lookup(tx)
         print str(root.noderev)
-        for n1 in ix.listdir(tx, root.noderev):
-            print " ", str(n1)
-            if n1._isdir:
-                for n2 in ix.listdir(tx, n1):
-                    print "   ", str(n2)
-
-        print "Lookup A"
-        track = ix.lookup(tx, None, "A")
-        print str(track.noderev)
-
-        print "Lookup A/foo"
-        track = ix.lookup(tx, None, "A/foo")
-        print str(track.noderev)
+        listdir(root.noderev, " ")
+
+        print "Lookup iota"
+        track = ix.lookup(tx, None, "iota")
+        print str(track), str(track.noderev)
+
+        print "Lookup A/D/H/psi"
+        track = ix.lookup(tx, None, "A/D/H/psi")
+        print str(track), str(track.noderev)
     finally:
         ix.close()
 

Modified: subversion/branches/auto-props-sdc/notes/directory-index/schema.sql
URL: http://svn.apache.org/viewvc/subversion/branches/auto-props-sdc/notes/directory-index/schema.sql?rev=1401527&r1=1401526&r2=1401527&view=diff
==============================================================================
--- subversion/branches/auto-props-sdc/notes/directory-index/schema.sql (original)
+++ subversion/branches/auto-props-sdc/notes/directory-index/schema.sql Wed Oct 24 01:27:14 2012
@@ -22,7 +22,6 @@
 DROP VIEW IF EXISTS nodeview;
 DROP TABLE IF EXISTS noderev;
 DROP TABLE IF EXISTS string;
-DROP TABLE IF EXISTS branch;
 DROP TABLE IF EXISTS txn;
 
 
@@ -61,36 +60,10 @@ CREATE TABLE txn (
 
 CREATE INDEX txn_revision_idx ON txn(revision);
 
-
--- Branches -- unique forks in the nodes' history
-CREATE TABLE branch (
-  -- branch identifier
-  id        integer NOT NULL PRIMARY KEY,
-
-  -- the transaction in which the branch was created
-  treeid    integer NOT NULL REFERENCES txn(id),
-
-  -- the node to which this branch belongs; refers to the initial
-  -- branch of the node
-  nodeid    integer NULL REFERENCES branch(id),
-
-  -- the source branch from which this branch was forked
-  origin    integer NULL REFERENCES branch(id),
-
-  -- mark branches in uncommitted transactions so that they can be
-  -- ignored by branch traversals
-  -- T = transient (uncommitted), P = permanent (committed)
-  state     character(1) NOT NULL DEFAULT 'T',
-
-  -- sanity check: enumerated value validation
-  CONSTRAINT enumeration_validation CHECK (state IN ('T', 'P')),
-
-  -- sanity check: ye can't be yer own daddy
-  CONSTRAINT genetic_diversity CHECK (id <> origin)
-);
-
-CREATE INDEX branch_txn_idx ON branch(treeid);
-CREATE INDEX branch_node_idx ON branch(nodeid);
+CREATE TRIGGER txn_ensure_treeid AFTER INSERT ON txn
+BEGIN
+  UPDATE txn SET treeid = NEW.id WHERE treeid IS NULL AND id = NEW.id;
+END;
 
 
 -- File names -- lookup table of strings
@@ -108,18 +81,19 @@ CREATE TABLE noderev (
   -- the transaction in which the node was changed
   treeid    integer NOT NULL REFERENCES txn(id),
 
-  -- the node identifier; a new node will get the ID of its initial
-  -- branch
-  nodeid    integer NOT NULL REFERENCES branch(id),
+  -- the node identifier
+  -- a new node will get the ID of its initial noderev.id
+  nodeid    integer NULL REFERENCES noderev(id),
 
   -- this node revision's immediate predecessor
   origin    integer NULL REFERENCES noderev(id),
 
   -- the parent (directory) of this node revision -- tree graph
-  parent    integer NULL REFERENCES branch(id),
+  parent    integer NULL REFERENCES noderev(id),
 
   -- the branch that this node revision belongs to -- history graph
-  branch    integer NOT NULL REFERENCES branch(id),
+  -- a new branch will get the ID of its initial noderev.id
+  branch    integer NULL REFERENCES noderev(id),
 
   -- the indexable, NFC-normalized name of this noderev within its parent
   nameid    integer NOT NULL REFERENCES string(id),
@@ -171,8 +145,15 @@ CREATE TABLE noderev (
 CREATE UNIQUE INDEX noderev_tree_idx ON noderev(parent,nameid,treeid,opcode);
 CREATE INDEX noderev_txn_idx ON noderev(treeid);
 CREATE INDEX nodefev_node_idx ON noderev(nodeid);
+CREATE INDEX noderev_branch_idx ON noderev(branch);
 CREATE INDEX noderev_successor_idx ON noderev(origin);
 
+CREATE TRIGGER noderev_ensure_node_and_branch AFTER INSERT ON noderev
+BEGIN
+    UPDATE noderev SET nodeid = NEW.id WHERE nodeid IS NULL AND id = NEW.id;
+    UPDATE noderev SET branch = NEW.id WHERE branch IS NULL AND id = NEW.id;
+END;
+
 
 CREATE VIEW nodeview AS
   SELECT
@@ -188,7 +169,6 @@ CREATE VIEW nodeview AS
 
 INSERT INTO txn (id, treeid, revision, created, state)
   VALUES (0, 0, 0, 'EPOCH', 'P');
-INSERT INTO branch (id, treeid, nodeid, state) VALUES (0, 0, 0, 'P');
 INSERT INTO string (id, val) VALUES (0, '');
 INSERT INTO noderev (id, treeid, nodeid, branch,
                      nameid, denameid, kind, opcode, state)
@@ -199,9 +179,6 @@ INSERT INTO noderev (id, treeid, nodeid,
 INSERT INTO txn (treeid, revision, created, author)
   VALUES (:treeid, :revision, :created, :author);
 
----STATEMENT TXN_UPDATE_INITIAL_TREEID
-UPDATE txn SET treeid = :id WHERE id = :id;
-
 ---STATEMENT TXN_GET
 SELECT * FROM txn WHERE id = :id;
 
@@ -230,28 +207,6 @@ UPDATE txn SET state = 'D' WHERE id = :i
 ---STATEMENT TXN_CLEANUP
 DELETE FROM txn WHERE id = :id;
 
----STATEMENT BRANCH_INSERT
-INSERT INTO branch (nodeid, treeid, origin)
-  VALUES (:nodeid, :treeid, :origin);
-
----STATEMENT BRANCH_UPDATE_INITIAL_NODEID
-UPDATE branch SET nodeid = :id WHERE id = :id;
-
----STATEMENT BRANCH_UPDATE_TREEID
-UPDATE branch SET treeid = :new_treeid WHERE treeid = :old_treeid;
-
----STATEMENT BRANCH_GET
-SELECT * FROM branch WHERE id = :id;
-
----STATEMENT BRANCH_HISTORY
-SELECT * from branch WHERE nodeid = :nodeid ORDER BY id ASC;
-
----STATEMENT BRANCH_COMMIT
-UPDATE branch SET state = 'P' WHERE treeid = :treeid;
-
----STATEMENT BRANCH_CLEANUP
-DELETE FROM branch WHERE treeid = :treeid;
-
 ---STATEMENT STRING_INSERT
 INSERT INTO string (val) VALUES (:val);
 
@@ -273,9 +228,6 @@ UPDATE noderev SET opcode = :opcode WHER
 ---STATEMENT NODEVIEW_GET
 SELECT * FROM nodeview WHERE id = :id;
 
----STATEMENT NODEREV_COUNT_SUCCESSORS
-SELECT COUNT(id) FROM noderev WHERE origin = :origin;
-
 ---STATEMENT NODEREV_COMMIT
 UPDATE noderev SET state = 'P' WHERE treeid = :treeid;
 
@@ -309,7 +261,8 @@ ORDER BY treeid DESC LIMIT 1;
 ---STATEMENT NODEVIEW_LIST_DIRECTORY
 SELECT * FROM nodeview
   JOIN (SELECT nameid, MAX(treeid) AS treeid FROM noderev
-        WHERE treeid <= :treeid AND state = 'P') AS filter
+        WHERE treeid <= :treeid AND state = 'P'
+        GROUP BY nameid) AS filter
     ON nodeview.nameid = filter.nameid AND nodeview.treeid = filter.treeid
 WHERE parent = :parent AND opcode <> 'D'
 ORDER BY nodeview.name ASC;
@@ -317,7 +270,8 @@ ORDER BY nodeview.name ASC;
 ---STATEMENT NODEVIEW_LIST_TRANSIENT_DIRECTORY
 SELECT * FROM nodeview
   JOIN (SELECT nameid, MAX(treeid) AS treeid FROM noderev
-        WHERE treeid < :treeid AND state = 'P' OR treeid = :treeid) AS filter
+        WHERE treeid < :treeid AND state = 'P' OR treeid = :treeid
+        GROUP BY nameid) AS filter
     ON nodeview.nameid = filter.name AND nodeview.treeid = filter.treeid
 WHERE parent = :parent AND opcode <> 'D'
 ORDER BY nodeview.name ASC;

Modified: subversion/branches/auto-props-sdc/notes/fsfs
URL: http://svn.apache.org/viewvc/subversion/branches/auto-props-sdc/notes/fsfs?rev=1401527&r1=1401526&r2=1401527&view=diff
==============================================================================
--- subversion/branches/auto-props-sdc/notes/fsfs (original)
+++ subversion/branches/auto-props-sdc/notes/fsfs Wed Oct 24 01:27:14 2012
@@ -234,6 +234,16 @@ repository.  The backed-up "current" fil
 new revision which wasn't copied, or which was only partially
 populated when it was copied.
 
+[ Update: as of 1.6, FSFS uses an optional SQLite DB, rep-cache.db, when
+rep-sharing is enabled.  SQLite provides no guarantee that copying live
+databases will result in copies that are uncorrupt, or that are corrupt but
+will raise an error when accessed.  'svnadmin hotcopy' avoids the problem by
+establishing an appropriate SQLite lock (see svn_sqlite__hotcopy()).  User
+code should either use an atomic filesystem snapshot (as with zfs/LVM),
+refrain from copying rep-cache.db, or stop all access to that file before
+copying it (for example, by disabling commits, by establishing a lock a la
+svn_sqlite__hotcopy(), or by using 'svnadmin freeze'). ]
+
 The "svnadmin hotcopy" command avoids this problem by copying the
 "current" file before copying the revision files.  But a backup using
 the hotcopy command isn't as efficient as a straight incremental

Propchange: subversion/branches/auto-props-sdc/notes/obliterate/design-audit.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: subversion/branches/auto-props-sdc/notes/obliterate/design-authz.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: subversion/branches/auto-props-sdc/notes/obliterate/design-repos.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: subversion/branches/auto-props-sdc/notes/obliterate/design-wc.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: subversion/branches/auto-props-sdc/notes/obliterate/plan-milestones.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: subversion/branches/auto-props-sdc/notes/ra-serf-testing.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: subversion/branches/auto-props-sdc/notes/tree-conflicts/all-add-vs-add-tree-conflicts.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: subversion/branches/auto-props-sdc/notes/wc_node_walkers.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/BlameCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/BlameCallback.cpp?rev=1401527&r1=1401526&r2=1401527&view=diff
==============================================================================
--- subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/BlameCallback.cpp (original)
+++ subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/BlameCallback.cpp Wed Oct 24 01:27:14 2012
@@ -61,11 +61,9 @@ BlameCallback::callback(void *baton,
                         apr_pool_t *pool)
 {
   if (baton)
-    return ((BlameCallback *)baton)->singleLine(start_revnum, end_revnum,
-                                                line_no, revision, rev_props,
-                                                merged_revision,
-                                                merged_rev_props, merged_path,
-                                                line, local_change, pool);
+    return static_cast<BlameCallback *>(baton)->singleLine(start_revnum,
+        end_revnum, line_no, revision, rev_props, merged_revision,
+        merged_rev_props, merged_path, line, local_change, pool);
 
   return SVN_NO_ERROR;
 }

Modified: subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/ChangelistCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/ChangelistCallback.cpp?rev=1401527&r1=1401526&r2=1401527&view=diff
==============================================================================
--- subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/ChangelistCallback.cpp (original)
+++ subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/ChangelistCallback.cpp Wed Oct 24 01:27:14 2012
@@ -53,7 +53,8 @@ ChangelistCallback::callback(void *baton
                              apr_pool_t *pool)
 {
   if (baton)
-    ((ChangelistCallback *)baton)->doChangelist(path, changelist, pool);
+    static_cast<ChangelistCallback *>(baton)->doChangelist(path, changelist,
+            pool);
 
   return SVN_NO_ERROR;
 }

Modified: subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/ClientContext.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/ClientContext.cpp?rev=1401527&r1=1401526&r2=1401527&view=diff
==============================================================================
--- subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/ClientContext.cpp (original)
+++ subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/ClientContext.cpp Wed Oct 24 01:27:14 2012
@@ -71,7 +71,8 @@ ClientContext::ClientContext(jobject jsv
 
     env->DeleteLocalRef(jctx);
 
-    SVN_JNI_ERR(svn_client_create_context(&m_context, pool.getPool()),
+    SVN_JNI_ERR(svn_client_create_context2(&m_context, NULL,
+                                           pool.getPool()),
                 );
 
     /* Clear the wc_ctx as we don't want to maintain this unconditionally
@@ -323,7 +324,7 @@ ClientContext::cancelOperation()
 svn_error_t *
 ClientContext::checkCancel(void *cancelBaton)
 {
-    ClientContext *that = (ClientContext *)cancelBaton;
+    ClientContext *that = static_cast<ClientContext *>(cancelBaton);
     if (that->m_cancelOperation)
         return svn_error_create(SVN_ERR_CANCELLED, NULL,
                                 _("Operation cancelled"));

Modified: subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/CommitCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/CommitCallback.cpp?rev=1401527&r1=1401526&r2=1401527&view=diff
==============================================================================
--- subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/CommitCallback.cpp (original)
+++ subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/CommitCallback.cpp Wed Oct 24 01:27:14 2012
@@ -57,7 +57,7 @@ CommitCallback::callback(const svn_commi
                          apr_pool_t *pool)
 {
   if (baton)
-    return ((CommitCallback *)baton)->commitInfo(commit_info, pool);
+    return static_cast<CommitCallback *>(baton)->commitInfo(commit_info, pool);
 
   return SVN_NO_ERROR;
 }

Modified: subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/CommitMessage.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/CommitMessage.cpp?rev=1401527&r1=1401526&r2=1401527&view=diff
==============================================================================
--- subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/CommitMessage.cpp (original)
+++ subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/CommitMessage.cpp Wed Oct 24 01:27:14 2012
@@ -50,9 +50,9 @@ CommitMessage::callback(const char **log
                         void *baton,
                         apr_pool_t *pool)
 {
-  if (baton && ((CommitMessage *)baton)->m_jcommitMessage)
-    return ((CommitMessage *)baton)->getCommitMessage(log_msg, tmp_file,
-                                                      commit_items, pool);
+  if (baton && static_cast<CommitMessage *>(baton)->m_jcommitMessage)
+    return static_cast<CommitMessage *>(baton)->getCommitMessage(
+            log_msg, tmp_file, commit_items, pool);
 
   *log_msg = NULL;
   *tmp_file = NULL;

Modified: subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp?rev=1401527&r1=1401526&r2=1401527&view=diff
==============================================================================
--- subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp (original)
+++ subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp Wed Oct 24 01:27:14 2012
@@ -46,7 +46,7 @@ DiffSummaryReceiver::summarize(const svn
                                apr_pool_t *pool)
 {
   if (baton)
-    return ((DiffSummaryReceiver *) baton)->onSummary(diff, pool);
+    return static_cast<DiffSummaryReceiver *>(baton)->onSummary(diff, pool);
 
   return SVN_NO_ERROR;
 }

Modified: subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/InfoCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/InfoCallback.cpp?rev=1401527&r1=1401526&r2=1401527&view=diff
==============================================================================
--- subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/InfoCallback.cpp (original)
+++ subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/InfoCallback.cpp Wed Oct 24 01:27:14 2012
@@ -52,7 +52,7 @@ InfoCallback::callback(void *baton,
                        apr_pool_t *pool)
 {
   if (baton)
-    return ((InfoCallback *)baton)->singleInfo(path, info, pool);
+    return static_cast<InfoCallback *>(baton)->singleInfo(path, info, pool);
 
   return SVN_NO_ERROR;
 }

Modified: subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/InputStream.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/InputStream.cpp?rev=1401527&r1=1401526&r2=1401527&view=diff
==============================================================================
--- subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/InputStream.cpp (original)
+++ subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/InputStream.cpp Wed Oct 24 01:27:14 2012
@@ -70,7 +70,7 @@ svn_error_t *InputStream::read(void *bat
 {
   JNIEnv *env = JNIUtil::getEnv();
   // An object of our class is passed in as the baton.
-  InputStream *that = (InputStream*)baton;
+  InputStream *that = static_cast<InputStream *>(baton);
 
   // The method id will not change during the time this library is
   // loaded, so it can be cached.

Modified: subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/ListCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/ListCallback.cpp?rev=1401527&r1=1401526&r2=1401527&view=diff
==============================================================================
--- subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/ListCallback.cpp (original)
+++ subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/ListCallback.cpp Wed Oct 24 01:27:14 2012
@@ -57,8 +57,8 @@ ListCallback::callback(void *baton,
                        apr_pool_t *pool)
 {
   if (baton)
-    return ((ListCallback *)baton)->doList(path, dirent, lock, abs_path,
-                                           pool);
+    return static_cast<ListCallback *>(baton)->doList(
+            path, dirent, lock, abs_path, pool);
 
   return SVN_NO_ERROR;
 }

Modified: subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/LogMessageCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/LogMessageCallback.cpp?rev=1401527&r1=1401526&r2=1401527&view=diff
==============================================================================
--- subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/LogMessageCallback.cpp (original)
+++ subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/LogMessageCallback.cpp Wed Oct 24 01:27:14 2012
@@ -57,7 +57,8 @@ LogMessageCallback::callback(void *baton
                              apr_pool_t *pool)
 {
   if (baton)
-    return ((LogMessageCallback *)baton)->singleMessage(log_entry, pool);
+    return static_cast<LogMessageCallback *>(baton)->singleMessage(
+            log_entry, pool);
 
   return SVN_NO_ERROR;
 }

Modified: subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/OutputStream.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/OutputStream.cpp?rev=1401527&r1=1401526&r2=1401527&view=diff
==============================================================================
--- subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/OutputStream.cpp (original)
+++ subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/OutputStream.cpp Wed Oct 24 01:27:14 2012
@@ -76,7 +76,7 @@ svn_error_t *OutputStream::write(void *b
   JNIEnv *env = JNIUtil::getEnv();
 
   // An object of our class is passed in as the baton.
-  OutputStream *that = (OutputStream*)baton;
+  OutputStream *that = static_cast<OutputStream *>(baton);
 
   // The method id will not change during the time this library is
   // loaded, so it can be cached.

Modified: subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/PatchCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/PatchCallback.cpp?rev=1401527&r1=1401526&r2=1401527&view=diff
==============================================================================
--- subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/PatchCallback.cpp (original)
+++ subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/PatchCallback.cpp Wed Oct 24 01:27:14 2012
@@ -54,10 +54,9 @@ PatchCallback::callback(void *baton,
                         apr_pool_t *pool)
 {
   if (baton)
-    return ((PatchCallback *)baton)->singlePatch(filtered,
-                                                 canon_path_from_patchfile,
-                                                 patch_abspath, reject_abspath,
-                                                 pool);
+    return static_cast<PatchCallback *>(baton)->singlePatch(
+            filtered, canon_path_from_patchfile, patch_abspath, reject_abspath,
+            pool);
 
   return SVN_NO_ERROR;
 }

Modified: subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/Prompter.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/Prompter.cpp?rev=1401527&r1=1401526&r2=1401527&view=diff
==============================================================================
--- subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/Prompter.cpp (original)
+++ subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/Prompter.cpp Wed Oct 24 01:27:14 2012
@@ -427,7 +427,7 @@ svn_error_t *Prompter::simple_prompt(svn
                                      svn_boolean_t may_save,
                                      apr_pool_t *pool)
 {
-  Prompter *that = (Prompter*)baton;
+  Prompter *that = static_cast<Prompter *>(baton);
   svn_auth_cred_simple_t *ret =
     (svn_auth_cred_simple_t*)apr_pcalloc(pool, sizeof(*ret));
   if (!that->prompt(realm, username, may_save ? true : false))
@@ -460,7 +460,7 @@ svn_error_t *Prompter::username_prompt(s
                                        svn_boolean_t may_save,
                                        apr_pool_t *pool)
 {
-  Prompter *that = (Prompter*)baton;
+  Prompter *that = static_cast<Prompter *>(baton);
   svn_auth_cred_username_t *ret =
     (svn_auth_cred_username_t*)apr_pcalloc(pool, sizeof(*ret));
   const char *user = that->askQuestion(realm, _("Username: "), true,
@@ -484,7 +484,7 @@ Prompter::ssl_server_trust_prompt(svn_au
                                   svn_boolean_t may_save,
                                   apr_pool_t *pool)
 {
-  Prompter *that = (Prompter*)baton;
+  Prompter *that = static_cast<Prompter *>(baton);
   svn_auth_cred_ssl_server_trust_t *ret =
     (svn_auth_cred_ssl_server_trust_t*)apr_pcalloc(pool, sizeof(*ret));
 
@@ -550,7 +550,7 @@ Prompter::ssl_client_cert_prompt(svn_aut
                                  svn_boolean_t may_save,
                                  apr_pool_t *pool)
 {
-  Prompter *that = (Prompter*)baton;
+  Prompter *that = static_cast<Prompter *>(baton);
   svn_auth_cred_ssl_client_cert_t *ret =
     (svn_auth_cred_ssl_client_cert_t*)apr_pcalloc(pool, sizeof(*ret));
   const char *cert_file =
@@ -572,7 +572,7 @@ Prompter::ssl_client_cert_pw_prompt(svn_
                                     svn_boolean_t may_save,
                                     apr_pool_t *pool)
 {
-  Prompter *that = (Prompter*)baton;
+  Prompter *that = static_cast<Prompter *>(baton);
   svn_auth_cred_ssl_client_cert_pw_t *ret =
     (svn_auth_cred_ssl_client_cert_pw_t*)apr_pcalloc(pool, sizeof(*ret));
   const char *info = that->askQuestion(realm,
@@ -593,7 +593,7 @@ Prompter::plaintext_prompt(svn_boolean_t
                            void *baton,
                            apr_pool_t *pool)
 {
-  Prompter *that = (Prompter *) baton;
+  Prompter *that = static_cast<Prompter *>(baton);
 
   bool result = that->askYesNo(realmstring,
                                _("Store password unencrypted?"),
@@ -610,7 +610,7 @@ Prompter::plaintext_passphrase_prompt(sv
                                       void *baton,
                                       apr_pool_t *pool)
 {
-  Prompter *that = (Prompter *) baton;
+  Prompter *that = static_cast<Prompter *>(baton);
 
   bool result = that->askYesNo(realmstring,
                                _("Store passphrase unencrypted?"),

Modified: subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/ProplistCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/ProplistCallback.cpp?rev=1401527&r1=1401526&r2=1401527&view=diff
==============================================================================
--- subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/ProplistCallback.cpp (original)
+++ subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/ProplistCallback.cpp Wed Oct 24 01:27:14 2012
@@ -54,7 +54,8 @@ ProplistCallback::callback(void *baton,
                            apr_pool_t *pool)
 {
   if (baton)
-    return ((ProplistCallback *)baton)->singlePath(path, prop_hash, pool);
+    return static_cast<ProplistCallback *>(baton)->singlePath(
+            path, prop_hash, pool);
 
   return SVN_NO_ERROR;
 }

Modified: subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/ReposNotifyCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/ReposNotifyCallback.cpp?rev=1401527&r1=1401526&r2=1401527&view=diff
==============================================================================
--- subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/ReposNotifyCallback.cpp (original)
+++ subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/ReposNotifyCallback.cpp Wed Oct 24 01:27:14 2012
@@ -49,7 +49,7 @@ ReposNotifyCallback::notify(void *baton,
                             apr_pool_t *pool)
 {
   if (baton)
-    ((ReposNotifyCallback *)baton)->onNotify(notify, pool);
+    static_cast<ReposNotifyCallback *>(baton)->onNotify(notify, pool);
 }
 
 /**

Modified: subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/SVNClient.cpp?rev=1401527&r1=1401526&r2=1401527&view=diff
==============================================================================
--- subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/SVNClient.cpp Wed Oct 24 01:27:14 2012
@@ -44,6 +44,7 @@
 #include "StatusCallback.h"
 #include "ChangelistCallback.h"
 #include "ListCallback.h"
+#include "ImportFilterCallback.h"
 #include "JNIByteArray.h"
 #include "CommitMessage.h"
 #include "EnumMapper.h"
@@ -553,7 +554,9 @@ jlong SVNClient::doSwitch(const char *pa
 void SVNClient::doImport(const char *path, const char *url,
                          CommitMessage *message, svn_depth_t depth,
                          bool noIgnore, bool ignoreUnknownNodeTypes,
-                         RevpropTable &revprops, CommitCallback *callback)
+                         RevpropTable &revprops,
+                         ImportFilterCallback *ifCallback,
+                         CommitCallback *commitCallback)
 {
     SVN::Pool subPool(pool);
     SVN_JNI_NULL_PTR_EX(path, "path", );
@@ -567,10 +570,11 @@ void SVNClient::doImport(const char *pat
     if (ctx == NULL)
         return;
 
-    SVN_JNI_ERR(svn_client_import4(intPath.c_str(), intUrl.c_str(), depth,
+    SVN_JNI_ERR(svn_client_import5(intPath.c_str(), intUrl.c_str(), depth,
                                    noIgnore, ignoreUnknownNodeTypes,
                                    revprops.hash(subPool),
-                                   CommitCallback::callback, callback,
+                                   ImportFilterCallback::callback, ifCallback,
+                                   CommitCallback::callback, commitCallback,
                                    ctx, subPool.getPool()), );
 }
 
@@ -816,7 +820,8 @@ void SVNClient::getMergeinfoLog(int type
  * Get a property.
  */
 jbyteArray SVNClient::propertyGet(const char *path, const char *name,
-                                  Revision &revision, Revision &pegRevision)
+                                  Revision &revision, Revision &pegRevision,
+                                  StringArray &changelists)
 {
     SVN::Pool subPool(pool);
     SVN_JNI_NULL_PTR_EX(path, "path", NULL);
@@ -829,11 +834,11 @@ jbyteArray SVNClient::propertyGet(const 
         return NULL;
 
     apr_hash_t *props;
-    SVN_JNI_ERR(svn_client_propget4(&props, name,
+    SVN_JNI_ERR(svn_client_propget5(&props, NULL, name,
                                     intPath.c_str(), pegRevision.revision(),
                                     revision.revision(), NULL, svn_depth_empty,
-                                    NULL, ctx, subPool.getPool(),
-                                    subPool.getPool()),
+                                    changelists.array(subPool), ctx,
+                                    subPool.getPool(), subPool.getPool()),
                 NULL);
 
     apr_hash_index_t *hi;
@@ -1187,7 +1192,6 @@ void SVNClient::blame(const char *path, 
 {
     SVN::Pool subPool(pool);
     SVN_JNI_NULL_PTR_EX(path, "path", );
-    apr_pool_t *pool = subPool.getPool();
     Path intPath(path, subPool);
     SVN_JNI_ERR(intPath.error_occured(), );
 
@@ -1195,13 +1199,12 @@ void SVNClient::blame(const char *path, 
     if (ctx == NULL)
         return;
 
-    SVN_JNI_ERR(svn_client_blame5(intPath.c_str(), pegRevision.revision(),
-                                  revisionStart.revision(),
-                                  revisionEnd.revision(),
-                                  svn_diff_file_options_create(pool),
-                                  ignoreMimeType, includeMergedRevisions,
-                                  BlameCallback::callback, callback, ctx,
-                                  pool),
+    SVN_JNI_ERR(svn_client_blame5(
+          intPath.c_str(), pegRevision.revision(), revisionStart.revision(),
+          revisionEnd.revision(),
+          svn_diff_file_options_create(subPool.getPool()), ignoreMimeType,
+          includeMergedRevisions, BlameCallback::callback, callback, ctx,
+          subPool.getPool()),
         );
 }
 

Modified: subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/SVNClient.h
URL: http://svn.apache.org/viewvc/subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/SVNClient.h?rev=1401527&r1=1401526&r2=1401527&view=diff
==============================================================================
--- subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/SVNClient.h (original)
+++ subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/SVNClient.h Wed Oct 24 01:27:14 2012
@@ -46,6 +46,7 @@ class LogMessageCallback;
 class InfoCallback;
 class CommitCallback;
 class ListCallback;
+class ImportFilterCallback;
 class StatusCallback;
 class OutputStream;
 class PatchCallback;
@@ -107,7 +108,8 @@ class SVNClient :public SVNBase
                         const char *localPath, bool dryRun);
   void doImport(const char *path, const char *url, CommitMessage *message,
                 svn_depth_t depth, bool noIgnore, bool ignoreUnknownNodeTypes,
-                RevpropTable &revprops, CommitCallback *callback);
+                RevpropTable &revprops, ImportFilterCallback *ifCallback,
+                CommitCallback *commitCallback);
   jlong doSwitch(const char *path, const char *url, Revision &revision,
                  Revision &pegRevision, svn_depth_t depth,
                  bool depthIsSticky, bool ignoreExternals,
@@ -171,7 +173,8 @@ class SVNClient :public SVNBase
                          bool lastChanged);
   void upgrade(const char *path);
   jbyteArray propertyGet(const char *path, const char *name,
-                         Revision &revision, Revision &pegRevision);
+                         Revision &revision, Revision &pegRevision,
+                         StringArray &changelists);
   void diff(const char *target1, Revision &revision1,
             const char *target2, Revision &revision2,
             const char *relativeToDir, OutputStream &outputStream,

Modified: subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/SVNRepos.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/SVNRepos.cpp?rev=1401527&r1=1401526&r2=1401527&view=diff
==============================================================================
--- subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/SVNRepos.cpp (original)
+++ subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/SVNRepos.cpp Wed Oct 24 01:27:14 2012
@@ -68,7 +68,7 @@ void SVNRepos::cancelOperation()
 svn_error_t *
 SVNRepos::checkCancel(void *cancelBaton)
 {
-  SVNRepos *that = (SVNRepos *)cancelBaton;
+  SVNRepos *that = static_cast<SVNRepos *>(cancelBaton);
   if (that->m_cancelOperation)
     return svn_error_create(SVN_ERR_CANCELLED, NULL,
                             _("Operation cancelled"));
@@ -248,7 +248,7 @@ void SVNRepos::dump(File &path, OutputSt
 }
 
 void SVNRepos::hotcopy(File &path, File &targetPath,
-                       bool cleanLogs)
+                       bool cleanLogs, bool incremental)
 {
   SVN::Pool requestPool;
 
@@ -264,9 +264,12 @@ void SVNRepos::hotcopy(File &path, File 
       return;
     }
 
-  SVN_JNI_ERR(svn_repos_hotcopy(path.getInternalStyle(requestPool),
-                                targetPath.getInternalStyle(requestPool),
-                                cleanLogs, requestPool.getPool()), );
+  SVN_JNI_ERR(svn_repos_hotcopy2(path.getInternalStyle(requestPool),
+                                 targetPath.getInternalStyle(requestPool),
+                                 cleanLogs, incremental,
+                                 checkCancel, this /* cancel callback/baton */,
+                                 requestPool.getPool()),
+             );
 }
 
 static void

Modified: subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/SVNRepos.h
URL: http://svn.apache.org/viewvc/subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/SVNRepos.h?rev=1401527&r1=1401526&r2=1401527&view=diff
==============================================================================
--- subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/SVNRepos.h (original)
+++ subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/SVNRepos.h Wed Oct 24 01:27:14 2012
@@ -58,7 +58,7 @@ class SVNRepos : public SVNBase
   void listUnusedDBLogs(File &path,
                         MessageReceiver &messageReceiver);
   void listDBLogs(File &path, MessageReceiver &messageReceiver);
-  void hotcopy(File &path, File &targetPath, bool cleanLogs);
+  void hotcopy(File &path, File &targetPath, bool cleanLogs, bool incremental);
   void dump(File &path, OutputStream &dataOut, Revision &revsionStart,
             Revision &RevisionEnd, bool incremental, bool useDeltas,
             ReposNotifyCallback *notifyCallback);

Modified: subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/StatusCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/StatusCallback.cpp?rev=1401527&r1=1401526&r2=1401527&view=diff
==============================================================================
--- subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/StatusCallback.cpp (original)
+++ subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/StatusCallback.cpp Wed Oct 24 01:27:14 2012
@@ -55,7 +55,8 @@ StatusCallback::callback(void *baton,
                          apr_pool_t *pool)
 {
   if (baton)
-    return ((StatusCallback *)baton)->doStatus(local_abspath, status, pool);
+    return static_cast<StatusCallback *>(baton)->doStatus(
+            local_abspath, status, pool);
 
   return SVN_NO_ERROR;
 }

Modified: subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp?rev=1401527&r1=1401526&r2=1401527&view=diff
==============================================================================
--- subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp (original)
+++ subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp Wed Oct 24 01:27:14 2012
@@ -47,6 +47,7 @@
 #include "InfoCallback.h"
 #include "StatusCallback.h"
 #include "ListCallback.h"
+#include "ImportFilterCallback.h"
 #include "ChangelistCallback.h"
 #include "StringArray.h"
 #include "RevpropTable.h"
@@ -712,7 +713,7 @@ JNIEXPORT void JNICALL
 Java_org_apache_subversion_javahl_SVNClient_doImport
 (JNIEnv *env, jobject jthis, jstring jpath, jstring jurl, jobject jdepth,
  jboolean jnoIgnore, jboolean jignoreUnknownNodeTypes, jobject jrevpropTable,
- jobject jmessage, jobject jcallback)
+ jobject jimportFilterCallback, jobject jmessage, jobject jcommitCallback)
 {
   JNIEntry(SVNClient, doImport);
   SVNClient *cl = SVNClient::getCppObject(jthis);
@@ -737,11 +738,14 @@ Java_org_apache_subversion_javahl_SVNCli
   if (JNIUtil::isExceptionThrown())
     return;
 
-  CommitCallback callback(jcallback);
+  ImportFilterCallback importFilterCallback(jimportFilterCallback);
+  CommitCallback commitCallback(jcommitCallback);
+
   cl->doImport(path, url, &message, EnumMapper::toDepth(jdepth),
                jnoIgnore ? true : false,
                jignoreUnknownNodeTypes ? true : false, revprops,
-               jcallback ? &callback : NULL);
+               jimportFilterCallback ? &importFilterCallback : NULL,
+               jcommitCallback ? &commitCallback : NULL);
 }
 
 JNIEXPORT jobject JNICALL
@@ -1080,7 +1084,7 @@ Java_org_apache_subversion_javahl_SVNCli
 JNIEXPORT jbyteArray JNICALL
 Java_org_apache_subversion_javahl_SVNClient_propertyGet
 (JNIEnv *env, jobject jthis, jstring jpath, jstring jname, jobject jrevision,
- jobject jpegRevision)
+ jobject jpegRevision, jobject jchangelists)
 {
   JNIEntry(SVNClient, propertyGet);
   SVNClient *cl = SVNClient::getCppObject(jthis);
@@ -1105,7 +1109,11 @@ Java_org_apache_subversion_javahl_SVNCli
   if (JNIUtil::isExceptionThrown())
     return NULL;
 
-  return cl->propertyGet(path, name, revision, pegRevision);
+  StringArray changelists(jchangelists);
+  if (JNIUtil::isExceptionThrown())
+    return NULL;
+
+  return cl->propertyGet(path, name, revision, pegRevision, changelists);
 }
 
 JNIEXPORT jobject JNICALL

Modified: subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp?rev=1401527&r1=1401526&r2=1401527&view=diff
==============================================================================
--- subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp (original)
+++ subversion/branches/auto-props-sdc/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp Wed Oct 24 01:27:14 2012
@@ -170,7 +170,7 @@ Java_org_apache_subversion_javahl_SVNRep
 JNIEXPORT void JNICALL
 Java_org_apache_subversion_javahl_SVNRepos_hotcopy
 (JNIEnv *env, jobject jthis, jobject jpath, jobject jtargetPath,
- jboolean jcleanLogs)
+ jboolean jcleanLogs, jboolean jincremental)
 {
   JNIEntry(SVNRepos, hotcopy);
   SVNRepos *cl = SVNRepos::getCppObject(jthis);
@@ -188,7 +188,8 @@ Java_org_apache_subversion_javahl_SVNRep
   if (JNIUtil::isExceptionThrown())
     return;
 
-  cl->hotcopy(path, targetPath, jcleanLogs ? true : false);
+  cl->hotcopy(path, targetPath, jcleanLogs ? true : false,
+              jincremental ? true : false);
 }
 
 JNIEXPORT void JNICALL

Modified: subversion/branches/auto-props-sdc/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
URL: http://svn.apache.org/viewvc/subversion/branches/auto-props-sdc/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java?rev=1401527&r1=1401526&r2=1401527&view=diff
==============================================================================
--- subversion/branches/auto-props-sdc/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java (original)
+++ subversion/branches/auto-props-sdc/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java Wed Oct 24 01:27:14 2012
@@ -406,6 +406,13 @@ public interface ISVNClient
     void doImport(String path, String url, Depth depth,
                   boolean noIgnore, boolean ignoreUnknownNodeTypes,
                   Map<String, String> revpropTable,
+                  ImportFilterCallback importFilterCallback,
+                  CommitMessageCallback handler, CommitCallback commitCallback)
+            throws ClientException;
+
+    void doImport(String path, String url, Depth depth,
+                  boolean noIgnore, boolean ignoreUnknownNodeTypes,
+                  Map<String, String> revpropTable,
                   CommitMessageCallback handler, CommitCallback callback)
             throws ClientException;
 
@@ -719,6 +726,10 @@ public interface ISVNClient
      * @throws ClientException
      */
     byte[] propertyGet(String path, String name, Revision revision,
+                       Revision pegRevision, Collection<String> changelists)
+            throws ClientException;
+
+    byte[] propertyGet(String path, String name, Revision revision,
                        Revision pegRevision)
             throws ClientException;
 

Modified: subversion/branches/auto-props-sdc/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java
URL: http://svn.apache.org/viewvc/subversion/branches/auto-props-sdc/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java?rev=1401527&r1=1401526&r2=1401527&view=diff
==============================================================================
--- subversion/branches/auto-props-sdc/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java (original)
+++ subversion/branches/auto-props-sdc/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java Wed Oct 24 01:27:14 2012
@@ -113,6 +113,9 @@ public interface ISVNRepos {
 	 * @throws ClientException  throw in case of problem
 	 */
 	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;
 
 	/**

Modified: subversion/branches/auto-props-sdc/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
URL: http://svn.apache.org/viewvc/subversion/branches/auto-props-sdc/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java?rev=1401527&r1=1401526&r2=1401527&view=diff
==============================================================================
--- subversion/branches/auto-props-sdc/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java (original)
+++ subversion/branches/auto-props-sdc/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java Wed Oct 24 01:27:14 2012
@@ -230,9 +230,22 @@ public class SVNClient implements ISVNCl
                                 boolean noIgnore,
                                 boolean ignoreUnknownNodeTypes,
                                 Map<String, String> revpropTable,
-                                CommitMessageCallback handler, CommitCallback callback)
+                                ImportFilterCallback importFilterCallback,
+                                CommitMessageCallback handler,
+                                CommitCallback commitCallback)
             throws ClientException;
 
+    public void doImport(String path, String url, Depth depth, boolean noIgnore,
+                         boolean ignoreUnknownNodeTypes,
+                         Map<String, String> revpropTable,
+                         CommitMessageCallback handler,
+                         CommitCallback callback)
+            throws ClientException
+    {
+        doImport(path, url, depth, noIgnore, ignoreUnknownNodeTypes,
+                 revpropTable, null, handler, callback);
+    }
+
     public native Set<String> suggestMergeSources(String path,
                                                   Revision pegRevision)
             throws SubversionException;
@@ -366,8 +379,16 @@ public class SVNClient implements ISVNCl
                                       boolean force)
             throws ClientException;
 
+    public byte[] propertyGet(String path, String name,
+                              Revision revision, Revision pegRevision)
+            throws ClientException
+    {
+        return propertyGet(path, name, revision, pegRevision, null);
+    }
+
     public native byte[] propertyGet(String path, String name,
-                                     Revision revision, Revision pegRevision)
+                                     Revision revision, Revision pegRevision,
+                                     Collection<String> changelists)
             throws ClientException;
 
     public byte[] fileContent(String path, Revision revision,

Modified: subversion/branches/auto-props-sdc/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java
URL: http://svn.apache.org/viewvc/subversion/branches/auto-props-sdc/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java?rev=1401527&r1=1401526&r2=1401527&view=diff
==============================================================================
--- subversion/branches/auto-props-sdc/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java (original)
+++ subversion/branches/auto-props-sdc/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java Wed Oct 24 01:27:14 2012
@@ -130,7 +130,14 @@ public class SVNRepos implements ISVNRep
      * @throws ClientException  throw in case of problem
      */
     public native void hotcopy(File path, File targetPath,
-                               boolean cleanLogs) throws ClientException;
+                               boolean cleanLogs, boolean incremental)
+            throws ClientException;
+
+    public void hotcopy(File path, File targetPath,
+                        boolean cleanLogs) throws ClientException
+    {
+        hotcopy(path, targetPath, cleanLogs, false);
+    }
 
     /**
      * list all logfiles (BDB) in use or not)

Modified: subversion/branches/auto-props-sdc/subversion/bindings/swig/include/svn_types.swg
URL: http://svn.apache.org/viewvc/subversion/branches/auto-props-sdc/subversion/bindings/swig/include/svn_types.swg?rev=1401527&r1=1401526&r2=1401527&view=diff
==============================================================================
--- subversion/branches/auto-props-sdc/subversion/bindings/swig/include/svn_types.swg (original)
+++ subversion/branches/auto-props-sdc/subversion/bindings/swig/include/svn_types.swg Wed Oct 24 01:27:14 2012
@@ -793,23 +793,38 @@ svn_ ## TYPE ## _swig_rb_closed(VALUE se
    Callback: svn_commit_callback2_t
    svn_ra get_commit_editor2()
    svn_repos_get_commit_editor4()
+   svn_client_mkdir4() 
+   svn_client_delete4() 
+   svn_client_import4() 
+   svn_client_commit5() 
+   svn_client_copy6() 
+   svn_client_move6() 
+   svn_client_propset_remote() 
 */
 
+#ifdef SWIGPERL
+%typemap(in) (svn_commit_callback2_t commit_callback, void *commit_baton) {
+    $1 = svn_swig_pl_thunk_commit_callback2;
+    $2 = (void *)$input;
+    svn_swig_pl_hold_ref_in_pool (_global_pool, $input);
+};
+#endif
+
 #ifdef SWIGRUBY
-%typemap(in) (svn_commit_callback2_t callback, void *callback_baton)
+%typemap(in) (svn_commit_callback2_t commit_callback, void *commit_baton)
 {
   $1 = svn_swig_rb_commit_callback2;
   $2 = (void *)svn_swig_rb_make_baton($input, _global_svn_swig_rb_pool);
 };
 
-%typemap(argout) (svn_commit_callback2_t callback, void *callback_baton)
+%typemap(argout) (svn_commit_callback2_t commit_callback, void *commit_baton)
 {
   svn_swig_rb_set_baton($result, (VALUE)$2);
 };
 #endif
 
 #ifdef SWIGPYTHON
-%typemap(in) (svn_commit_callback2_t callback, void *callback_baton)
+%typemap(in) (svn_commit_callback2_t commit_callback, void *commit_baton)
 {
   $1 = svn_swig_py_commit_callback2;
   $2 = (void *)$input;

Modified: subversion/branches/auto-props-sdc/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
URL: http://svn.apache.org/viewvc/subversion/branches/auto-props-sdc/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c?rev=1401527&r1=1401526&r2=1401527&view=diff
==============================================================================
--- subversion/branches/auto-props-sdc/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c (original)
+++ subversion/branches/auto-props-sdc/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c Wed Oct 24 01:27:14 2012
@@ -919,6 +919,22 @@ svn_error_t *svn_swig_pl_thunk_commit_ca
     return SVN_NO_ERROR;
 }
 
+svn_error_t *svn_swig_pl_thunk_commit_callback2(const svn_commit_info_t *commit_info, 
+                                                void *baton,
+                                                apr_pool_t *pool)
+{
+    if (!SvOK((SV *)baton))
+        return SVN_NO_ERROR;
+
+    svn_swig_pl_callback_thunk(CALL_SV, baton, NULL,
+                               "SS",
+                               commit_info, _SWIG_TYPE("svn_commit_info_t *"),
+                               pool, POOLINFO);
+
+    return SVN_NO_ERROR;
+}
+
+
 /* Wrap RA */
 
 static svn_error_t * thunk_open_tmp_file(apr_file_t **fp,

Modified: subversion/branches/auto-props-sdc/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h
URL: http://svn.apache.org/viewvc/subversion/branches/auto-props-sdc/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h?rev=1401527&r1=1401526&r2=1401527&view=diff
==============================================================================
--- subversion/branches/auto-props-sdc/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h (original)
+++ subversion/branches/auto-props-sdc/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.h Wed Oct 24 01:27:14 2012
@@ -127,6 +127,11 @@ svn_error_t *svn_swig_pl_thunk_commit_ca
 					       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,
+                                                void *baton,
+                                                apr_pool_t *pool);
+
 /* thunked repos_history callback. */
 svn_error_t *svn_swig_pl_thunk_history_func(void *baton,
                                             const char *path,

Modified: subversion/branches/auto-props-sdc/subversion/bindings/swig/perl/native/Client.pm
URL: http://svn.apache.org/viewvc/subversion/branches/auto-props-sdc/subversion/bindings/swig/perl/native/Client.pm?rev=1401527&r1=1401526&r2=1401527&view=diff
==============================================================================
--- subversion/branches/auto-props-sdc/subversion/bindings/swig/perl/native/Client.pm (original)
+++ subversion/branches/auto-props-sdc/subversion/bindings/swig/perl/native/Client.pm Wed Oct 24 01:27:14 2012
@@ -10,7 +10,7 @@ BEGIN {
     @_all_fns =
         qw( version diff_summarize_dup create_context checkout3
             checkout2 checkout update4 update3 update2 update switch2 switch
-            add4 add3 add2 add mkdir3 mkdir2 mkdir delete3 delete2
+            add4 add3 add2 add mkdir4 mkdir3 mkdir2 mkdir delete3 delete2
             delete import3 import2 import commit4 commit3 commit2
             commit status4 status3 status2 status log4 log3 log2 log blame4
             blame3 blame2 blame diff4 diff3 diff2 diff diff_peg4
@@ -628,6 +628,21 @@ Has no return.
 
 =item $ctx-E<gt>mkdir($targets, $pool);
 
+Similar to $ctx-E<gt>mkdir2() except it returns an svn_client_commit_info_t
+object instead of a svn_commit_info_t object.
+
+=item $ctx-E<gt>mkdir2($targets, $pool);
+
+Similar to $ctx-E<gt>mkdir3(), but with $make_parents always FALSE, and
+$revprop_hash always undef.
+
+=item $ctx-E<gt>mkdir3($targets, $make_parents, $revprop_hash, $pool);
+
+Similar to $ctx-E<gt>mkdir4(), but returns a svn_commit_info_t object rather
+than through a callback function.
+
+=item $ctx-E<gt>mkdir4($targets, $make_parents, $revprop_hash, \&commit_callback, $pool);
+
 Create a directory, either in a repository or a working copy.
 
 If $targets contains URLs, immediately attempts to commit the creation of the
@@ -637,10 +652,23 @@ object.
 Else, create the directories on disk, and attempt to schedule them for addition.
 In this case returns undef.
 
+If $make_parents is TRUE, create any non-existant parent directories also.
+
+If not undef, $revprop_hash is a reference to a hash table holding additional
+custom revision properites (property names mapped to strings) to be set on the
+new revision in the event that this is a committing operation.  This hash
+cannot contain any standard Subversion properties.
+
+Calls the log message callback to query for a commit log message when one is
+needed.
+
 Calls the notify callback when the directory has been created (successfully)
 in the working copy, with the path of the new directory.  Note this is only
 called for items added to the working copy.
 
+If \&commit_callback is not undef, then for each successful commit, call
+\&commit_callback with the svn_commit_info_t object for the commit.
+
 =item $ctx-E<gt>move($src_path, $src_revision, $dst_path, $force, $pool);
 
 Move $src_path to $dst_path.

Modified: subversion/branches/auto-props-sdc/subversion/bindings/swig/perl/native/Core.pm
URL: http://svn.apache.org/viewvc/subversion/branches/auto-props-sdc/subversion/bindings/swig/perl/native/Core.pm?rev=1401527&r1=1401526&r2=1401527&view=diff
==============================================================================
--- subversion/branches/auto-props-sdc/subversion/bindings/swig/perl/native/Core.pm (original)
+++ subversion/branches/auto-props-sdc/subversion/bindings/swig/perl/native/Core.pm Wed Oct 24 01:27:14 2012
@@ -823,6 +823,37 @@ Author of created rev.
 
 =cut
 
+package _p_svn_commit_info_t;
+use SVN::Base qw(Core svn_commit_info_t_);
+
+=head2 svn_commit_info_t
+
+=over 4
+
+=item $commit-E<gt>revision()
+
+Just committed revision.
+
+=item $commit-E<gt>date()
+
+Server-side date of the commit.
+
+=item $commit-E<gt>author()
+
+Author of the commit.
+
+=item $commit-E<gt>post_commit_err()
+
+Error message from the post-commit hook, or undef.
+
+=item $commit-E<gt>repos_root()
+
+Repoistory root, may be undef if unknown.
+
+=back
+
+=cut
+
 package _p_svn_auth_cred_simple_t;
 use SVN::Base qw(Core svn_auth_cred_simple_t_);
 



Mime
View raw message