subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1212428 [1/3] - in /subversion/branches/moves-scan-log: ./ subversion/include/ subversion/libsvn_client/ subversion/libsvn_delta/ subversion/libsvn_repos/ subversion/libsvn_wc/ subversion/tests/cmdline/ subversion/tests/cmdline/svntest/ su...
Date Fri, 09 Dec 2011 14:01:26 GMT
Author: stsp
Date: Fri Dec  9 14:01:25 2011
New Revision: 1212428

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

Modified:
    subversion/branches/moves-scan-log/   (props changed)
    subversion/branches/moves-scan-log/subversion/include/svn_delta.h
    subversion/branches/moves-scan-log/subversion/include/svn_dirent_uri.h
    subversion/branches/moves-scan-log/subversion/include/svn_wc.h
    subversion/branches/moves-scan-log/subversion/libsvn_client/add.c
    subversion/branches/moves-scan-log/subversion/libsvn_client/delete.c
    subversion/branches/moves-scan-log/subversion/libsvn_client/merge.c
    subversion/branches/moves-scan-log/subversion/libsvn_delta/compat.c
    subversion/branches/moves-scan-log/subversion/libsvn_repos/commit.c
    subversion/branches/moves-scan-log/subversion/libsvn_repos/dump.c
    subversion/branches/moves-scan-log/subversion/libsvn_wc/externals.c
    subversion/branches/moves-scan-log/subversion/libsvn_wc/status.c
    subversion/branches/moves-scan-log/subversion/libsvn_wc/update_editor.c
    subversion/branches/moves-scan-log/subversion/libsvn_wc/util.c
    subversion/branches/moves-scan-log/subversion/libsvn_wc/wc.h
    subversion/branches/moves-scan-log/subversion/libsvn_wc/wc_db.c
    subversion/branches/moves-scan-log/subversion/tests/cmdline/basic_tests.py
    subversion/branches/moves-scan-log/subversion/tests/cmdline/externals_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/prop_tests.py
    subversion/branches/moves-scan-log/subversion/tests/cmdline/svntest/actions.py
    subversion/branches/moves-scan-log/subversion/tests/libsvn_wc/op-depth-test.c
    subversion/branches/moves-scan-log/tools/dist/dist.sh

Propchange: subversion/branches/moves-scan-log/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  9 14:01:25 2011
@@ -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-1210540
+/subversion/trunk:1186288-1212396

Modified: subversion/branches/moves-scan-log/subversion/include/svn_delta.h
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/include/svn_delta.h?rev=1212428&r1=1212427&r2=1212428&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/include/svn_delta.h (original)
+++ subversion/branches/moves-scan-log/subversion/include/svn_delta.h Fri Dec  9 14:01:25
2011
@@ -1111,6 +1111,20 @@ typedef svn_error_t *(*svn_delta_fetch_k
   apr_pool_t *scratch_pool
   );
 
+/** Callback to fetch the FILENAME of a file to use as the delta base for
+ * PATH.  The file should last at least as long as RESULT_POOL.  If the base
+ * stream is empty, return NULL through FILENAME.
+ *
+ * @since New in 1.8.
+ */
+typedef svn_error_t *(*svn_delta_fetch_base_func_t)(
+  const char **filename,
+  void *baton,
+  const char *path,
+  apr_pool_t *result_pool,
+  apr_pool_t *scratch_pool
+  );
+
 /** Collection of callbacks used for the shim code.  To enable this struct
  * to grow, always use svn_delta_shim_callbacks_default()
  * to allocate new instances of it.
@@ -1123,6 +1137,8 @@ typedef struct svn_delta_shim_callbacks_
   void *fetch_props_baton;
   svn_delta_fetch_kind_func_t fetch_kind_func;
   void *fetch_kind_baton;
+  svn_delta_fetch_base_func_t fetch_base_func;
+  void *fetch_base_baton;
 } svn_delta_shim_callbacks_t;
 
 /** Return a collection of default shim functions in @a result_pool.

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=1212428&r1=1212427&r2=1212428&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 Fri Dec  9 14:01:25
2011
@@ -760,7 +760,7 @@ svn_uri_condense_targets(const char **pc
  *
  * Allocate the result in @a result_pool.
  *
- * Note: Use of this function is strongly encouraged. Do not roll your own.
+ * @note Use of this function is strongly encouraged. Do not roll your own.
  * (http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-3846)
  *
  * @since New in 1.7.

Modified: subversion/branches/moves-scan-log/subversion/include/svn_wc.h
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/include/svn_wc.h?rev=1212428&r1=1212427&r2=1212428&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/include/svn_wc.h (original)
+++ subversion/branches/moves-scan-log/subversion/include/svn_wc.h Fri Dec  9 14:01:25 2011
@@ -1366,7 +1366,9 @@ typedef struct svn_wc_notify_t {
    * In all other cases, it is @c NULL.  @since New in 1.5 */
   const char *changelist_name;
 
-  /** When @c action is #svn_wc_notify_merge_begin, and both the
+  /** When @c action is #svn_wc_notify_merge_begin or
+   * #svn_wc_notify_foreign_merge_begin or
+   * #svn_wc_notify_merge_record_info_begin, and both the
    * left and right sides of the merge are from the same URL.  In all
    * other cases, it is @c NULL.  @since New in 1.5 */
   svn_merge_range_t *merge_range;

Modified: subversion/branches/moves-scan-log/subversion/libsvn_client/add.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_client/add.c?rev=1212428&r1=1212427&r2=1212428&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_client/add.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_client/add.c Fri Dec  9 14:01:25
2011
@@ -809,6 +809,11 @@ mkdir_urls(const apr_array_header_t *url
       const char *bname;
       svn_uri_split(&common, &bname, common, pool);
       APR_ARRAY_PUSH(targets, const char *) = bname;
+
+      if (*bname == '\0')
+        return svn_error_createf(SVN_ERR_ILLEGAL_TARGET, NULL,
+                                 _("There is no valid uri above '%s'"),
+                                 common);
     }
   else
     {
@@ -831,6 +836,12 @@ mkdir_urls(const apr_array_header_t *url
           const char *bname;
 
           svn_uri_split(&common, &bname, common, pool);
+
+          if (*bname == '\0')
+             return svn_error_createf(SVN_ERR_ILLEGAL_TARGET, NULL,
+                                      _("There is no valid uri above '%s'"),
+                                      common);
+
           for (i = 0; i < targets->nelts; i++)
             {
               const char *path = APR_ARRAY_IDX(targets, i, const char *);

Modified: subversion/branches/moves-scan-log/subversion/libsvn_client/delete.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_client/delete.c?rev=1212428&r1=1212427&r2=1212428&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_client/delete.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_client/delete.c Fri Dec  9 14:01:25
2011
@@ -272,6 +272,12 @@ delete_urls_multi_repos(const apr_array_
           APR_ARRAY_PUSH(relpaths_list, const char *) = repos_relpath;
         }
 
+      /* Check we identified a non-root relpath.  Return an RA error
+         code for 1.6 compatibility. */
+      if (!repos_relpath || !*repos_relpath)
+        return svn_error_createf(SVN_ERR_RA_ILLEGAL_URL, NULL,
+                                 "URL '%s' not within a repository", uri);
+
       /* Now, test to see if the thing actually exists. */
       SVN_ERR(svn_ra_check_path(ra_session, repos_relpath, SVN_INVALID_REVNUM,
                                 &kind, pool));



Mime
View raw message