[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-cvs
Subject:    svn commit: r35610 - in trunk/subversion/svn: . schema
From:       Bert Huijben <rhuijben () sharpsvn ! net>
Date:       2009-01-31 1:15:12
Message-ID: 200901310115.n0V1FCW7021636 () svn2 ! sjc ! collab ! net
[Download RAW message or body]

Author: rhuijben
Date: Fri Jan 30 17:15:12 2009
New Revision: 35610

Log:
Add nodekind attribute to the xml output of log paths.

The attribute name is "kind" to match the name used by svn info.

* svn/log-cmd.c
  (log_entry_receiver_xml): Add kind attribute with nodekind.
* svn/schema/log.rnc
  (path): Define kind attribute.

Modified:
   trunk/subversion/svn/log-cmd.c
   trunk/subversion/svn/schema/log.rnc

Modified: trunk/subversion/svn/log-cmd.c
URL: http://svn.collab.net/viewvc/svn/trunk/subversion/svn/log-cmd.c?pathrev=35610&r1=35609&r2=35610
==============================================================================
--- trunk/subversion/svn/log-cmd.c	Fri Jan 30 16:31:36 2009	(r35609)
+++ trunk/subversion/svn/log-cmd.c	Fri Jan 30 17:15:12 2009	(r35610)
@@ -381,13 +381,15 @@ log_entry_receiver_xml(void *baton,
               svn_xml_make_open_tag(&sb, pool, svn_xml_protect_pcdata, "path",
                                     "action", action,
                                     "copyfrom-path", log_item->copyfrom_path,
-                                    "copyfrom-rev", revstr, NULL);
+                                    "copyfrom-rev", revstr,
+                                    "kind", svn_cl__node_kind_str_xml(log_item->node_kind), NULL);
             }
           else
             {
               /* <path action="X"> */
               svn_xml_make_open_tag(&sb, pool, svn_xml_protect_pcdata, "path",
-                                    "action", action, NULL);
+                                    "action", action, 
+                                    "kind", svn_cl__node_kind_str_xml(log_item->node_kind), NULL);
             }
           /* xxx</path> */
           svn_xml_escape_cdata_cstring(&sb, path, pool);
@@ -523,11 +525,11 @@ svn_cl__log(apr_getopt_t *os,
       if (opt_state->all_revprops)
         revprops = NULL;
       else if(opt_state->no_revprops)
-	{
-	  revprops = apr_array_make(pool,
-				    0,
+    {
+      revprops = apr_array_make(pool,
+                    0,
                                     sizeof(char *));
-	}
+    }
       else if (opt_state->revprop_table != NULL)
         {
           apr_hash_index_t *hi;

Modified: trunk/subversion/svn/schema/log.rnc
URL: http://svn.collab.net/viewvc/svn/trunk/subversion/svn/schema/log.rnc?pathrev=35610&r1=35609&r2=35610
==============================================================================
--- trunk/subversion/svn/schema/log.rnc	Fri Jan 30 16:31:36 2009	(r35609)
+++ trunk/subversion/svn/schema/log.rnc	Fri Jan 30 17:15:12 2009	(r35610)
@@ -20,6 +20,8 @@ path = element path { attlist.path, text
 attlist.path &=
   ## "action code": A)dd, D)elete, R)eplace or M)odify
   attribute action { "A" | "D" | "R" | "M" },
+  ## kind is "" when repository was < 1.6 when committing
+  attribute kind { "file" | "dir" | "" },
   (
    ## The copyfrom path within repository.
    attribute copyfrom-path { text },

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=495&dsMessageId=1077635

[prev in list] [next in list] [prev in thread] [next in thread]