subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1138960 - in /subversion/trunk/subversion: bindings/javahl/native/CreateJ.cpp include/svn_client.h libsvn_client/status.c svn/status.c
Date Thu, 23 Jun 2011 16:06:52 GMT
Author: julianfoad
Date: Thu Jun 23 16:06:52 2011
New Revision: 1138960

URL: http://svn.apache.org/viewvc?rev=1138960&view=rev
Log:
Tweak the svn_client_status_t structure.

* subversion/include/svn_client.h
  (svn_client_status_t): Rename 'locked' to 'wc_is_locked' to help
    distinguish it from the other two lock fields. Move the repository
    location fields to be next to the revision number, because they are
    closely related. Replace the word 'entry' with 'node' in doc strings.

* subversion/bindings/javahl/native/CreateJ.cpp
  (Status): Track the rename.

* subversion/libsvn_client/status.c
  (tweak_status, svn_client__create_status): Same.

* subversion/svn/status.c
  (print_status, svn_cl__print_status_xml): Same.

Modified:
    subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp
    subversion/trunk/subversion/include/svn_client.h
    subversion/trunk/subversion/libsvn_client/status.c
    subversion/trunk/subversion/svn/status.c

Modified: subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp?rev=1138960&r1=1138959&r2=1138960&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp Thu Jun 23 16:06:52 2011
@@ -541,7 +541,7 @@ CreateJ::Status(svn_wc_context_t *wc_ctx
   jobject jRepositoryPropType = EnumMapper::mapStatusKind(
                                                   status->repos_prop_status);
   jboolean jIsCopied = (status->copied == 1) ? JNI_TRUE: JNI_FALSE;
-  jboolean jIsLocked = (status->locked == 1) ? JNI_TRUE: JNI_FALSE;
+  jboolean jIsLocked = (status->wc_is_locked == 1) ? JNI_TRUE: JNI_FALSE;
   jboolean jIsSwitched = (status->switched == 1) ? JNI_TRUE: JNI_FALSE;
   jboolean jIsFileExternal = (status->file_external == 1) ? JNI_TRUE
                                                           : JNI_FALSE;

Modified: subversion/trunk/subversion/include/svn_client.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_client.h?rev=1138960&r1=1138959&r2=1138960&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_client.h (original)
+++ subversion/trunk/subversion/include/svn_client.h Thu Jun 23 16:06:52 2011
@@ -2098,20 +2098,26 @@ typedef struct svn_client_status_t
    * svn_wc_status_modified and svn_wc_status_conflicted. */
   enum svn_wc_status_kind text_status;
 
-  /** The status of the entry's properties.
+  /** The status of the node's properties.
    * Valid values are: svn_wc_status_none, svn_wc_status_normal,
    * svn_wc_status_modified and svn_wc_status_conflicted. */
   enum svn_wc_status_kind prop_status;
 
   /** a node can be 'locked' if a working copy update is in progress or
    * was interrupted. */
-  svn_boolean_t locked;
+  svn_boolean_t wc_is_locked;
 
   /** a file or directory can be 'copied' if it's scheduled for
    * addition-with-history (or part of a subtree that is scheduled as such.).
    */
   svn_boolean_t copied;
 
+  /** The URL of the repository root. */
+  const char *repos_root_url;
+
+  /** The in-repository path relative to the repository root. */
+  const char *repos_relpath;
+
   /** Base revision. */
   svn_revnum_t revision;
 
@@ -2124,15 +2130,6 @@ typedef struct svn_client_status_t
   /** Last commit author of this item */
   const char *changed_author;
 
-  /** The URL of the repository */
-  const char *repos_root_url;
-
-  /** The in-repository path relative to the repository root.
-   * Use svn_path_url_component2() to join this value to the
-   * repos_root_url to get the full URL.
-   */
-  const char *repos_relpath;
-
     /** a file or directory can be 'switched' if the switch command has been
    * used.  If this is TRUE, then file_external will be FALSE.
    */
@@ -2174,13 +2171,13 @@ typedef struct svn_client_status_t
    * restructuring changes */
   enum svn_wc_status_kind repos_node_status;
 
-  /** The entry's text status in the repository. */
+  /** The node's text status in the repository. */
   enum svn_wc_status_kind repos_text_status;
 
-  /** The entry's property status in the repository. */
+  /** The node's property status in the repository. */
   enum svn_wc_status_kind repos_prop_status;
 
-  /** The entry's lock in the repository, if any. */
+  /** The node's lock in the repository, if any. */
   const svn_lock_t *repos_lock;
 
   /** Set to the youngest committed revision, or #SVN_INVALID_REVNUM

Modified: subversion/trunk/subversion/libsvn_client/status.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/status.c?rev=1138960&r1=1138959&r2=1138960&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/status.c (original)
+++ subversion/trunk/subversion/libsvn_client/status.c Thu Jun 23 16:06:52 2011
@@ -83,7 +83,7 @@ tweak_status(void *baton,
                            scratch_pool);
 
   /* If the status item has an entry, but doesn't belong to one of the
-     changelists our caller is interested in, we filter our this status
+     changelists our caller is interested in, we filter out this status
      transmission.  */
   if (sb->changelist_hash
       && (! status->changelist
@@ -593,7 +593,7 @@ svn_client__create_status(svn_client_sta
   (*cst)->prop_status = status->prop_status;
 
   if (status->kind == svn_node_dir)
-    (*cst)->locked = status->locked;
+    (*cst)->wc_is_locked = status->locked;
 
   (*cst)->copied = status->copied;
   (*cst)->revision = status->revision;

Modified: subversion/trunk/subversion/svn/status.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/status.c?rev=1138960&r1=1138959&r2=1138960&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/status.c (original)
+++ subversion/trunk/subversion/svn/status.c Thu Jun 23 16:06:52 2011
@@ -259,7 +259,7 @@ print_status(const char *path,
                                 "%c%c%c%c%c%c%c %c   %6s   %6s %-12s %s%s\n",
                                 generate_status_code(combined_status(status)),
                                 generate_status_code(prop_status),
-                                status->locked ? 'L' : ' ',
+                                status->wc_is_locked ? 'L' : ' ',
                                 status->copied ? '+' : ' ',
                                 generate_switch_column_code(status),
                                 lock_status,
@@ -276,7 +276,7 @@ print_status(const char *path,
            svn_cmdline_printf(pool, "%c%c%c%c%c%c%c %c   %6s   %s%s\n",
                               generate_status_code(combined_status(status)),
                               generate_status_code(prop_status),
-                              status->locked ? 'L' : ' ',
+                              status->wc_is_locked ? 'L' : ' ',
                               status->copied ? '+' : ' ',
                               generate_switch_column_code(status),
                               lock_status,
@@ -291,7 +291,7 @@ print_status(const char *path,
        svn_cmdline_printf(pool, "%c%c%c%c%c%c%c %s%s\n",
                           generate_status_code(combined_status(status)),
                           generate_status_code(prop_status),
-                          status->locked ? 'L' : ' ',
+                          status->wc_is_locked ? 'L' : ' ',
                           status->copied ? '+' : ' ',
                           generate_switch_column_code(status),
                           ((status->lock)
@@ -334,7 +334,7 @@ svn_cl__print_status_xml(const char *pat
                      (status->node_status != svn_wc_status_deleted)
                                           ? status->prop_status
                                           : svn_wc_status_none));
-  if (status->locked)
+  if (status->wc_is_locked)
     apr_hash_set(att_hash, "wc-locked", APR_HASH_KEY_STRING, "true");
   if (status->copied)
     apr_hash_set(att_hash, "copied", APR_HASH_KEY_STRING, "true");



Mime
View raw message