hyung-hwan/codepot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed bugs found in the previous changes to svn_update2() and svn_checkout()

Browse Source
This commit is contained in:
hyung-hwan
2015-09-04 14:25:36 +00:00
parent 9c974dc71b
commit 978bb9d359
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
codepot/pecl-svn/svn.c
View File

@ -830,14 +830,19 @@ PHP_FUNCTION(svn_checkout)
} }
#if defined(PHP_SVN_SUPPORT_DEPTH) #if defined(PHP_SVN_SUPPORT_DEPTH)
if (ZEND_NUM_ARGS() < 5) {
/* depth is not specified. adjust 'depth' for backward compatibilty */
if (flags & SVN_NON_RECURSIVE) depth = svn_depth_files;
}
err = svn_client_checkout3 (NULL, err = svn_client_checkout3 (NULL,
true_path, true_path,
can_target_path, can_target_path,
&peg_revision, &peg_revision,
&revision, &revision,
depth, depth,
!(flags & SVN_NON_RECURSIVE), flags & SVN_IGNORE_EXTERNALS, /* ignore_externals */
flags & SVN_IGNORE_EXTERNALS, FALSE, /* allow_unver_obstructions */
SVN_G(ctx), SVN_G(ctx),
subpool); subpool);
#else #else
@ -3831,7 +3836,8 @@ PHP_FUNCTION(svn_update2)
zend_bool recurse = 1; zend_bool recurse = 1;
apr_pool_t *subpool; apr_pool_t *subpool;
svn_error_t *err; svn_error_t *err;
svn_revnum_t result_rev; apr_array_header_t *result_revs;
apr_array_header_t *path_array;
svn_opt_revision_t rev; svn_opt_revision_t rev;
long revno = -1; long revno = -1;
long flags = 0; long flags = 0;
@ -3858,10 +3864,14 @@ PHP_FUNCTION(svn_update2)
path = svn_path_canonicalize(utf8_path, subpool); path = svn_path_canonicalize(utf8_path, subpool);
path_array = apr_array_make (subpool, 1, sizeof(char *));
APR_ARRAY_PUSH(path_array, const char *) = path;
rev.value.number = revno; rev.value.number = revno;
rev.kind = php_svn_get_revision_kind (rev); rev.kind = php_svn_get_revision_kind (rev);
err = svn_client_update3(&result_rev, path, &rev, err = svn_client_update3(
&result_revs, path_array, &rev,
depth, depth,
FALSE, /* depth_is_sticky */ FALSE, /* depth_is_sticky */
flags & SVN_IGNORE_EXTERNALS, /* ignore_externals */ flags & SVN_IGNORE_EXTERNALS, /* ignore_externals */
@ -3872,7 +3882,7 @@ PHP_FUNCTION(svn_update2)
php_svn_handle_error(err TSRMLS_CC); php_svn_handle_error(err TSRMLS_CC);
RETVAL_FALSE; RETVAL_FALSE;
} else { } else {
RETVAL_LONG(result_rev); RETVAL_LONG(APR_ARRAY_IDX(result_revs, 0, long));
} }
cleanup: cleanup: