Fossil SCM
Less verbose -v
Commit
4f46e4f910a717c1818a819034d7e7910c5db1f8
Parent
87f51a3ded8a692…
1 file changed
+4
-7
+4
-7
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -316,26 +316,23 @@ | ||
| 316 | 316 | } |
| 317 | 317 | |
| 318 | 318 | compute_fileage(rid,0); |
| 319 | 319 | db_prepare(&q, |
| 320 | 320 | "SELECT datetime(fileage.mtime, 'localtime'), fileage.pathname,\n" |
| 321 | - " blob.size, blob.uuid, blob2.uuid\n" | |
| 322 | - " FROM fileage, blob, blob as blob2\n" | |
| 323 | - " WHERE blob.rid=fileage.fid AND blob2.rid=fileage.mid %s\n" | |
| 321 | + " blob.size\n" | |
| 322 | + " FROM fileage, blob\n" | |
| 323 | + " WHERE blob.rid=fileage.fid %s\n" | |
| 324 | 324 | " ORDER BY %s;", blob_sql_text(&where), zOrderBy /*safe-for-%s*/ |
| 325 | 325 | ); |
| 326 | 326 | blob_reset(&where); |
| 327 | 327 | |
| 328 | 328 | while( db_step(&q)==SQLITE_ROW ){ |
| 329 | 329 | const char *zTime = db_column_text(&q,0); |
| 330 | 330 | const char *zFile = db_column_text(&q,1); |
| 331 | 331 | int size = db_column_int(&q,2); |
| 332 | - const char *zFUuid = db_column_text(&q,3); | |
| 333 | - const char *zCUuid = db_column_text(&q,4); | |
| 334 | 332 | if( verboseFlag ){ |
| 335 | - /* TBD: What to include in verbose. UUID? */ | |
| 336 | - fossil_print("%s %7d %S %S %s\n", zTime, size, zFUuid, zCUuid, zFile); | |
| 333 | + fossil_print("%s %7d %s\n", zTime, size, zFile); | |
| 337 | 334 | }else if( showAge ){ |
| 338 | 335 | fossil_print("%s %s\n", zTime, zFile); |
| 339 | 336 | }else{ |
| 340 | 337 | fossil_print("%s\n", zFile); |
| 341 | 338 | } |
| 342 | 339 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -316,26 +316,23 @@ | |
| 316 | } |
| 317 | |
| 318 | compute_fileage(rid,0); |
| 319 | db_prepare(&q, |
| 320 | "SELECT datetime(fileage.mtime, 'localtime'), fileage.pathname,\n" |
| 321 | " blob.size, blob.uuid, blob2.uuid\n" |
| 322 | " FROM fileage, blob, blob as blob2\n" |
| 323 | " WHERE blob.rid=fileage.fid AND blob2.rid=fileage.mid %s\n" |
| 324 | " ORDER BY %s;", blob_sql_text(&where), zOrderBy /*safe-for-%s*/ |
| 325 | ); |
| 326 | blob_reset(&where); |
| 327 | |
| 328 | while( db_step(&q)==SQLITE_ROW ){ |
| 329 | const char *zTime = db_column_text(&q,0); |
| 330 | const char *zFile = db_column_text(&q,1); |
| 331 | int size = db_column_int(&q,2); |
| 332 | const char *zFUuid = db_column_text(&q,3); |
| 333 | const char *zCUuid = db_column_text(&q,4); |
| 334 | if( verboseFlag ){ |
| 335 | /* TBD: What to include in verbose. UUID? */ |
| 336 | fossil_print("%s %7d %S %S %s\n", zTime, size, zFUuid, zCUuid, zFile); |
| 337 | }else if( showAge ){ |
| 338 | fossil_print("%s %s\n", zTime, zFile); |
| 339 | }else{ |
| 340 | fossil_print("%s\n", zFile); |
| 341 | } |
| 342 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -316,26 +316,23 @@ | |
| 316 | } |
| 317 | |
| 318 | compute_fileage(rid,0); |
| 319 | db_prepare(&q, |
| 320 | "SELECT datetime(fileage.mtime, 'localtime'), fileage.pathname,\n" |
| 321 | " blob.size\n" |
| 322 | " FROM fileage, blob\n" |
| 323 | " WHERE blob.rid=fileage.fid %s\n" |
| 324 | " ORDER BY %s;", blob_sql_text(&where), zOrderBy /*safe-for-%s*/ |
| 325 | ); |
| 326 | blob_reset(&where); |
| 327 | |
| 328 | while( db_step(&q)==SQLITE_ROW ){ |
| 329 | const char *zTime = db_column_text(&q,0); |
| 330 | const char *zFile = db_column_text(&q,1); |
| 331 | int size = db_column_int(&q,2); |
| 332 | if( verboseFlag ){ |
| 333 | fossil_print("%s %7d %s\n", zTime, size, zFile); |
| 334 | }else if( showAge ){ |
| 335 | fossil_print("%s %s\n", zTime, zFile); |
| 336 | }else{ |
| 337 | fossil_print("%s\n", zFile); |
| 338 | } |
| 339 |