You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2014/04/01 23:49:53 UTC
svn commit: r1583804 - in /subversion/branches/remote-only-status: ./
subversion/include/svn_fs.h subversion/include/svn_repos.h
subversion/libsvn_wc/status.c subversion/tests/cmdline/wc_tests.py
Author: brane
Date: Tue Apr 1 21:49:52 2014
New Revision: 1583804
URL: http://svn.apache.org/r1583804
Log:
On the remote-only-status branch: sync with trunk up to r1583803.
Modified:
subversion/branches/remote-only-status/ (props changed)
subversion/branches/remote-only-status/subversion/include/svn_fs.h
subversion/branches/remote-only-status/subversion/include/svn_repos.h
subversion/branches/remote-only-status/subversion/libsvn_wc/status.c
subversion/branches/remote-only-status/subversion/tests/cmdline/wc_tests.py
Propchange: subversion/branches/remote-only-status/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1583336-1583803
Modified: subversion/branches/remote-only-status/subversion/include/svn_fs.h
URL: http://svn.apache.org/viewvc/subversion/branches/remote-only-status/subversion/include/svn_fs.h?rev=1583804&r1=1583803&r2=1583804&view=diff
==============================================================================
--- subversion/branches/remote-only-status/subversion/include/svn_fs.h (original)
+++ subversion/branches/remote-only-status/subversion/include/svn_fs.h Tue Apr 1 21:49:52 2014
@@ -2566,7 +2566,7 @@ typedef struct svn_fs_lock_result_t
* that existing lock. If current_rev is a valid revnum, then do an
* out-of-dateness check. If the revnum is less than the
* last-changed-revision of the path (or if the path doesn't exist in
- * HEAD), yeild an #SVN_ERR_FS_OUT_OF_DATE error for this path.
+ * HEAD), yield an #SVN_ERR_FS_OUT_OF_DATE error for this path.
*
* If a path is already locked, then return #SVN_ERR_FS_PATH_ALREADY_LOCKED,
* unless @a steal_lock is TRUE, in which case "steal" the existing
@@ -2639,8 +2639,8 @@ svn_fs_generate_lock_token(const char **
*
* The paths to be unlocked are passed as <tt>const char *</tt> keys
* of the @a targets hash with the corresponding lock tokens as
- * <tt>const char *</tt> values. If the the token doesn't point to a
- * lock, yield an #SVN_ERR_FS_BAD_LOCK_TOKEN errot for this path. If
+ * <tt>const char *</tt> values. If the token doesn't point to a
+ * lock, yield an #SVN_ERR_FS_BAD_LOCK_TOKEN error for this path. If
* the token points to an expired lock, yield an
* #SVN_ERR_FS_LOCK_EXPIRED error for this path. If @a fs has no
* username associated with it, yield an #SVN_ERR_FS_NO_USER unless @a
Modified: subversion/branches/remote-only-status/subversion/include/svn_repos.h
URL: http://svn.apache.org/viewvc/subversion/branches/remote-only-status/subversion/include/svn_repos.h?rev=1583804&r1=1583803&r2=1583804&view=diff
==============================================================================
--- subversion/branches/remote-only-status/subversion/include/svn_repos.h (original)
+++ subversion/branches/remote-only-status/subversion/include/svn_repos.h Tue Apr 1 21:49:52 2014
@@ -2191,12 +2191,12 @@ svn_repos_fs_begin_txn_for_update(svn_fs
* which the pre-lock is successful are passed to svn_fs_lock2 and the
* post-lock is run for those that are successfully locked.
*
- * @a results contains the result for each target of running the
+ * @a *results contains the result for each target of running the
* pre-lock and svn_fs_lock2 if the pre-lock was successful.
*
* If an error occurs when running the post-lock hook the error is
- * returned wrapped with SVN_ERR_REPOS_POST_LOCK_HOOK_FAILED. If the
- * caller sees this error, it knows that the some locks succeeded. In
+ * returned wrapped with #SVN_ERR_REPOS_POST_LOCK_HOOK_FAILED. If the
+ * caller sees this error, it knows that some locks succeeded. In
* all cases the caller must handle all errors in @a results to avoid
* leaks.
*
@@ -2237,7 +2237,7 @@ svn_repos_fs_lock(svn_lock_t **lock,
apr_pool_t *pool);
-/** Like svn_fs_unlock(), but invoke the @a repos's pre- and
+/** Like svn_fs_unlock2(), but invoke the @a repos's pre- and
* post-unlock hooks before and after the unlocking action.
*
* The pre-unlock hook is run for every path in @a targets. Those
@@ -2245,14 +2245,14 @@ svn_repos_fs_lock(svn_lock_t **lock,
* svn_fs_unlock2 and the post-unlock is run for those that are
* successfully unlocked.
*
- * @a results contains the result for each target of running the
+ * @a *results contains the result for each target of running the
* pre-unlock and svn_fs_unlock2 if the pre-unlock was successful.
* If an error occurs when running the post-unlock hook, return the
- * original error wrapped with SVN_ERR_REPOS_POST_UNLOCK_HOOK_FAILED.
+ * original error wrapped with #SVN_ERR_REPOS_POST_UNLOCK_HOOK_FAILED.
* If the caller sees this error, it knows that some unlocks
- * succeeded. In all cases the caller must handle all error in @a
- * results to avoid leaks.
+ * succeeded. In all cases the caller must handle all errors in @a
+ * *results to avoid leaks.
*
* Allocate @a *results in @a result_pool. Use @a scratch_pool for
* temporary allocations.
@@ -2267,7 +2267,7 @@ svn_repos_fs_unlock2(apr_hash_t **result
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
-/* Similar to svn_repos_fs_unlock2 but only unlocks a single path.
+/** Similar to svn_repos_fs_unlock2() but only unlocks a single path.
*
* @since New in 1.2.
*/
Modified: subversion/branches/remote-only-status/subversion/libsvn_wc/status.c
URL: http://svn.apache.org/viewvc/subversion/branches/remote-only-status/subversion/libsvn_wc/status.c?rev=1583804&r1=1583803&r2=1583804&view=diff
==============================================================================
--- subversion/branches/remote-only-status/subversion/libsvn_wc/status.c (original)
+++ subversion/branches/remote-only-status/subversion/libsvn_wc/status.c Tue Apr 1 21:49:52 2014
@@ -1287,8 +1287,9 @@ get_dir_status(const struct walk_status_
if (wb->check_working_copy)
{
- err = svn_io_get_dirents3(&dirents, local_abspath, FALSE, scratch_pool,
- iterpool);
+ err = svn_io_get_dirents3(&dirents, local_abspath,
+ wb->ignore_text_mods /* only_check_type*/,
+ scratch_pool, iterpool);
if (err
&& (APR_STATUS_IS_ENOENT(err->apr_err)
|| SVN__APR_STATUS_IS_ENOTDIR(err->apr_err)))
Modified: subversion/branches/remote-only-status/subversion/tests/cmdline/wc_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/remote-only-status/subversion/tests/cmdline/wc_tests.py?rev=1583804&r1=1583803&r2=1583804&view=diff
==============================================================================
--- subversion/branches/remote-only-status/subversion/tests/cmdline/wc_tests.py (original)
+++ subversion/branches/remote-only-status/subversion/tests/cmdline/wc_tests.py Tue Apr 1 21:49:52 2014
@@ -119,8 +119,13 @@ def add_with_symlink_in_path(sbox):
sbox.simple_append('A/B/kappa', 'xyz', True)
sbox.simple_add('Z/B/kappa')
+def is_posix_os_and_not_root():
+ if not svntest.main.is_posix_os():
+ return False
+ return os.getuid() != 0
+
@Issue(4118)
-@SkipUnless(svntest.main.is_posix_os)
+@SkipUnless(is_posix_os_and_not_root)
def status_with_inaccessible_wc_db(sbox):
"""inaccessible .svn/wc.db"""