Jon Trowbridge <trow@ximian.com> writes:
> Back in August, I sent a patch to the list that rationalized the
> treatment of ignored vs. unversioned items when checking a file's
> status. It went few iterations of review on the list, but never got
> applied. (Maybe I was supposed to apply it myself and dropped the
> ball.)
>
> Anyway, I updated my tree for the first time in ages and got conflicts
> against my local changes to subversion/libsvn_wc/status.c. The patch is
> attached below: it is exactly the same as before, except for the changes
> that were necessary to resolve the conflicts.
>
> Is it OK for me to commit this?
>
> -JT
Not just yet, Jon. There are still some problems. Some comments:
> Index: status.c
> ===================================================================
> --- status.c
> +++ status.c Thu Oct 17 00:46:16 2002
> @@ -93,6 +93,10 @@
> If GET_ALL is zero, and ENTRY is not locally modified, then *STATUS
> will be set to NULL. If GET_ALL is non-zero, then *STATUS will be
> allocated and returned no matter what.
> +
> + If IS_IGNORED is non-zero and this is a non-versioned entity, set
> + the text_status to svn_wc_status_none. Otherwise set the
> + text_status to svn_wc_status_unversioned.
This is nit-picking, but when I first read this addition, I read it
like:
if is_ignored && non-versioned:
text_status = svn_wc_status_none
else:
text_status = svn_wc_status_unversioned;
But what I think you meant was:
if is_ignored:
if non-versioned:
text_status = svn_wc_status_none
else:
text_status = svn_wc_status_unversioned
If I'm correct, can you clarify this logic a bit in the docstring?
Also, the patch changes the behavior of the command line client (the
old way is much preferred):
% svn st --no-ignore
? .libs
? checkout-test
? checkout-test.o
? mixed_no_repair.src
? translate-test
? translate-test.o
% new-svn st --no-ignore
.libs
checkout-test
checkout-test.o
mixed_no_repair.src
translate-test
translate-test.o
I'm totally +1 on the spirit of the change. You just need to iron out
the details (and with 'svn status', the details are pleeeeeeeeentiful).
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Oct 17 15:05:22 2002