Fossil SCM
Correct spacing of CHERRYPICK, BACKOUT, and INTEGRATE records in the change/status report to match the other record types. The style is to have a token identifying the record type, spaces padding up to TEN columns if necessary, a single space, then the filename or artifact ID. Previously, these three records padded to ELEVEN, which is inappropriate outside of Spın̈al Tap.
Commit
6cd7087a35cb8448031ad72f99439401ce872670
Parent
0fc8b9df0c4e27b…
1 file changed
+2
-2
+2
-2
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -138,18 +138,18 @@ | ||
| 138 | 138 | blob_reset(&rewrittenPathname); |
| 139 | 139 | db_finalize(&q); |
| 140 | 140 | db_prepare(&q, "SELECT uuid, id FROM vmerge JOIN blob ON merge=rid" |
| 141 | 141 | " WHERE id<=0"); |
| 142 | 142 | while( db_step(&q)==SQLITE_ROW ){ |
| 143 | - const char *zLabel = "MERGED_WITH"; | |
| 143 | + const char *zLabel = "MERGED_WITH "; | |
| 144 | 144 | switch( db_column_int(&q, 1) ){ |
| 145 | 145 | case -1: zLabel = "CHERRYPICK "; break; |
| 146 | 146 | case -2: zLabel = "BACKOUT "; break; |
| 147 | 147 | case -4: zLabel = "INTEGRATE "; break; |
| 148 | 148 | } |
| 149 | 149 | blob_append(report, zPrefix, nPrefix); |
| 150 | - blob_appendf(report, "%s %s\n", zLabel, db_column_text(&q, 0)); | |
| 150 | + blob_appendf(report, "%s%s\n", zLabel, db_column_text(&q, 0)); | |
| 151 | 151 | } |
| 152 | 152 | db_finalize(&q); |
| 153 | 153 | if( nErr ){ |
| 154 | 154 | fossil_fatal("aborting due to prior errors"); |
| 155 | 155 | } |
| 156 | 156 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -138,18 +138,18 @@ | |
| 138 | blob_reset(&rewrittenPathname); |
| 139 | db_finalize(&q); |
| 140 | db_prepare(&q, "SELECT uuid, id FROM vmerge JOIN blob ON merge=rid" |
| 141 | " WHERE id<=0"); |
| 142 | while( db_step(&q)==SQLITE_ROW ){ |
| 143 | const char *zLabel = "MERGED_WITH"; |
| 144 | switch( db_column_int(&q, 1) ){ |
| 145 | case -1: zLabel = "CHERRYPICK "; break; |
| 146 | case -2: zLabel = "BACKOUT "; break; |
| 147 | case -4: zLabel = "INTEGRATE "; break; |
| 148 | } |
| 149 | blob_append(report, zPrefix, nPrefix); |
| 150 | blob_appendf(report, "%s %s\n", zLabel, db_column_text(&q, 0)); |
| 151 | } |
| 152 | db_finalize(&q); |
| 153 | if( nErr ){ |
| 154 | fossil_fatal("aborting due to prior errors"); |
| 155 | } |
| 156 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -138,18 +138,18 @@ | |
| 138 | blob_reset(&rewrittenPathname); |
| 139 | db_finalize(&q); |
| 140 | db_prepare(&q, "SELECT uuid, id FROM vmerge JOIN blob ON merge=rid" |
| 141 | " WHERE id<=0"); |
| 142 | while( db_step(&q)==SQLITE_ROW ){ |
| 143 | const char *zLabel = "MERGED_WITH "; |
| 144 | switch( db_column_int(&q, 1) ){ |
| 145 | case -1: zLabel = "CHERRYPICK "; break; |
| 146 | case -2: zLabel = "BACKOUT "; break; |
| 147 | case -4: zLabel = "INTEGRATE "; break; |
| 148 | } |
| 149 | blob_append(report, zPrefix, nPrefix); |
| 150 | blob_appendf(report, "%s%s\n", zLabel, db_column_text(&q, 0)); |
| 151 | } |
| 152 | db_finalize(&q); |
| 153 | if( nErr ){ |
| 154 | fossil_fatal("aborting due to prior errors"); |
| 155 | } |
| 156 |