subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From i...@apache.org
Subject svn commit: r1723867 - in /subversion/branches/fs-node-api: ./ subversion/libsvn_ra_local/ra_plugin.c subversion/svnserve/serve.c subversion/tests/libsvn_ra/ra-test.c
Date Sat, 09 Jan 2016 17:44:31 GMT
Author: ivan
Date: Sat Jan  9 17:44:30 2016
New Revision: 1723867

URL: http://svn.apache.org/viewvc?rev=1723867&view=rev
Log:
On 'fs-node-api' branch: Sync with trunk up to r1723866.

Modified:
    subversion/branches/fs-node-api/   (props changed)
    subversion/branches/fs-node-api/subversion/libsvn_ra_local/ra_plugin.c
    subversion/branches/fs-node-api/subversion/svnserve/serve.c
    subversion/branches/fs-node-api/subversion/tests/libsvn_ra/ra-test.c

Propchange: subversion/branches/fs-node-api/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan  9 17:44:30 2016
@@ -95,4 +95,4 @@
 /subversion/branches/verify-at-commit:1462039-1462408
 /subversion/branches/verify-keep-going:1439280-1546110
 /subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1723795-1723839
+/subversion/trunk:1723795-1723866

Modified: subversion/branches/fs-node-api/subversion/libsvn_ra_local/ra_plugin.c
URL: http://svn.apache.org/viewvc/subversion/branches/fs-node-api/subversion/libsvn_ra_local/ra_plugin.c?rev=1723867&r1=1723866&r2=1723867&view=diff
==============================================================================
--- subversion/branches/fs-node-api/subversion/libsvn_ra_local/ra_plugin.c (original)
+++ subversion/branches/fs-node-api/subversion/libsvn_ra_local/ra_plugin.c Sat Jan  9 17:44:30
2016
@@ -1364,7 +1364,7 @@ svn_ra_local__get_dir(svn_ra_session_t *
           if (dirent_fields & SVN_DIRENT_SIZE)
             {
               /* size  */
-              if (entry->kind == svn_node_dir)
+              if (fs_entry->kind == svn_node_dir)
                 entry->size = 0;
               else
                 SVN_ERR(svn_fs_file_length2(&(entry->size), fs_entry->node,

Modified: subversion/branches/fs-node-api/subversion/svnserve/serve.c
URL: http://svn.apache.org/viewvc/subversion/branches/fs-node-api/subversion/svnserve/serve.c?rev=1723867&r1=1723866&r2=1723867&view=diff
==============================================================================
--- subversion/branches/fs-node-api/subversion/svnserve/serve.c (original)
+++ subversion/branches/fs-node-api/subversion/svnserve/serve.c Sat Jan  9 17:44:30 2016
@@ -1828,7 +1828,7 @@ get_dir(svn_ra_svn_conn_t *conn,
               entry_kind = fsent->kind;
 
           if (dirent_fields & SVN_DIRENT_SIZE)
-              if (entry_kind != svn_node_dir)
+              if (fsent->kind != svn_node_dir)
                 SVN_CMD_ERR(svn_fs_file_length(&entry_size, root, file_path,
                                                subpool));
 

Modified: subversion/branches/fs-node-api/subversion/tests/libsvn_ra/ra-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/fs-node-api/subversion/tests/libsvn_ra/ra-test.c?rev=1723867&r1=1723866&r2=1723867&view=diff
==============================================================================
--- subversion/branches/fs-node-api/subversion/tests/libsvn_ra/ra-test.c (original)
+++ subversion/branches/fs-node-api/subversion/tests/libsvn_ra/ra-test.c Sat Jan  9 17:44:30
2016
@@ -603,6 +603,7 @@ get_dir_test(const svn_test_opts_t *opts
 {
   svn_ra_session_t *session;
   apr_hash_t *dirents;
+  svn_dirent_t *ent;
 
   SVN_ERR(make_and_open_repos(&session, "test-get-dir", opts, pool));
   SVN_ERR(commit_tree(session, pool));
@@ -613,6 +614,14 @@ get_dir_test(const svn_test_opts_t *opts
                                         SVN_DIRENT_KIND, pool),
                         SVN_ERR_FS_NOT_FOUND);
 
+  /* Test fetching SVN_DIRENT_SIZE without SVN_DIRENT_KIND. */
+  SVN_ERR(svn_ra_get_dir2(session, &dirents, NULL, NULL, "", 1,
+                          SVN_DIRENT_SIZE, pool));
+  SVN_TEST_INT_ASSERT(apr_hash_count(dirents), 1);
+  ent = svn_hash_gets(dirents, "A");
+  SVN_TEST_ASSERT(ent);
+  SVN_TEST_INT_ASSERT(ent->size, 0);
+
   return SVN_NO_ERROR;
 }
 



Mime
View raw message