svn commit: r940162 - /subversion/trunk/subversion/svn/status-cmd.c

[da...@apache.org]

Author: dannas
Date: Sun May  2 06:05:30 2010
New Revision: 940162

URL: http://svn.apache.org/viewvc?rev=940162&view=rev
Log:
As part of WC-NG, use a node func for fetching a changelist instead of
reading from the entry field.

* subversion/svn/status-cmd.c
  (print_status): Use svn_wc__node_get_changelist() instead of checking 
    the 'entry' field of svn_wc_status3_t.

Modified:
    subversion/trunk/subversion/svn/status-cmd.c

Modified: subversion/trunk/subversion/svn/status-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/status-cmd.c?rev=940162&r1=940161&r2=940162&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/status-cmd.c (original)
+++ subversion/trunk/subversion/svn/status-cmd.c Sun May  2 06:05:30 2010
@@ -177,6 +177,7 @@ print_status(void *baton,
   apr_time_t changed_date;
   const char *changed_author;
   const char *local_abspath;
+  const char *changelist;
 
   SVN_ERR(svn_dirent_get_absolute(&local_abspath, path, sb->cl_pool));
   tweaked_status = svn_wc_dup_status3(status, sb->cl_pool);
@@ -201,14 +202,17 @@ print_status(void *baton,
       tweaked_status->changed_author = changed_author;
     }
 
-  /* If there's a changelist attached to the entry, then we don't print
+  SVN_ERR(svn_wc__node_get_changelist(&changelist, sb->ctx->wc_ctx, local_abspath,
+                                      pool, pool));
+
+  /* If the path is part of a changelist, then we don't print
      the item, but instead dup & cache the status structure for later. */
-  if (status->entry && status->entry->changelist)
+  if (changelist)
     {
       /* The hash maps a changelist name to an array of status_cache
          structures. */
       apr_array_header_t *path_array;
-      const char *cl_key = apr_pstrdup(sb->cl_pool, status->entry->changelist);
+      const char *cl_key = apr_pstrdup(sb->cl_pool, changelist);
       struct status_cache *scache = apr_pcalloc(sb->cl_pool, sizeof(*scache));
       scache->path = apr_pstrdup(sb->cl_pool, path);
       scache->status = svn_wc_dup_status3(tweaked_status, sb->cl_pool);