svn commit: r942591 - in /subversion/trunk/subversion: include/svn_wc.h libsvn_client/delete.c libsvn_wc/status.c svn/status-cmd.c

[da...@apache.org]

Author: dannas
Date: Sun May  9 19:35:28 2010
New Revision: 942591

URL: http://svn.apache.org/viewvc?rev=942591&view=rev
Log:
First step of removing the usage of the entry field in svn_wc_status3_t
for detecting if a path is versioned. No semantic changes.

We still have a number of usages inside libsvn_wc of status->entry.

* subversion/include/svn_wc.h
  (svn_wc_status3_t): Introduce new field 'versioned'.

* subversion/libsvn_wc/status.c
  (assemble_status): Initialize status->versioned.

* subversion/svn/status-cmd.c
  (print_status): Replace usage of status->entry with status->versioned.

* subversion/libsvn_client/delete.c
  (find_undeletables): Replace usage of status->entry with
      status->versioned.

Modified:
    subversion/trunk/subversion/include/svn_wc.h
    subversion/trunk/subversion/libsvn_client/delete.c
    subversion/trunk/subversion/libsvn_wc/status.c
    subversion/trunk/subversion/svn/status-cmd.c

Modified: subversion/trunk/subversion/include/svn_wc.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_wc.h?rev=942591&r1=942590&r2=942591&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_wc.h (original)
+++ subversion/trunk/subversion/include/svn_wc.h Sun May  9 19:35:28 2010
@@ -3643,6 +3643,9 @@ typedef struct svn_wc_status3_t
   /** Set to TRUE if the item is the victim of a conflict. */
   svn_boolean_t conflicted;
 
+  /** If the path is under version control, versioned is TRUE. */
+  svn_boolean_t versioned;
+
   /* NOTE! Please update svn_wc_dup_status3() when adding new fields here. */
 } svn_wc_status3_t;
 

Modified: subversion/trunk/subversion/libsvn_client/delete.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/delete.c?rev=942591&r1=942590&r2=942591&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/delete.c (original)
+++ subversion/trunk/subversion/libsvn_client/delete.c Sun May  9 19:35:28 2010
@@ -59,7 +59,7 @@ find_undeletables(void *baton,
                              _("'%s' is in the way of the resource "
                                "actually under version control"),
                              svn_dirent_local_style(path, pool));
-  else if (! status->entry)
+  else if (! status->versioned)
     return svn_error_createf(SVN_ERR_UNVERSIONED_RESOURCE, NULL,
                              _("'%s' is not under version control"),
                              svn_dirent_local_style(path, pool));

Modified: subversion/trunk/subversion/libsvn_wc/status.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/status.c?rev=942591&r1=942590&r2=942591&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/status.c (original)
+++ subversion/trunk/subversion/libsvn_wc/status.c Sun May  9 19:35:28 2010
@@ -396,6 +396,7 @@ assemble_status(svn_wc_status3_t **statu
       /* For the case of an incoming delete to a locally deleted path during
        * an update, we get a tree conflict. */
       stat->conflicted = (tree_conflict != NULL);
+      stat->versioned = FALSE;
 
       *status = stat;
       return SVN_NO_ERROR;
@@ -657,6 +658,7 @@ assemble_status(svn_wc_status3_t **statu
   stat->lock_comment = lock ? lock->comment : NULL;
   stat->lock_creation_date = lock ? lock->date : 0;
   stat->conflicted = conflicted;
+  stat->versioned = TRUE;
 
   *status = stat;
 

Modified: subversion/trunk/subversion/svn/status-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/status-cmd.c?rev=942591&r1=942590&r2=942591&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/status-cmd.c (original)
+++ subversion/trunk/subversion/svn/status-cmd.c Sun May  9 19:35:28 2010
@@ -188,7 +188,7 @@ print_status(void *baton,
    * ### WORKING nodes on its own. Until we've agreed on how the CLI should
    * ### handle the revision information, we use this appproach to stay compat
    * ### with our testsuite. */
-  if (status->entry)
+  if (status->versioned)
     {
       SVN_ERR(svn_wc__node_get_working_rev_info(&revision, &changed_rev,
                                                 &changed_date,