Fossil SCM
Preliminarily remove the "rid" property from artifact_to_json() output, as that value is only valid within a given repository instance.
Commit
024c0ff07f0d6f57f6550986c393dc6954acbb8c268bb295e8ebb1bc36a364e5
Parent
4416f09b420cae1…
1 file changed
+2
-2
+2
-2
| --- src/manifest.c | ||
| +++ src/manifest.c | ||
| @@ -2946,13 +2946,13 @@ | ||
| 2946 | 2946 | void artifact_to_json(Manifest const *p, Blob *b){ |
| 2947 | 2947 | int i; |
| 2948 | 2948 | char *zUuid; |
| 2949 | 2949 | |
| 2950 | 2950 | blob_append_literal(b, "{"); |
| 2951 | - blob_appendf(b, "\"rid\": %d", p->rid); | |
| 2952 | 2951 | zUuid = rid_to_uuid(p->rid); |
| 2953 | - blob_appendf(b, ", \"uuid\": %!j", zUuid); | |
| 2952 | + blob_appendf(b, "\"uuid\": %!j", zUuid); | |
| 2953 | + /*blob_appendf(b, ", \"rid\": %d", p->rid); not portable across repos*/ | |
| 2954 | 2954 | blob_appendf(b, ", \"type\": %!j", artifact_type_to_name(p->type)); |
| 2955 | 2955 | #define ISA(TYPE) if( p->type==TYPE ) |
| 2956 | 2956 | #define CARD_LETTER(LETTER) \ |
| 2957 | 2957 | blob_append_literal(b, ",\"" #LETTER "\": ") |
| 2958 | 2958 | #define CARD_STR(LETTER, VAL) \ |
| 2959 | 2959 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -2946,13 +2946,13 @@ | |
| 2946 | void artifact_to_json(Manifest const *p, Blob *b){ |
| 2947 | int i; |
| 2948 | char *zUuid; |
| 2949 | |
| 2950 | blob_append_literal(b, "{"); |
| 2951 | blob_appendf(b, "\"rid\": %d", p->rid); |
| 2952 | zUuid = rid_to_uuid(p->rid); |
| 2953 | blob_appendf(b, ", \"uuid\": %!j", zUuid); |
| 2954 | blob_appendf(b, ", \"type\": %!j", artifact_type_to_name(p->type)); |
| 2955 | #define ISA(TYPE) if( p->type==TYPE ) |
| 2956 | #define CARD_LETTER(LETTER) \ |
| 2957 | blob_append_literal(b, ",\"" #LETTER "\": ") |
| 2958 | #define CARD_STR(LETTER, VAL) \ |
| 2959 |
| --- src/manifest.c | |
| +++ src/manifest.c | |
| @@ -2946,13 +2946,13 @@ | |
| 2946 | void artifact_to_json(Manifest const *p, Blob *b){ |
| 2947 | int i; |
| 2948 | char *zUuid; |
| 2949 | |
| 2950 | blob_append_literal(b, "{"); |
| 2951 | zUuid = rid_to_uuid(p->rid); |
| 2952 | blob_appendf(b, "\"uuid\": %!j", zUuid); |
| 2953 | /*blob_appendf(b, ", \"rid\": %d", p->rid); not portable across repos*/ |
| 2954 | blob_appendf(b, ", \"type\": %!j", artifact_type_to_name(p->type)); |
| 2955 | #define ISA(TYPE) if( p->type==TYPE ) |
| 2956 | #define CARD_LETTER(LETTER) \ |
| 2957 | blob_append_literal(b, ",\"" #LETTER "\": ") |
| 2958 | #define CARD_STR(LETTER, VAL) \ |
| 2959 |