You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2010/11/17 01:09:55 UTC
svn commit: r1035869 [1/19] - in /subversion/branches/performance: ./ build/
build/generator/ build/generator/templates/ build/win32/
subversion/bindings/javahl/native/
subversion/bindings/javahl/src/org/apache/subversion/javahl/
subversion/bindings/ja...
Author: stefan2
Date: Wed Nov 17 00:09:50 2010
New Revision: 1035869
URL: http://svn.apache.org/viewvc?rev=1035869&view=rev
Log:
On the performance branch:
Bring up-to-date with trunk.
[lots of tree conflicts due to moved files were to resolve]
Added:
subversion/branches/performance/build/generator/templates/build_locale.ezt
- copied unchanged from r1035839, subversion/trunk/build/generator/templates/build_locale.ezt
subversion/branches/performance/build/generator/templates/build_zlib.ezt
- copied unchanged from r1035839, subversion/trunk/build/generator/templates/build_zlib.ezt
subversion/branches/performance/build/generator/templates/msvc_dsp.ezt
- copied unchanged from r1035839, subversion/trunk/build/generator/templates/msvc_dsp.ezt
subversion/branches/performance/build/generator/templates/msvc_dsw.ezt
- copied unchanged from r1035839, subversion/trunk/build/generator/templates/msvc_dsw.ezt
subversion/branches/performance/build/generator/templates/neon.dsp.ezt
- copied unchanged from r1035839, subversion/trunk/build/generator/templates/neon.dsp.ezt
subversion/branches/performance/build/generator/templates/neon.vcproj.ezt
- copied unchanged from r1035839, subversion/trunk/build/generator/templates/neon.vcproj.ezt
subversion/branches/performance/build/generator/templates/neon.vcxproj.ezt
- copied unchanged from r1035839, subversion/trunk/build/generator/templates/neon.vcxproj.ezt
subversion/branches/performance/build/generator/templates/serf.dsp.ezt
- copied unchanged from r1035839, subversion/trunk/build/generator/templates/serf.dsp.ezt
subversion/branches/performance/build/generator/templates/serf.vcproj.ezt
- copied unchanged from r1035839, subversion/trunk/build/generator/templates/serf.vcproj.ezt
subversion/branches/performance/build/generator/templates/serf.vcxproj.ezt
- copied unchanged from r1035839, subversion/trunk/build/generator/templates/serf.vcxproj.ezt
subversion/branches/performance/build/generator/templates/svn_config.dsp.ezt
- copied unchanged from r1035839, subversion/trunk/build/generator/templates/svn_config.dsp.ezt
subversion/branches/performance/build/generator/templates/svn_config.vcproj.ezt
- copied unchanged from r1035839, subversion/trunk/build/generator/templates/svn_config.vcproj.ezt
subversion/branches/performance/build/generator/templates/svn_config.vcxproj.ezt
- copied unchanged from r1035839, subversion/trunk/build/generator/templates/svn_config.vcxproj.ezt
subversion/branches/performance/build/generator/templates/svn_locale.dsp.ezt
- copied unchanged from r1035839, subversion/trunk/build/generator/templates/svn_locale.dsp.ezt
subversion/branches/performance/build/generator/templates/svn_locale.vcproj.ezt
- copied unchanged from r1035839, subversion/trunk/build/generator/templates/svn_locale.vcproj.ezt
subversion/branches/performance/build/generator/templates/svn_locale.vcxproj.ezt
- copied unchanged from r1035839, subversion/trunk/build/generator/templates/svn_locale.vcxproj.ezt
subversion/branches/performance/build/generator/templates/zlib.dsp.ezt
- copied unchanged from r1035839, subversion/trunk/build/generator/templates/zlib.dsp.ezt
subversion/branches/performance/build/generator/templates/zlib.vcproj.ezt
- copied unchanged from r1035839, subversion/trunk/build/generator/templates/zlib.vcproj.ezt
subversion/branches/performance/build/generator/templates/zlib.vcxproj.ezt
- copied unchanged from r1035839, subversion/trunk/build/generator/templates/zlib.vcxproj.ezt
subversion/branches/performance/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_Version.cpp
- copied unchanged from r1035839, subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_Version.cpp
subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/
- copied from r1035839, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/
subversion/branches/performance/subversion/tests/cmdline/upgrade_tests_data/delete-in-copy.tar.bz2
- copied unchanged from r1035839, subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/delete-in-copy.tar.bz2
subversion/branches/performance/subversion/tests/cmdline/upgrade_tests_data/upgrade_tc.tar.bz2
- copied unchanged from r1035839, subversion/trunk/subversion/tests/cmdline/upgrade_tests_data/upgrade_tc.tar.bz2
Removed:
subversion/branches/performance/build/generator/build_locale.ezt
subversion/branches/performance/build/generator/build_zlib.ezt
subversion/branches/performance/build/generator/msvc_dsp.ezt
subversion/branches/performance/build/generator/msvc_dsw.ezt
subversion/branches/performance/build/generator/neon.dsp.ezt
subversion/branches/performance/build/generator/neon.vcproj.ezt
subversion/branches/performance/build/generator/neon.vcxproj.ezt
subversion/branches/performance/build/generator/serf.dsp.ezt
subversion/branches/performance/build/generator/serf.vcproj.ezt
subversion/branches/performance/build/generator/serf.vcxproj.ezt
subversion/branches/performance/build/generator/svn_config.vcproj.ezt
subversion/branches/performance/build/generator/svn_config.vcxproj.ezt
subversion/branches/performance/build/generator/svn_locale.vcproj.ezt
subversion/branches/performance/build/generator/svn_locale.vcxproj.ezt
subversion/branches/performance/build/generator/zlib.dsp.ezt
subversion/branches/performance/build/generator/zlib.vcproj.ezt
subversion/branches/performance/build/generator/zlib.vcxproj.ezt
subversion/branches/performance/build/win32/svn_config.dsp
subversion/branches/performance/build/win32/svn_locale.dsp
subversion/branches/performance/subversion/bindings/javahl/native/org_apache_subversion_javahl_Version.cpp
subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/MergeinfoLogKind.java
subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/NodeKind.java
subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/Tristate.java
subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/Version.java
subversion/branches/performance/subversion/libsvn_fs_fs/err.c
subversion/branches/performance/subversion/libsvn_fs_fs/err.h
Modified:
subversion/branches/performance/ (props changed)
subversion/branches/performance/CHANGES
subversion/branches/performance/COMMITTERS
subversion/branches/performance/Makefile.in
subversion/branches/performance/build.conf
subversion/branches/performance/build/generator/gen_msvc_dsp.py
subversion/branches/performance/build/generator/gen_vcnet_vcproj.py
subversion/branches/performance/build/generator/gen_win.py
subversion/branches/performance/build/run_tests.py
subversion/branches/performance/configure.ac
subversion/branches/performance/get-deps.sh
subversion/branches/performance/subversion/bindings/javahl/native/CreateJ.cpp
subversion/branches/performance/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp
subversion/branches/performance/subversion/bindings/javahl/native/EnumMapper.cpp
subversion/branches/performance/subversion/bindings/javahl/native/ListCallback.cpp
subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/ChangePath.java
subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java
subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItem.java
subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java
subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictVersion.java
subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/DiffSummary.java
subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/DirEntry.java
subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java
subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/Info.java
subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/Mergeinfo.java
subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java
subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java
subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/Status.java
subversion/branches/performance/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NodeKind.java
subversion/branches/performance/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
subversion/branches/performance/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Version.java
subversion/branches/performance/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
subversion/branches/performance/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java
subversion/branches/performance/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java
subversion/branches/performance/subversion/bindings/swig/include/svn_containers.swg
subversion/branches/performance/subversion/bindings/swig/perl/native/t/3client.t
subversion/branches/performance/subversion/bindings/swig/ruby/svn/fs.rb
subversion/branches/performance/subversion/include/private/svn_wc_private.h
subversion/branches/performance/subversion/include/svn_client.h
subversion/branches/performance/subversion/include/svn_error_codes.h
subversion/branches/performance/subversion/include/svn_path.h
subversion/branches/performance/subversion/include/svn_types.h
subversion/branches/performance/subversion/libsvn_client/changelist.c
subversion/branches/performance/subversion/libsvn_client/checkout.c
subversion/branches/performance/subversion/libsvn_client/cleanup.c
subversion/branches/performance/subversion/libsvn_client/client.h
subversion/branches/performance/subversion/libsvn_client/deprecated.c
subversion/branches/performance/subversion/libsvn_client/externals.c
subversion/branches/performance/subversion/libsvn_client/patch.c
subversion/branches/performance/subversion/libsvn_client/relocate.c
subversion/branches/performance/subversion/libsvn_client/status.c
subversion/branches/performance/subversion/libsvn_client/update.c
subversion/branches/performance/subversion/libsvn_diff/diff_file.c
subversion/branches/performance/subversion/libsvn_fs_fs/dag.c
subversion/branches/performance/subversion/libsvn_fs_fs/fs.c
subversion/branches/performance/subversion/libsvn_fs_fs/fs_fs.c
subversion/branches/performance/subversion/libsvn_fs_fs/fs_fs.h
subversion/branches/performance/subversion/libsvn_fs_fs/lock.c
subversion/branches/performance/subversion/libsvn_fs_fs/tree.c
subversion/branches/performance/subversion/libsvn_repos/load-fs-vtable.c
subversion/branches/performance/subversion/libsvn_repos/rev_hunt.c
subversion/branches/performance/subversion/libsvn_subr/constructors.c
subversion/branches/performance/subversion/libsvn_subr/io.c
subversion/branches/performance/subversion/libsvn_wc/adm_crawler.c
subversion/branches/performance/subversion/libsvn_wc/adm_ops.c
subversion/branches/performance/subversion/libsvn_wc/copy.c
subversion/branches/performance/subversion/libsvn_wc/entries.c
subversion/branches/performance/subversion/libsvn_wc/tree_conflicts.c
subversion/branches/performance/subversion/libsvn_wc/tree_conflicts.h
subversion/branches/performance/subversion/libsvn_wc/update_editor.c
subversion/branches/performance/subversion/libsvn_wc/upgrade.c
subversion/branches/performance/subversion/libsvn_wc/wc-metadata.sql
subversion/branches/performance/subversion/libsvn_wc/wc-queries.sql
subversion/branches/performance/subversion/libsvn_wc/wc.h
subversion/branches/performance/subversion/libsvn_wc/wc_db.c
subversion/branches/performance/subversion/libsvn_wc/wc_db.h
subversion/branches/performance/subversion/libsvn_wc/workqueue.c
subversion/branches/performance/subversion/mod_dav_svn/activity.c
subversion/branches/performance/subversion/mod_dav_svn/dav_svn.h
subversion/branches/performance/subversion/mod_dav_svn/deadprops.c
subversion/branches/performance/subversion/mod_dav_svn/lock.c
subversion/branches/performance/subversion/mod_dav_svn/reports/dated-rev.c
subversion/branches/performance/subversion/mod_dav_svn/reports/deleted-rev.c
subversion/branches/performance/subversion/mod_dav_svn/reports/get-locks.c
subversion/branches/performance/subversion/mod_dav_svn/repos.c
subversion/branches/performance/subversion/mod_dav_svn/util.c
subversion/branches/performance/subversion/mod_dav_svn/version.c
subversion/branches/performance/subversion/po/de.po
subversion/branches/performance/subversion/po/es.po
subversion/branches/performance/subversion/po/fr.po
subversion/branches/performance/subversion/po/it.po
subversion/branches/performance/subversion/po/ja.po
subversion/branches/performance/subversion/po/ko.po
subversion/branches/performance/subversion/po/nb.po
subversion/branches/performance/subversion/po/pl.po
subversion/branches/performance/subversion/po/pt_BR.po
subversion/branches/performance/subversion/po/sv.po
subversion/branches/performance/subversion/po/zh_CN.po
subversion/branches/performance/subversion/po/zh_TW.po
subversion/branches/performance/subversion/svn/cat-cmd.c
subversion/branches/performance/subversion/svn/changelist-cmd.c
subversion/branches/performance/subversion/svn/cl.h
subversion/branches/performance/subversion/svn/conflict-callbacks.c
subversion/branches/performance/subversion/svn/export-cmd.c
subversion/branches/performance/subversion/svn/list-cmd.c
subversion/branches/performance/subversion/svn/main.c
subversion/branches/performance/subversion/svn/notify.c
subversion/branches/performance/subversion/svn/patch-cmd.c
subversion/branches/performance/subversion/svn/switch-cmd.c
subversion/branches/performance/subversion/svn/unlock-cmd.c
subversion/branches/performance/subversion/svn/update-cmd.c
subversion/branches/performance/subversion/svn/util.c
subversion/branches/performance/subversion/svnrdump/dump_editor.c
subversion/branches/performance/subversion/svnrdump/dump_editor.h
subversion/branches/performance/subversion/svnrdump/load_editor.c
subversion/branches/performance/subversion/svnrdump/load_editor.h
subversion/branches/performance/subversion/svnrdump/svnrdump.c
subversion/branches/performance/subversion/svnsync/main.c
subversion/branches/performance/subversion/tests/cmdline/authz_tests.py
subversion/branches/performance/subversion/tests/cmdline/basic_tests.py
subversion/branches/performance/subversion/tests/cmdline/cat_tests.py
subversion/branches/performance/subversion/tests/cmdline/depth_tests.py
subversion/branches/performance/subversion/tests/cmdline/externals_tests.py
subversion/branches/performance/subversion/tests/cmdline/info_tests.py
subversion/branches/performance/subversion/tests/cmdline/input_validation_tests.py
subversion/branches/performance/subversion/tests/cmdline/merge_authz_tests.py
subversion/branches/performance/subversion/tests/cmdline/patch_tests.py
subversion/branches/performance/subversion/tests/cmdline/svnrdump_tests.py
subversion/branches/performance/subversion/tests/cmdline/svnsync_tests.py
subversion/branches/performance/subversion/tests/cmdline/svntest/main.py
subversion/branches/performance/subversion/tests/cmdline/update_tests.py
subversion/branches/performance/subversion/tests/cmdline/upgrade_tests.py
subversion/branches/performance/subversion/tests/libsvn_fs_fs/fs-pack-test.c
subversion/branches/performance/subversion/tests/libsvn_wc/op-depth-test.c
subversion/branches/performance/subversion/tests/libsvn_wc/tree-conflict-data-test.c
subversion/branches/performance/tools/dev/unix-build/Makefile.svn
subversion/branches/performance/tools/dist/construct-rolling-environment.sh
subversion/branches/performance/tools/hook-scripts/mailer/mailer.py
Propchange: subversion/branches/performance/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 17 00:09:50 2010
@@ -23,6 +23,7 @@
/subversion/branches/log-g-performance:870941-871032
/subversion/branches/merge-skips-obstructions:874525-874615
/subversion/branches/nfc-nfd-aware-client:870276,870376
+/subversion/branches/py-tests-as-modules:956579-1033052
/subversion/branches/ra_serf-digest-authn:875693-876404
/subversion/branches/reintegrate-improvements:873853-874164
/subversion/branches/subtree-mergeinfo:876734-878766
@@ -37,4 +38,4 @@
/subversion/branches/tc_url_rev:874351-874483
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
-/subversion/trunk:962911-1032276
+/subversion/trunk:962911-1035839
Modified: subversion/branches/performance/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/performance/CHANGES?rev=1035869&r1=1035868&r2=1035869&view=diff
==============================================================================
--- subversion/branches/performance/CHANGES (original)
+++ subversion/branches/performance/CHANGES Wed Nov 17 00:09:50 2010
@@ -1,3 +1,20 @@
+Version 1.6.14
+(?? Nov 2010, from /branches/1.6.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.6.14
+
+ User-visible changes:
+ * improve svnsync handling of dir copies (r962377, -8)
+ * hide unreadable dirs in mod_dav_svn's GET response (r996884)
+ * make 'svnmucc propsetf' actually work (r1005446)
+ * limit memory fragmentation in svnserve (r1022675)
+ * fix 'svn export' regression from 1.6.13 (r1032970)
+ * fix 'svn export' mistakenly uri-encodes paths (issue #3745)
+ * fix server-side memory leaks triggered by 'blame -g' (r1032808)
+
+ Developer-visible changes:
+ * improve test accuracy over dav (r991534, r877814)
+
+
Version 1.6.13
(01 Oct 2010, from /branches/1.6.x)
http://svn.apache.org/repos/asf/subversion/tags/1.6.13
Modified: subversion/branches/performance/COMMITTERS
URL: http://svn.apache.org/viewvc/subversion/branches/performance/COMMITTERS?rev=1035869&r1=1035868&r2=1035869&view=diff
==============================================================================
--- subversion/branches/performance/COMMITTERS [UTF-8] (original)
+++ subversion/branches/performance/COMMITTERS [UTF-8] Wed Nov 17 00:09:50 2010
@@ -1,4 +1,4 @@
-The following people have commit access to the Subversion sources.
+The following people have commit access to the Subversion sources.
Note that this is not a full list of Subversion's authors, however --
for that, you'd need to look over the log messages to see all the
patch contributors.
@@ -13,8 +13,8 @@ Blanket commit access:
sussman Ben Collins-Sussman <su...@red-bean.com>
kfogel Karl Fogel <kf...@red-bean.com>
gstein Greg Stein <gs...@gmail.com>
- brane Branko ?ibej <br...@xbc.nu>
- joe Joe Orton <jo...@manyfish.co.uk>
+ brane Branko Čibej <br...@xbc.nu>
+ jorton Joe Orton <jo...@manyfish.co.uk>
ghudson Greg Hudson <gh...@mit.edu>
fitz Brian W. Fitzpatrick <fi...@red-bean.com>
daniel Daniel Stenberg <da...@haxx.se>
@@ -29,7 +29,7 @@ Blanket commit access:
jaa Jani Averbach <ja...@iki.fi>
julianfoad Julian Foad <ju...@wandisco.com>
jszakmeister John Szakmeister <jo...@szakmeister.net>
- ehu Erik H�n <er...@wandisco.com>
+ ehu Erik Hülsmann <er...@wandisco.com>
breser Ben Reser <be...@reser.org>
maxb Max Bowsher <ma...@ukf.net>
dberlin Daniel Berlin <db...@dberlin.org>
@@ -50,11 +50,11 @@ Blanket commit access:
peters Peter Samuelson <pe...@p12n.org>
rhuijben Bert Huijben <rh...@collab.net>
stylesen Senthil Kumaran S <st...@gmail.com>
- steveking Stefan K�ortoisesvn@gmail.com>
+ steveking Stefan Küng <to...@gmail.com>
neels Neels J. Hofmeyr <ne...@elego.de>
jwhitlock Jeremy Whitlock <jc...@gmail.com>
sbutler Stephen Butler <sb...@elego.de>
- dannas Daniel N�und <da...@elego.de>
+ dannas Daniel Näslund <da...@elego.de>
stefan2 Stefan Fuhrmann <st...@alice-dsl.de>
[[END ACTIVE FULL COMMITTERS. LEAVE THIS LINE HERE; SCRIPTS LOOK FOR IT.]]
@@ -72,7 +72,7 @@ Full committers who have asked to be lis
lundblad Peter N. Lundblad <pe...@famlundblad.se>
malcolm Malcolm Rowe <ma...@farside.org.uk>
naked Nuutti Kotivuori <na...@iki.fi>
- ringstrom Tobias Ringstr�tobias@ringstrom.mine.nu>
+ ringstrom Tobias Ringström <to...@ringstrom.mine.nu>
Partial committers who have asked to be listed as dormant:
@@ -92,7 +92,7 @@ Commit access for specific areas:
joeswatosh Joe Swatosh <jo...@gmail.com> (Swig-Ruby b.)
jrvernooij Jelmer Vernooij <je...@samba.org> (Python bindings)
sage Sage LaTorra <sa...@gmail.com> (Ctypes-Python bindings)
- rdonch ????? ???????? <DX...@yandex.ru> (Swig-Python b.)
+ rdonch Роман Донченко <DX...@yandex.ru> (Swig-Python b.)
Packages:
@@ -103,7 +103,7 @@ Commit access for specific areas:
kbohling Kirby C. Bohling <kb...@birddog.com> (tools/dev)
nsd Nick Duffek <ni...@duffek.com> (doc)
- xsteve Stefan Reich�stefan@xsteve.at> (psvn.el)
+ xsteve Stefan Reichör <st...@xsteve.at> (psvn.el)
josander Jostein Andersen <jo...@vait.se> (various)
niemeyer Gustavo Niemeyer <ni...@conectiva.com> (svnperms.py)
zbrown Zack Brown <zb...@tumblerings.org> (doc)
@@ -125,15 +125,15 @@ Commit access for specific areas:
mf Martin Furter <mf...@rola.ch> (svnmirror.sh
svn-backup-dumps.py)
adejong Arthur de Jong <ar...@ch.tudelft.nl> (svn2cl)
- wsanchez Wilfredo S�hez <ws...@wsanchez.net> (various contrib)
+ wsanchez Wilfredo Sánchez <ws...@wsanchez.net> (various contrib)
mhagger Michael Haggerty <mh...@alum.mit.edu> (svntest)
madanus Madan U S <ma...@collab.net> (svnmerge)
wein Mathias Weinert <we...@mccw.de> (mailer)
bhuvan Bhuvaneswaran <bh...@collab.net> (svn2feed.py,
build/hudson)
aogier Anthony Ogier <ao...@iorga.com> (svn-merge-vendor.py)
- dkagedal David K�dal <da...@lysator.liu.se> (dsvn.el)
- mattiase Mattias Engdeg� <ma...@acm.org> (dsvn.el)
+ dkagedal David Kågedal <da...@lysator.liu.se> (dsvn.el)
+ mattiase Mattias Engdegård <ma...@acm.org> (dsvn.el)
dustin Dustin J. Mitchell <du...@zmanda.com> (svnmerge)
rocketraman Raman Gupta <ro...@fastmail.fm> (svnmerge)
rhansen Richard Hansen <rh...@bbn.com> (svnstsw)
@@ -148,11 +148,11 @@ Commit access for specific areas:
Translation of message files:
- niqueco Nicol�Lichtmaier <ni...@reloco.com.ar> (po: es)
- luebbe L�nken <lu...@tigris.org> (po: de)
+ niqueco Nicolás Lichtmaier <ni...@reloco.com.ar> (po: es)
+ luebbe Lübbe Onken <lu...@tigris.org> (po: de)
jensseidel Jens Seidel <je...@users.sf.net> (po: de)
- oyvindmo �vind M�svn@moll.no> (po: nb)
- sunny256 �vind A. Holm <su...@sunbase.org> (po: nb)
+ oyvindmo Øyvind Møll <sv...@moll.no> (po: nb)
+ sunny256 Øyvind A. Holm <su...@sunbase.org> (po: nb)
jzgoda Jaroslaw Zgoda <jz...@o2.pl> (po: pl)
karolszk Karol Szkudlarek <ka...@mikronika.com.pl> (po: pl)
plasma Wei-Hon Chen <pl...@ms9.hinet.net> (po: zh_TW)
@@ -171,7 +171,7 @@ giorgio_valoti Giorgio Valoti <giorgio
Experimental branches:
gthompson Glenn A. Thompson <gt...@cdr.net> (pluggable-db br.)
- sigfred Sigfred H�rsen <bs...@mumak.com> (svnserve-ssl br.)
+ sigfred Sigfred Håversen <bs...@mumak.com> (svnserve-ssl br.)
pmarek Ph. Marek <ph...@marek.priv.at> (meta-data-v br.)
jpeacock John Peacock <jp...@rowman.com> (perl-bindings-
improvements br.)
@@ -185,22 +185,22 @@ giorgio_valoti Giorgio Valoti <giorgio
Subprojects that are complete, abandoned or have moved elsewhere:
- xela Alexander M�<al...@littleblue.de> (Java JNI b.)
+ xela Alexander Müller <al...@littleblue.de> (Java JNI b.)
yoshiki Yoshiki Hayashi <yo...@xemacs.org> (Non-SWIG Ruby b.)
- mmacek Marko Ma?ek <Ma...@gmx.net> (cvs2svn branch)
+ mmacek Marko Maček <Ma...@gmx.net> (cvs2svn branch)
mass David Waite <ma...@akuma.org> (certs branch)
sergeyli Sergey A. Lipnevich <se...@optimaltec.com> (neon-0.24 port)
ballbach Michael Ballbach <ba...@rten.net> (Old Mandrake RPM)
morten Morten Ludvigsen <mo...@2ps.dk> (Swig-Java b.)
- jespersm Jesper Steen M� <je...@selskabet.org> (Swig-Java b.)
+ jespersm Jesper Steen Møller <je...@selskabet.org> (Swig-Java b.)
knacke Kai Nacke <ka...@redstar.de> (Swig-Java b.)
- fmatias F�ciano Matias <fe...@free.fr> (doc: fr)
+ fmatias Féliciano Matias <fe...@free.fr> (doc: fr)
dimentiy Dmitriy O. Popkov <di...@dimentiy.info> (doc: ru)
khmarbaise Karl Heinz Marbaise <kh...@gmx.de> (doc: de)
gerhardoettl Gerhard Oettl <ge...@oesoft.at> (doc: de)
beerfrick Ariel Arjona <be...@gmail.com> (doc: es)
gradha Grzegorz A. Hankiewicz <gr...@titanium.sabren.com> (doc: es)
- ruben Rub�G� <ru...@euskalnet.net> (doc: es)
+ ruben Rubén Gómez <ru...@euskalnet.net> (doc: es)
dbrouard Diego Brouard <db...@gmail.com> (doc: es)
firemeteor Guo Rui <ti...@mail.ustc.edu.cn> (issue-2843-dev
br.)
Modified: subversion/branches/performance/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/performance/Makefile.in?rev=1035869&r1=1035868&r2=1035869&view=diff
==============================================================================
--- subversion/branches/performance/Makefile.in (original)
+++ subversion/branches/performance/Makefile.in Wed Nov 17 00:09:50 2010
@@ -340,8 +340,6 @@ ECHO_N = @ECHO_N@
TESTS = $(TEST_PROGRAMS) @BDB_TEST_PROGRAMS@
-TRUNK_TRAIL_URL = /repos/asf/subversion/trunk
-
all: mkdir-init external-all local-all
clean: external-clean local-clean
distclean: external-distclean local-distclean
@@ -389,7 +387,7 @@ fast-distclean: fast-clean
$(SVN_CONFIG_SCRIPT_FILES)
# clean everything out, returning to before './autogen.sh' was run.
-local-extraclean: local-distclean extraclean-swig extraclean-ctypes-python
+local-extraclean: local-distclean extraclean-swig extraclean-ctypes-python clean-javahl
rm -f $(top_srcdir)/build-outputs.mk \
$(top_srcdir)/subversion/svn_private_config.h.in \
$(top_srcdir)/configure \
@@ -410,23 +408,18 @@ local-distclean: fast-distclean check-cl
local-install: @INSTALL_RULES@
-### HACK!! Find a better way to do this
revision-install:
- subversion/svnversion/svnversion $(top_srcdir) $(TRUNK_TRAIL_URL) > \
- $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt; \
- if test "$$?" != "0"; then \
- svnversion $(top_srcdir) $(TRUNK_TRAIL_URL) > \
- $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt; \
- if test "$$?" != "0"; then \
- echo "unknown" > \
- $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt; \
- fi; \
- fi;
+ test -d $(DESTDIR)$(includedir)/subversion-1 || \
+ $(MKDIR) $(DESTDIR)$(includedir)/subversion-1
+ (subversion/svnversion/svnversion $(top_srcdir) || \
+ svnversion $(top_srcdir) || \
+ echo "unknown"; \
+ ) > $(DESTDIR)$(includedir)/subversion-1/svn-revision.txt
install-static: @INSTALL_STATIC_RULES@
# JavaHL target aliases
-javahl: mkdir-init javahl-java javahl-javah javahl-callback-javah javahl-lib @JAVAHL_TESTS_TARGET@ javahl-compat
+javahl: mkdir-init javahl-java javahl-javah javahl-callback-javah javahl-types-javah javahl-lib @JAVAHL_TESTS_TARGET@ javahl-compat
install-javahl: javahl install-javahl-java install-javahl-javah install-javahl-lib
javahl-compat: javahl-compat-java @JAVAHL_COMPAT_TESTS_TARGET@
@@ -607,7 +600,8 @@ doc-javahl:
-link http://java.sun.com/javase/6/docs/api/ \
org.tigris.subversion.javahl \
org.apache.subversion.javahl \
- org.apache.subversion.javahl.callback
+ org.apache.subversion.javahl.callback \
+ org.apache.subversion.javahl.types
doc-clean:
rm -rf $(top_srcdir)/doc/doxygen
Modified: subversion/branches/performance/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/performance/build.conf?rev=1035869&r1=1035868&r2=1035869&view=diff
==============================================================================
--- subversion/branches/performance/build.conf (original)
+++ subversion/branches/performance/build.conf Wed Nov 17 00:09:50 2010
@@ -56,7 +56,7 @@ private-built-includes =
subversion/bindings/javahl/include/org_apache_subversion_javahl_Revision.h
subversion/bindings/javahl/include/org_apache_subversion_javahl_SVNRepos.h
subversion/bindings/javahl/include/org_apache_subversion_javahl_SVNClient.h
- subversion/bindings/javahl/include/org_apache_subversion_javahl_Version.h
+ subversion/bindings/javahl/include/org_apache_subversion_javahl_types_Version.h
subversion/bindings/javahl/include/org_apache_subversion_javahl_callback_UserPasswordCallback.h
@@ -405,7 +405,7 @@ sources = internal_statements.sql
type = i18n
path = subversion/po
install = locale
-external-project = build/win32/svn_locale
+external-project = svn_locale
# ----------------------------------------------------------------------------
#
@@ -527,6 +527,7 @@ msvc-static = no
type = java
path = subversion/bindings/javahl/src/org/apache/subversion/javahl
subversion/bindings/javahl/src/org/apache/subversion/javahl/callback
+ subversion/bindings/javahl/src/org/apache/subversion/javahl/types
src-root = subversion/bindings/javahl/src
sources = *.java
install = javahl-java
@@ -570,6 +571,17 @@ package-roots = org
#add-deps = javahl-compat-java
add-deps = $(javahl_compat_java_DEPS)
+[javahl-types-javah]
+type = javah
+path = subversion/bindings/javahl/src/org/apache/subversion/javahl/types
+classes = subversion/bindings/javahl/classes
+headers = subversion/bindings/javahl/include
+package = org.apache.subversion.javahl.types
+sources = *.java
+add-deps = $(javahl_java_DEPS)
+install = javahl-javah
+link-cmd = $(COMPILE_JAVAHL_JAVAH) -force
+
[javahl-callback-javah]
type = javah
path = subversion/bindings/javahl/src/org/apache/subversion/javahl/callback
@@ -599,7 +611,7 @@ path = subversion/bindings/javahl/native
libs = libsvn_repos libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_diff
libsvn_subr libsvn_fs aprutil apriconv apr neon
sources = *.cpp *.c
-add-deps = $(javahl_javah_DEPS) $(javahl_java_DEPS) $(javahl_callback_javah_DEPS)
+add-deps = $(javahl_javah_DEPS) $(javahl_java_DEPS) $(javahl_callback_javah_DEPS) $(javahl_types_javah_DEPS)
install = javahl-lib
# need special build rule to include -I$(JDK)/include/jni.h
compile-cmd = $(COMPILE_JAVAHL_CXX)
@@ -1048,7 +1060,7 @@ external-lib = $(SVN_SASL_LIBS)
[zlib]
type = lib
external-lib = $(SVN_ZLIB_LIBS)
-external-project = build/win32/zlib
+external-project = zlib
msvc-static = yes
[neon]
@@ -1124,7 +1136,7 @@ libs = fs-libs ra-libs libsvn_client lib
[__CONFIG__]
type = lib
-external-project = build/win32/svn_config
+external-project = svn_config
[__SWIG_PYTHON__]
type = swig_project
Modified: subversion/branches/performance/build/generator/gen_msvc_dsp.py
URL: http://svn.apache.org/viewvc/subversion/branches/performance/build/generator/gen_msvc_dsp.py?rev=1035869&r1=1035868&r2=1035869&view=diff
==============================================================================
--- subversion/branches/performance/build/generator/gen_msvc_dsp.py (original)
+++ subversion/branches/performance/build/generator/gen_msvc_dsp.py Wed Nov 17 00:09:50 2010
@@ -103,6 +103,18 @@ class Generator(gen_win.WinGeneratorBase
def write(self):
"Write a Workspace (.dsw)"
+ self.move_proj_file(self.projfilesdir,
+ 'svn_config.dsp',
+ (
+ ('sql', sql),
+ ('project_guid', self.makeguid('__CONFIG__')),
+ )
+ )
+ self.move_proj_file(self.projfilesdir,
+ 'svn_locale.dsp',
+ (
+ ('project_guid', self.makeguid('svn_locale')),
+ ))
self.write_zlib_project_file('zlib.dsp')
self.write_neon_project_file('neon.dsp')
self.write_serf_project_file('serf.dsp')
Modified: subversion/branches/performance/build/generator/gen_vcnet_vcproj.py
URL: http://svn.apache.org/viewvc/subversion/branches/performance/build/generator/gen_vcnet_vcproj.py?rev=1035869&r1=1035868&r2=1035869&view=diff
==============================================================================
--- subversion/branches/performance/build/generator/gen_vcnet_vcproj.py (original)
+++ subversion/branches/performance/build/generator/gen_vcnet_vcproj.py Wed Nov 17 00:09:50 2010
@@ -141,14 +141,14 @@ class Generator(gen_win.WinGeneratorBase
# apr doesn't supply vcproj files, the user must convert them
# manually before loading the generated solution
- self.move_proj_file(os.path.join('build', 'win32'),
+ self.move_proj_file(self.projfilesdir,
'svn_config' + self.vcproj_extension,
(
('sql', sql),
('project_guid', self.makeguid('__CONFIG__')),
)
)
- self.move_proj_file(os.path.join('build', 'win32'),
+ self.move_proj_file(self.projfilesdir,
'svn_locale' + self.vcproj_extension,
(
('project_guid', self.makeguid('svn_locale')),
Modified: subversion/branches/performance/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/branches/performance/build/generator/gen_win.py?rev=1035869&r1=1035868&r2=1035869&view=diff
==============================================================================
--- subversion/branches/performance/build/generator/gen_win.py (original)
+++ subversion/branches/performance/build/generator/gen_win.py Wed Nov 17 00:09:50 2010
@@ -255,8 +255,9 @@ class WinGeneratorBase(GeneratorBase):
# Find Sqlite
self._find_sqlite()
- # Look for ML
+ # Look for ZLib and ML
if self.zlib_path:
+ self._find_zlib()
self._find_ml()
# Find neon version
@@ -281,12 +282,20 @@ class WinGeneratorBase(GeneratorBase):
if self.write_file_if_changed(svnissdeb, buf.replace("@CONFIG@", "Debug")):
print('Wrote %s' % svnissdeb)
+ #Make the project files directory if it doesn't exist
+ #TODO win32 might not be the best path as win64 stuff will go here too
+ self.projfilesdir=os.path.join("build","win32",subdir)
+ self.rootpath = ".." + "\\.." * self.projfilesdir.count(os.sep)
+ if not os.path.exists(self.projfilesdir):
+ os.makedirs(self.projfilesdir)
+
# Generate the build_zlib.bat file
if self.zlib_path:
data = {'zlib_path': os.path.abspath(self.zlib_path),
+ 'zlib_version': self.zlib_version,
'use_ml': self.have_ml and 1 or None}
- bat = os.path.join('build', 'win32', 'build_zlib.bat')
- self.write_with_template(bat, 'build_zlib.ezt', data)
+ bat = os.path.join(self.projfilesdir, 'build_zlib.bat')
+ self.write_with_template(bat, 'templates/build_zlib.ezt', data)
# Generate the build_locale.bat file
pofiles = []
@@ -296,15 +305,9 @@ class WinGeneratorBase(GeneratorBase):
pofiles.append(POFile(po[:-3]))
data = {'pofiles': pofiles}
- self.write_with_template(os.path.join('build', 'win32', 'build_locale.bat'),
- 'build_locale.ezt', data)
-
- #Make the project files directory if it doesn't exist
- #TODO win32 might not be the best path as win64 stuff will go here too
- self.projfilesdir=os.path.join("build","win32",subdir)
- self.rootpath = ".." + "\\.." * self.projfilesdir.count(os.sep)
- if not os.path.exists(self.projfilesdir):
- os.makedirs(self.projfilesdir)
+ self.write_with_template(os.path.join(self.projfilesdir,
+ 'build_locale.bat'),
+ 'templates/build_locale.ezt', data)
#Here we can add additional platforms to compile for
self.platforms = ['Win32']
@@ -677,8 +680,10 @@ class WinGeneratorBase(GeneratorBase):
path = self.neon_path + target.external_project[4:]
elif target.external_project[:5] == 'serf/' and self.serf_lib:
path = self.serf_path + target.external_project[4:]
- else:
+ elif target.external_project.find('/') != -1:
path = target.external_project
+ else:
+ path = os.path.join(self.projfilesdir, target.external_project)
return "%s.%s" % (gen_base.native_path(path), proj_ext)
@@ -1115,7 +1120,7 @@ class WinGeneratorBase(GeneratorBase):
if not self.zlib_path:
return
zlib_path = os.path.abspath(self.zlib_path)
- self.move_proj_file(os.path.join('build', 'win32'), name,
+ self.move_proj_file(self.projfilesdir, name,
(('zlib_path', zlib_path),
('zlib_sources',
glob.glob(os.path.join(zlib_path, '*.c'))
@@ -1125,7 +1130,9 @@ class WinGeneratorBase(GeneratorBase):
'contrib/masmx86/*.asm'))),
('zlib_headers',
glob.glob(os.path.join(zlib_path, '*.h'))),
+ ('zlib_version', self.zlib_version),
('project_guid', self.makeguid('zlib')),
+ ('use_ml', self.have_ml and 1 or None),
))
def write_neon_project_file(self, name):
@@ -1180,7 +1187,7 @@ class WinGeneratorBase(GeneratorBase):
### these projects include zlib, neon, serf, locale, config, etc.
dest_file = os.path.join(path, name)
- source_template = name + '.ezt'
+ source_template = os.path.join('templates', name + '.ezt')
data = {
'version' : self.vcproj_version,
'configs' : self.configs,
@@ -1544,6 +1551,32 @@ class WinGeneratorBase(GeneratorBase):
else:
print(msg % self.sqlite_version)
+ def _find_zlib(self):
+ "Find the ZLib library and version"
+
+ if not self.zlib_path:
+ self.zlib_version = '1'
+ return
+
+ header_file = os.path.join(self.zlib_path, 'zlib.h')
+
+ if not os.path.exists(header_file):
+ self.zlib_version = '1'
+ return
+
+ fp = open(header_file)
+ txt = fp.read()
+ fp.close()
+ vermatch = re.search(r'^\s*#define\s+ZLIB_VERSION\s+"(\d+)\.(\d+)\.(\d+)(?:\.\d)?"', txt, re.M)
+
+ version = tuple(map(int, vermatch.groups()))
+
+ self.zlib_version = '%d.%d.%d' % version
+
+ msg = 'Found ZLib version %s\n'
+
+ print(msg % self.zlib_version)
+
class ProjectItem:
"A generic item class for holding sources info, config info, etc for a project"
def __init__(self, **kw):
Modified: subversion/branches/performance/build/run_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/performance/build/run_tests.py?rev=1035869&r1=1035868&r2=1035869&view=diff
==============================================================================
--- subversion/branches/performance/build/run_tests.py (original)
+++ subversion/branches/performance/build/run_tests.py Wed Nov 17 00:09:50 2010
@@ -42,9 +42,9 @@ separated list of test numbers; the defa
'''
# A few useful constants
-LINE_LENGTH = 40
+LINE_LENGTH = 45
-import os, re, subprocess, sys
+import os, re, subprocess, sys, imp
from datetime import datetime
import getopt
@@ -237,43 +237,14 @@ class TestHarness:
self.log.close()
self.log = None
- def _run_test(self, prog, test_nr, total_tests):
- "Run a single test. Return the test's exit code."
-
- if self.log:
- log = self.log
- else:
- log = sys.stdout
-
- test_nums = None
- if '#' in prog:
- prog, test_nums = prog.split('#')
-
+ def _run_c_test(self, prog, test_nums, dot_count):
+ 'Run a c test, escaping parameters as required.'
progdir, progbase = os.path.split(prog)
- if self.log:
- # Using write here because we don't want even a trailing space
- test_info = '%s [%d/%d]' % (progbase, test_nr + 1, total_tests)
- sys.stdout.write('Running tests in %s' % (test_info, ))
- sys.stdout.write('.'*(LINE_LENGTH - len(test_info)))
- sys.stdout.flush()
- log.write('START: %s\n' % progbase)
- log.flush()
+ sys.stdout.write('.' * dot_count)
+ sys.stdout.flush()
- start_time = datetime.now()
- if progbase[-3:] == '.py':
- progname = sys.executable
- cmdline = [progname,
- os.path.join(self.srcdir, prog)]
- if self.base_url is not None:
- cmdline.append('--url=' + self.base_url)
- if self.enable_sasl is not None:
- cmdline.append('--enable-sasl')
- if self.parallel is not None:
- cmdline.append('--parallel')
- if self.config_file is not None:
- cmdline.append('--config-file=' + self.config_file)
- elif os.access(prog, os.X_OK):
+ if os.access(progbase, os.X_OK):
progname = './' + progbase
cmdline = [progname,
'--srcdir=' + os.path.join(self.srcdir, progdir)]
@@ -307,10 +278,134 @@ class TestHarness:
test_nums = test_nums.split(',')
cmdline.extend(test_nums)
+ return self._run_prog(progname, cmdline)
+
+ def _run_py_test(self, prog, test_nums, dot_count):
+ 'Run a python test, passing parameters as needed.'
+ progdir, progbase = os.path.split(prog)
+
+ old_path = sys.path[:]
+ sys.path = [progdir] + sys.path
+
+ try:
+ prog_mod = imp.load_module(progbase[:-3], open(prog, 'r'), prog,
+ ('.py', 'U', imp.PY_SOURCE))
+ except:
+ print('Don\'t know what to do about ' + progbase)
+ raise
+
+ import svntest.main
+
+ # set up our options
+ svntest.main.create_default_options()
+ if self.base_url is not None:
+ svntest.main.options.test_area_url = self.base_url
+ if self.enable_sasl is not None:
+ svntest.main.options.enable_sasl = True
+ if self.parallel is not None:
+ svntest.main.options.parallel = svntest.main.default_num_threads
+ if self.config_file is not None:
+ svntest.main.options.config_file = self.config_file
+ if self.verbose is not None:
+ svntest.main.options.verbose = True
+ if self.cleanup is not None:
+ svntest.main.options.cleanup = True
+ if self.fs_type is not None:
+ svntest.main.options.fs_type = self.fs_type
+ if self.http_library is not None:
+ svntest.main.options.http_library = self.http_library
+ if self.server_minor_version is not None:
+ svntest.main.options.server_minor_version = self.server_minor_version
+ if self.list_tests is not None:
+ svntest.main.options.list_tests = True
+ if self.svn_bin is not None:
+ svntest.main.options.svn_bin = self.svn_bin
+ if self.fsfs_sharding is not None:
+ svntest.main.options.fsfs_sharding = self.fsfs_sharding
+ if self.fsfs_packing is not None:
+ svntest.main.options.fsfs_packing = self.fsfs_packing
+
+ svntest.main.options.srcdir = self.srcdir
+
+ # setup the output pipes
+ if self.log:
+ sys.stdout.flush()
+ sys.stderr.flush()
+ self.log.flush()
+ old_stdout = os.dup(1)
+ old_stderr = os.dup(2)
+ os.dup2(self.log.fileno(), 1)
+ os.dup2(self.log.fileno(), 2)
+
+ # This has to be class-scoped for use in the progress_func()
+ self.dots_written = 0
+ def progress_func(completed, total):
+ dots = (completed * dot_count) / total
+
+ dots_to_write = dots - self.dots_written
+ if self.log:
+ os.write(old_stdout, '.' * dots_to_write)
+ else:
+ sys.stdout.write(old_stdout, '.' * dots_to_write)
+ sys.stdout.flush()
+
+ self.dots_written = dots
+
+ serial_only = hasattr(prog_mod, 'serial_only') and prog_mod.serial_only
+
+ # run the tests
+ svntest.testcase.TextColors.disable()
+ failed = svntest.main.execute_tests(prog_mod.test_list,
+ serial_only=serial_only,
+ test_name=progbase,
+ progress_func=progress_func)
+
+ # restore some values
+ sys.path = old_path
+ if self.log:
+ sys.stdout.flush()
+ sys.stderr.flush()
+ os.dup2(old_stdout, 1)
+ os.dup2(old_stderr, 2)
+ os.close(old_stdout)
+ os.close(old_stderr)
+
+ return failed
+
+ def _run_test(self, prog, test_nr, total_tests):
+ "Run a single test. Return the test's exit code."
+
+ if self.log:
+ log = self.log
+ else:
+ log = sys.stdout
+
+ test_nums = None
+ if '#' in prog:
+ prog, test_nums = prog.split('#')
+
+ progdir, progbase = os.path.split(prog)
+ if self.log:
+ # Using write here because we don't want even a trailing space
+ test_info = '%s [%d/%d]' % (progbase, test_nr + 1, total_tests)
+ sys.stdout.write('Running tests in %s' % (test_info, ))
+ sys.stdout.flush()
+
+ log.write('START: %s\n' % progbase)
+ log.flush()
+
+ start_time = datetime.now()
+
+ progabs = os.path.abspath(os.path.join(self.srcdir, prog))
old_cwd = os.getcwd()
try:
os.chdir(progdir)
- failed = self._run_prog(progname, cmdline)
+ if progbase[-3:] == '.py':
+ failed = self._run_py_test(progabs, test_nums,
+ (LINE_LENGTH - len(test_info)))
+ else:
+ failed = self._run_c_test(prog, test_nums,
+ (LINE_LENGTH - len(test_info)))
except:
os.chdir(old_cwd)
raise
Modified: subversion/branches/performance/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/performance/configure.ac?rev=1035869&r1=1035868&r2=1035869&view=diff
==============================================================================
--- subversion/branches/performance/configure.ac (original)
+++ subversion/branches/performance/configure.ac Wed Nov 17 00:09:50 2010
@@ -777,12 +777,28 @@ dnl Process some configuration options -
AC_ARG_WITH(ssl,
AS_HELP_STRING([--with-ssl],
[This option does NOT affect the Subversion build process in any
- way. It enables OpenSSL support in the Neon library. If and
- only if you are building Neon as an integrated part of the
- Subversion build process, rather than linking to an already
- installed version of Neon, you probably want to pass this
- option so that Neon (and so indirectly, Subversion) will be
- capable of https:// access.]),
+ way. It enables OpenSSL support in the Neon HTTP client
+ library. If and only if you are building Neon as an integrated
+ part of the Subversion build process, rather than linking to
+ an already installed version of Neon, you probably want to pass
+ this option so that Neon (and so indirectly, Subversion) will
+ be capable of https:// access via that library. (Note that
+ Subversion may also or alternatively be configured to use
+ the Serf library for http:// and https:// access; see the
+ --with-serf and --with-openssl options.)]),
+[])
+
+AC_ARG_WITH(openssl,
+AS_HELP_STRING([--with-openssl],
+ [This option does NOT affect the Subversion build process in any
+ way. It tells an integrated Serf HTTP client library build
+ process where to locate the OpenSSL library when (and only when)
+ building Serf as an integrated part of the Subversion build
+ process. When linking to a previously installed version of Serf
+ instead, you do not need to use this option. (Note that
+ Subversion may also or alternatively be configured to use the
+ Neon library for http:// and https:// access; see the
+ --with-neon and --with-ssl options.)]),
[])
AC_ARG_ENABLE(debug,
Modified: subversion/branches/performance/get-deps.sh
URL: http://svn.apache.org/viewvc/subversion/branches/performance/get-deps.sh?rev=1035869&r1=1035868&r2=1035869&view=diff
==============================================================================
--- subversion/branches/performance/get-deps.sh (original)
+++ subversion/branches/performance/get-deps.sh Wed Nov 17 00:09:50 2010
@@ -23,15 +23,15 @@
# get-deps.sh -- download the dependencies useful for building Subversion
#
-APR=apr-1.3.8
-APR_UTIL=apr-util-1.3.9
-NEON=neon-0.29.0
-SERF=serf-0.6.1
+APR=apr-1.3.9
+APR_UTIL=apr-util-1.3.10
+NEON=neon-0.29.5
+SERF=serf-0.7.0
ZLIB=zlib-1.2.5
-SQLITE_VERSION=3.7.2
+SQLITE_VERSION=3.7.3
SQLITE=sqlite-amalgamation-$SQLITE_VERSION
-HTTPD=httpd-2.2.14
+HTTPD=httpd-2.2.17
HTTPD_OOPS=
APR_ICONV=apr-iconv-1.2.1
APR_ICONV_OOPS=
Modified: subversion/branches/performance/subversion/bindings/javahl/native/CreateJ.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/bindings/javahl/native/CreateJ.cpp?rev=1035869&r1=1035868&r2=1035869&view=diff
==============================================================================
--- subversion/branches/performance/subversion/bindings/javahl/native/CreateJ.cpp (original)
+++ subversion/branches/performance/subversion/bindings/javahl/native/CreateJ.cpp Wed Nov 17 00:09:50 2010
@@ -60,7 +60,7 @@ CreateJ::ConflictDescriptor(const svn_wc
{
ctor = env->GetMethodID(clazz, "<init>", "(Ljava/lang/String;"
"L"JAVA_PACKAGE"/ConflictDescriptor$Kind;"
- "L"JAVA_PACKAGE"/NodeKind;"
+ "L"JAVA_PACKAGE"/types/NodeKind;"
"Ljava/lang/String;ZLjava/lang/String;"
"L"JAVA_PACKAGE"/ConflictDescriptor$Action;"
"L"JAVA_PACKAGE"/ConflictDescriptor$Reason;"
@@ -152,7 +152,8 @@ CreateJ::ConflictVersion(const svn_wc_co
{
ctor = env->GetMethodID(clazz, "<init>", "(Ljava/lang/String;J"
"Ljava/lang/String;"
- "L"JAVA_PACKAGE"/NodeKind;)V");
+ "L"JAVA_PACKAGE"/types/NodeKind;"
+ ")V");
if (JNIUtil::isJavaExceptionThrown() || ctor == 0)
POP_AND_RETURN_NULL;
}
@@ -196,7 +197,7 @@ CreateJ::Info(const char *path, const sv
mid = env->GetMethodID(clazz, "<init>",
"(Ljava/lang/String;Ljava/lang/String;"
"Ljava/lang/String;J"
- "L"JAVA_PACKAGE"/NodeKind;"
+ "L"JAVA_PACKAGE"/types/NodeKind;"
"Ljava/lang/String;Ljava/lang/String;"
"JJLjava/lang/String;"
"L"JAVA_PACKAGE"/Lock;Z"
@@ -376,9 +377,9 @@ CreateJ::ChangedPath(const char *path, s
"<init>",
"(Ljava/lang/String;JLjava/lang/String;"
"L"JAVA_PACKAGE"/ChangePath$Action;"
- "L"JAVA_PACKAGE"/NodeKind;"
- "L"JAVA_PACKAGE"/Tristate;"
- "L"JAVA_PACKAGE"/Tristate;)V");
+ "L"JAVA_PACKAGE"/types/NodeKind;"
+ "L"JAVA_PACKAGE"/types/Tristate;"
+ "L"JAVA_PACKAGE"/types/Tristate;)V");
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN(SVN_NO_ERROR);
}
@@ -431,7 +432,7 @@ CreateJ::Status(svn_wc_context_t *wc_ctx
{
mid = env->GetMethodID(clazz, "<init>",
"(Ljava/lang/String;Ljava/lang/String;"
- "L"JAVA_PACKAGE"/NodeKind;"
+ "L"JAVA_PACKAGE"/types/NodeKind;"
"JJJLjava/lang/String;"
"L"JAVA_PACKAGE"/Status$Kind;"
"L"JAVA_PACKAGE"/Status$Kind;"
@@ -443,7 +444,7 @@ CreateJ::Status(svn_wc_context_t *wc_ctx
"JZZLjava/lang/String;Ljava/lang/String;"
"Ljava/lang/String;"
"JL"JAVA_PACKAGE"/Lock;"
- "JJL"JAVA_PACKAGE"/NodeKind;"
+ "JJL"JAVA_PACKAGE"/types/NodeKind;"
"Ljava/lang/String;Ljava/lang/String;)V");
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NULL;
@@ -696,7 +697,8 @@ CreateJ::ClientNotifyInformation(const s
midCT = env->GetMethodID(clazz, "<init>",
"(Ljava/lang/String;"
"L"JAVA_PACKAGE"/ClientNotifyInformation$Action;"
- "L"JAVA_PACKAGE"/NodeKind;Ljava/lang/String;"
+ "L"JAVA_PACKAGE"/types/NodeKind;"
+ "Ljava/lang/String;"
"L"JAVA_PACKAGE"/Lock;"
"Ljava/lang/String;"
"L"JAVA_PACKAGE"/ClientNotifyInformation$Status;"
@@ -874,7 +876,7 @@ CreateJ::CommitItem(svn_client_commit_it
{
midConstructor = env->GetMethodID(clazz, "<init>",
"(Ljava/lang/String;"
- "L"JAVA_PACKAGE"/NodeKind;"
+ "L"JAVA_PACKAGE"/types/NodeKind;"
"ILjava/lang/String;"
"Ljava/lang/String;J)V");
if (JNIUtil::isExceptionThrown())
Modified: subversion/branches/performance/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp?rev=1035869&r1=1035868&r2=1035869&view=diff
==============================================================================
--- subversion/branches/performance/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp (original)
+++ subversion/branches/performance/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp Wed Nov 17 00:09:50 2010
@@ -91,7 +91,7 @@ DiffSummaryReceiver::onSummary(const svn
ctor = env->GetMethodID(clazz, "<init>",
"(Ljava/lang/String;"
"L"JAVA_PACKAGE"/DiffSummary$DiffKind;Z"
- "L"JAVA_PACKAGE"/NodeKind;)V");
+ "L"JAVA_PACKAGE"/types/NodeKind;)V");
if (JNIUtil::isJavaExceptionThrown() || ctor == 0)
POP_AND_RETURN(SVN_NO_ERROR);
}
Modified: subversion/branches/performance/subversion/bindings/javahl/native/EnumMapper.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/bindings/javahl/native/EnumMapper.cpp?rev=1035869&r1=1035868&r2=1035869&view=diff
==============================================================================
--- subversion/branches/performance/subversion/bindings/javahl/native/EnumMapper.cpp (original)
+++ subversion/branches/performance/subversion/bindings/javahl/native/EnumMapper.cpp Wed Nov 17 00:09:50 2010
@@ -114,7 +114,7 @@ jobject EnumMapper::mapReposNotifyAction
jobject EnumMapper::mapNodeKind(svn_node_kind_t nodeKind)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/NodeKind", (int) nodeKind);
+ return mapEnum(JAVA_PACKAGE"/types/NodeKind", (int) nodeKind);
}
/**
@@ -165,7 +165,7 @@ jobject EnumMapper::mapConflictReason(sv
int EnumMapper::toMergeinfoLogKind(jobject jLogKind)
{
- return getOrdinal(JAVA_PACKAGE"/MergeinfoLogKind", jLogKind);
+ return getOrdinal(JAVA_PACKAGE"/Mergeinfo$LogKind", jLogKind);
}
int EnumMapper::toLogLevel(jobject jLogLevel)
@@ -195,7 +195,8 @@ jobject EnumMapper::mapOperation(svn_wc_
jobject EnumMapper::mapTristate(svn_tristate_t tristate)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/Tristate", (int) tristate);
+ return mapEnum(JAVA_PACKAGE"/types/Tristate",
+ (int) (tristate - svn_tristate_false));
}
svn_wc_conflict_choice_t EnumMapper::toConflictChoice(jobject jchoice)
Modified: subversion/branches/performance/subversion/bindings/javahl/native/ListCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/bindings/javahl/native/ListCallback.cpp?rev=1035869&r1=1035868&r2=1035869&view=diff
==============================================================================
--- subversion/branches/performance/subversion/bindings/javahl/native/ListCallback.cpp (original)
+++ subversion/branches/performance/subversion/bindings/javahl/native/ListCallback.cpp Wed Nov 17 00:09:50 2010
@@ -140,7 +140,7 @@ ListCallback::createJavaDirEntry(const c
{
mid = env->GetMethodID(clazz, "<init>",
"(Ljava/lang/String;Ljava/lang/String;"
- "L"JAVA_PACKAGE"/NodeKind;"
+ "L"JAVA_PACKAGE"/types/NodeKind;"
"JZJJLjava/lang/String;)V");
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NULL;
Modified: subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/ChangePath.java
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/ChangePath.java?rev=1035869&r1=1035868&r2=1035869&view=diff
==============================================================================
--- subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/ChangePath.java (original)
+++ subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/ChangePath.java Wed Nov 17 00:09:50 2010
@@ -23,6 +23,8 @@
package org.apache.subversion.javahl;
+import org.apache.subversion.javahl.types.*;
+
public class ChangePath implements java.io.Serializable
{
// Update the serialVersionUID when there is a incompatible change
Modified: subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java?rev=1035869&r1=1035868&r2=1035869&view=diff
==============================================================================
--- subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java (original)
+++ subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java Wed Nov 17 00:09:50 2010
@@ -26,6 +26,7 @@ package org.apache.subversion.javahl;
import java.util.Map;
import java.util.EventObject;
import org.apache.subversion.javahl.callback.ClientNotifyCallback;
+import org.apache.subversion.javahl.types.NodeKind;
/**
* The event passed to the {@link ClientNotifyCallback#onNotify}
Modified: subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItem.java
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItem.java?rev=1035869&r1=1035868&r2=1035869&view=diff
==============================================================================
--- subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItem.java (original)
+++ subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItem.java Wed Nov 17 00:09:50 2010
@@ -23,6 +23,8 @@
package org.apache.subversion.javahl;
+import org.apache.subversion.javahl.types.NodeKind;
+
/**
* This class describes a item which will be commited.
*/
Modified: subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java?rev=1035869&r1=1035868&r2=1035869&view=diff
==============================================================================
--- subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java (original)
+++ subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java Wed Nov 17 00:09:50 2010
@@ -23,6 +23,8 @@
package org.apache.subversion.javahl;
+import org.apache.subversion.javahl.types.NodeKind;
+
/**
* The description of a merge conflict, encountered during
* merge/update/switch operations.
Modified: subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictVersion.java
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictVersion.java?rev=1035869&r1=1035868&r2=1035869&view=diff
==============================================================================
--- subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictVersion.java (original)
+++ subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictVersion.java Wed Nov 17 00:09:50 2010
@@ -23,6 +23,8 @@
package org.apache.subversion.javahl;
+import org.apache.subversion.javahl.types.NodeKind;
+
/**
* The description of a merge conflict, encountered during
* merge/update/switch operations.
Modified: subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/DiffSummary.java
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/DiffSummary.java?rev=1035869&r1=1035868&r2=1035869&view=diff
==============================================================================
--- subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/DiffSummary.java (original)
+++ subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/DiffSummary.java Wed Nov 17 00:09:50 2010
@@ -25,6 +25,7 @@ package org.apache.subversion.javahl;
import java.util.EventObject;
import org.apache.subversion.javahl.callback.DiffSummaryCallback;
+import org.apache.subversion.javahl.types.NodeKind;
/**
* The event passed to the {@link DiffSummaryCallback#onSummary} API
Modified: subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/DirEntry.java
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/DirEntry.java?rev=1035869&r1=1035868&r2=1035869&view=diff
==============================================================================
--- subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/DirEntry.java (original)
+++ subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/DirEntry.java Wed Nov 17 00:09:50 2010
@@ -25,6 +25,8 @@ package org.apache.subversion.javahl;
import java.util.Date;
+import org.apache.subversion.javahl.types.NodeKind;
+
/**
* A general subversion directory entry. Used for {@link ISVNClient#list}.
*/
Modified: subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java?rev=1035869&r1=1035868&r2=1035869&view=diff
==============================================================================
--- subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java (original)
+++ subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java Wed Nov 17 00:09:50 2010
@@ -24,6 +24,7 @@
package org.apache.subversion.javahl;
import org.apache.subversion.javahl.callback.*;
+import org.apache.subversion.javahl.types.*;
import java.io.OutputStream;
import java.util.Collection;
@@ -200,12 +201,12 @@ public interface ISVNClient
/**
* Sets a file for deletion.
* @param path path or url to be deleted
- * @param message if path is a url, this will be the commit message.
* @param force delete even when there are local modifications.
* @param keepLocal only remove the paths from the repository.
* @param revpropTable A string-to-string mapping of revision properties
* to values which will be set if this operation
* results in a commit.
+ * @param handler the commit message callback
* @throws ClientException
* @since 1.5
*/
@@ -262,17 +263,14 @@ public interface ISVNClient
/**
* Commits changes to the repository.
* @param path files to commit.
- * @param message log message.
* @param depth how deep to recurse in subdirectories
* @param noUnlock do remove any locks
* @param keepChangelist keep changelist associations after the commit.
* @param changelists if non-null, filter paths using changelists
+ * @param handler the commit message callback
* @param revpropTable A string-to-string mapping of revision properties
* to values which will be set if this operation
* results in a commit.
- * @return The new revision number created by the commit, or
- * {@link Revision#SVN_INVALID_REVNUM} if the revision number is
- * invalid.
* @throws ClientException
* @since 1.5
*/
@@ -287,8 +285,6 @@ public interface ISVNClient
*
* @param sources A list of <code>CopySource</code> objects.
* @param destPath Destination path or URL.
- * @param message Commit message. May be <code>null</code> if
- * <code>destPath</code> is not a URL.
* @param copyAsChild Whether to copy <code>srcPaths</code> as
* children of <code>destPath</code>.
* @param makeParents Whether to create intermediate parents
@@ -297,6 +293,8 @@ public interface ISVNClient
* @param revpropTable A string-to-string mapping of revision properties
* to values which will be set if this operation
* results in a commit.
+ * @param handler the commit message callback, may be <code>null</code>
+ * if <code>destPath</code> is not a URL
* @throws ClientException If the copy operation fails.
* @since 1.7
*/
@@ -311,8 +309,6 @@ public interface ISVNClient
*
* @param srcPaths Source paths or URLs.
* @param destPath Destination path or URL.
- * @param message Commit message. May be <code>null</code> if
- * <code>destPath</code> is not a URL.
* @param force Whether to perform the move even if local
* modifications exist.
* @param moveAsChild Whether to move <code>srcPaths</code> as
@@ -321,6 +317,8 @@ public interface ISVNClient
* @param revpropTable A string-to-string mapping of revision properties
* to values which will be set if this operation
* results in a commit.
+ * @param handler the commit message callback, may be <code>null</code>
+ * if <code>destPath</code> is not a URL
* @throws ClientException If the move operation fails.
* @since 1.5
*/
@@ -334,11 +332,11 @@ public interface ISVNClient
* Creates a directory directly in a repository or creates a
* directory on disk and schedules it for addition.
* @param path directories to be created
- * @param message commit message to used if path contains urls
* @param makeParents Whether to create intermediate parents
* @param revpropTable A string-to-string mapping of revision properties
* to values which will be set if this operation
* results in a commit.
+ * @param handler the handler to use if paths contains URLs
* @throws ClientException
* @since 1.5
*/
@@ -412,7 +410,6 @@ public interface ISVNClient
* head.
* @param path the local path
* @param url the target url
- * @param message the log message.
* @param depth depth to traverse into subdirectories
* @param noIgnore whether to add files matched by ignore patterns
* @param ignoreUnknownNodeTypes whether to ignore files which
@@ -420,6 +417,7 @@ public interface ISVNClient
* @param revpropTable A string-to-string mapping of revision properties
* to values which will be set if this operation
* results in a commit.
+ * @param handler the commit message callback
* @throws ClientException
*
* @since 1.5
@@ -527,7 +525,7 @@ public interface ISVNClient
* @param callback the object to receive the log messages
* @since 1.7
*/
- void getMergeinfoLog(MergeinfoLogKind kind, String pathOrUrl,
+ void getMergeinfoLog(Mergeinfo.LogKind kind, String pathOrUrl,
Revision pegRevision, String mergeSourceUrl,
Revision srcPegRevision, boolean discoverChangedPaths,
Depth depth, Set<String> revProps,
Modified: subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java?rev=1035869&r1=1035868&r2=1035869&view=diff
==============================================================================
--- subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java (original)
+++ subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java Wed Nov 17 00:09:50 2010
@@ -29,6 +29,7 @@ import java.io.InputStream;
import java.io.File;
import org.apache.subversion.javahl.callback.ReposNotifyCallback;
+import org.apache.subversion.javahl.types.*;
public interface ISVNRepos {
Modified: subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/Info.java
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/Info.java?rev=1035869&r1=1035868&r2=1035869&view=diff
==============================================================================
--- subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/Info.java (original)
+++ subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/Info.java Wed Nov 17 00:09:50 2010
@@ -25,6 +25,8 @@ package org.apache.subversion.javahl;
import java.util.Date;
+import org.apache.subversion.javahl.types.NodeKind;
+
/**
* this class is returned by {@link ISVNClient#info2} and contains information
* about items in the repository or working copy
Modified: subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/Mergeinfo.java
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/Mergeinfo.java?rev=1035869&r1=1035868&r2=1035869&view=diff
==============================================================================
--- subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/Mergeinfo.java (original)
+++ subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/Mergeinfo.java Wed Nov 17 00:09:50 2010
@@ -200,4 +200,17 @@ public class Mergeinfo implements java.i
{
mergeSources.put(mergeSrc, range);
}
+
+ /**
+ * Constants to specify which collection of revisions to report in
+ * getMergeinfoLog.
+ */
+ public enum LogKind
+ {
+ /** Revisions eligible for merging from merge-source to merge-target. */
+ eligible,
+
+ /** Revisions already merged from merge-source to merge-target. */
+ merged;
+ }
}
Modified: subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java?rev=1035869&r1=1035868&r2=1035869&view=diff
==============================================================================
--- subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java (original)
+++ subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java Wed Nov 17 00:09:50 2010
@@ -23,6 +23,8 @@
package org.apache.subversion.javahl;
+import org.apache.subversion.javahl.types.Version;
+
/**
* Handles activities related to management of native resouces
* (e.g. loading of native libraries).
Modified: subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java?rev=1035869&r1=1035868&r2=1035869&view=diff
==============================================================================
--- subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java (original)
+++ subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java Wed Nov 17 00:09:50 2010
@@ -24,6 +24,7 @@
package org.apache.subversion.javahl;
import org.apache.subversion.javahl.callback.*;
+import org.apache.subversion.javahl.types.*;
import java.io.OutputStream;
import java.io.ByteArrayOutputStream;
@@ -349,7 +350,7 @@ public class SVNClient implements ISVNCl
/**
* @since 1.7
*/
- public native void getMergeinfoLog(MergeinfoLogKind kind, String pathOrUrl,
+ public native void getMergeinfoLog(Mergeinfo.LogKind kind, String pathOrUrl,
Revision pegRevision,
String mergeSourceUrl,
Revision srcPegRevision,
Modified: subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java?rev=1035869&r1=1035868&r2=1035869&view=diff
==============================================================================
--- subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java (original)
+++ subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java Wed Nov 17 00:09:50 2010
@@ -29,6 +29,7 @@ import java.io.InputStream;
import java.io.File;
import org.apache.subversion.javahl.callback.ReposNotifyCallback;
+import org.apache.subversion.javahl.types.*;
/**
* This class offers the same commands as the svnadmin commandline
Modified: subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/Status.java
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/Status.java?rev=1035869&r1=1035868&r2=1035869&view=diff
==============================================================================
--- subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/Status.java (original)
+++ subversion/branches/performance/subversion/bindings/javahl/src/org/apache/subversion/javahl/Status.java Wed Nov 17 00:09:50 2010
@@ -25,6 +25,8 @@ package org.apache.subversion.javahl;
import java.util.Date;
+import org.apache.subversion.javahl.types.NodeKind;
+
/**
* Subversion status API.
* This describes the status of one subversion item (file or directory) in
Modified: subversion/branches/performance/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NodeKind.java
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NodeKind.java?rev=1035869&r1=1035868&r2=1035869&view=diff
==============================================================================
--- subversion/branches/performance/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NodeKind.java (original)
+++ subversion/branches/performance/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NodeKind.java Wed Nov 17 00:09:50 2010
@@ -61,7 +61,7 @@ public final class NodeKind
return statusNames[kind];
}
- public static int fromApache(org.apache.subversion.javahl.NodeKind aKind)
+ public static int fromApache(org.apache.subversion.javahl.types.NodeKind aKind)
{
switch(aKind)
{
Modified: subversion/branches/performance/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java?rev=1035869&r1=1035868&r2=1035869&view=diff
==============================================================================
--- subversion/branches/performance/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java (original)
+++ subversion/branches/performance/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java Wed Nov 17 00:09:50 2010
@@ -1489,7 +1489,7 @@ public class SVNClient implements SVNCli
try
{
aSVNClient.getMergeinfoLog(
- org.apache.subversion.javahl.MergeinfoLogKind.values()[kind],
+ org.apache.subversion.javahl.Mergeinfo.LogKind.values()[kind],
pathOrUrl, pegRevision == null ? null : pegRevision.toApache(),
mergeSourceUrl,
srcPegRevision == null ? null : srcPegRevision.toApache(),
Modified: subversion/branches/performance/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Version.java
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Version.java?rev=1035869&r1=1035868&r2=1035869&view=diff
==============================================================================
--- subversion/branches/performance/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Version.java (original)
+++ subversion/branches/performance/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Version.java Wed Nov 17 00:09:50 2010
@@ -30,14 +30,14 @@ package org.tigris.subversion.javahl;
*/
public class Version
{
- private org.apache.subversion.javahl.Version aVersion;
+ private org.apache.subversion.javahl.types.Version aVersion;
public Version()
{
- aVersion = new org.apache.subversion.javahl.Version();
+ aVersion = new org.apache.subversion.javahl.types.Version();
}
- public Version(org.apache.subversion.javahl.Version aVersion)
+ public Version(org.apache.subversion.javahl.types.Version aVersion)
{
this.aVersion = aVersion;
}
Modified: subversion/branches/performance/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java?rev=1035869&r1=1035868&r2=1035869&view=diff
==============================================================================
--- subversion/branches/performance/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java (original)
+++ subversion/branches/performance/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java Wed Nov 17 00:09:50 2010
@@ -23,6 +23,7 @@
package org.apache.subversion.javahl;
import org.apache.subversion.javahl.callback.*;
+import org.apache.subversion.javahl.types.*;
import java.io.File;
import java.io.FileOutputStream;
@@ -2204,7 +2205,7 @@ public class BasicTests extends SVNTests
if (expectedAvailableStart > 0)
{
long[] availableRevs =
- getMergeinfoRevisions(MergeinfoLogKind.eligible, targetPath,
+ getMergeinfoRevisions(Mergeinfo.LogKind.eligible, targetPath,
Revision.HEAD, mergeSrc,
Revision.HEAD);
assertNotNull("Missing eligible merge info on '"+targetPath + '\'',
@@ -2220,7 +2221,7 @@ public class BasicTests extends SVNTests
* are no revisions to return.
* @since 1.5
*/
- private long[] getMergeinfoRevisions(MergeinfoLogKind kind,
+ private long[] getMergeinfoRevisions(Mergeinfo.LogKind kind,
String pathOrUrl,
Revision pegRevision,
String mergeSourceUrl,
Modified: subversion/branches/performance/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java?rev=1035869&r1=1035868&r2=1035869&view=diff
==============================================================================
--- subversion/branches/performance/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java (original)
+++ subversion/branches/performance/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java Wed Nov 17 00:09:50 2010
@@ -23,6 +23,7 @@
package org.apache.subversion.javahl;
import org.apache.subversion.javahl.callback.*;
+import org.apache.subversion.javahl.types.NodeKind;
import java.io.File;
import java.io.FileInputStream;
Modified: subversion/branches/performance/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java?rev=1035869&r1=1035868&r2=1035869&view=diff
==============================================================================
--- subversion/branches/performance/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java (original)
+++ subversion/branches/performance/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java Wed Nov 17 00:09:50 2010
@@ -32,6 +32,8 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Date;
+import org.apache.subversion.javahl.types.NodeKind;
+
import junit.framework.Assert;
/**
* This class describe the expected state of the working copy
Modified: subversion/branches/performance/subversion/bindings/swig/include/svn_containers.swg
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/bindings/swig/include/svn_containers.swg?rev=1035869&r1=1035868&r2=1035869&view=diff
==============================================================================
--- subversion/branches/performance/subversion/bindings/swig/include/svn_containers.swg (original)
+++ subversion/branches/performance/subversion/bindings/swig/include/svn_containers.swg Wed Nov 17 00:09:50 2010
@@ -863,3 +863,13 @@
%typemap(argout) apr_array_header_t **RANGELIST_INOUT =
apr_array_header_t **RANGELIST;
#endif
+
+/* -----------------------------------------------------------------------
+ Output of apr_array_header_t * <svn_auth_provider_object_t *>
+*/
+#ifdef SWIGPERL
+%typemap(argout) apr_array_header_t **providers {
+ %append_output(svn_swig_pl_convert_array(*$1,
+ $descriptor(svn_auth_provider_object_t *)));
+}
+#endif
Modified: subversion/branches/performance/subversion/bindings/swig/perl/native/t/3client.t
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/bindings/swig/perl/native/t/3client.t?rev=1035869&r1=1035868&r2=1035869&view=diff
==============================================================================
--- subversion/branches/performance/subversion/bindings/swig/perl/native/t/3client.t (original)
+++ subversion/branches/performance/subversion/bindings/swig/perl/native/t/3client.t Wed Nov 17 00:09:50 2010
@@ -20,7 +20,7 @@
#
#
-use Test::More tests => 118;
+use Test::More tests => 119;
use strict;
# shut up about variables that are only used once.
@@ -464,6 +464,19 @@ SKIP: {
'Successfully set auth_baton back to old value');
}
+# Keep track of the ok-ness ourselves, since we need to know the exact
+# number of tests at the start of this file. The 'subtest' feature of
+# Test::More would be perfect for this, but it's only available in very
+# recent perl versions, it seems.
+my $ok = 1;
+# Get a list of platform specific providers, using the default
+# configuration and pool.
+my @providers = @{SVN::Core::auth_get_platform_specific_client_providers(undef, undef)};
+foreach my $p (@providers) {
+ $ok &= defined($p) && $p->isa('_p_svn_auth_provider_object_t');
+}
+ok($ok, 'svn_auth_get_platform_specific_client_providers returns _p_svn_auth_provider_object_t\'s');
+
END {
diag('cleanup');
rmtree($testpath);
Re: svn commit: r1035869 [1/19] - in /subversion/branches/performance:
./ build/ build/generator/ build/generator/templates/ build/win32/ subversion/bindings/javahl/native/
subversion/bindings/javahl/src/org/apache/subversion/javahl/ subversion/bindings/ja...
Posted by Stefan Fuhrmann <st...@alice-dsl.de>.
On 17.11.2010 08:51, Stefan Sperling wrote:
> On Wed, Nov 17, 2010 at 12:09:55AM -0000, stefan2@apache.org wrote:
>> Author: stefan2
>> Date: Wed Nov 17 00:09:50 2010
>> New Revision: 1035869
>>
>> URL: http://svn.apache.org/viewvc?rev=1035869&view=rev
>> Log:
>> On the performance branch:
>> Bring up-to-date with trunk.
>> [lots of tree conflicts due to moved files were to resolve]
> Just out of curiousity:
> Can you describe what kinds of conflicts you were seeing?
> Were the tree conflicts within the build/generator directory?
> Or elsewhere, too?
And JAVA bindings (and possibly a few other places).
> Tree conflicts should only happen if you also deleted/moved/edited the
> correspponding files (or directories) on the performance branch.
>
They were all of the "deleted (renamed) after modification" variety.
-- Stefan^2.
Re: svn commit: r1035869 [1/19] - in
/subversion/branches/performance: ./ build/ build/generator/
build/generator/templates/ build/win32/ subversion/bindings/javahl/native/
subversion/bindings/javahl/src/org/apache/subversion/javahl/
subversion/bindings/ja...
Posted by Stefan Sperling <st...@elego.de>.
On Wed, Nov 17, 2010 at 12:09:55AM -0000, stefan2@apache.org wrote:
> Author: stefan2
> Date: Wed Nov 17 00:09:50 2010
> New Revision: 1035869
>
> URL: http://svn.apache.org/viewvc?rev=1035869&view=rev
> Log:
> On the performance branch:
> Bring up-to-date with trunk.
> [lots of tree conflicts due to moved files were to resolve]
Just out of curiousity:
Can you describe what kinds of conflicts you were seeing?
Were the tree conflicts within the build/generator directory?
Or elsewhere, too?
Tree conflicts should only happen if you also deleted/moved/edited the
correspponding files (or directories) on the performance branch.