svn commit: r955783 - /subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp

[rh...@apache.org]

Author: rhuijben
Date: Thu Jun 17 23:18:12 2010
New Revision: 955783

URL: http://svn.apache.org/viewvc?rev=955783&view=rev
Log:
* subversion/bindings/javahl/native/CreateJ.cpp
  (CreateJ::Status): Calculate text_status as the pre node_status
    value.

Modified:
    subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp

Modified: subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp?rev=955783&r1=955782&r2=955783&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp Thu Jun 17 23:18:12 2010
@@ -425,9 +425,18 @@ CreateJ::Status(svn_wc_context_t *wc_ctx
   jstring jChangelist = NULL;
   if (status != NULL)
     {
-      /* ### Node status is more like the old text_status, then the new text_status
-         ### Maybe this should be handled on the tigris/apache boundary */
-      jTextType = EnumMapper::mapStatusKind(status->node_status);
+      /* ### Calculate the old style text_status value to make
+         ### the tests pass. It is probably better to do this in
+         ### the tigris package and then switch the apache package
+         ### to three statuses. */
+      enum svn_wc_status_kind text_status = status->node_status;
+
+      /* Avoid using values that might come from prop changes */
+      if (text_status == svn_wc_status_modified
+          || text_status == svn_wc_status_conflicted)
+        text_status = status->text_status;
+
+      jTextType = EnumMapper::mapStatusKind(text_status);
       jPropType = EnumMapper::mapStatusKind(status->prop_status);
       jRepositoryTextType = EnumMapper::mapStatusKind(
                                                       status->repos_text_status);