Fossil SCM
Merge updates from trunk.
Commit
c3fbab2edb6123f80eeaae6adb4c49f307b55e9a
Parent
92fb97609a0788b…
1 file changed
+3
-3
+3
-3
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -68,11 +68,11 @@ | ||
| 68 | 68 | zDate = db_text(0, |
| 69 | 69 | "SELECT datetime(mtime) || ' UTC' FROM event WHERE objid=%d", |
| 70 | 70 | rid |
| 71 | 71 | ); |
| 72 | 72 | /* 01234567890123 */ |
| 73 | - fossil_print("%-13s %s %s\n", zUuidName, zUuid, zDate ? zDate : ""); | |
| 73 | + fossil_print("%-13s %.40s %s\n", zUuidName, zUuid, zDate ? zDate : ""); | |
| 74 | 74 | free(zDate); |
| 75 | 75 | if( showComment ){ |
| 76 | 76 | zComment = db_text(0, |
| 77 | 77 | "SELECT coalesce(ecomment,comment) || " |
| 78 | 78 | " ' (user: ' || coalesce(euser,user,'?') || ')' " |
| @@ -91,11 +91,11 @@ | ||
| 91 | 91 | const char *zType = db_column_int(&q, 2) ? "parent:" : "merged-from:"; |
| 92 | 92 | zDate = db_text("", |
| 93 | 93 | "SELECT datetime(mtime) || ' UTC' FROM event WHERE objid=%d", |
| 94 | 94 | db_column_int(&q, 1) |
| 95 | 95 | ); |
| 96 | - fossil_print("%-13s %s %s\n", zType, zUuid, zDate); | |
| 96 | + fossil_print("%-13s %.40s %s\n", zType, zUuid, zDate); | |
| 97 | 97 | free(zDate); |
| 98 | 98 | } |
| 99 | 99 | db_finalize(&q); |
| 100 | 100 | db_prepare(&q, "SELECT uuid, cid, isprim FROM plink JOIN blob ON cid=rid " |
| 101 | 101 | " WHERE pid=%d" |
| @@ -105,11 +105,11 @@ | ||
| 105 | 105 | const char *zType = db_column_int(&q, 2) ? "child:" : "merged-into:"; |
| 106 | 106 | zDate = db_text("", |
| 107 | 107 | "SELECT datetime(mtime) || ' UTC' FROM event WHERE objid=%d", |
| 108 | 108 | db_column_int(&q, 1) |
| 109 | 109 | ); |
| 110 | - fossil_print("%-13s %s %s\n", zType, zUuid, zDate); | |
| 110 | + fossil_print("%-13s %.40s %s\n", zType, zUuid, zDate); | |
| 111 | 111 | free(zDate); |
| 112 | 112 | } |
| 113 | 113 | db_finalize(&q); |
| 114 | 114 | } |
| 115 | 115 | zTags = info_tags_of_checkin(rid, 0); |
| 116 | 116 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -68,11 +68,11 @@ | |
| 68 | zDate = db_text(0, |
| 69 | "SELECT datetime(mtime) || ' UTC' FROM event WHERE objid=%d", |
| 70 | rid |
| 71 | ); |
| 72 | /* 01234567890123 */ |
| 73 | fossil_print("%-13s %s %s\n", zUuidName, zUuid, zDate ? zDate : ""); |
| 74 | free(zDate); |
| 75 | if( showComment ){ |
| 76 | zComment = db_text(0, |
| 77 | "SELECT coalesce(ecomment,comment) || " |
| 78 | " ' (user: ' || coalesce(euser,user,'?') || ')' " |
| @@ -91,11 +91,11 @@ | |
| 91 | const char *zType = db_column_int(&q, 2) ? "parent:" : "merged-from:"; |
| 92 | zDate = db_text("", |
| 93 | "SELECT datetime(mtime) || ' UTC' FROM event WHERE objid=%d", |
| 94 | db_column_int(&q, 1) |
| 95 | ); |
| 96 | fossil_print("%-13s %s %s\n", zType, zUuid, zDate); |
| 97 | free(zDate); |
| 98 | } |
| 99 | db_finalize(&q); |
| 100 | db_prepare(&q, "SELECT uuid, cid, isprim FROM plink JOIN blob ON cid=rid " |
| 101 | " WHERE pid=%d" |
| @@ -105,11 +105,11 @@ | |
| 105 | const char *zType = db_column_int(&q, 2) ? "child:" : "merged-into:"; |
| 106 | zDate = db_text("", |
| 107 | "SELECT datetime(mtime) || ' UTC' FROM event WHERE objid=%d", |
| 108 | db_column_int(&q, 1) |
| 109 | ); |
| 110 | fossil_print("%-13s %s %s\n", zType, zUuid, zDate); |
| 111 | free(zDate); |
| 112 | } |
| 113 | db_finalize(&q); |
| 114 | } |
| 115 | zTags = info_tags_of_checkin(rid, 0); |
| 116 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -68,11 +68,11 @@ | |
| 68 | zDate = db_text(0, |
| 69 | "SELECT datetime(mtime) || ' UTC' FROM event WHERE objid=%d", |
| 70 | rid |
| 71 | ); |
| 72 | /* 01234567890123 */ |
| 73 | fossil_print("%-13s %.40s %s\n", zUuidName, zUuid, zDate ? zDate : ""); |
| 74 | free(zDate); |
| 75 | if( showComment ){ |
| 76 | zComment = db_text(0, |
| 77 | "SELECT coalesce(ecomment,comment) || " |
| 78 | " ' (user: ' || coalesce(euser,user,'?') || ')' " |
| @@ -91,11 +91,11 @@ | |
| 91 | const char *zType = db_column_int(&q, 2) ? "parent:" : "merged-from:"; |
| 92 | zDate = db_text("", |
| 93 | "SELECT datetime(mtime) || ' UTC' FROM event WHERE objid=%d", |
| 94 | db_column_int(&q, 1) |
| 95 | ); |
| 96 | fossil_print("%-13s %.40s %s\n", zType, zUuid, zDate); |
| 97 | free(zDate); |
| 98 | } |
| 99 | db_finalize(&q); |
| 100 | db_prepare(&q, "SELECT uuid, cid, isprim FROM plink JOIN blob ON cid=rid " |
| 101 | " WHERE pid=%d" |
| @@ -105,11 +105,11 @@ | |
| 105 | const char *zType = db_column_int(&q, 2) ? "child:" : "merged-into:"; |
| 106 | zDate = db_text("", |
| 107 | "SELECT datetime(mtime) || ' UTC' FROM event WHERE objid=%d", |
| 108 | db_column_int(&q, 1) |
| 109 | ); |
| 110 | fossil_print("%-13s %.40s %s\n", zType, zUuid, zDate); |
| 111 | free(zDate); |
| 112 | } |
| 113 | db_finalize(&q); |
| 114 | } |
| 115 | zTags = info_tags_of_checkin(rid, 0); |
| 116 |