Re: svn commit: r1202799 - in /subversion/trunk/subversion/svn: cl.h main.c status-cmd.c status.c

On 11/16/2011 05:29 PM, Daniel Shahaf wrote:
> cmpilato_at_apache.org wrote on Wed, Nov 16, 2011 at 17:29:42 -0000:
>> Author: cmpilato
>> Date: Wed Nov 16 17:29:42 2011
>> New Revision: 1202799
>>
>> URL: http://svn.apache.org/viewvc?rev=1202799&view=rev
>> Log:
>> For issue #1935 ("svn status too verbose with svn:externals
>> definitions"), make 'svn status' suppress the printing of "X" and
>> "Performing status on external item..." lines when in --quiet (but not
>> also --verbose) mode.
>
> Nice change. Now my 'svn st -q' is clean, save for file externals'
> lines. If you can get that too it'll be great; but if not, I'm also
> adding that to my list to look at eventually. Thanks.

Ah, right. File externals. I wonder, is this change enough? I don't want
to skip over modified file externals, right -- only the unmodified ones.

Index: subversion/svn/status.c
===================================================================
--- subversion/svn/status.c (revision 1203188)
+++ subversion/svn/status.c (working copy)
@@ -548,9 +548,14 @@
           && status->repos_node_status == svn_wc_status_none))
     return SVN_NO_ERROR;

- if (suppress_externals_placeholders
- && status->node_status == svn_wc_status_external)
- return SVN_NO_ERROR;
+ if (suppress_externals_placeholders)
+ {
+ if (status->node_status == svn_wc_status_external)
+ return SVN_NO_ERROR;
+ if ((status->node_status == svn_wc_status_normal)
+ && (status->file_external))
+ return SVN_NO_ERROR;
+ }

   return print_status(cwd_abspath, svn_dirent_local_style(path, pool),
                       detailed, show_last_committed, repos_locks, status,

-- 
C. Michael Pilato <cmpilato_at_collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand