You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Ed Price <ed...@gmail.com> on 2006/03/11 03:40:09 UTC
[PATCH] Fix issue 2030 for "svn status"
For both convenience and consistency, it would be nice if "svn status"
skipped non-versioned items, like (eg) "svn update" does:
$ svnadmin create repos
$ svn co file://`pwd`/repos wc
Checked out revision 0.
$ mkdir notwc
$ svn up *
Skipped 'notwc'
Skipped 'repos'
At revision 0.
$ svn st *
subversion/libsvn_wc/lock.c:460: (apr_err=155007)
svn: 'notwc' is not a working copy
subversion/libsvn_subr/io.c:2386: (apr_err=2)
svn: Can't open file 'notwc/.svn/format': No such file or directory
$
It seems this is issue 2030 ("Errorful targets should be skipped, not
end the entire operation"):
http://subversion.tigris.org/issues/show_bug.cgi?id=2030
I've attached a patch which fixes this issue for "svn status".
It includes a testcase, and modifies the error message (which now
includes "warning: " since it is now a warning instead of an error)
for another testcase.
There is one difference in pool usage (XML used to be in the main pool
instead of the subpool) but I believe the change is actually a slight
improvement (the XML could/should have used the subpool before).
Thanks,
-Ed
[[[
Fix issue #2030 (Errorful targets should be skipped, not end the
entire operation) for "svn status".
* subversion/svn/status-cmd.c
(do_status): New helper function.
(svn_cl__status): Wrap do_status with svn_cl__try, allowing
SVN_ERR_WC_NOT_DIRECTORY (not a working copy).
* subversion/tests/cmdline/stat_tests.py
(status_on_unversioned_dotdot): Adjust expected message; status on
non-WC is now a warning instead of an error.
(status_unversioned_dir): New test.
(test_list): Add new test.
]]]
Re: [PATCH] Fix issue 2030 for "svn status"
Posted by Garrett Rooney <ro...@electricjellyfish.net>.
On 3/19/06, Ed Price <ed...@gmail.com> wrote:
> Any thoughts on this patch?
>
> I'm attaching a new version of the patch. The only difference
> is a very minor improvement in the testcase. (Runs status
> on two dirs instead of one, to be more sure that it's not
> erroring out.) Same log message as before.
Looks good to me, committed in r18971.
Thanks!
-garrett
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Fix issue 2030 for "svn status"
Posted by Ed Price <ed...@gmail.com>.
Any thoughts on this patch?
I'm attaching a new version of the patch. The only difference
is a very minor improvement in the testcase. (Runs status
on two dirs instead of one, to be more sure that it's not
erroring out.) Same log message as before.
Thanks,
-Ed
On 3/10/06, Ed Price <ed...@gmail.com> wrote:
> For both convenience and consistency, it would be nice if "svn status"
> skipped non-versioned items, like (eg) "svn update" does:
>
> $ svnadmin create repos
> $ svn co file://`pwd`/repos wc
> Checked out revision 0.
> $ mkdir notwc
> $ svn up *
> Skipped 'notwc'
> Skipped 'repos'
> At revision 0.
> $ svn st *
> subversion/libsvn_wc/lock.c:460: (apr_err=155007)
> svn: 'notwc' is not a working copy
> subversion/libsvn_subr/io.c:2386: (apr_err=2)
> svn: Can't open file 'notwc/.svn/format': No such file or directory
> $
>
> It seems this is issue 2030 ("Errorful targets should be skipped, not
> end the entire operation"):
>
> http://subversion.tigris.org/issues/show_bug.cgi?id=2030
>
> I've attached a patch which fixes this issue for "svn status".
>
> It includes a testcase, and modifies the error message (which now
> includes "warning: " since it is now a warning instead of an error)
> for another testcase.
>
> There is one difference in pool usage (XML used to be in the main pool
> instead of the subpool) but I believe the change is actually a slight
> improvement (the XML could/should have used the subpool before).
>
> Thanks,
> -Ed
>
> [[[
> Fix issue #2030 (Errorful targets should be skipped, not end the
> entire operation) for "svn status".
>
> * subversion/svn/status-cmd.c
> (do_status): New helper function.
> (svn_cl__status): Wrap do_status with svn_cl__try, allowing
> SVN_ERR_WC_NOT_DIRECTORY (not a working copy).
>
> * subversion/tests/cmdline/stat_tests.py
> (status_on_unversioned_dotdot): Adjust expected message; status on
> non-WC is now a warning instead of an error.
> (status_unversioned_dir): New test.
> (test_list): Add new test.
> ]]]