subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject svn commit: r1066452 [1/11] - in /subversion/branches/performance: ./ build/ build/ac-macros/ build/generator/ contrib/hook-scripts/ notes/ notes/api-errata/1.7/ subversion/bindings/javahl/tests/org/apache/subversion/javahl/ subversion/include/ subvers...
Date Wed, 02 Feb 2011 13:04:59 GMT
Author: stefan2
Date: Wed Feb  2 13:04:51 2011
New Revision: 1066452

URL: http://svn.apache.org/viewvc?rev=1066452&view=rev
Log:
On the performance branch:
Bring up-to-date with trunk.

Added:
    subversion/branches/performance/notes/xfail-status
      - copied unchanged from r1066449, subversion/trunk/notes/xfail-status
    subversion/branches/performance/subversion/include/private/svn_fspath.h
      - copied unchanged from r1066449, subversion/trunk/subversion/include/private/svn_fspath.h
    subversion/branches/performance/subversion/libsvn_wc/wc_db_pristine.c
      - copied unchanged from r1066449, subversion/trunk/subversion/libsvn_wc/wc_db_pristine.c
    subversion/branches/performance/subversion/tests/cmdline/svnsync_tests_data/descend-into-replace.dump
      - copied unchanged from r1066449, subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/descend-into-replace.dump
    subversion/branches/performance/subversion/tests/cmdline/svnsync_tests_data/descend-into-replace.expected.dump
      - copied unchanged from r1066449, subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/descend-into-replace.expected.dump
    subversion/branches/performance/subversion/tests/cmdline/svnsync_tests_data/dir-prop-change.dump
      - copied unchanged from r1066449, subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/dir-prop-change.dump
    subversion/branches/performance/subversion/tests/cmdline/svnsync_tests_data/repo-with-copy-of-root-dir.dump
      - copied unchanged from r1066449, subversion/trunk/subversion/tests/cmdline/svnsync_tests_data/repo-with-copy-of-root-dir.dump
Removed:
    subversion/branches/performance/subversion/tests/cmdline/svnsync_tests_data/descend_into_replace.dump
    subversion/branches/performance/subversion/tests/cmdline/svnsync_tests_data/descend_into_replace.expected.dump
    subversion/branches/performance/subversion/tests/cmdline/svnsync_tests_data/dir_prop_change.dump
    subversion/branches/performance/subversion/tests/cmdline/svnsync_tests_data/repo_with_copy_of_root_dir.dump
Modified:
    subversion/branches/performance/   (props changed)
    subversion/branches/performance/CHANGES
    subversion/branches/performance/COMMITTERS
    subversion/branches/performance/INSTALL
    subversion/branches/performance/build.conf
    subversion/branches/performance/build/ac-macros/neon.m4
    subversion/branches/performance/build/generator/gen_win.py
    subversion/branches/performance/build/run_tests.py
    subversion/branches/performance/configure.ac
    subversion/branches/performance/contrib/hook-scripts/remove-zombie-locks.py
    subversion/branches/performance/notes/api-errata/1.7/wc007.txt   (contents, props changed)
    subversion/branches/performance/notes/variance-adjusted-patching.html
    subversion/branches/performance/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
    subversion/branches/performance/subversion/include/private/svn_fs_util.h
    subversion/branches/performance/subversion/include/private/svn_mergeinfo_private.h
    subversion/branches/performance/subversion/include/private/svn_opt_private.h
    subversion/branches/performance/subversion/include/private/svn_ra_private.h
    subversion/branches/performance/subversion/include/private/svn_repos_private.h
    subversion/branches/performance/subversion/include/private/svn_sqlite.h
    subversion/branches/performance/subversion/include/private/svn_wc_private.h
    subversion/branches/performance/subversion/include/svn_client.h
    subversion/branches/performance/subversion/include/svn_cmdline.h
    subversion/branches/performance/subversion/include/svn_config.h
    subversion/branches/performance/subversion/include/svn_dav.h
    subversion/branches/performance/subversion/include/svn_delta.h
    subversion/branches/performance/subversion/include/svn_diff.h
    subversion/branches/performance/subversion/include/svn_dirent_uri.h
    subversion/branches/performance/subversion/include/svn_editor.h
    subversion/branches/performance/subversion/include/svn_error.h
    subversion/branches/performance/subversion/include/svn_fs.h
    subversion/branches/performance/subversion/include/svn_io.h
    subversion/branches/performance/subversion/include/svn_mergeinfo.h
    subversion/branches/performance/subversion/include/svn_ra.h
    subversion/branches/performance/subversion/include/svn_repos.h
    subversion/branches/performance/subversion/include/svn_subst.h
    subversion/branches/performance/subversion/include/svn_types.h
    subversion/branches/performance/subversion/include/svn_wc.h
    subversion/branches/performance/subversion/libsvn_client/add.c
    subversion/branches/performance/subversion/libsvn_client/client.h
    subversion/branches/performance/subversion/libsvn_client/commit.c
    subversion/branches/performance/subversion/libsvn_client/copy.c
    subversion/branches/performance/subversion/libsvn_client/delete.c
    subversion/branches/performance/subversion/libsvn_client/diff.c
    subversion/branches/performance/subversion/libsvn_client/export.c
    subversion/branches/performance/subversion/libsvn_client/externals.c
    subversion/branches/performance/subversion/libsvn_client/info.c
    subversion/branches/performance/subversion/libsvn_client/list.c
    subversion/branches/performance/subversion/libsvn_client/locking_commands.c
    subversion/branches/performance/subversion/libsvn_client/merge.c
    subversion/branches/performance/subversion/libsvn_client/mergeinfo.c
    subversion/branches/performance/subversion/libsvn_client/patch.c
    subversion/branches/performance/subversion/libsvn_client/prop_commands.c
    subversion/branches/performance/subversion/libsvn_client/ra.c
    subversion/branches/performance/subversion/libsvn_client/repos_diff.c
    subversion/branches/performance/subversion/libsvn_client/status.c
    subversion/branches/performance/subversion/libsvn_client/switch.c
    subversion/branches/performance/subversion/libsvn_client/update.c
    subversion/branches/performance/subversion/libsvn_client/util.c
    subversion/branches/performance/subversion/libsvn_delta/path_driver.c
    subversion/branches/performance/subversion/libsvn_diff/parse-diff.c
    subversion/branches/performance/subversion/libsvn_diff/token.c
    subversion/branches/performance/subversion/libsvn_fs_base/bdb/changes-table.c
    subversion/branches/performance/subversion/libsvn_fs_base/bdb/env.c
    subversion/branches/performance/subversion/libsvn_fs_base/bdb/locks-table.c
    subversion/branches/performance/subversion/libsvn_fs_base/dag.c
    subversion/branches/performance/subversion/libsvn_fs_base/lock.c
    subversion/branches/performance/subversion/libsvn_fs_base/tree.c
    subversion/branches/performance/subversion/libsvn_fs_fs/dag.c
    subversion/branches/performance/subversion/libsvn_fs_fs/fs_fs.c
    subversion/branches/performance/subversion/libsvn_fs_fs/lock.c
    subversion/branches/performance/subversion/libsvn_fs_fs/tree.c
    subversion/branches/performance/subversion/libsvn_ra/compat.c
    subversion/branches/performance/subversion/libsvn_ra/ra_loader.c
    subversion/branches/performance/subversion/libsvn_ra/util.c
    subversion/branches/performance/subversion/libsvn_ra_local/ra_plugin.c
    subversion/branches/performance/subversion/libsvn_ra_neon/fetch.c
    subversion/branches/performance/subversion/libsvn_ra_neon/get_locks.c
    subversion/branches/performance/subversion/libsvn_ra_neon/options.c
    subversion/branches/performance/subversion/libsvn_ra_neon/props.c
    subversion/branches/performance/subversion/libsvn_ra_neon/ra_neon.h
    subversion/branches/performance/subversion/libsvn_ra_neon/session.c
    subversion/branches/performance/subversion/libsvn_ra_neon/util.c
    subversion/branches/performance/subversion/libsvn_ra_serf/commit.c
    subversion/branches/performance/subversion/libsvn_ra_serf/getlocks.c
    subversion/branches/performance/subversion/libsvn_ra_serf/merge.c
    subversion/branches/performance/subversion/libsvn_ra_serf/options.c
    subversion/branches/performance/subversion/libsvn_ra_serf/property.c
    subversion/branches/performance/subversion/libsvn_ra_serf/ra_serf.h
    subversion/branches/performance/subversion/libsvn_ra_serf/serf.c
    subversion/branches/performance/subversion/libsvn_ra_serf/update.c
    subversion/branches/performance/subversion/libsvn_ra_serf/util.c
    subversion/branches/performance/subversion/libsvn_ra_svn/client.c
    subversion/branches/performance/subversion/libsvn_ra_svn/cyrus_auth.c
    subversion/branches/performance/subversion/libsvn_ra_svn/editorp.c
    subversion/branches/performance/subversion/libsvn_ra_svn/protocol
    subversion/branches/performance/subversion/libsvn_repos/authz.c
    subversion/branches/performance/subversion/libsvn_repos/commit.c
    subversion/branches/performance/subversion/libsvn_repos/hooks.c
    subversion/branches/performance/subversion/libsvn_repos/load.c
    subversion/branches/performance/subversion/libsvn_repos/log.c
    subversion/branches/performance/subversion/libsvn_repos/replay.c
    subversion/branches/performance/subversion/libsvn_repos/reporter.c
    subversion/branches/performance/subversion/libsvn_repos/repos.c
    subversion/branches/performance/subversion/libsvn_subr/config_file.c
    subversion/branches/performance/subversion/libsvn_subr/deprecated.c
    subversion/branches/performance/subversion/libsvn_subr/dirent_uri.c
    subversion/branches/performance/subversion/libsvn_subr/error.c
    subversion/branches/performance/subversion/libsvn_subr/io.c
    subversion/branches/performance/subversion/libsvn_subr/mergeinfo.c
    subversion/branches/performance/subversion/libsvn_subr/path.c
    subversion/branches/performance/subversion/libsvn_subr/sqlite.c
    subversion/branches/performance/subversion/libsvn_subr/stream.c
    subversion/branches/performance/subversion/libsvn_subr/subst.c
    subversion/branches/performance/subversion/libsvn_subr/target.c
    subversion/branches/performance/subversion/libsvn_wc/adm_files.c
    subversion/branches/performance/subversion/libsvn_wc/adm_ops.c
    subversion/branches/performance/subversion/libsvn_wc/entries.c
    subversion/branches/performance/subversion/libsvn_wc/props.c
    subversion/branches/performance/subversion/libsvn_wc/relocate.c
    subversion/branches/performance/subversion/libsvn_wc/status.c
    subversion/branches/performance/subversion/libsvn_wc/update_editor.c
    subversion/branches/performance/subversion/libsvn_wc/upgrade.c
    subversion/branches/performance/subversion/libsvn_wc/util.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/workqueue.c
    subversion/branches/performance/subversion/libsvn_wc/workqueue.h
    subversion/branches/performance/subversion/mod_authz_svn/mod_authz_svn.c
    subversion/branches/performance/subversion/mod_dav_svn/authz.c
    subversion/branches/performance/subversion/mod_dav_svn/mirror.c
    subversion/branches/performance/subversion/mod_dav_svn/mod_dav_svn.c
    subversion/branches/performance/subversion/mod_dav_svn/reports/update.c
    subversion/branches/performance/subversion/mod_dav_svn/repos.c
    subversion/branches/performance/subversion/mod_dav_svn/version.c
    subversion/branches/performance/subversion/po/fr.po
    subversion/branches/performance/subversion/svn/checkout-cmd.c
    subversion/branches/performance/subversion/svn/cl.h
    subversion/branches/performance/subversion/svn/diff-cmd.c
    subversion/branches/performance/subversion/svn/export-cmd.c
    subversion/branches/performance/subversion/svn/lock-cmd.c
    subversion/branches/performance/subversion/svn/main.c
    subversion/branches/performance/subversion/svn/merge-cmd.c
    subversion/branches/performance/subversion/svn/patch-cmd.c
    subversion/branches/performance/subversion/svn/propset-cmd.c
    subversion/branches/performance/subversion/svn/util.c
    subversion/branches/performance/subversion/svnadmin/main.c
    subversion/branches/performance/subversion/svnlook/main.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/svnserve/serve.c
    subversion/branches/performance/subversion/tests/cmdline/authz_tests.py
    subversion/branches/performance/subversion/tests/cmdline/autoprop_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/changelist_tests.py
    subversion/branches/performance/subversion/tests/cmdline/commit_tests.py
    subversion/branches/performance/subversion/tests/cmdline/davautocheck.sh
    subversion/branches/performance/subversion/tests/cmdline/depth_tests.py
    subversion/branches/performance/subversion/tests/cmdline/diff_tests.py
    subversion/branches/performance/subversion/tests/cmdline/input_validation_tests.py
    subversion/branches/performance/subversion/tests/cmdline/lock_tests.py
    subversion/branches/performance/subversion/tests/cmdline/merge_reintegrate_tests.py
    subversion/branches/performance/subversion/tests/cmdline/merge_tests.py
    subversion/branches/performance/subversion/tests/cmdline/prop_tests.py
    subversion/branches/performance/subversion/tests/cmdline/schedule_tests.py
    subversion/branches/performance/subversion/tests/cmdline/special_tests.py
    subversion/branches/performance/subversion/tests/cmdline/stat_tests.py
    subversion/branches/performance/subversion/tests/cmdline/svnrdump_tests.py
    subversion/branches/performance/subversion/tests/cmdline/svnrdump_tests_data/descend-into-replace.dump
    subversion/branches/performance/subversion/tests/cmdline/svnrdump_tests_data/descend-into-replace.expected.dump
    subversion/branches/performance/subversion/tests/cmdline/svnsync_tests.py
    subversion/branches/performance/subversion/tests/cmdline/svntest/main.py
    subversion/branches/performance/subversion/tests/cmdline/svntest/verify.py
    subversion/branches/performance/subversion/tests/cmdline/svntest/wc.py
    subversion/branches/performance/subversion/tests/cmdline/switch_tests.py
    subversion/branches/performance/subversion/tests/cmdline/tree_conflict_tests.py
    subversion/branches/performance/subversion/tests/cmdline/update_tests.py
    subversion/branches/performance/subversion/tests/libsvn_diff/parse-diff-test.c
    subversion/branches/performance/subversion/tests/libsvn_subr/dirent_uri-test.c
    subversion/branches/performance/subversion/tests/libsvn_subr/path-test.c
    subversion/branches/performance/subversion/tests/libsvn_subr/stream-test.c
    subversion/branches/performance/subversion/tests/libsvn_subr/subst_translate-test.c
    subversion/branches/performance/subversion/tests/libsvn_wc/db-test.c
    subversion/branches/performance/subversion/tests/libsvn_wc/entries-compat.c
    subversion/branches/performance/subversion/tests/libsvn_wc/op-depth-test.c
    subversion/branches/performance/subversion/tests/svn_test.h
    subversion/branches/performance/subversion/tests/svn_test_main.c
    subversion/branches/performance/tools/buildbot/slaves/svn-openbsd-i386/svnbuild.sh
    subversion/branches/performance/tools/buildbot/slaves/svn-openbsd-i386/svncheck-bindings.sh
    subversion/branches/performance/tools/buildbot/slaves/svn-openbsd-i386/svncheck.sh
    subversion/branches/performance/tools/buildbot/slaves/svn-openbsd-i386/svnclean.sh
    subversion/branches/performance/tools/client-side/bash_completion
    subversion/branches/performance/tools/client-side/svnmucc/svnmucc.c
    subversion/branches/performance/tools/dev/unix-build/Makefile.svn
    subversion/branches/performance/tools/po/l10n-report.py
    subversion/branches/performance/win-tests.py

Propchange: subversion/branches/performance/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb  2 13:04:51 2011
@@ -39,4 +39,5 @@
 /subversion/branches/tc_url_rev:874351-874483
 /subversion/branches/tree-conflicts:868291-873154
 /subversion/branches/tree-conflicts-notify:873926-874008
-/subversion/trunk:962911-1043512,1043551-1053645,1053833-1055984
+/subversion/branches/uris-as-urls:1060426-1064427
+/subversion/trunk:962911-1043512,1043551-1053645,1053833-1055984,1056165-1066449

Modified: subversion/branches/performance/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/performance/CHANGES?rev=1066452&r1=1066451&r2=1066452&view=diff
==============================================================================
--- subversion/branches/performance/CHANGES (original)
+++ subversion/branches/performance/CHANGES Wed Feb  2 13:04:51 2011
@@ -9,8 +9,10 @@ http://svn.apache.org/repos/asf/subversi
    * fix 'svn export' regression from 1.6.13 (r1032970)
    * fix 'svn export' mistakenly uri-encodes paths (issue #3745)
    * fix server-side memory leaks triggered by 'blame -g' (r1032808)
+            This has been tracked as CVE-2010-4644
    * prevent crash in mod_dav_svn when using SVNParentPath (r1033166)
-   * allow 'log -g' to continue in the face of invalid mergeinfo (r1028108)
+            This has been tracked as CVE-2010-4539
+   * allow 'log -g' to continue in the face of invalid mergeinfo (issue #3270)
    * filter unreadable paths for 'svn ls' and 'svn co' (r997026, -070, -474)
    * fix abort in 'svn blame -g' (issue #3666)
    * fix file handle leak in ruby bindings (issue #3512)

Modified: subversion/branches/performance/COMMITTERS
URL: http://svn.apache.org/viewvc/subversion/branches/performance/COMMITTERS?rev=1066452&r1=1066451&r2=1066452&view=diff
==============================================================================
--- subversion/branches/performance/COMMITTERS [UTF-8] (original)
+++ subversion/branches/performance/COMMITTERS [UTF-8] Wed Feb  2 13:04:51 2011
@@ -29,7 +29,7 @@ Blanket commit access:
            jaa   Jani Averbach <jaa@iki.fi>
     julianfoad   Julian Foad <julian.foad@wandisco.com>
   jszakmeister   John Szakmeister <john@szakmeister.net>
-           ehu   Erik Hülsmann <erik.huelsmann@wandisco.com>
+           ehu   Erik Hülsmann <ehuels@gmail.com>
         breser   Ben Reser <ben@reser.org>
           maxb   Max Bowsher <maxb1@ukf.net>
        dberlin   Daniel Berlin <dberlin@dberlin.org>
@@ -54,8 +54,9 @@ Blanket commit access:
          neels   Neels J. Hofmeyr <neels@elego.de>
      jwhitlock   Jeremy Whitlock <jcscoobyrs@gmail.com>
        sbutler   Stephen Butler <sbutler@elego.de>
-        dannas   Daniel Näslund <dannas@elego.de>
+        dannas   Daniel Näslund <dannas@dannas.name>
        stefan2   Stefan Fuhrmann <stefanfuhrmann@alice-dsl.de>
+       jcorvel   Johan Corveleyn <jcorvel@gmail.com>
 
 [[END ACTIVE FULL COMMITTERS.  LEAVE THIS LINE HERE; SCRIPTS LOOK FOR IT.]]
 
@@ -101,33 +102,41 @@ Commit access for specific areas:
 
   Miscellaneous:
 
-      kbohling   Kirby C. Bohling <kbohling@birddog.com>     (tools/dev)
+      kbohling   Kirby C. Bohling <kbohling@birddog.com>     (tools/dev) [EMAIL
+                                                             IS BOUNCING]
            nsd   Nick Duffek <nick@duffek.com>               (doc)
         xsteve   Stefan Reichör <stefan@xsteve.at>           (psvn.el)
       josander   Jostein Andersen <jostein@vait.se>          (various)
       niemeyer   Gustavo Niemeyer <niemeyer@conectiva.com>   (svnperms.py)
-        zbrown   Zack Brown <zbrown@tumblerings.org>         (doc)
+                                                             [EMAIL IS BOUNCING]
+        zbrown   Zack Brown <zbrown@tumblerings.org>         (doc) [EMAIL IS
+                                                             BOUNCING]
         mprice   Michael Price <ectospheno@gmail.com>        (releases)
     jrepenning   Jack Repenning <jrepenning@collab.net>      (tools/dev)
-      lonestar   Martin Maurer <martin.maurer@email.de>      (svnshow)
-       shlomif   Shlomi Fish <shlomif@vipe.technion.ac.il>   (svn-push)
+      jlonestar   Martin Maurer <martin.maurer@email.de>      (svnshow) [EMAIL
+                                                             IS BOUNCING]
+       shlomif   Shlomi Fish <shlomif@vipe.technion.ac.il>   (svn-push) [EMAIL
+                                                             IS BOUNCING]
        mthelen   Michael W Thelen <mike@pietdepsi.com>       (doc)
   jeremybettis   Jeremy Bettis <jeremy@deadbeef.com>         (case-insensitive)
       martinto   Martin Tomes <lists@tomes.org>              (case-insensitive)
         danpat   Daniel Patterson <danpat@danpat.net>        (svn-graph.pl)
-   archiecobbs   Archie Cobbs <archie@awarix.com>            (svnmerge)
+   archiecobbs   Archie Cobbs <archie@awarix.com>            (svnmerge) [EMAIL
+                                                             IS BOUNCING]
   giovannibajo   Giovanni Bajo <rasky@develer.com>           (svnmerge)
         offby1   Eric Hanchrow <offby1@blarg.net>            (doc)
        nomis80   Simon Perreault <nomis80@nomis80.org>       (svn-clean)
       jlvarner   Joshua Varner <jlvarner@gmail.com>          (doc)
           nori   Kobayashi Noritada <nori1@dolphin.c.u-tokyo.ac.jp> (Ruby tools,
-                                                              po: ja)
+                                                              po: ja) [EMAIL IS
+                                                              BOUNCING]
             mf   Martin Furter <mf@rola.ch>                  (svnmirror.sh
                                                           svn-backup-dumps.py)
        adejong   Arthur de Jong <arthur@ch.tudelft.nl>       (svn2cl)
       wsanchez   Wilfredo Sánchez <wsanchez@wsanchez.net>    (various contrib)
        mhagger   Michael Haggerty <mhagger@alum.mit.edu>     (svntest)
-       madanus   Madan U S <madan@collab.net>                (svnmerge)
+       madanus   Madan U S <madan@collab.net>                (svnmerge) [EMAIL
+                                                             IS BOUNCING]
           wein   Mathias Weinert <wein@mccw.de>              (mailer)
         bhuvan   Bhuvaneswaran <bhuvan@collab.net>           (svn2feed.py,
                                                               build/hudson)
@@ -156,15 +165,19 @@ Commit access for specific areas:
         jzgoda   Jaroslaw Zgoda <jzgoda@o2.pl>               (po: pl)
       karolszk   Karol Szkudlarek <karol@mikronika.com.pl>   (po: pl)
         plasma   Wei-Hon Chen <plasma@ms9.hinet.net>         (po: zh_TW)
-       jihuang   June-Yen Huang <jihuang@iis.sinica.edu.tw>  (po: zh_TW)
+       jihuang   June-Yen Huang <jihuang@iis.sinica.edu.tw>  (po: zh_TW) [EMAIL
+                                                             IS BOUNCING]
        marcosc   Marcos Chaves <marcos.nospam@gmail.com>     (po: pt_BR)
         pynoos   Hojin Choi <hojin.choi@gmail.com>           (po: ko)
        blueboh   Jeong Seolin <blueboh@gmail.com>            (po: ko)
      dongsheng   Dongsheng Song <songdongsheng@live.cn>      (po: zh_CN)
-        hynnet   YingNing Huang <hyn@bao.hynnet.com>         (po: zh_CN)
-          lark   Wang Jian <lark@linux.net.cn>               (po: zh_CN)
+        hynnet   YingNing Huang <hyn@bao.hynnet.com>         (po: zh_CN) [EMAIL
+                                                             IS BOUNCING]
+          lark   Wang Jian <lark@linux.net.cn>               (po: zh_CN) [EMAIL
+                                                             IS BOUNCING]
 giorgio_valoti   Giorgio Valoti <giorgio_v@mac.com>          (po: it)
-        nebiac   Federico Nebiacolombo <cint1@amsjv.it>      (po: it)
+        nebiac   Federico Nebiacolombo <cint1@amsjv.it>      (po: it) [EMAIL
+                                                             IS BOUNCING]
         fabien   Fabien Coelho <fabien@coelho.net>           (po: fr)
        marcelg   Marcel Gosselin <marcel.gosselin@polymtl.ca> (po: fr)
 
@@ -172,6 +185,7 @@ giorgio_valoti   Giorgio Valoti <giorgio
 
      gthompson   Glenn A. Thompson <gthompson@cdr.net>       (pluggable-db br.)
        sigfred   Sigfred Håversen <bsdlist@mumak.com>        (svnserve-ssl br.)
+                                                             [EMAIL IS BOUNCING]
         pmarek   Ph. Marek <philipp@marek.priv.at>           (meta-data-v br.)
       jpeacock   John Peacock <jpeacock@rowman.com>          (perl-bindings-
                                                               improvements br.)
@@ -180,8 +194,6 @@ giorgio_valoti   Giorgio Valoti <giorgio
        cacknin   Charles Acknin <charlesacknin@gmail.com>    (svnpatch-diff 
                                                               br.)
         holden   Holden Karau <holden@pigscanfly.ca>         (scheme-bindings br.)
-       jcorvel   Johan Corveleyn <jcorvel@gmail.com>         (diff-
-                                                              optimizations br.)
 
   Subprojects that are complete, abandoned or have moved elsewhere:
 
@@ -209,4 +221,4 @@ giorgio_valoti   Giorgio Valoti <giorgio
 ## Local Variables:
 ## coding:utf-8
 ## End:
-## vim:encoding=utf8
+## vim:fileencoding=utf8

Modified: subversion/branches/performance/INSTALL
URL: http://svn.apache.org/viewvc/subversion/branches/performance/INSTALL?rev=1066452&r1=1066451&r2=1066452&view=diff
==============================================================================
--- subversion/branches/performance/INSTALL (original)
+++ subversion/branches/performance/INSTALL Wed Feb  2 13:04:51 2011
@@ -322,7 +322,7 @@ I.    INTRODUCTION
       newer. The autogen.sh script knows about that.
 
 
-      5.  An HTTP client libary:  serf.  (OPTIONAL)
+      5.  An HTTP client library:  serf.  (OPTIONAL)
 
       If you want your client to be able to speak to an Apache
       server (via a http:// or https:// URL), you must link against
@@ -504,8 +504,8 @@ I.    INTRODUCTION
 
       13. SQLite  (REQUIRED)
 
-      Subversion (starting with version 1.6) requires SQLite version
-      3.4.0 or above, and you can meet this dependency several ways:
+      Subversion 1.7 requires SQLite version 3.6.18 or above.  You can meet
+      this dependency several ways:
         * Use an SQLite amalgamation file.
         * Specify an SQLite installation to use.
         * Let Subversion find an installed SQLite.

Modified: subversion/branches/performance/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/performance/build.conf?rev=1066452&r1=1066451&r2=1066452&view=diff
==============================================================================
--- subversion/branches/performance/build.conf (original)
+++ subversion/branches/performance/build.conf Wed Feb  2 13:04:51 2011
@@ -53,10 +53,10 @@ private-built-includes =
         subversion/bindings/javahl/include/org_apache_subversion_javahl_CommitItemStateFlags.h
         subversion/bindings/javahl/include/org_apache_subversion_javahl_NativeResources.h
         subversion/bindings/javahl/include/org_apache_subversion_javahl_Path.h
-        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_types_Version.h
+        subversion/bindings/javahl/include/org_apache_subversion_javahl_types_Revision.h
         subversion/bindings/javahl/include/org_apache_subversion_javahl_callback_UserPasswordCallback.h
 
 
@@ -325,7 +325,7 @@ msvc-export = 
         svn_sorts.h svn_string.h svn_subst.h svn_time.h svn_types.h svn_user.h
         svn_utf.h svn_version.h svn_xml.h 
         private\svn_atomic.h private\svn_cache.h private\svn_cmdline_private.h
-        private\svn_debug.h
+        private\svn_debug.h private\svn_fspath.h
         private\svn_log.h private\svn_mergeinfo_private.h
         private\svn_opt_private.h private\svn_skel.h private\svn_sqlite.h
         private\svn_utf_private.h private\svn_eol_private.h

Modified: subversion/branches/performance/build/ac-macros/neon.m4
URL: http://svn.apache.org/viewvc/subversion/branches/performance/build/ac-macros/neon.m4?rev=1066452&r1=1066451&r2=1066452&view=diff
==============================================================================
--- subversion/branches/performance/build/ac-macros/neon.m4 (original)
+++ subversion/branches/performance/build/ac-macros/neon.m4 Wed Feb  2 13:04:51 2011
@@ -61,6 +61,10 @@ AC_DEFUN(SVN_LIB_NEON,
     fi
 
     SVN_NEON_CONFIG()
+  ],
+  [
+    AC_PATH_PROG(neon_config, neon-config)
+    SVN_NEON_CONFIG()
   ])
   
   AC_SUBST(SVN_NEON_INCLUDES)

Modified: subversion/branches/performance/build/generator/gen_win.py
URL: http://svn.apache.org/viewvc/subversion/branches/performance/build/generator/gen_win.py?rev=1066452&r1=1066451&r2=1066452&view=diff
==============================================================================
--- subversion/branches/performance/build/generator/gen_win.py (original)
+++ subversion/branches/performance/build/generator/gen_win.py Wed Feb  2 13:04:51 2011
@@ -1544,8 +1544,9 @@ class WinGeneratorBase(GeneratorBase):
     msg = 'Found SQLite version %s\n'
 
     major, minor, patch = version
-    if major < 3 or (major == 3 and minor < 4):
-      sys.stderr.write("ERROR: SQLite 3.4.0 or higher is required "
+    if major < 3 or (major == 3 and minor < 6) \
+                 or (major == 3 and minor == 6 and patch < 18):
+      sys.stderr.write("ERROR: SQLite 3.6.18 or higher is required "
                        "(%s found)\n" % self.sqlite_version);
       sys.exit(1)
     else:

Modified: subversion/branches/performance/build/run_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/performance/build/run_tests.py?rev=1066452&r1=1066451&r2=1066452&view=diff
==============================================================================
--- subversion/branches/performance/build/run_tests.py (original)
+++ subversion/branches/performance/build/run_tests.py Wed Feb  2 13:04:51 2011
@@ -79,7 +79,7 @@ class TestHarness:
                server_minor_version=None, verbose=None,
                cleanup=None, enable_sasl=None, parallel=None, config_file=None,
                fsfs_sharding=None, fsfs_packing=None,
-               list_tests=None, svn_bin=None):
+               list_tests=None, svn_bin=None, mode_filter=None):
     '''Construct a TestHarness instance.
 
     ABS_SRCDIR and ABS_BUILDDIR are the source and build directories.
@@ -91,6 +91,8 @@ class TestHarness:
     HTTP_LIBRARY is the HTTP library for DAV-based communications.
     SERVER_MINOR_VERSION is the minor version of the server being tested.
     SVN_BIN is the path where the svn binaries are installed.
+    mode_filter restricts the TestHarness to tests with the expected mode
+    XFail, Skip, Pass, or All tests (default).
     '''
     self.srcdir = abs_srcdir
     self.builddir = abs_builddir
@@ -113,6 +115,7 @@ class TestHarness:
       self.config_file = os.path.abspath(config_file)
     self.list_tests = list_tests
     self.svn_bin = svn_bin
+    self.mode_filter = mode_filter
     self.log = None
     if not sys.stdout.isatty() or sys.platform == 'win32':
       TextColors.disable()
@@ -151,16 +154,26 @@ class TestHarness:
         sys.stdout.write('%s\n       [[%s'
                          % (x[:wip], x[wip + len(wimptag):]))
 
-    passed = [x for x in log_lines if x[:6] == 'PASS: ']
+    if self.list_tests:
+      passed = [x for x in log_lines if x[8:13] == '     ']
+    else:
+      passed = [x for x in log_lines if x[:6] == 'PASS: ']
 
-    skipped = [x for x in log_lines if x[:6] == 'SKIP: ']
-    if skipped:
+    if self.list_tests:
+      skipped = [x for x in log_lines if x[8:12] == 'SKIP']
+    else:
+      skipped = [x for x in log_lines if x[:6] == 'SKIP: ']
+
+    if skipped and not self.list_tests:
       print('At least one test was SKIPPED, checking ' + self.logfile)
       for x in skipped:
         sys.stdout.write(x)
 
-    xfailed = [x for x in log_lines if x[:6] == 'XFAIL:']
-    if xfailed:
+    if self.list_tests:
+      xfailed = [x for x in log_lines if x[8:13] == 'XFAIL']
+    else:
+      xfailed = [x for x in log_lines if x[:6] == 'XFAIL:']
+    if xfailed and not self.list_tests:
       print('At least one test XFAILED, checking ' + self.logfile)
       for x in xfailed:
         printxfail(x)
@@ -178,21 +191,40 @@ class TestHarness:
         sys.stdout.write(x)
 
     # Print summaries, from least interesting to most interesting.
-    print('Summary of test results:')
+    if self.list_tests:
+      print('Summary of test listing:')
+    else:
+      print('Summary of test results:')
     if passed:
-      print('  %d test%s PASSED'
-            % (len(passed), 's'*min(len(passed) - 1, 1)))
+      if self.list_tests:
+        print('  %d test%s are set to PASS'
+              % (len(passed), 's'*min(len(passed) - 1, 1)))
+      else:
+        print('  %d test%s PASSED'
+              % (len(passed), 's'*min(len(passed) - 1, 1)))
     if skipped:
-      print('  %d test%s SKIPPED'
-            % (len(skipped), 's'*min(len(skipped) - 1, 1)))
+      if self.list_tests:
+        print('  %d test%s are set as SKIP'
+              % (len(skipped), 's'*min(len(skipped) - 1, 1)))
+      else:
+        print('  %d test%s SKIPPED'
+              % (len(skipped), 's'*min(len(skipped) - 1, 1)))
     if xfailed:
       passwimp = [x for x in xfailed if 0 <= x.find(wimptag)]
       if passwimp:
-        print('  %d test%s XFAILED (%d WORK-IN-PROGRESS)'
-              % (len(xfailed), 's'*min(len(xfailed) - 1, 1), len(passwimp)))
+        if self.list_tests:
+          print('  %d test%s are set to XFAIL (%d WORK-IN-PROGRESS)'
+                % (len(xfailed), 's'*min(len(xfailed) - 1, 1), len(passwimp)))
+        else:
+          print('  %d test%s XFAILED (%d WORK-IN-PROGRESS)'
+                % (len(xfailed), 's'*min(len(xfailed) - 1, 1), len(passwimp)))
       else:
-        print('  %d test%s XFAILED'
-              % (len(xfailed), 's'*min(len(xfailed) - 1, 1)))
+        if self.list_tests:
+          print('  %d test%s are set as XFAIL'
+                % (len(xfailed), 's'*min(len(xfailed) - 1, 1)))
+        else:
+          print('  %d test%s XFAILED'
+                % (len(xfailed), 's'*min(len(xfailed) - 1, 1)))
     if xpassed:
       failwimp = [x for x in xpassed if 0 <= x.find(wimptag)]
       if failwimp:
@@ -245,8 +277,9 @@ class TestHarness:
     'Run a c test, escaping parameters as required.'
     progdir, progbase = os.path.split(prog)
 
-    sys.stdout.write('.' * dot_count)
-    sys.stdout.flush()
+    if not self.list_tests:
+      sys.stdout.write('.' * dot_count)
+      sys.stdout.flush()
 
     if os.access(progbase, os.X_OK):
       progname = './' + progbase
@@ -265,18 +298,12 @@ class TestHarness:
       cmdline.append('--cleanup')
     if self.fs_type is not None:
       cmdline.append('--fs-type=' + self.fs_type)
-    if self.http_library is not None:
-      cmdline.append('--http-library=' + self.http_library)
     if self.server_minor_version is not None:
       cmdline.append('--server-minor-version=' + self.server_minor_version)
     if self.list_tests is not None:
       cmdline.append('--list')
-    if self.svn_bin is not None:
-      cmdline.append('--bin=' + self.svn_bin)
-    if self.fsfs_sharding is not None:
-      cmdline.append('--fsfs-sharding=%d' % self.fsfs_sharding)
-    if self.fsfs_packing is not None:
-      cmdline.append('--fsfs-packing')
+    if self.mode_filter is not None:
+      cmdline.append('--mode-filter=' + self.mode_filter)
 
     if test_nums:
       test_nums = test_nums.split(',')
@@ -328,6 +355,8 @@ class TestHarness:
       svntest.main.options.fsfs_sharding = self.fsfs_sharding
     if self.fsfs_packing is not None:
       svntest.main.options.fsfs_packing = self.fsfs_packing
+    if self.mode_filter is not None:
+      svntest.main.options.mode_filter = self.mode_filter
 
     svntest.main.options.srcdir = self.srcdir
 
@@ -356,10 +385,16 @@ class TestHarness:
 
     # run the tests
     svntest.testcase.TextColors.disable()
+
+    if self.list_tests:
+      prog_f = None
+    else:
+      prog_f = progress_func
+
     failed = svntest.main.execute_tests(prog_mod.test_list,
                                         serial_only=serial_only,
                                         test_name=progbase,
-                                        progress_func=progress_func)
+                                        progress_func=prog_f)
 
     # restore some values
     sys.path = old_path
@@ -389,13 +424,20 @@ class TestHarness:
     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, ))
+      if self.list_tests:
+        sys.stdout.write('Listing tests in %s' % (test_info, ))
+      else:
+        sys.stdout.write('Running tests in %s' % (test_info, ))
       sys.stdout.flush()
     else:
       # ### Hack for --log-to-stdout to work (but not print any dots).
       test_info = ''
 
-    log.write('START: %s\n' % progbase)
+    if self.list_tests:
+      log.write('LISTING: %s\n' % progbase)
+    else:
+      log.write('START: %s\n' % progbase)
+
     log.flush()
 
     start_time = datetime.now()
@@ -427,18 +469,24 @@ class TestHarness:
       else:
         log.write('FAIL:  %s: Unknown test failure.\n' % progbase)
 
-    # Log the elapsed time.
-    elapsed_time = str(datetime.now() - start_time)
-    log.write('END: %s\n' % progbase)
-    log.write('ELAPSED: %s %s\n' % (progbase, elapsed_time))
+    if not self.list_tests:
+      # Log the elapsed time.
+      elapsed_time = str(datetime.now() - start_time)
+      log.write('END: %s\n' % progbase)
+      log.write('ELAPSED: %s %s\n' % (progbase, elapsed_time))
+
     log.write('\n')
 
-    # If we printed a "Running all tests in ..." line, add the test result.
+    # If we are only listing the tests just add a newline, otherwise if
+    # we printed a "Running all tests in ..." line, add the test result.
     if self.log:
-      if failed:
-        print(TextColors.FAILURE + 'FAILURE' + TextColors.ENDC)
+      if self.list_tests:
+        print ''
       else:
-        print(TextColors.SUCCESS + 'success' + TextColors.ENDC)
+        if failed:
+          print(TextColors.FAILURE + 'FAILURE' + TextColors.ENDC)
+        else:
+          print(TextColors.SUCCESS + 'success' + TextColors.ENDC)
 
     return failed
 

Modified: subversion/branches/performance/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/performance/configure.ac?rev=1066452&r1=1066451&r2=1066452&view=diff
==============================================================================
--- subversion/branches/performance/configure.ac (original)
+++ subversion/branches/performance/configure.ac Wed Feb  2 13:04:51 2011
@@ -152,7 +152,7 @@ dnl Find Apache with a recent-enough mag
 SVN_FIND_APACHE(20020903)
 
 dnl Search for SQLite
-SQLITE_MINIMUM_VER="3.4.0"
+SQLITE_MINIMUM_VER="3.6.18"
 SQLITE_RECOMMENDED_VER="3.7.2"
 SQLITE_URL="http://www.sqlite.org/sqlite-amalgamation-${SQLITE_RECOMMENDED_VER}.tar.gz"
 SVN_LIB_SQLITE(${SQLITE_MINIMUM_VER}, ${SQLITE_RECOMMENDED_VER},

Modified: subversion/branches/performance/contrib/hook-scripts/remove-zombie-locks.py
URL: http://svn.apache.org/viewvc/subversion/branches/performance/contrib/hook-scripts/remove-zombie-locks.py?rev=1066452&r1=1066451&r2=1066452&view=diff
==============================================================================
--- subversion/branches/performance/contrib/hook-scripts/remove-zombie-locks.py (original)
+++ subversion/branches/performance/contrib/hook-scripts/remove-zombie-locks.py Wed Feb  2 13:04:51 2011
@@ -20,7 +20,7 @@ remove-zombie-locks.py - remove zombie l
 
 Usage: remove-zombie-locks.py REPOS-PATH <REVISION|all>
 
-  When REVISION (an interger) is specified this script scans a commited
+  When REVISION (an interger) is specified this script scans a committed
   revision for deleted files and checks if a lock exists for any of these
   files. If any locks exist they are forcibly removed.
 
@@ -123,24 +123,34 @@ class RepositoryZombieLockRemover:
     print "Removing all zombie locks from repository at %s\n" \
           "This may take several minutes..." % self.repos_path
 
-    # Subversion's Berkeley DB implementation doesn't allow reentry of
-    # its BDB-transaction-using APIs from within BDB-transaction-using
-    # APIs (such as svn_fs_get_locks()).  So we have do this in two
-    # steps, first harvest the locks, then checking/removing them.
-    if self.fs_type == svn.fs.SVN_FS_TYPE_BDB:
-      self.locks = []
-      def bdb_lock_callback(lock, callback_pool):
-        self.locks.append(lock)
-      svn.fs.svn_fs_get_locks(self.fs_ptr, self.repos_subpath,
-                              bdb_lock_callback, self.pool)
-      subpool = svn.core.svn_pool_create(self.pool)
-      for lock in self.locks:
-        svn.core.svn_pool_clear(subpool)
-        self.unlock_nonexistant_files(lock, subpool)
-      svn.core.svn_pool_destroy(subpool)
+    # Try to use svn_fs_get_locks2() if it's present, as it's believed
+    # to be problem-free.
+    #
+    # If not, use svn_fs_get_locks().  But note that Subversion's
+    # Berkeley DB implementation of svn_fs_get_locks() in 1.6 and
+    # prior doesn't allow reentry of its BDB-transaction-using APIs
+    # from within BDB-transaction-using APIs (such as
+    # svn_fs_get_locks()).  So we have do this in two steps, first
+    # harvest the locks, then checking/removing them.
+    if hasattr(svn.fs, 'svn_fs_get_locks2'):
+      svn.fs.svn_fs_get_locks2(self.fs_ptr, self.repos_subpath,
+                               svn.core.svn_depth_infinity,
+                               self.unlock_nonexistant_files, self.pool)
     else:
-      svn.fs.svn_fs_get_locks(self.fs_ptr, self.repos_subpath,
-                              self.unlock_nonexistant_files, self.pool)
+      if self.fs_type == svn.fs.SVN_FS_TYPE_BDB:
+        self.locks = []
+        def bdb_lock_callback(lock, callback_pool):
+          self.locks.append(lock)
+        svn.fs.svn_fs_get_locks(self.fs_ptr, self.repos_subpath,
+                                bdb_lock_callback, self.pool)
+        subpool = svn.core.svn_pool_create(self.pool)
+        for lock in self.locks:
+          svn.core.svn_pool_clear(subpool)
+          self.unlock_nonexistant_files(lock, subpool)
+        svn.core.svn_pool_destroy(subpool)
+      else:
+        svn.fs.svn_fs_get_locks(self.fs_ptr, self.repos_subpath,
+                                self.unlock_nonexistant_files, self.pool)
     print "Done."
 
 

Modified: subversion/branches/performance/notes/api-errata/1.7/wc007.txt
URL: http://svn.apache.org/viewvc/subversion/branches/performance/notes/api-errata/1.7/wc007.txt?rev=1066452&r1=1066451&r2=1066452&view=diff
==============================================================================
--- subversion/branches/performance/notes/api-errata/1.7/wc007.txt (original)
+++ subversion/branches/performance/notes/api-errata/1.7/wc007.txt Wed Feb  2 13:04:51 2011
@@ -1,4 +1,4 @@
-API ERRATA -- $Id: wc006.txt 943050 2010-05-11 08:56:25Z julianfoad $
+API ERRATA -- $Id$
 
 Root Cause of Errata: 
  Library(s) Affected: libsvn_wc

Propchange: subversion/branches/performance/notes/api-errata/1.7/wc007.txt
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: subversion/branches/performance/notes/variance-adjusted-patching.html
URL: http://svn.apache.org/viewvc/subversion/branches/performance/notes/variance-adjusted-patching.html?rev=1066452&r1=1066451&r2=1066452&view=diff
==============================================================================
--- subversion/branches/performance/notes/variance-adjusted-patching.html (original)
+++ subversion/branches/performance/notes/variance-adjusted-patching.html Wed Feb  2 13:04:51 2011
@@ -670,7 +670,7 @@ in that you could adjust the 'soft-confl
 <p>The message he's referring to appears to be this one:</p>
 
 <pre>
-   <a href="http://subversion.tigris.org/servlets/ReadMsg?list=dev&amp;msgId=162878">http://subversion.tigris.org/servlets/ReadMsg?list=dev&amp;msgId=162878</a>
+   <a href="http://svn.haxx.se/dev/archive-2002-02/1059.shtml">http://svn.haxx.se/dev/archive-2002-02/1059.shtml</a>
    From: William Uther
    To: dev@subversion.tigris.org
    Subject: Re: Merging

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=1066452&r1=1066451&r2=1066452&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 Feb  2 13:04:51 2011
@@ -2580,12 +2580,11 @@ public class BasicTests extends SVNTests
      */
     public void testPatch() throws SubversionException, IOException
     {
-    	OneTest thisTest = new OneTest(true);
-    	File patchInput = new File(super.localTmp, thisTest.testName);
-    	final String iotaPath = thisTest.getWCPath().replace('\\', '/') + "/iota";
+        OneTest thisTest = new OneTest(true);
+        File patchInput = new File(super.localTmp, thisTest.testName);
         final String NL = System.getProperty("line.separator");
 
-    	final String patchText = "Index: iota" + NL +
+        final String patchText = "Index: iota" + NL +
             "===================================================================" + NL +
             "--- iota\t(revision 1)" + NL +
             "+++ iota\t(working copy)" + NL +
@@ -2598,14 +2597,16 @@ public class BasicTests extends SVNTests
         writer.flush();
         writer.close();
 
-    	client.patch(patchInput.getAbsolutePath(), iotaPath, false, 0,
-    			false, true, true,
-    			new PatchCallback() {
-					public boolean singlePatch(String pathFromPatchfile,
-                            String patchPath, String rejectPath) {
-						// Do nothing, right now.
-                        return false;
-					}
+        client.patch(patchInput.getAbsolutePath(),
+                     thisTest.getWCPath().replace('\\', '/'), false, 0,
+                     false, true, true,
+                     new PatchCallback() {
+                         public boolean singlePatch(String pathFromPatchfile,
+                                                    String patchPath,
+                                                    String rejectPath) {
+                             // Do nothing, right now.
+                            return false;
+                         }
     	});
     }
 

Modified: subversion/branches/performance/subversion/include/private/svn_fs_util.h
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/include/private/svn_fs_util.h?rev=1066452&r1=1066451&r2=1066452&view=diff
==============================================================================
--- subversion/branches/performance/subversion/include/private/svn_fs_util.h (original)
+++ subversion/branches/performance/subversion/include/private/svn_fs_util.h Wed Feb  2 13:04:51 2011
@@ -52,7 +52,7 @@ svn_fs__canonicalize_abspath(const char 
 
 /* If EXPECT_OPEN, verify that FS refers to an open database;
    otherwise, verify that FS refers to an unopened database.  Return
-   an appropriate error if the expecation fails to match the
+   an appropriate error if the expectation fails to match the
    reality.  */
 svn_error_t *
 svn_fs__check_fs(svn_fs_t *fs, svn_boolean_t expect_open);

Modified: subversion/branches/performance/subversion/include/private/svn_mergeinfo_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/include/private/svn_mergeinfo_private.h?rev=1066452&r1=1066451&r2=1066452&view=diff
==============================================================================
--- subversion/branches/performance/subversion/include/private/svn_mergeinfo_private.h (original)
+++ subversion/branches/performance/subversion/include/private/svn_mergeinfo_private.h Wed Feb  2 13:04:51 2011
@@ -54,14 +54,14 @@ svn_mergeinfo__set_inheritance(svn_merge
 
 /* Return whether INFO1 and INFO2 are equal in *IS_EQUAL.
 
-   CONSIDER_INERITANCE determines how the rangelists in the two
-   hashes are compared for equality.  If CONSIDER_INERITANCE is FALSE,
+   CONSIDER_INHERITANCE determines how the rangelists in the two
+   hashes are compared for equality.  If CONSIDER_INHERITANCE is FALSE,
    then the start and end revisions of the svn_merge_range_t's being
    compared are the only factors considered when determining equality.
 
      e.g. '/trunk: 1,3-4*,5' == '/trunk: 1,3-5'
 
-   If CONSIDER_INERITANCE is TRUE, then the inheritability of the
+   If CONSIDER_INHERITANCE is TRUE, then the inheritability of the
    svn_merge_range_t's is also considered and must be the same for two
    otherwise identical ranges to be judged equal.
 
@@ -168,8 +168,8 @@ svn_mergeinfo__get_range_endpoints(svn_r
 
 /* Set *FILTERED_MERGEINFO to a deep copy of MERGEINFO, allocated in
    RESULT_POOL, less any rangelists that fall outside of the range
-   OLDEST_REV:YOUGEST_REV (inclusive) if INCLUDE_RANGE is true, or less
-   any rangelists within the range OLDEST_REV:YOUGEST_REV if INCLUDE_RANGE
+   OLDEST_REV:YOUNGEST_REV (inclusive) if INCLUDE_RANGE is true, or less
+   any rangelists within the range OLDEST_REV:YOUNGEST_REV if INCLUDE_RANGE
    is false.  If all the rangelists mapped to a given path are filtered
    then filter that path as well.  If all paths are filtered or MERGEINFO is
    empty or NULL then *FILTERED_MERGEINFO is set to an empty hash.

Modified: subversion/branches/performance/subversion/include/private/svn_opt_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/include/private/svn_opt_private.h?rev=1066452&r1=1066451&r2=1066452&view=diff
==============================================================================
--- subversion/branches/performance/subversion/include/private/svn_opt_private.h (original)
+++ subversion/branches/performance/subversion/include/private/svn_opt_private.h Wed Feb  2 13:04:51 2011
@@ -79,9 +79,9 @@ svn_opt__arg_canonicalize_url(const char
 /*
  * Attempt to transform PATH_IN, which is a local path-like user input, into a
  * valid local path:
- *   - Attempt to get the correct capitialization by trying to actually find
+ *   - Attempt to get the correct capitalization by trying to actually find
  *     the path specified.
- *   - If the path does not exist (which is valid) the given capitialization
+ *   - If the path does not exist (which is valid) the given capitalization
  *     is used.
  *   - canonicalize the separator ("/") characters
  * PATH_IN is in UTF-8 encoding and has no peg revision specifier.

Modified: subversion/branches/performance/subversion/include/private/svn_ra_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/include/private/svn_ra_private.h?rev=1066452&r1=1066451&r2=1066452&view=diff
==============================================================================
--- subversion/branches/performance/subversion/include/private/svn_ra_private.h (original)
+++ subversion/branches/performance/subversion/include/private/svn_ra_private.h Wed Feb  2 13:04:51 2011
@@ -37,7 +37,7 @@ extern "C" {
 #endif /* __cplusplus */
 
 /* Return an error with code SVN_ERR_UNSUPPORTED_FEATURE, and an error
-   message referencing PATH_OR_URL, if the "server" pointed to be
+   message referencing PATH_OR_URL, if the "server" pointed to by
    RA_SESSION doesn't support Merge Tracking (e.g. is pre-1.5).
    Perform temporary allocations in POOL. */
 svn_error_t *
@@ -102,6 +102,11 @@ typedef svn_error_t *(*svn_ra__lock_retr
  * Use @a cancel_func and @a cancel_baton to check for early
  * cancellation.
  *
+ * @note If the server does not support #SVN_RA_CAPABILITY_ATOMIC_REVPROPS
+ * (i.e., is a pre-1.7 server), then this function makes a "best effort"
+ * attempt to obtain the lock, but is susceptible to a race condition; see
+ * issue #3546.
+ *
  * @since New in 1.7.
  */
 svn_error_t *

Modified: subversion/branches/performance/subversion/include/private/svn_repos_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/include/private/svn_repos_private.h?rev=1066452&r1=1066451&r2=1066452&view=diff
==============================================================================
--- subversion/branches/performance/subversion/include/private/svn_repos_private.h (original)
+++ subversion/branches/performance/subversion/include/private/svn_repos_private.h Wed Feb  2 13:04:51 2011
@@ -69,6 +69,24 @@ svn_repos__obliterate_path_rev(svn_repos
                                const char *path,
                                apr_pool_t *pool);
 
+/** Return the path to @a repos's pre-obliterate hook, allocated in
+ * @a pool.
+ *
+ * @since New in 1.7.
+ */
+const char *
+svn_repos__pre_obliterate_hook(svn_repos_t *repos,
+                               apr_pool_t *pool);
+
+/** Return the path to @a repos's post-obliterate hook, allocated in
+ * @a pool.
+ *
+ * @since New in 1.7.
+ */
+const char *
+svn_repos__post_obliterate_hook(svn_repos_t *repos,
+                                apr_pool_t *pool);
+
 
 /** Validate that property @a name is valid for use in a Subversion
  * repository; return @c SVN_ERR_REPOS_BAD_ARGS if it isn't.  For some

Modified: subversion/branches/performance/subversion/include/private/svn_sqlite.h
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/include/private/svn_sqlite.h?rev=1066452&r1=1066451&r2=1066452&view=diff
==============================================================================
--- subversion/branches/performance/subversion/include/private/svn_sqlite.h (original)
+++ subversion/branches/performance/subversion/include/private/svn_sqlite.h Wed Feb  2 13:04:51 2011
@@ -118,7 +118,7 @@ svn_sqlite__open(svn_sqlite__db_t **db, 
                  int latest_schema, const char * const *upgrade_sql,
                  apr_pool_t *result_pool, apr_pool_t *scratch_pool);
 
-/* Explicity close the connection in DB. */
+/* Explicitly close the connection in DB. */
 svn_error_t *
 svn_sqlite__close(svn_sqlite__db_t *db);
 

Modified: subversion/branches/performance/subversion/include/private/svn_wc_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/include/private/svn_wc_private.h?rev=1066452&r1=1066451&r2=1066452&view=diff
==============================================================================
--- subversion/branches/performance/subversion/include/private/svn_wc_private.h (original)
+++ subversion/branches/performance/subversion/include/private/svn_wc_private.h Wed Feb  2 13:04:51 2011
@@ -571,7 +571,7 @@ svn_wc__node_is_file_external(svn_boolea
  * that there can be multiple prop conflicts.
  *
  * One or two of @a prop_conflicted, @a text_conflicted and @a
- * tree_conflicted can be NULL if we're not interrested in that particular
+ * tree_conflicted can be NULL if we're not interested in that particular
  * value.
  */
 svn_error_t *

Modified: subversion/branches/performance/subversion/include/svn_client.h
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/include/svn_client.h?rev=1066452&r1=1066451&r2=1066452&view=diff
==============================================================================
--- subversion/branches/performance/subversion/include/svn_client.h (original)
+++ subversion/branches/performance/subversion/include/svn_client.h Wed Feb  2 13:04:51 2011
@@ -2813,7 +2813,7 @@ svn_client_diff(const apr_array_header_t
  *
  * If @a peg_revision is #svn_opt_revision_unspecified, behave
  * identically to svn_client_diff5(), using @a path for both of that
- * function's @a path1 and @a path2 argments.
+ * function's @a path1 and @a path2 arguments.
  *
  * All other options are handled identically to svn_client_diff5().
  *
@@ -2996,7 +2996,7 @@ svn_client_diff_summarize(const char *pa
  *
  * If @a peg_revision is #svn_opt_revision_unspecified, behave
  * identically to svn_client_diff_summarize2(), using @a path for both
- * of that function's @a path1 and @a path2 argments.
+ * of that function's @a path1 and @a path2 arguments.
  *
  * The function may report false positives if @a ignore_ancestry is false,
  * as described in the documentation for svn_client_diff_summarize2().
@@ -4378,7 +4378,7 @@ svn_client_revprop_get(const char *propn
                        apr_pool_t *pool);
 
 /**
- * Invoke @a receiver with @a receiver_baton to return the regular properies
+ * Invoke @a receiver with @a receiver_baton to return the regular properties
  * of @a target, a URL or working copy path.  @a receiver will be called
  * for each path encountered.
  *
@@ -4434,7 +4434,7 @@ svn_client_proplist3(const char *target,
  *
  * @since New in 1.2.
  *
- * @deprecated Provided for backward compatiblility with the 1.4 API.
+ * @deprecated Provided for backward compatibility with the 1.4 API.
  */
 SVN_DEPRECATED
 svn_error_t *
@@ -5352,7 +5352,7 @@ typedef svn_error_t *(*svn_client_patch_
 
 /**
  * Apply a unidiff patch that's located at absolute path
- * @a patch_abspath to the working copy at @a local_abspath.
+ * @a patch_abspath to the working copy directory at @a local_abspath.
  *
  * This function makes a best-effort attempt at applying the patch.
  * It might skip patch targets which cannot be patched (e.g. targets
@@ -5442,10 +5442,10 @@ svn_client_url_from_path2(const char **u
                           apr_pool_t *result_pool,
                           apr_pool_t *scratch_pool);
 
-/** Simlar to svn_client_url_from_path2(), but without a context argument.
+/** Similar to svn_client_url_from_path2(), but without a context argument.
  *
  * @since New in 1.5.
- * @deprecated Provided for backward compatilibity with the 1.6 API.
+ * @deprecated Provided for backward compatibility with the 1.6 API.
  */
 SVN_DEPRECATED
 svn_error_t *
@@ -5503,7 +5503,7 @@ svn_client_uuid_from_path2(const char **
 /** Similar to svn_client_uuid_from_path2(), but with a relative path and
  * an access baton.
  *
- * @deprecated Provided for backward compatilibity with the 1.6 API.
+ * @deprecated Provided for backward compatibility with the 1.6 API.
  */
 SVN_DEPRECATED
 svn_error_t *

Modified: subversion/branches/performance/subversion/include/svn_cmdline.h
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/include/svn_cmdline.h?rev=1066452&r1=1066451&r2=1066452&view=diff
==============================================================================
--- subversion/branches/performance/subversion/include/svn_cmdline.h (original)
+++ subversion/branches/performance/subversion/include/svn_cmdline.h Wed Feb  2 13:04:51 2011
@@ -289,7 +289,7 @@ svn_cmdline_auth_ssl_client_cert_pw_prom
   apr_pool_t *pool);
 
 /** An implementation of @c svn_auth_plaintext_prompt_func_t that
- * prompts the user whether storing unencypted passwords to disk is OK.
+ * prompts the user whether storing unencrypted passwords to disk is OK.
  *
  * Expects a @c svn_cmdline_prompt_baton2_t to be passed as @a baton.
  *
@@ -302,7 +302,7 @@ svn_cmdline_auth_plaintext_prompt(svn_bo
                                   apr_pool_t *pool);
 
 /** An implementation of @c svn_auth_plaintext_passphrase_prompt_func_t that
- * prompts the user whether storing unencypted passphrase to disk is OK.
+ * prompts the user whether storing unencrypted passphrase to disk is OK.
  *
  * Expects a @c svn_cmdline_prompt_baton2_t to be passed as @a baton.
  *

Modified: subversion/branches/performance/subversion/include/svn_config.h
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/include/svn_config.h?rev=1066452&r1=1066451&r2=1066452&view=diff
==============================================================================
--- subversion/branches/performance/subversion/include/svn_config.h (original)
+++ subversion/branches/performance/subversion/include/svn_config.h Wed Feb  2 13:04:51 2011
@@ -309,7 +309,7 @@ typedef svn_boolean_t (*svn_config_secti
                                                          void *baton);
 
 /** Similar to svn_config_enumerate_sections2(), but uses a memory pool of
- * @a cfg instead of one that is explicitely provided.
+ * @a cfg instead of one that is explicitly provided.
  *
  * @deprecated Provided for backwards compatibility with the 1.2 API.
  */
@@ -356,7 +356,7 @@ typedef svn_boolean_t (*svn_config_enume
                                                  void *baton);
 
 /** Similar to svn_config_enumerate2(), but uses a memory pool of
- * @a cfg instead of one that is explicitely provided.
+ * @a cfg instead of one that is explicitly provided.
  *
  * @deprecated Provided for backwards compatibility with the 1.2 API.
  */

Modified: subversion/branches/performance/subversion/include/svn_dav.h
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/include/svn_dav.h?rev=1066452&r1=1066451&r2=1066452&view=diff
==============================================================================
--- subversion/branches/performance/subversion/include/svn_dav.h (original)
+++ subversion/branches/performance/subversion/include/svn_dav.h Wed Feb  2 13:04:51 2011
@@ -92,12 +92,12 @@ extern "C" {
     universe of svn_lock_t->owner.)  */
 #define SVN_DAV_LOCK_OWNER_HEADER "X-SVN-Lock-Owner"
 
-/** Assuming the OPTIONS was performed againts a resource within a
+/** Assuming the OPTIONS was performed against a resource within a
  * Subversion repository, then this header indicates the youngest
  * revision in the repository.  */
 #define SVN_DAV_YOUNGEST_REV_HEADER "SVN-Youngest-Rev"
 
-/** Assuming the OPTIONS was performed againts a resource within a
+/** Assuming the OPTIONS was performed against a resource within a
  * Subversion repository, then this header indicates the UUID of the
  * repository.  */
 #define SVN_DAV_REPOS_UUID_HEADER "SVN-Repository-UUID"

Modified: subversion/branches/performance/subversion/include/svn_delta.h
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/include/svn_delta.h?rev=1066452&r1=1066451&r2=1066452&view=diff
==============================================================================
--- subversion/branches/performance/subversion/include/svn_delta.h (original)
+++ subversion/branches/performance/subversion/include/svn_delta.h Wed Feb  2 13:04:51 2011
@@ -1095,7 +1095,7 @@ svn_delta_get_cancellation_editor(svn_ca
  * #svn_depth_infinity, #svn_depth_empty, #svn_depth_files,
  * #svn_depth_immediates, or #svn_depth_unknown.
  *
- * If filtering is deemed unncessary (or if @a requested_depth is
+ * If filtering is deemed unnecessary (or if @a requested_depth is
  * #svn_depth_unknown), @a *editor and @a *edit_baton will be set to @a
  * wrapped_editor and @a wrapped_baton, respectively; otherwise,
  * they'll be set to new objects allocated from @a pool.
@@ -1232,7 +1232,7 @@ typedef svn_error_t *(*svn_file_rev_hand
  * reproduced here for dependency reasons.
  *
  * @deprecated This type is provided for the svn_compat_wrap_file_rev_handler()
- * compatibilty wrapper, and should not be used for new development.
+ * compatibility wrapper, and should not be used for new development.
  * @since New in 1.5.
  */
 typedef svn_error_t *(*svn_file_rev_handler_old_t)(

Modified: subversion/branches/performance/subversion/include/svn_diff.h
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/include/svn_diff.h?rev=1066452&r1=1066451&r2=1066452&view=diff
==============================================================================
--- subversion/branches/performance/subversion/include/svn_diff.h (original)
+++ subversion/branches/performance/subversion/include/svn_diff.h Wed Feb  2 13:04:51 2011
@@ -490,7 +490,7 @@ svn_diff_file_diff4_2(svn_diff_t **diff,
                       const svn_diff_file_options_t *options,
                       apr_pool_t *pool);
 
-/** Simliar to svn_file_diff4_2(), but with @a options set to a struct with
+/** Similar to svn_file_diff4_2(), but with @a options set to a struct with
  * default options.
  *
  * @deprecated Provided for backwards compatibility with the 1.3 API.
@@ -639,7 +639,7 @@ svn_diff_mem_string_diff(svn_diff_t **di
                          apr_pool_t *pool);
 
 
-/** Generate @a diff output from the @a orginal, @a modified and @a latest
+/** Generate @a diff output from the @a original, @a modified and @a latest
  * in-memory strings.  @a diff will be allocated in @a pool.
  *
  * @since New in 1.5.
@@ -844,7 +844,7 @@ typedef struct svn_diff_hunk_t svn_diff_
  * @since New in 1.7.
  */
 svn_error_t *
-svn_diff_hunk_readline_diff_text(const svn_diff_hunk_t *hunk,
+svn_diff_hunk_readline_diff_text(svn_diff_hunk_t *hunk,
                                  svn_stringbuf_t **stringbuf,
                                  const char **eol,
                                  svn_boolean_t *eof,
@@ -864,7 +864,7 @@ svn_diff_hunk_readline_diff_text(const s
  * @since New in 1.7.
  */
 svn_error_t *
-svn_diff_hunk_readline_original_text(const svn_diff_hunk_t *hunk,
+svn_diff_hunk_readline_original_text(svn_diff_hunk_t *hunk,
                                      svn_stringbuf_t **stringbuf,
                                      const char **eol,
                                      svn_boolean_t *eof,
@@ -879,7 +879,7 @@ svn_diff_hunk_readline_original_text(con
  * @since New in 1.7.
  */
 svn_error_t *
-svn_diff_hunk_readline_modified_text(const svn_diff_hunk_t *hunk,
+svn_diff_hunk_readline_modified_text(svn_diff_hunk_t *hunk,
                                      svn_stringbuf_t **stringbuf,
                                      const char **eol,
                                      svn_boolean_t *eof,
@@ -888,18 +888,18 @@ svn_diff_hunk_readline_modified_text(con
 
 /** Reset the diff text of @a hunk so it can be read again from the start.
  * @since New in 1.7. */
-svn_error_t *
-svn_diff_hunk_reset_diff_text(const svn_diff_hunk_t *hunk);
+void
+svn_diff_hunk_reset_diff_text(svn_diff_hunk_t *hunk);
 
 /** Reset the original text of @a hunk so it can be read again from the start.
  * @since New in 1.7. */
-svn_error_t *
-svn_diff_hunk_reset_original_text(const svn_diff_hunk_t *hunk);
+void
+svn_diff_hunk_reset_original_text(svn_diff_hunk_t *hunk);
 
 /** Reset the modified text of @a hunk so it can be read again from the start.
  * @since New in 1.7. */
-svn_error_t *
-svn_diff_hunk_reset_modified_text(const svn_diff_hunk_t *hunk);
+void
+svn_diff_hunk_reset_modified_text(svn_diff_hunk_t *hunk);
 
 /** Return the line offset of the original hunk text,
  * as parsed from the hunk header.
@@ -941,6 +941,7 @@ svn_diff_hunk_get_trailing_context(const
 
 /**
  * Data type to manage parsing of properties in patches.
+ * API users should not allocate structures of this type directly.
  *
  * @since New in 1.7. */
 typedef struct svn_prop_patch_t {
@@ -957,15 +958,10 @@ typedef struct svn_prop_patch_t {
 
 /**
  * Data type to manage parsing of patches.
+ * API users should not allocate structures of this type directly.
  *
  * @since New in 1.7. */
 typedef struct svn_patch_t {
-  /** Path to the patch file. */
-  const char *path;
-
-  /** The patch file itself. */
-  apr_file_t *patch_file;
-
   /**
    * The old and new file names as retrieved from the patch file.
    * These paths are UTF-8 encoded and canonicalized, but otherwise
@@ -992,6 +988,20 @@ typedef struct svn_patch_t {
   svn_boolean_t reverse;
 } svn_patch_t;
 
+/* An opaque type representing an open patch file.
+ *
+ * @since New in 1.7. */
+typedef struct svn_patch_file_t svn_patch_file_t;
+
+/* Open @a patch_file at @a local_abspath.
+ * Allocate @a patch_file in @a result_pool.
+ *
+ * @since New in 1.7. */
+svn_error_t *
+svn_diff_open_patch_file(svn_patch_file_t **patch_file,
+                         const char *local_abspath,
+                         apr_pool_t *result_pool);
+
 /**
  * Return the next @a *patch in @a patch_file.
  * If no patch can be found, set @a *patch to NULL.
@@ -1004,20 +1014,21 @@ typedef struct svn_patch_t {
  * @since New in 1.7. */
 svn_error_t *
 svn_diff_parse_next_patch(svn_patch_t **patch,
-                          apr_file_t *patch_file,
+                          svn_patch_file_t *patch_file,
                           svn_boolean_t reverse,
                           svn_boolean_t ignore_whitespace,
                           apr_pool_t *result_pool,
                           apr_pool_t *scratch_pool);
 
 /**
- * Dispose of @a patch, closing any streams used by it.
+ * Dispose of @a patch_file.
  * Use @a scratch_pool for all temporary allocations.
  *
  * @since New in 1.7.
  */
 svn_error_t *
-svn_diff_close_patch(const svn_patch_t *patch, apr_pool_t *scratch_pool);
+svn_diff_close_patch_file(svn_patch_file_t *patch_file,
+                          apr_pool_t *scratch_pool);
 
 #ifdef __cplusplus
 }



Mime
View raw message