[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn_wc_status_unversioned and svn_wc_status_none

From: Jon Middleton <jjm_at_ixtab.org.uk>
Date: 2002-12-10 00:12:35 CET

On Mon, Dec 09, 2002 at 03:08:05PM -0600, Karl Fogel wrote:
>
> Could you write up a short spec that says how Subversion behaves now,
> versus how it would behave after your patch? Target audience for the
> spec is someone who has read the svn book, but not this thread.

ok, here goes -

In svn_wc.h it states the there the following two states for a
unversioned file in the working copy:

  svn_wc_status_none : PATH is not versioned, and is either not
                       present on disk, or is ignored by svn's
                       default ignore regular expressions or the
                       svn:ignore property setting for PATH's
                       parent directory.

  svn_wc_status_unversioned : PATH is not versioned, but is
                              present on disk and not being
                              ignored (see above).

But it turns out that svn status display differs depending on how it's
called, follows some ate some example outputs from svn status

  jjm@ixchel:examples$ svn status check-modified.py~
  ? check-modified.py~

  jjm@ixchel:examples$ svn status --no-ignore check-modified.py~
  ? check-modified.py~

  jjm@ixchel:examples$ svn status --no-ignore
  M check-modified.py
         check-modified.py~
  ? foo

  jjm@ixchel:examples$ svn st
  M check-modified.py
  ? foo

I prepose that a extra letter ("I" ?) be added to the status output so
that it is possible distinguish between a unmodifed file under
revision control and an ignored file. The following is how the above
output would after this change.

  jjm@ixchel:examples$ svn status check-modified.py~
  I check-modified.py~

  jjm@ixchel:examples$ svn status --no-ignore check-modified.py~
  I check-modified.py~

  jjm@ixchel:examples$ svn status --no-ignore
  M check-modified.py
  I check-modified.py~
  ? foo

  jjm@ixchel:examples$ svn st
  M check-modified.py
  ? foo

Also the function svn_wc_status will currently only return
svn_wc_status_unversioned for a file which unversioned or ignored, I
propose that this function be modified will set the status of a
ignored file to svn_wc_status_none instead of svn_wc_status_unversioned.

Comments ?

-- 
Jon
"First things first -- but not necessarily in that order"
                -- The Doctor, "Doctor Who"		

  • application/pgp-signature attachment: stored
Received on Tue Dec 10 00:13:19 2002

This is an archived mail posted to the Subversion Dev mailing list.