Fossil

Diff
Login

Diff

Differences From Artifact [6a036f4e3d]:

To Artifact [ef14a9dec8]:


219
220
221
222
223
224
225
226
227




228
229
230
231
232
233
234
235
236
237
238
239
240
      name = json_new_string( n+1 );
      cson_object_set_s(zEntry, zKeyIsDir, cson_value_true() );
    } else{
      name = json_new_string( n );
    }
    cson_object_set_s(zEntry, zKeyName, name );
    if( zCI && !isDir){
      /* don't add the uuid/size for dir entries - that data refers
         to one of the files in that directory :/. */




      char const * u = db_column_text(&q,1);
      sqlite_int64 const sz = db_column_int64(&q,2);
      /*sqlite_int64 const ts = db_column_int64(&q,3);*/
      if(u && *u){
        cson_object_set_s(zEntry, zKeyUuid, json_new_string( u ) );
      }
      cson_object_set_s(zEntry, zKeySize,
                        cson_value_new_integer( (cson_int_t)sz ));
      /*cson_object_set(zEntry, "mtime",
          cson_value_new_integer( (cson_int_t)ts ));*/
    }
  }
  db_finalize(&q);







|
|
>
>
>
>



<
|
<







219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234

235

236
237
238
239
240
241
242
      name = json_new_string( n+1 );
      cson_object_set_s(zEntry, zKeyIsDir, cson_value_true() );
    } else{
      name = json_new_string( n );
    }
    cson_object_set_s(zEntry, zKeyName, name );
    if( zCI && !isDir){
      /* Don't add the uuid/size for dir entries - that data refers to
         one of the files in that directory :/. Entries with no
         --checkin may refer to N versions, and therefore we cannot
         associate a single size and uuid with them (and fetching all
         would be overkill for most use cases).
      */
      char const * u = db_column_text(&q,1);
      sqlite_int64 const sz = db_column_int64(&q,2);
      /*sqlite_int64 const ts = db_column_int64(&q,3);*/

      cson_object_set_s(zEntry, zKeyUuid, json_new_string( u ) );

      cson_object_set_s(zEntry, zKeySize,
                        cson_value_new_integer( (cson_int_t)sz ));
      /*cson_object_set(zEntry, "mtime",
          cson_value_new_integer( (cson_int_t)ts ));*/
    }
  }
  db_finalize(&q);