> -----Original Message-----
> From: cmpilato_at_apache.org [mailto:cmpilato_at_apache.org]
> Sent: donderdag 17 november 2011 17:12
> To: commits_at_subversion.apache.org
> Subject: svn commit: r1203234 - /subversion/trunk/subversion/svn/status.c
>
> Author: cmpilato
> Date: Thu Nov 17 16:12:04 2011
> New Revision: 1203234
>
> URL: http://svn.apache.org/viewvc?rev=1203234&view=rev
> Log:
> Follow-up to r1202799, also muting the display of unmodified file
> externals in 'svn status -q' output.
>
> * subversion/svn/status.c
> (svn_cl__print_status): Also skip unmodified file externals when
> 'suppress_externals_placeholders' is set.
>
> Suggested by: danielsh
>
> Modified:
> subversion/trunk/subversion/svn/status.c
>
> Modified: subversion/trunk/subversion/svn/status.c
> URL:
> http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/status.c?re
> v=1203234&r1=1203233&r2=1203234&view=diff
> ==========================================================
> ====================
> --- subversion/trunk/subversion/svn/status.c (original)
> +++ subversion/trunk/subversion/svn/status.c Thu Nov 17 16:12:04 2011
> @@ -548,9 +548,14 @@ svn_cl__print_status(const char *cwd_abs
> && 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;
> + }
This also hides file externals that have their properties changed and maybe a few other states.
See libsvn_wc/status.c is_sendable_status()...
I see Changelist and lock.
Directory externals can theoretically be tree conflicted in the parent working copy. (I don't think we currently introduce them in this case)
Bert
Received on 2011-11-18 10:21:25 CET