Philip Martin <philip.mar...@wandisco.com> writes:
> Matthew Bentham <mj...@artvps.com> writes:
>
>> wc-ng: work towards eliminating svn_wc_entry_t
>>
>> * subversion/libsvn_client/commit_util.c
>> (add_lock_token): Replace a use of svn_wc__maybe_get_entry with
>> use of svn_wc__node_get_*
>>
>> Patch by: Matthew Bentham <mjb67{_AT_}artvps.com>
>> ]]]
>> Index: subversion/libsvn_client/commit_util.c
>> ===================================================================
>> --- subversion/libsvn_client/commit_util.c (revision 909397)
>> +++ subversion/libsvn_client/commit_util.c (working copy)
>> @@ -195,19 +195,25 @@
>> {
>> struct add_lock_token_baton *altb = walk_baton;
>> apr_pool_t *token_pool = apr_hash_pool_get(altb->lock_tokens);
>> - const svn_wc_entry_t *entry;
>> + const char* lock_token;
>> + const char* url;
>> +
>> + SVN_ERR(svn_wc__node_get_lock_token(&lock_token, altb->wc_ctx,
>> + local_abspath, scratch_pool, scratch_pool));
>
> Indentation is a bit off. I'll fix and commit when the regression tests
> finish.
lock_tests.py 13 is failing:
../../../../src/subversion/tests/cmdline/lock_tests.py 13
../src/subversion/svn/commit-cmd.c:142: (apr_err=160037)
../src/subversion/libsvn_client/commit.c:853: (apr_err=160037)
svn: Commit failed (details follow):
../src/subversion/libsvn_client/commit_util.c:1640: (apr_err=160037)
../src/subversion/libsvn_delta/path_driver.c:254: (apr_err=160037)
../src/subversion/libsvn_fs_fs/tree.c:1936: (apr_err=160037)
../src/subversion/libsvn_fs_fs/lock.c:633: (apr_err=160037)
../src/subversion/libsvn_fs_fs/lock.c:566: (apr_err=160037)
../src/subversion/libsvn_fs_fs/lock.c:545: (apr_err=160037)
../src/subversion/libsvn_fs_fs/lock.c:599: (apr_err=160037)
svn: Cannot verify lock on path '/A/D/G/tau'; no matching lock-token available
Traceback (most recent call last):
File "/home/pm/sw/subversion/src/subversion/tests/cmdline/svntest/main.py",
line 1197, in run
rc = self.pred.run(sandbox)
File
"/home/pm/sw/subversion/src/subversion/tests/cmdline/svntest/testcase.py", line
160, in run
return self.func(sandbox)
File "../../../../src/subversion/tests/cmdline/lock_tests.py", line 542, in
deleted_dir_lock
'-m', '', parent_dir)
File
"/home/pm/sw/subversion/src/subversion/tests/cmdline/svntest/actions.py", line
219, in run_and_verify_svn
expected_exit, *varargs)
File
"/home/pm/sw/subversion/src/subversion/tests/cmdline/svntest/actions.py", line
254, in run_and_verify_svn2
exit_code, out, err = main.run_svn(want_err, *varargs)
File "/home/pm/sw/subversion/src/subversion/tests/cmdline/svntest/main.py",
line 605, in run_svn
*(_with_auth(_with_config_dir(varargs))))
File "/home/pm/sw/subversion/src/subversion/tests/cmdline/svntest/main.py",
line 366, in run_command
None, *varargs)
File "/home/pm/sw/subversion/src/subversion/tests/cmdline/svntest/main.py",
line 538, in run_command_stdin
raise Failure
Failure
I think the problem is that svn_wc__node_get_url doesn't work for
deleted nodes, it certainly has no code to scan the working tree for
deletions.
--
Philip
