Fossil SCM
s/commit/checkin/, for consistency. s/artifactType/type/.
Commit
44e032aa8a0da9f5c1f83866f8a3ef636c9c1bd4
Parent
cc444a02cd9cc4b…
1 file changed
+2
-2
+2
-2
| --- src/json_artifact.c | ||
| +++ src/json_artifact.c | ||
| @@ -41,11 +41,11 @@ | ||
| 41 | 41 | char const * zParent = NULL; |
| 42 | 42 | cson_value * v = NULL; |
| 43 | 43 | Stmt q; |
| 44 | 44 | static cson_value * eventTypeLabel = NULL; |
| 45 | 45 | if(!eventTypeLabel){ |
| 46 | - eventTypeLabel = json_new_string("commit"); | |
| 46 | + eventTypeLabel = json_new_string("checkin"); | |
| 47 | 47 | json_gc_add("$EVENT_TYPE_LABEL(commit)", eventTypeLabel, 1); |
| 48 | 48 | } |
| 49 | 49 | zParent = db_text(0, |
| 50 | 50 | "SELECT uuid FROM plink, blob" |
| 51 | 51 | " WHERE plink.cid=%d AND blob.rid=plink.pid AND plink.isprim", |
| @@ -73,11 +73,11 @@ | ||
| 73 | 73 | const char *zUser; |
| 74 | 74 | const char *zComment; |
| 75 | 75 | char * zEUser, * zEComment; |
| 76 | 76 | int mtime, omtime; |
| 77 | 77 | #define SET(K,V) cson_object_set(o,(K), (V)) |
| 78 | - SET("artifactType", eventTypeLabel ); | |
| 78 | + SET("type", eventTypeLabel ); | |
| 79 | 79 | SET("uuid",json_new_string(zUuid)); |
| 80 | 80 | SET("isLeaf", cson_value_new_bool(is_a_leaf(rid))); |
| 81 | 81 | zUser = db_column_text(&q,2); |
| 82 | 82 | zEUser = db_text(0, |
| 83 | 83 | "SELECT value FROM tagxref WHERE tagid=%d AND rid=%d", |
| 84 | 84 |
| --- src/json_artifact.c | |
| +++ src/json_artifact.c | |
| @@ -41,11 +41,11 @@ | |
| 41 | char const * zParent = NULL; |
| 42 | cson_value * v = NULL; |
| 43 | Stmt q; |
| 44 | static cson_value * eventTypeLabel = NULL; |
| 45 | if(!eventTypeLabel){ |
| 46 | eventTypeLabel = json_new_string("commit"); |
| 47 | json_gc_add("$EVENT_TYPE_LABEL(commit)", eventTypeLabel, 1); |
| 48 | } |
| 49 | zParent = db_text(0, |
| 50 | "SELECT uuid FROM plink, blob" |
| 51 | " WHERE plink.cid=%d AND blob.rid=plink.pid AND plink.isprim", |
| @@ -73,11 +73,11 @@ | |
| 73 | const char *zUser; |
| 74 | const char *zComment; |
| 75 | char * zEUser, * zEComment; |
| 76 | int mtime, omtime; |
| 77 | #define SET(K,V) cson_object_set(o,(K), (V)) |
| 78 | SET("artifactType", eventTypeLabel ); |
| 79 | SET("uuid",json_new_string(zUuid)); |
| 80 | SET("isLeaf", cson_value_new_bool(is_a_leaf(rid))); |
| 81 | zUser = db_column_text(&q,2); |
| 82 | zEUser = db_text(0, |
| 83 | "SELECT value FROM tagxref WHERE tagid=%d AND rid=%d", |
| 84 |
| --- src/json_artifact.c | |
| +++ src/json_artifact.c | |
| @@ -41,11 +41,11 @@ | |
| 41 | char const * zParent = NULL; |
| 42 | cson_value * v = NULL; |
| 43 | Stmt q; |
| 44 | static cson_value * eventTypeLabel = NULL; |
| 45 | if(!eventTypeLabel){ |
| 46 | eventTypeLabel = json_new_string("checkin"); |
| 47 | json_gc_add("$EVENT_TYPE_LABEL(commit)", eventTypeLabel, 1); |
| 48 | } |
| 49 | zParent = db_text(0, |
| 50 | "SELECT uuid FROM plink, blob" |
| 51 | " WHERE plink.cid=%d AND blob.rid=plink.pid AND plink.isprim", |
| @@ -73,11 +73,11 @@ | |
| 73 | const char *zUser; |
| 74 | const char *zComment; |
| 75 | char * zEUser, * zEComment; |
| 76 | int mtime, omtime; |
| 77 | #define SET(K,V) cson_object_set(o,(K), (V)) |
| 78 | SET("type", eventTypeLabel ); |
| 79 | SET("uuid",json_new_string(zUuid)); |
| 80 | SET("isLeaf", cson_value_new_bool(is_a_leaf(rid))); |
| 81 | zUser = db_column_text(&q,2); |
| 82 | zEUser = db_text(0, |
| 83 | "SELECT value FROM tagxref WHERE tagid=%d AND rid=%d", |
| 84 |