You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Madan U Sreenivasan <ma...@collab.net> on 2006/05/23 11:59:59 UTC
Re: svn commit: r19777 - in trunk/subversion: libsvn_client tests/cmdline
On Tue, 23 May 2006 14:19:50 +0530, <br...@tigris.org> wrote:
> Author: breser
> Date: Tue May 23 01:49:50 2006
> New Revision: 19777
>
> Modified:
> trunk/subversion/libsvn_client/info.c
> trunk/subversion/tests/cmdline/lock_tests.py
Checkin from above '/'?
> * subversion/libsvn_client/info.c
[snip]
> * subversion/tests/cmdline/lock_tests.py
shouldnt this be 'trunk/subversion' too?
> (examine_lock_encoded_recurse): New test.
Did you miss out...
(test_list) : Add examine_lock_encoded_recurse() test.
> Modified: trunk/subversion/libsvn_client/info.c
> URL:
> http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_client/info.c?pathrev=19777&r1=19776&r2=19777
> ==============================================================================
> --- trunk/subversion/libsvn_client/info.c (original)
> +++ trunk/subversion/libsvn_client/info.c Tue May 23 01:49:50 2006
> @@ -157,6 +157,8 @@
> fs_path = svn_path_is_child(repos_root, URL, subpool);
> fs_path = apr_pstrcat(subpool, "/", fs_path, NULL);
> + fs_path = svn_path_uri_decode(fs_path, subpool);
> +
There are a few extra spaces just before these lines (exactly on line
157). Could you also pl. take care of that.
> lock = apr_hash_get(locks, fs_path, APR_HASH_KEY_STRING);
> SVN_ERR(build_info_from_dirent(&info, the_ent, lock, URL, rev,
>
> Modified: trunk/subversion/tests/cmdline/lock_tests.py
> URL:
> http://svn.collab.net/viewvc/svn/trunk/subversion/tests/cmdline/lock_tests.py?pathrev=19777&r1=19776&r2=19777
> ==============================================================================
> --- trunk/subversion/tests/cmdline/lock_tests.py (original)
> +++ trunk/subversion/tests/cmdline/lock_tests.py Tue May 23 01:49:50 2006
> @@ -1510,6 +1510,58 @@
> '--password',
> svntest.main.wc_passwd,
> file_path)
> +#----------------------------------------------------------------------
> +# Verify that info shows lock info for locked files with URI-unsafe
> names
> +# when run in recursive mode.
> +def examine_lock_encoded_recurse(sbox):
> + "verify recursive info shows lock info"
> +
> + sbox.build()
> + wc_dir = sbox.wc_dir
> +
> + fname = 'A/B/F/one iota'
> + comment = 'This is a lock test.'
> + file_path = os.path.join(sbox.wc_dir, fname)
> +
> + svntest.main.file_append(file_path, "This represents a binary file\n")
> + svntest.actions.run_and_verify_svn(None, None, [], "add", file_path)
> +
> + expected_output = svntest.wc.State(wc_dir, {
> + fname : Item(verb='Adding'),
> + })
> +
> + expected_status = svntest.actions.get_virginal_state(wc_dir, 1)
> + expected_status.add({ fname: Item(wc_rev=2, status=' ') })
> +
> + # Commit the file.
> + svntest.actions.run_and_verify_commit(wc_dir,
> + expected_output,
> + expected_status,
> + None,
> + None, None,
> + None, None,
> + file_path)
> +
> + # lock the file
> + svntest.actions.run_and_verify_svn(None, ".*locked by user", [],
> 'lock',
> + '--username',
> svntest.main.wc_author,
> + '--password',
> svntest.main.wc_passwd,
> + '-m', comment, file_path)
> +
> + # Run info and check that we get the lock fields.
> + output, err = svntest.actions.run_and_verify_svn(None, None, [],
> + 'info', '-R',
> + svntest.main.current_repo_url + '/A/B/F')
There are a few tabs there...
> +
> + lock_info = output[-6:-1]
> + if ((len(lock_info) != 5)
> + or (lock_info[0][0:28] != 'Lock Token: opaquelocktoken:')
> + or (lock_info[1] != 'Lock Owner: ' + svntest.main.wc_author
> + '\n')
> + or (lock_info[2][0:13] != 'Lock Created:')
> + or (lock_info[4] != comment + '\n')):
> + raise svntest.Failure
line specific comparisons? Does this work with '--enable-maintainer-mode'
AND otherwise?
Regards,
Madan.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Re: svn commit: r19777 - in trunk/subversion: libsvn_client tests/cmdline
Posted by Madan U Sreenivasan <ma...@collab.net>.
On Tue, 23 May 2006 17:29:59 +0530, Madan U Sreenivasan <ma...@collab.net>
wrote:
> On Tue, 23 May 2006 14:19:50 +0530, <br...@tigris.org> wrote:
>
>> Author: breser
>> Date: Tue May 23 01:49:50 2006
>> New Revision: 19777
>>
>> Modified:
>> trunk/subversion/libsvn_client/info.c
>> trunk/subversion/tests/cmdline/lock_tests.py
>
> Checkin from above '/'?
>
>> * subversion/libsvn_client/info.c
> [snip]
>> * subversion/tests/cmdline/lock_tests.py
>
> shouldnt this be 'trunk/subversion' too?
Please ignore my above two comments. Looks like the commit mails always
show path from '/' and not from where the commit happened. My bad. sorry.
Regards,
Madan.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: svn commit: r19777 - in trunk/subversion: libsvn_client tests/cmdline
Posted by Daniel Rall <dl...@collab.net>.
On Tue, 23 May 2006, Madan S. wrote:
> On Tue, 23 May 2006 14:19:50 +0530, <br...@tigris.org> wrote:
>
> >Author: breser
> >Date: Tue May 23 01:49:50 2006
> >New Revision: 19777
> >
> >Modified:
> > trunk/subversion/libsvn_client/info.c
> > trunk/subversion/tests/cmdline/lock_tests.py
>
> Checkin from above '/'?
>
> >* subversion/libsvn_client/info.c
> [snip]
> >* subversion/tests/cmdline/lock_tests.py
>
> shouldnt this be 'trunk/subversion' too?
>
> > (examine_lock_encoded_recurse): New test.
>
> Did you miss out...
>
> (test_list) : Add examine_lock_encoded_recurse() test.
...
I've updated the log message, thanks Madan.
> >--- trunk/subversion/tests/cmdline/lock_tests.py (original)
> >+++ trunk/subversion/tests/cmdline/lock_tests.py Tue May 23 01:49:50
...
> >+ # Run info and check that we get the lock fields.
> >+ output, err = svntest.actions.run_and_verify_svn(None, None, [],
> >+ 'info', '-R',
> >+
> >svntest.main.current_repo_url + '/A/B/F')
>
> There are a few tabs there...
...
I took care of this in r19794.
--
Daniel Rall
Re: svn commit: r19777 - in trunk/subversion: libsvn_client tests/cmdline
Posted by Daniel Rall <dl...@collab.net>.
Yeah, everything else seemed fine to me, too.
Thanks guys!
- Dan
On Tue, 23 May 2006, Ben Reser wrote:
> On 5/23/06, Madan U Sreenivasan <ma...@collab.net> wrote:
> >Did you miss out...
> >
> >(test_list) : Add examine_lock_encoded_recurse() test.
>
> Yup looks like dlr fixed it already.
>
> >> Modified: trunk/subversion/libsvn_client/info.c
> >> URL:
> >>
> >http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_client/info.c?pathrev=19777&r1=19776&r2=19777
> >>
> >==============================================================================
> >> --- trunk/subversion/libsvn_client/info.c (original)
> >> +++ trunk/subversion/libsvn_client/info.c Tue May 23 01:49:50 2006
> >> @@ -157,6 +157,8 @@
> >> fs_path = svn_path_is_child(repos_root, URL, subpool);
> >> fs_path = apr_pstrcat(subpool, "/", fs_path, NULL);
> >> + fs_path = svn_path_uri_decode(fs_path, subpool);
> >> +
> >
> >There are a few extra spaces just before these lines (exactly on line
> >157). Could you also pl. take care of that.
>
> I'm not seeing the extra spaces here. And doesn't seem like anyone
> has fixed it either.
>
> >> + # Run info and check that we get the lock fields.
> >> + output, err = svntest.actions.run_and_verify_svn(None, None, [],
> >> + 'info', '-R',
> >> +
> >svntest.main.current_repo_url + '/A/B/F')
> >
> >There are a few tabs there...
>
> Bitten by OS X's vim being configured different than I'm used to.
>
> >> +
> >> + lock_info = output[-6:-1]
> >> + if ((len(lock_info) != 5)
> >> + or (lock_info[0][0:28] != 'Lock Token: opaquelocktoken:')
> >> + or (lock_info[1] != 'Lock Owner: ' + svntest.main.wc_author
> >> + '\n')
> >> + or (lock_info[2][0:13] != 'Lock Created:')
> >> + or (lock_info[4] != comment + '\n')):
> >> + raise svntest.Failure
> >
> >line specific comparisons? Does this work with '--enable-maintainer-mode'
> >AND otherwise?
>
> Yes and yes. This isn't the first time in that test file we test for
> lock output from info that way.
> Also I put the test file in a directory by itself so it would always
> be the list item listed.
Re: svn commit: r19777 - in trunk/subversion: libsvn_client tests/cmdline
Posted by Ben Reser <be...@reser.org>.
On 5/23/06, Madan U Sreenivasan <ma...@collab.net> wrote:
> Did you miss out...
>
> (test_list) : Add examine_lock_encoded_recurse() test.
Yup looks like dlr fixed it already.
> > Modified: trunk/subversion/libsvn_client/info.c
> > URL:
> > http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_client/info.c?pathrev=19777&r1=19776&r2=19777
> > ==============================================================================
> > --- trunk/subversion/libsvn_client/info.c (original)
> > +++ trunk/subversion/libsvn_client/info.c Tue May 23 01:49:50 2006
> > @@ -157,6 +157,8 @@
> > fs_path = svn_path_is_child(repos_root, URL, subpool);
> > fs_path = apr_pstrcat(subpool, "/", fs_path, NULL);
> > + fs_path = svn_path_uri_decode(fs_path, subpool);
> > +
>
> There are a few extra spaces just before these lines (exactly on line
> 157). Could you also pl. take care of that.
I'm not seeing the extra spaces here. And doesn't seem like anyone
has fixed it either.
> > + # Run info and check that we get the lock fields.
> > + output, err = svntest.actions.run_and_verify_svn(None, None, [],
> > + 'info', '-R',
> > + svntest.main.current_repo_url + '/A/B/F')
>
> There are a few tabs there...
Bitten by OS X's vim being configured different than I'm used to.
> > +
> > + lock_info = output[-6:-1]
> > + if ((len(lock_info) != 5)
> > + or (lock_info[0][0:28] != 'Lock Token: opaquelocktoken:')
> > + or (lock_info[1] != 'Lock Owner: ' + svntest.main.wc_author
> > + '\n')
> > + or (lock_info[2][0:13] != 'Lock Created:')
> > + or (lock_info[4] != comment + '\n')):
> > + raise svntest.Failure
>
> line specific comparisons? Does this work with '--enable-maintainer-mode'
> AND otherwise?
Yes and yes. This isn't the first time in that test file we test for
lock output from info that way.
Also I put the test file in a directory by itself so it would always
be the list item listed.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org