subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hwri...@apache.org
Subject svn commit: r1066152 [3/3] - in /subversion/branches/ignore-mergeinfo-log: ./ notes/ subversion/include/ subversion/include/private/ subversion/libsvn_ra_local/ subversion/libsvn_ra_svn/ subversion/libsvn_repos/ subversion/libsvn_subr/ subversion/libsv...
Date Tue, 01 Feb 2011 19:19:53 GMT
Modified: subversion/branches/ignore-mergeinfo-log/subversion/svnserve/serve.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo-log/subversion/svnserve/serve.c?rev=1066152&r1=1066151&r2=1066152&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo-log/subversion/svnserve/serve.c (original)
+++ subversion/branches/ignore-mergeinfo-log/subversion/svnserve/serve.c Tue Feb  1 19:19:52
2011
@@ -2011,18 +2011,17 @@ static svn_error_t *log_cmd(svn_ra_svn_c
     revprops = NULL;
   else if (strcmp(revprop_word, "revprops") == 0)
     {
+      SVN_ERR_ASSERT(revprop_items);
+
       revprops = apr_array_make(pool, revprop_items->nelts,
                                 sizeof(char *));
-      if (revprop_items)
+      for (i = 0; i < revprop_items->nelts; i++)
         {
-          for (i = 0; i < revprop_items->nelts; i++)
-            {
-              elt = &APR_ARRAY_IDX(revprop_items, i, svn_ra_svn_item_t);
-              if (elt->kind != SVN_RA_SVN_STRING)
-                return svn_error_create(SVN_ERR_RA_SVN_MALFORMED_DATA, NULL,
-                                        _("Log revprop entry not a string"));
-              APR_ARRAY_PUSH(revprops, const char *) = elt->u.string->data;
-            }
+          elt = &APR_ARRAY_IDX(revprop_items, i, svn_ra_svn_item_t);
+          if (elt->kind != SVN_RA_SVN_STRING)
+            return svn_error_create(SVN_ERR_RA_SVN_MALFORMED_DATA, NULL,
+                                    _("Log revprop entry not a string"));
+          APR_ARRAY_PUSH(revprops, const char *) = elt->u.string->data;
         }
     }
   else

Modified: subversion/branches/ignore-mergeinfo-log/subversion/tests/libsvn_subr/dirent_uri-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo-log/subversion/tests/libsvn_subr/dirent_uri-test.c?rev=1066152&r1=1066151&r2=1066152&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo-log/subversion/tests/libsvn_subr/dirent_uri-test.c
(original)
+++ subversion/branches/ignore-mergeinfo-log/subversion/tests/libsvn_subr/dirent_uri-test.c
Tue Feb  1 19:19:52 2011
@@ -825,6 +825,22 @@ test_uri_canonicalize(apr_pool_t *pool)
     { "http://server////",     "http://server" },
     { "http://server/file//",  "http://server/file" },
     { "http://server//.//f//", "http://server/f" },
+    { "http://server/d/.",     "http://server/d" },
+    { "http://server/d/%2E",   "http://server/d" },
+    { "http://server/d/./q",   "http://server/d/q" },
+    { "http://server/d/%2E/q", "http://server/d/q" },
+    { "http://server/%",       "http://server/%25" },
+    { "http://server/%25",     "http://server/%25" },
+    { "http://server/%/d",     "http://server/%25/d" },
+    { "http://server/%25/d",   "http://server/%25/d" },
+    { "http://server/+",       "http://server/+" },
+    { "http://server/%2B",     "http://server/+" },
+    { "http://server/ ",       "http://server/%20" },
+    { "http://server/#",       "http://server/%23" },
+    { "http://server/d/a%2Fb", "http://server/d/a/b" },
+    /* ### These tests fail to notice that %2F is '/'.
+    { "http://server/d/.%2F.", "http://server/d" },
+    { "http://server/d/%25%2F%25", "http://server/d" }, */
     { "file:///C%3a/temp",     "file:///C:/temp" },
     { "http://server/cr%AB",   "http://server/cr%AB" },
     { "http://server/cr%ab",   "http://server/cr%AB" },
@@ -1099,6 +1115,13 @@ test_uri_is_canonical(apr_pool_t *pool)
     { "http://hst/foo/../bar",           TRUE,  TRUE  },
     { "http://hst/foo/bar/",             FALSE, TRUE  },
     { "http://hst/",                     FALSE, TRUE  },
+    { "http://hst/foo/.",                FALSE, TRUE  },
+    { "http://hst/foo/%2E",              FALSE, TRUE  },
+    { "http://hst/%",                    FALSE, TRUE  },
+    { "http://hst/+",                    TRUE,  TRUE  },
+    { "http://hst/#",                    FALSE, TRUE  },
+    { "http://hst/ ",                    FALSE, TRUE  },
+    { "http://hst/%2B",                  FALSE, TRUE  },
     { "http://HST",                      FALSE, TRUE  },
     { "http://HST/",                     FALSE, TRUE  },
     { "http://HST/FOO/BaR",              FALSE, TRUE  },

Modified: subversion/branches/ignore-mergeinfo-log/tools/client-side/bash_completion
URL: http://svn.apache.org/viewvc/subversion/branches/ignore-mergeinfo-log/tools/client-side/bash_completion?rev=1066152&r1=1066151&r2=1066152&view=diff
==============================================================================
--- subversion/branches/ignore-mergeinfo-log/tools/client-side/bash_completion (original)
+++ subversion/branches/ignore-mergeinfo-log/tools/client-side/bash_completion Tue Feb  1
19:19:52 2011
@@ -166,8 +166,8 @@ _svn()
 	cmds="$cmds commit ci copy cp delete remove rm diff export help import"
 	cmds="$cmds info list ls lock log merge mergeinfo mkdir move mv rename"
 	cmds="$cmds patch propdel pdel propedit pedit propget pget proplist"
-	cmds="$cmds plist propset pset resolve resolved revert status switch"
-	cmds="$cmds unlock update"
+	cmds="$cmds plist propset pset relocate resolve resolved revert status"
+	cmds="$cmds  switch unlock update"
 
 	# help options have a strange command status...
 	local helpOpts='--help -h'
@@ -910,6 +910,9 @@ _svn()
 		    cmdOpts="$cmdOpts --revprop $rOpts"
 		[[ $val ]] || cmdOpts="$cmdOpts -F --file"
 		;;
+        relocate)
+		cmdOpts="--ignore-externals"
+		;;
         resolve)
                 cmdOpts="--targets -R --recursive $qOpts $pOpts --accept \
                          --depth"



Mime
View raw message