Fossil SCM
Formatting fixes on the "purge list" command.
Commit
4130b9a6e3f2d34240cdadc4ab983ce75a534cfc
Parent
92de66d2199ce30…
1 file changed
+4
-3
+4
-3
| --- src/purge.c | ||
| +++ src/purge.c | ||
| @@ -36,11 +36,11 @@ | ||
| 36 | 36 | ** purge command. |
| 37 | 37 | */ |
| 38 | 38 | static const char zPurgeInit[] = |
| 39 | 39 | @ CREATE TABLE IF NOT EXISTS "%w".purgeevent( |
| 40 | 40 | @ peid INTEGER PRIMARY KEY, -- Unique ID for the purge event |
| 41 | -@ ctime DATETIME, -- Julian day number when purge occurred | |
| 41 | +@ ctime DATETIME, -- When purge occurred. Seconds since 1970. | |
| 42 | 42 | @ pnotes TEXT -- Human-readable notes about the purge event |
| 43 | 43 | @ ); |
| 44 | 44 | @ CREATE TABLE IF NOT EXISTS "%w".purgeitem( |
| 45 | 45 | @ peid INTEGER REFERENCES purgeevent ON DELETE CASCADE, -- Purge event |
| 46 | 46 | @ uuid TEXT NOT NULL, -- SHA1 hash of the purged artifact |
| @@ -236,11 +236,11 @@ | ||
| 236 | 236 | db_column_int(&q,2)); |
| 237 | 237 | sz1 += db_column_int(&q,1); |
| 238 | 238 | sz2 += db_column_int(&q,2); |
| 239 | 239 | } |
| 240 | 240 | db_finalize(&q); |
| 241 | - fossil_print(" %40s %10lld %10lld\n", "", sz1, sz2); | |
| 241 | + fossil_print(" %40s %10lld %10lld\n", "Total:", sz1, sz2); | |
| 242 | 242 | } |
| 243 | 243 | |
| 244 | 244 | /* |
| 245 | 245 | ** COMMAND: purge |
| 246 | 246 | ** |
| @@ -277,11 +277,12 @@ | ||
| 277 | 277 | db_find_and_open_repository(0,0); |
| 278 | 278 | n = (int)strlen(zSubcmd); |
| 279 | 279 | if( strncmp(zSubcmd, "list", n)==0 || strcmp(zSubcmd,"ls")==0 ){ |
| 280 | 280 | int showDetail = find_option("l","l",0)!=0; |
| 281 | 281 | if( db_int(-1,"PRAGMA table_info('purgeevent')")<0 ) return; |
| 282 | - db_prepare(&q, "SELECT peid, datetime(ctime) FROM purgeevent"); | |
| 282 | + db_prepare(&q, "SELECT peid, datetime(ctime,'unixepoch','localtime')" | |
| 283 | + " FROM purgeevent"); | |
| 283 | 284 | while( db_step(&q)==SQLITE_ROW ){ |
| 284 | 285 | fossil_print("%4d on %s\n", db_column_int(&q,0), db_column_text(&q,1)); |
| 285 | 286 | if( showDetail ){ |
| 286 | 287 | purge_event_content(db_column_int(&q,0)); |
| 287 | 288 | } |
| 288 | 289 |
| --- src/purge.c | |
| +++ src/purge.c | |
| @@ -36,11 +36,11 @@ | |
| 36 | ** purge command. |
| 37 | */ |
| 38 | static const char zPurgeInit[] = |
| 39 | @ CREATE TABLE IF NOT EXISTS "%w".purgeevent( |
| 40 | @ peid INTEGER PRIMARY KEY, -- Unique ID for the purge event |
| 41 | @ ctime DATETIME, -- Julian day number when purge occurred |
| 42 | @ pnotes TEXT -- Human-readable notes about the purge event |
| 43 | @ ); |
| 44 | @ CREATE TABLE IF NOT EXISTS "%w".purgeitem( |
| 45 | @ peid INTEGER REFERENCES purgeevent ON DELETE CASCADE, -- Purge event |
| 46 | @ uuid TEXT NOT NULL, -- SHA1 hash of the purged artifact |
| @@ -236,11 +236,11 @@ | |
| 236 | db_column_int(&q,2)); |
| 237 | sz1 += db_column_int(&q,1); |
| 238 | sz2 += db_column_int(&q,2); |
| 239 | } |
| 240 | db_finalize(&q); |
| 241 | fossil_print(" %40s %10lld %10lld\n", "", sz1, sz2); |
| 242 | } |
| 243 | |
| 244 | /* |
| 245 | ** COMMAND: purge |
| 246 | ** |
| @@ -277,11 +277,12 @@ | |
| 277 | db_find_and_open_repository(0,0); |
| 278 | n = (int)strlen(zSubcmd); |
| 279 | if( strncmp(zSubcmd, "list", n)==0 || strcmp(zSubcmd,"ls")==0 ){ |
| 280 | int showDetail = find_option("l","l",0)!=0; |
| 281 | if( db_int(-1,"PRAGMA table_info('purgeevent')")<0 ) return; |
| 282 | db_prepare(&q, "SELECT peid, datetime(ctime) FROM purgeevent"); |
| 283 | while( db_step(&q)==SQLITE_ROW ){ |
| 284 | fossil_print("%4d on %s\n", db_column_int(&q,0), db_column_text(&q,1)); |
| 285 | if( showDetail ){ |
| 286 | purge_event_content(db_column_int(&q,0)); |
| 287 | } |
| 288 |
| --- src/purge.c | |
| +++ src/purge.c | |
| @@ -36,11 +36,11 @@ | |
| 36 | ** purge command. |
| 37 | */ |
| 38 | static const char zPurgeInit[] = |
| 39 | @ CREATE TABLE IF NOT EXISTS "%w".purgeevent( |
| 40 | @ peid INTEGER PRIMARY KEY, -- Unique ID for the purge event |
| 41 | @ ctime DATETIME, -- When purge occurred. Seconds since 1970. |
| 42 | @ pnotes TEXT -- Human-readable notes about the purge event |
| 43 | @ ); |
| 44 | @ CREATE TABLE IF NOT EXISTS "%w".purgeitem( |
| 45 | @ peid INTEGER REFERENCES purgeevent ON DELETE CASCADE, -- Purge event |
| 46 | @ uuid TEXT NOT NULL, -- SHA1 hash of the purged artifact |
| @@ -236,11 +236,11 @@ | |
| 236 | db_column_int(&q,2)); |
| 237 | sz1 += db_column_int(&q,1); |
| 238 | sz2 += db_column_int(&q,2); |
| 239 | } |
| 240 | db_finalize(&q); |
| 241 | fossil_print(" %40s %10lld %10lld\n", "Total:", sz1, sz2); |
| 242 | } |
| 243 | |
| 244 | /* |
| 245 | ** COMMAND: purge |
| 246 | ** |
| @@ -277,11 +277,12 @@ | |
| 277 | db_find_and_open_repository(0,0); |
| 278 | n = (int)strlen(zSubcmd); |
| 279 | if( strncmp(zSubcmd, "list", n)==0 || strcmp(zSubcmd,"ls")==0 ){ |
| 280 | int showDetail = find_option("l","l",0)!=0; |
| 281 | if( db_int(-1,"PRAGMA table_info('purgeevent')")<0 ) return; |
| 282 | db_prepare(&q, "SELECT peid, datetime(ctime,'unixepoch','localtime')" |
| 283 | " FROM purgeevent"); |
| 284 | while( db_step(&q)==SQLITE_ROW ){ |
| 285 | fossil_print("%4d on %s\n", db_column_int(&q,0), db_column_text(&q,1)); |
| 286 | if( showDetail ){ |
| 287 | purge_event_content(db_column_int(&q,0)); |
| 288 | } |
| 289 |