subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From phi...@apache.org
Subject svn commit: r1227105 [1/8] - in /subversion/branches/moves-scan-log: ./ notes/ subversion/bindings/javahl/src/org/apache/subversion/javahl/ subversion/bindings/swig/ruby/test/ subversion/include/ subversion/include/private/ subversion/libsvn_client/ su...
Date Wed, 04 Jan 2012 10:30:19 GMT
Author: philip
Date: Wed Jan  4 10:30:16 2012
New Revision: 1227105

URL: http://svn.apache.org/viewvc?rev=1227105&view=rev
Log:
Sync the moves-scan-log branch with trunk@1227101.

Modified:
    subversion/branches/moves-scan-log/   (props changed)
    subversion/branches/moves-scan-log/CHANGES
    subversion/branches/moves-scan-log/notes/knobs
    subversion/branches/moves-scan-log/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java
    subversion/branches/moves-scan-log/subversion/bindings/swig/ruby/test/test_delta.rb
    subversion/branches/moves-scan-log/subversion/include/private/svn_cache.h
    subversion/branches/moves-scan-log/subversion/include/private/svn_client_private.h
    subversion/branches/moves-scan-log/subversion/include/private/svn_error_private.h
    subversion/branches/moves-scan-log/subversion/include/private/svn_fs_util.h
    subversion/branches/moves-scan-log/subversion/include/private/svn_fspath.h
    subversion/branches/moves-scan-log/subversion/include/private/svn_mutex.h
    subversion/branches/moves-scan-log/subversion/include/svn_client.h
    subversion/branches/moves-scan-log/subversion/include/svn_dirent_uri.h
    subversion/branches/moves-scan-log/subversion/include/svn_fs.h
    subversion/branches/moves-scan-log/subversion/include/svn_repos.h
    subversion/branches/moves-scan-log/subversion/include/svn_string.h
    subversion/branches/moves-scan-log/subversion/libsvn_client/client.h
    subversion/branches/moves-scan-log/subversion/libsvn_client/diff.c
    subversion/branches/moves-scan-log/subversion/libsvn_client/merge.c
    subversion/branches/moves-scan-log/subversion/libsvn_client/mergeinfo.c
    subversion/branches/moves-scan-log/subversion/libsvn_client/ra.c
    subversion/branches/moves-scan-log/subversion/libsvn_client/repos_diff.c
    subversion/branches/moves-scan-log/subversion/libsvn_client/switch.c
    subversion/branches/moves-scan-log/subversion/libsvn_delta/delta.h
    subversion/branches/moves-scan-log/subversion/libsvn_delta/svndiff.c
    subversion/branches/moves-scan-log/subversion/libsvn_delta/text_delta.c
    subversion/branches/moves-scan-log/subversion/libsvn_delta/xdelta.c
    subversion/branches/moves-scan-log/subversion/libsvn_fs/fs-loader.c
    subversion/branches/moves-scan-log/subversion/libsvn_fs/fs-loader.h
    subversion/branches/moves-scan-log/subversion/libsvn_fs_base/fs.c
    subversion/branches/moves-scan-log/subversion/libsvn_fs_base/id.c
    subversion/branches/moves-scan-log/subversion/libsvn_fs_fs/caching.c
    subversion/branches/moves-scan-log/subversion/libsvn_fs_fs/fs.c
    subversion/branches/moves-scan-log/subversion/libsvn_fs_fs/fs_fs.c
    subversion/branches/moves-scan-log/subversion/libsvn_fs_fs/fs_fs.h
    subversion/branches/moves-scan-log/subversion/libsvn_fs_fs/id.c
    subversion/branches/moves-scan-log/subversion/libsvn_fs_fs/rep-cache-db.sql
    subversion/branches/moves-scan-log/subversion/libsvn_fs_fs/rep-cache.c
    subversion/branches/moves-scan-log/subversion/libsvn_fs_fs/rep-cache.h
    subversion/branches/moves-scan-log/subversion/libsvn_fs_fs/tree.c
    subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/log.c
    subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/session.c
    subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/log.c
    subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/serf.c
    subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/util.c
    subversion/branches/moves-scan-log/subversion/libsvn_ra_svn/cyrus_auth.c
    subversion/branches/moves-scan-log/subversion/libsvn_repos/load-fs-vtable.c
    subversion/branches/moves-scan-log/subversion/libsvn_repos/repos.c
    subversion/branches/moves-scan-log/subversion/libsvn_repos/rev_hunt.c
    subversion/branches/moves-scan-log/subversion/libsvn_subr/cache-membuffer.c
    subversion/branches/moves-scan-log/subversion/libsvn_subr/config.c
    subversion/branches/moves-scan-log/subversion/libsvn_subr/dirent_uri.c
    subversion/branches/moves-scan-log/subversion/libsvn_subr/error.c
    subversion/branches/moves-scan-log/subversion/libsvn_subr/io.c
    subversion/branches/moves-scan-log/subversion/libsvn_subr/opt.c
    subversion/branches/moves-scan-log/subversion/libsvn_subr/stream.c
    subversion/branches/moves-scan-log/subversion/libsvn_subr/svn_mutex.c
    subversion/branches/moves-scan-log/subversion/libsvn_subr/svn_string.c
    subversion/branches/moves-scan-log/subversion/libsvn_wc/copy.c
    subversion/branches/moves-scan-log/subversion/libsvn_wc/wc-metadata.sql
    subversion/branches/moves-scan-log/subversion/libsvn_wc/wc_db.c
    subversion/branches/moves-scan-log/subversion/libsvn_wc/wc_db.h
    subversion/branches/moves-scan-log/subversion/libsvn_wc/wc_db_wcroot.c
    subversion/branches/moves-scan-log/subversion/mod_dav_svn/dav_svn.h
    subversion/branches/moves-scan-log/subversion/mod_dav_svn/reports/log.c
    subversion/branches/moves-scan-log/subversion/mod_dav_svn/repos.c
    subversion/branches/moves-scan-log/subversion/mod_dav_svn/util.c
    subversion/branches/moves-scan-log/subversion/po/de.po
    subversion/branches/moves-scan-log/subversion/po/fr.po
    subversion/branches/moves-scan-log/subversion/po/zh_CN.po
    subversion/branches/moves-scan-log/subversion/svn/cl.h
    subversion/branches/moves-scan-log/subversion/svn/log-cmd.c
    subversion/branches/moves-scan-log/subversion/svn/main.c
    subversion/branches/moves-scan-log/subversion/svn/merge-cmd.c
    subversion/branches/moves-scan-log/subversion/svn/mergeinfo-cmd.c
    subversion/branches/moves-scan-log/subversion/svn/propedit-cmd.c
    subversion/branches/moves-scan-log/subversion/svn/util.c
    subversion/branches/moves-scan-log/subversion/svnadmin/main.c
    subversion/branches/moves-scan-log/subversion/svnsync/sync.c
    subversion/branches/moves-scan-log/subversion/tests/cmdline/copy_tests.py
    subversion/branches/moves-scan-log/subversion/tests/cmdline/diff_tests.py
    subversion/branches/moves-scan-log/subversion/tests/cmdline/externals_tests.py
    subversion/branches/moves-scan-log/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
    subversion/branches/moves-scan-log/subversion/tests/cmdline/input_validation_tests.py
    subversion/branches/moves-scan-log/subversion/tests/cmdline/log_tests.py
    subversion/branches/moves-scan-log/subversion/tests/cmdline/merge_reintegrate_tests.py
    subversion/branches/moves-scan-log/subversion/tests/cmdline/merge_tests.py
    subversion/branches/moves-scan-log/subversion/tests/cmdline/mergeinfo_tests.py
    subversion/branches/moves-scan-log/subversion/tests/cmdline/special_tests.py
    subversion/branches/moves-scan-log/subversion/tests/cmdline/svnadmin_tests.py
    subversion/branches/moves-scan-log/subversion/tests/cmdline/svnrdump_tests.py
    subversion/branches/moves-scan-log/subversion/tests/libsvn_client/client-test.c
    subversion/branches/moves-scan-log/subversion/tests/libsvn_subr/cache-test.c
    subversion/branches/moves-scan-log/subversion/tests/libsvn_subr/config-test.c
    subversion/branches/moves-scan-log/subversion/tests/libsvn_subr/config-test.cfg
    subversion/branches/moves-scan-log/subversion/tests/libsvn_wc/op-depth-test.c
    subversion/branches/moves-scan-log/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd
    subversion/branches/moves-scan-log/tools/client-side/svnmucc/svnmucc.c
    subversion/branches/moves-scan-log/tools/dev/po-merge.py
    subversion/branches/moves-scan-log/tools/dist/backport.pl
    subversion/branches/moves-scan-log/tools/dist/dist.sh
    subversion/branches/moves-scan-log/tools/server-side/svnpredumpfilter.py

Propchange: subversion/branches/moves-scan-log/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  4 10:30:16 2012
@@ -57,4 +57,4 @@
 /subversion/branches/tree-conflicts:868291-873154
 /subversion/branches/tree-conflicts-notify:873926-874008
 /subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1186288-1212396
+/subversion/trunk:1186288-1227101

Modified: subversion/branches/moves-scan-log/CHANGES
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/CHANGES?rev=1227105&r1=1227104&r2=1227105&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/CHANGES (original)
+++ subversion/branches/moves-scan-log/CHANGES Wed Jan  4 10:30:16 2012
@@ -12,6 +12,9 @@ http://svn.apache.org/repos/asf/subversi
   - Minor new features and improvements:
     * new 'svnadmin load --revision' load filtering support (issue #3734)
     * new 'commit --include-externals' option (related to issues #1167, #3563)
+    * new 'svnadmin hotcopy --incremental' support for FSFS (issue #3815)
+    * reject some attempts to merge between unrelated branches (r1215273)
+    * support GPG agent for password storage on UNIX-like platforms (r1150783)
 
   - Client-side bugfixes:
     *

Modified: subversion/branches/moves-scan-log/notes/knobs
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/notes/knobs?rev=1227105&r1=1227104&r2=1227105&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/notes/knobs (original)
+++ subversion/branches/moves-scan-log/notes/knobs Wed Jan  4 10:30:16 2012
@@ -33,6 +33,8 @@ DEFAULT_HTTP_LIBRARY
 MAX_SECS_TO_LINGER
 SUFFIX_LINES_TO_KEEP
 SVN_FS_FS_DEFAULT_MAX_FILES_PER_DIR
+SVN_FS_FS_MAX_LINEAR_DELTIFICATION
+SVN_FS_FS_MAX_DELTIFICATION_WALK
 SVN_UNALIGNED_ACCESS_IS_OK
 
 2.2 Features
@@ -44,6 +46,8 @@ SVN_MERGE__ALLOW_ALL_FORWARD_MERGES_FROM
 SVN_USE_WIN32_CRASHHANDLER
 SVN_DAV_SEND_VTXN_NAME
 SVN_DISABLE_PREFIX_SUFFIX_SCANNING
+SVN_FS_FS_DELTIFY_DIRECTORIES
+SVN_FS_FS_DELTIFY_PROPS
 SVN_SQLITE_MIN_VERSION_NUMBER
 SVN_SQLITE_MIN_VERSION
 
@@ -125,7 +129,25 @@ SVN_I_LIKE_LATENCY_SO_IGNORE_HTTPV2
   Range:     natural integers
   Suggested: 1, 2, 3, 4, 5, 7, 11
 
-3.6 SVN_UNALIGNED_ACCESS_IS_OK
+3.6 SVN_FS_FS_MAX_LINEAR_DELTIFICATION
+
+  Scope:     libsvn_fs_fs
+  Purpose:   max length + 1 of the linear deltification history
+             before skip-deltification kicks in
+  Default:   16
+  Range:     natural integers
+  Suggested: 2, 4, 8, 16, 32, 64
+
+3.7 SVN_FS_FS_MAX_DELTIFICATION_WALK
+
+  Scope:     libsvn_fs_fs
+  Purpose:   max skip deltification range. Change histories
+             longer than that will be restarted with a fulltext.
+  Default:   1023
+  Range:     natural integers
+  Suggested: 1, 2, 3, 4, 5, 7, 11
+
+3.8 SVN_UNALIGNED_ACCESS_IS_OK
 
   Scope:     (global)
   Purpose:   enable data accesss optimizations.
@@ -207,7 +229,27 @@ SVN_I_LIKE_LATENCY_SO_IGNORE_HTTPV2
   Default:   not defined
   Suggested: not defined
 
-4.8 SVN_SQLITE_MIN_VERSION_NUMBER
+4.8 SVN_FS_FS_DELTIFY_DIRECTORIES
+
+  Scope:     libsvn_fs_fs
+  Purpose:   Define this symbol to enable directory deltification in FSFS.
+             When activated, previous versions of Subversion will still be
+             able to read from and write to this repository.
+  Range:     definedness
+  Default:   not defined
+  Suggested: defined
+
+4.9 SVN_FS_FS_DELTIFY_PROPS
+
+  Scope:     libsvn_fs_fs
+  Purpose:   Define this symbol to enable node property deltification in
+             FSFS.  When activated, previous versions of Subversion will
+             still be able to read from and write to this repository.
+  Range:     definedness
+  Default:   not defined
+  Suggested: not defined
+
+4.10 SVN_SQLITE_MIN_VERSION_NUMBER
 
   Scope:     libsvn_subr
   Purpose:   The minimum SQLite version to have run-time support for.
@@ -215,7 +257,7 @@ SVN_I_LIKE_LATENCY_SO_IGNORE_HTTPV2
   Default:   SQLITE_VERSION_NUMBER (i.e., the compile-time-sqlite version)
   Suggested: not defined (to use default)
 
-4.9 SVN_SQLITE_MIN_VERSION
+4.11 SVN_SQLITE_MIN_VERSION
 
   Scope:     libsvn_subr
   Purpose:   See SVN_SQLITE_MIN_VERSION_NUMBER.  The two must be overridden

Modified: subversion/branches/moves-scan-log/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java?rev=1227105&r1=1227104&r2=1227105&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java
(original)
+++ subversion/branches/moves-scan-log/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java
Wed Jan  4 10:30:16 2012
@@ -541,7 +541,10 @@ public class ClientNotifyInformation ext
         failed_locked ("failed by lock"),
 
         /** Operation failed because the operation was forbidden */
-        failed_forbidden_by_server ("failed forbidden by server");
+        failed_forbidden_by_server ("failed forbidden by server"),
+
+        /** Operation skipped the path because it was conflicted */
+        skip_conflicted ("skipped conflicted path");
 
         /**
          * The description of the action.

Modified: subversion/branches/moves-scan-log/subversion/bindings/swig/ruby/test/test_delta.rb
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/bindings/swig/ruby/test/test_delta.rb?rev=1227105&r1=1227104&r2=1227105&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/bindings/swig/ruby/test/test_delta.rb (original)
+++ subversion/branches/moves-scan-log/subversion/bindings/swig/ruby/test/test_delta.rb Wed
Jan  4 10:30:16 2012
@@ -77,7 +77,7 @@ class SvnDeltaTest < Test::Unit::TestCas
       if composed_window.nil?
         composed_window = window
       else
-        composed_window = composed_window.compose(window)
+        composed_window = window.compose(composed_window)
       end
     end
 

Modified: subversion/branches/moves-scan-log/subversion/include/private/svn_cache.h
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/include/private/svn_cache.h?rev=1227105&r1=1227104&r2=1227105&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/include/private/svn_cache.h (original)
+++ subversion/branches/moves-scan-log/subversion/include/private/svn_cache.h Wed Jan  4 10:30:16
2012
@@ -295,8 +295,9 @@ svn_cache__membuffer_cache_create(svn_me
  * svn_string_t; if @a serialize_func is NULL, then the data is
  * assumed to be an svn_stringbuf_t.
  *
- * These caches themselves are thread safe, the shared @a memcache may
- * be not, depending on its creation parameters.
+ * If @a thread_safe is true, and APR is compiled with threads, all
+ * accesses to the cache will be protected with a mutex, if the shared 
+ * @a memcache has also been created with thread_safe flag set.
  *
  * These caches do not support svn_cache__iter.
  */
@@ -307,6 +308,7 @@ svn_cache__create_membuffer_cache(svn_ca
                                   svn_cache__deserialize_func_t deserialize,
                                   apr_ssize_t klen,
                                   const char *prefix,
+                                  svn_boolean_t thread_safe,
                                   apr_pool_t *result_pool);
 
 /**

Modified: subversion/branches/moves-scan-log/subversion/include/private/svn_client_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/include/private/svn_client_private.h?rev=1227105&r1=1227104&r2=1227105&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/include/private/svn_client_private.h (original)
+++ subversion/branches/moves-scan-log/subversion/include/private/svn_client_private.h Wed
Jan  4 10:30:16 2012
@@ -59,6 +59,29 @@ svn_client__create_status(svn_client_sta
                           apr_pool_t *result_pool,
                           apr_pool_t *scratch_pool);
 
+/* Set *ANCESTOR_URL and *ANCESTOR_REVISION to the URL and revision,
+ * respectively, of the youngest common ancestor of the two locations
+ * PATH_OR_URL1@REV1 and PATH_OR_URL2@REV2.  Set *ANCESTOR_RELPATH to
+ * NULL and *ANCESTOR_REVISION to SVN_INVALID_REVNUM if they have no
+ * common ancestor.  This function assumes that PATH_OR_URL1@REV1 and
+ * PATH_OR_URL2@REV2 both refer to the same repository.
+ *
+ * Use the authentication baton cached in CTX to authenticate against
+ * the repository.
+ *
+ * See also svn_client__get_youngest_common_ancestor().
+ */
+svn_error_t *
+svn_client__youngest_common_ancestor(const char **ancestor_url,
+                                     svn_revnum_t *ancestor_rev,
+                                     const char *path_or_url1,
+                                     const svn_opt_revision_t *revision1,
+                                     const char *path_or_url2,
+                                     const svn_opt_revision_t *revision2,
+                                     svn_client_ctx_t *ctx,
+                                     apr_pool_t *result_pool,
+                                     apr_pool_t *scratch_pool);
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */

Modified: subversion/branches/moves-scan-log/subversion/include/private/svn_error_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/include/private/svn_error_private.h?rev=1227105&r1=1227104&r2=1227105&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/include/private/svn_error_private.h (original)
+++ subversion/branches/moves-scan-log/subversion/include/private/svn_error_private.h Wed
Jan  4 10:30:16 2012
@@ -39,6 +39,14 @@ extern "C" {
 svn_boolean_t
 svn_error__is_tracing_link(svn_error_t *err);
 
+/**
+ * Converts a zlib error to an svn_error_t. zerr is the error code,
+ * function is the function name, message is an optional extra part
+ * of the error message and may be NULL.
+ */
+svn_error_t *
+svn_error__wrap_zlib(int zerr, const char *function, const char *message);
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */

Modified: subversion/branches/moves-scan-log/subversion/include/private/svn_fs_util.h
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/include/private/svn_fs_util.h?rev=1227105&r1=1227104&r2=1227105&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/include/private/svn_fs_util.h (original)
+++ subversion/branches/moves-scan-log/subversion/include/private/svn_fs_util.h Wed Jan  4
10:30:16 2012
@@ -44,7 +44,11 @@ extern "C" {
    ignored) we want any paths that are physically stored in the
    underlying database to look consistent.  Specifically, absolute
    filesystem paths should begin with '/', and all redundant and trailing '/'
-   characters be removed.  */
+   characters be removed.
+
+   This is similar to svn_fspath__canonicalize() but doesn't treat "."
+   segments as special.
+*/
 const char *
 svn_fs__canonicalize_abspath(const char *path, apr_pool_t *pool);
 

Modified: subversion/branches/moves-scan-log/subversion/include/private/svn_fspath.h
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/include/private/svn_fspath.h?rev=1227105&r1=1227104&r2=1227105&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/include/private/svn_fspath.h (original)
+++ subversion/branches/moves-scan-log/subversion/include/private/svn_fspath.h Wed Jan  4
10:30:16 2012
@@ -55,6 +55,9 @@ svn_fspath__is_canonical(const char *fsp
  * The returned fspath may be statically allocated or allocated from
  * @a pool.
  *
+ * This is similar to svn_fs__canonicalize_abspath() but also treats "."
+ * segments as special.
+ *
  * @since New in 1.7.
  */
 const char *

Modified: subversion/branches/moves-scan-log/subversion/include/private/svn_mutex.h
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/include/private/svn_mutex.h?rev=1227105&r1=1227104&r2=1227105&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/include/private/svn_mutex.h (original)
+++ subversion/branches/moves-scan-log/subversion/include/private/svn_mutex.h Wed Jan  4 10:30:16
2012
@@ -55,7 +55,7 @@ typedef void svn_mutex__t;
 
 #endif
 
-/** Initialize the @a *mutex. If @a enable_mutex is TRUE, the mutex will
+/** Initialize the @a *mutex. If @a mutex_required is TRUE, the mutex will
  * actually be created with a lifetime defined by @a result_pool. Otherwise,
  * the pointer will be set to @c NULL and @ref svn_mutex__lock as well as
  * @ref svn_mutex__unlock will be no-ops.
@@ -64,7 +64,7 @@ typedef void svn_mutex__t;
  */
 svn_error_t *
 svn_mutex__init(svn_mutex__t **mutex,
-                svn_boolean_t enable_mutex,
+                svn_boolean_t mutex_required,
                 apr_pool_t *result_pool);
 
 /** Acquire the @a mutex, if that has been enabled in @ref svn_mutex__init.

Modified: subversion/branches/moves-scan-log/subversion/include/svn_client.h
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/include/svn_client.h?rev=1227105&r1=1227104&r2=1227105&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/include/svn_client.h (original)
+++ subversion/branches/moves-scan-log/subversion/include/svn_client.h Wed Jan  4 10:30:16
2012
@@ -3435,6 +3435,38 @@ svn_client_merge(const char *source1,
                  apr_pool_t *pool);
 
 
+/**
+ * Determine the URLs and revisions needed to perform a reintegrate merge
+ * from @a source_path_or_url at @a source_peg_revision into the working
+ * copy at @a target_wcpath.
+ *
+ * Set @a *url1_p and @a *rev1_p to the left side, and @a *url2_p and
+ * @a *rev2_p to the right side, URLs and revisions of the source of the
+ * required two-URL merge.
+ *
+ * If no merge should be performed, set @a *url1_p to NULL and @a *rev1_p
+ * to #SVN_INVALID_REVNUM.
+ *
+ * The authentication baton cached in @a ctx is used to communicate with the
+ * repository.
+ *
+ * Allocate all the results in @a result_pool.  Use @a scratch_pool for
+ * temporary allocations.
+ *
+ * @since New in 1.8.
+ */
+svn_error_t *
+svn_client_find_reintegrate_merge(const char **url1_p,
+                                  svn_revnum_t *rev1_p,
+                                  const char **url2_p,
+                                  svn_revnum_t *rev2_p,
+                                  /* inputs */
+                                  const char *source_path_or_url,
+                                  const svn_opt_revision_t *source_peg_revision,
+                                  const char *target_wcpath,
+                                  svn_client_ctx_t *ctx,
+                                  apr_pool_t *result_pool,
+                                  apr_pool_t *scratch_pool);
 
 /**
  * Perform a reintegration merge of @a source_path_or_url at @a source_peg_revision

Modified: subversion/branches/moves-scan-log/subversion/include/svn_dirent_uri.h
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/include/svn_dirent_uri.h?rev=1227105&r1=1227104&r2=1227105&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/include/svn_dirent_uri.h (original)
+++ subversion/branches/moves-scan-log/subversion/include/svn_dirent_uri.h Wed Jan  4 10:30:16
2012
@@ -28,7 +28,7 @@
  *  - a dirent is a path on (local) disc or a UNC path (Windows) in
  *    either relative or absolute format.
  *    Examples:
- *       "/foo/bar", "X:/temp", "//server/share", "A:/" (Windows only)
+ *       "/foo/bar", "X:/temp", "//server/share", "A:/" (Windows only), ""
  *    But not:
  *       "http://server"
  *
@@ -39,13 +39,13 @@
  *       "http://server", "file:///path/to/repos",
  *       "svn+ssh://user@host:123/My%20Stuff/file.doc"
  *    But not:
- *       "file", "dir/file", "A:/dir", "/My%20Stuff/file.doc"
+ *       "file", "dir/file", "A:/dir", "/My%20Stuff/file.doc", ""
  *
  *  - a relative path (relpath) is an unrooted path that can be joined
  *    to any other relative path, uri or dirent. A relative path is
  *    never rooted/prefixed by a '/'.
  *    Examples:
- *       "file", "dir/file", "dir/subdir/../file"
+ *       "file", "dir/file", "dir/subdir/../file", ""
  *    But not:
  *       "/file", "http://server/file"
  *
@@ -54,6 +54,8 @@
  * the path string if it's a dirent or a URI, it's up to the API user to
  * make this choice. See also issue #2028.
  *
+ * All incoming and outgoing paths are non-NULL unless otherwise documented.
+ *
  * All of these functions expect paths passed into them to be in canonical
  * form, except:
  *

Modified: subversion/branches/moves-scan-log/subversion/include/svn_fs.h
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/include/svn_fs.h?rev=1227105&r1=1227104&r2=1227105&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/include/svn_fs.h (original)
+++ subversion/branches/moves-scan-log/subversion/include/svn_fs.h Wed Jan  4 10:30:16 2012
@@ -309,8 +309,31 @@ svn_fs_delete_fs(const char *path,
  * means deleting copied, unused logfiles for a Berkeley DB source
  * filesystem.
  *
+ * If @a incremental is TRUE, make an effort to not re-copy information
+ * already present in the destination. If incremental hotcopy is not
+ * implemented, raise SVN_ERR_UNSUPPORTED_FEATURE.
+ *
+ * Use @a scratch_pool for temporary allocations.
+ *
+ * @since New in 1.8.
+ */
+svn_error_t *
+svn_fs_hotcopy2(const char *src_path,
+                const char *dest_path,
+                svn_boolean_t clean,
+                svn_boolean_t incremental,
+                svn_cancel_func_t cancel_func,
+                void *cancel_baton,
+                apr_pool_t *scratch_pool);
+
+/**
+ * Like svn_fs_hotcopy2(), but without the @a incremental parameter
+ * and without cancellation support.
+ *
+ * @deprecated Provided for backward compatibility with the 1.7 API.
  * @since New in 1.1.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_fs_hotcopy(const char *src_path,
                const char *dest_path,

Modified: subversion/branches/moves-scan-log/subversion/include/svn_repos.h
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/include/svn_repos.h?rev=1227105&r1=1227104&r2=1227105&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/include/svn_repos.h (original)
+++ subversion/branches/moves-scan-log/subversion/include/svn_repos.h Wed Jan  4 10:30:16
2012
@@ -516,8 +516,30 @@ svn_repos_fs(svn_repos_t *repos);
  * source filesystem as part of the copy operation; currently, this
  * means deleting copied, unused logfiles for a Berkeley DB source
  * repository.
+ *
+ * If @a incremental is TRUE, make an effort to not re-copy information
+ * already present in the destination. If incremental hotcopy is not
+ * implemented by the filesystem backend, raise SVN_ERR_UNSUPPORTED_FEATURE.
+ *
+ * @since New in 1.8.
  */
 svn_error_t *
+svn_repos_hotcopy2(const char *src_path,
+                   const char *dst_path,
+                   svn_boolean_t clean_logs,
+                   svn_boolean_t incremental,
+                   svn_cancel_func_t cancel_func,
+                   void *cancel_baton,
+                   apr_pool_t *pool);
+
+/** 
+ * Like svn_repos_hotcopy2(), but without the @a incremental parameter
+ * and without cancellation support.
+ *
+ * @deprecated Provided for backward compatibility with the 1.6 API.
+ */
+SVN_DEPRECATED
+svn_error_t *
 svn_repos_hotcopy(const char *src_path,
                   const char *dst_path,
                   svn_boolean_t clean_logs,

Modified: subversion/branches/moves-scan-log/subversion/include/svn_string.h
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/include/svn_string.h?rev=1227105&r1=1227104&r2=1227105&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/include/svn_string.h (original)
+++ subversion/branches/moves-scan-log/subversion/include/svn_string.h Wed Jan  4 10:30:16
2012
@@ -383,6 +383,20 @@ svn_boolean_t
 svn_cstring_match_list(const char *str, const apr_array_header_t *list);
 
 /**
+ * Get the next token from @a *str interpreting any char from @a sep as a
+ * token separator.  Separators at the beginning of @a str will be skipped.
+ * Returns a pointer to the beginning of the first token in @a *str or NULL
+ * if no token is left.  Modifies @a str such that the next call will return
+ * the next token.
+ *
+ * Note that the content of @a *str may be modified by this function.
+ *
+ * @since New in 1.8.
+ */
+char *
+svn_cstring_tokenize(const char *sep, char **str);
+
+/**
  * Return the number of line breaks in @a msg, allowing any kind of newline
  * termination (CR, LF, CRLF, or LFCR), even inconsistent.
  *

Modified: subversion/branches/moves-scan-log/subversion/libsvn_client/client.h
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_client/client.h?rev=1227105&r1=1227104&r2=1227105&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_client/client.h (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_client/client.h Wed Jan  4 10:30:16
2012
@@ -185,19 +185,30 @@ svn_client__repos_location_segments(apr_
                                     apr_pool_t *pool);
 
 
-/* Set *ANCESTOR_PATH and *ANCESTOR_REVISION to the youngest common
-   ancestor path (a path relative to the root of the repository) and
-   revision, respectively, of the two locations identified as
-   PATH_OR_URL1@REV1 and PATH_OR_URL2@REV1.  Use the authentication
-   baton cached in CTX to authenticate against the repository.
-   This function assumes that PATH_OR_URL1@REV1 and PATH_OR_URL2@REV1
-   both refer to the same repository.  Use POOL for all allocations. */
+/* Find the common ancestor of two locations in a repository.
+   Ancestry is determined by the 'copy-from' relationship and the normal
+   successor relationship.
+
+   Set *ANCESTOR_RELPATH, *ANCESTOR_URL, and *ANCESTOR_REVISION to the
+   path (relative to the root of the repository, with no leading '/'),
+   URL, and revision, respectively, of the youngest common ancestor of
+   the two locations URL1@REV1 and URL2@REV2.  Set *ANCESTOR_RELPATH and
+   *ANCESTOR_URL to NULL and *ANCESTOR_REVISION to SVN_INVALID_REVNUM if
+   they have no common ancestor.  This function assumes that URL1@REV1
+   and URL2@REV2 both refer to the same repository.
+
+   Use the authentication baton cached in CTX to authenticate against
+   the repository.  Use POOL for all allocations.
+
+   See also svn_client__youngest_common_ancestor().
+*/
 svn_error_t *
-svn_client__get_youngest_common_ancestor(const char **ancestor_path,
+svn_client__get_youngest_common_ancestor(const char **ancestor_relpath,
+                                         const char **ancestor_url,
                                          svn_revnum_t *ancestor_revision,
-                                         const char *path_or_url1,
+                                         const char *url1,
                                          svn_revnum_t rev1,
-                                         const char *path_or_url2,
+                                         const char *url2,
                                          svn_revnum_t rev2,
                                          svn_client_ctx_t *ctx,
                                          apr_pool_t *pool);

Modified: subversion/branches/moves-scan-log/subversion/libsvn_client/diff.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_client/diff.c?rev=1227105&r1=1227104&r2=1227105&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_client/diff.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_client/diff.c Wed Jan  4 10:30:16
2012
@@ -1607,7 +1607,7 @@ diff_prepare_repos_repos(const char **ur
                                  *url1, *rev1, *rev2);
       else
         return svn_error_createf(SVN_ERR_FS_NOT_FOUND, NULL,
-                                 _("Diff targets '%s and '%s' were not found "
+                                 _("Diff targets '%s' and '%s' were not found "
                                    "in the repository at revisions '%ld' and "
                                    "'%ld'"),
                                  *url1, *url2, *rev1, *rev2);



Mime
View raw message