Fossil SCM

Show file sizes in the description of individual file artifacts.

drh 2017-09-19 18:04 trunk
Commit 4c268999d5fd3b60fee31c49c4c748017a610480ea6a6afd8d925b5fbe616f87
Parent 0594266c8efc2b7…
2 files changed +10 -6 +5 -2
~ src/finfo.c ~ src/info.c
M src/finfo.c
+10 -6
--- src/finfo.c
+++ src/finfo.c
@@ -343,20 +343,22 @@
343343
 " coalesce(event.ecomment, event.comment)," /* Check-in comment */
344344
 " coalesce(event.euser, event.user)," /* User who made chng */
345345
 " mlink.pid," /* Parent file rid */
346346
 " mlink.fid," /* File rid */
347347
 " (SELECT uuid FROM blob WHERE rid=mlink.pid)," /* Parent file uuid */
348
- " (SELECT uuid FROM blob WHERE rid=mlink.fid)," /* Current file uuid */
348
+ " blob.uuid," /* Current file uuid */
349349
 " (SELECT uuid FROM blob WHERE rid=mlink.mid)," /* Check-in uuid */
350350
 " event.bgcolor," /* Background color */
351351
 " (SELECT value FROM tagxref WHERE tagid=%d AND tagtype>0"
352352
 " AND tagxref.rid=mlink.mid)," /* Branchname */
353353
 " mlink.mid," /* check-in ID */
354
- " mlink.pfnid" /* Previous filename */
355
- " FROM mlink, event"
354
+ " mlink.pfnid," /* Previous filename */
355
+ " blob.size" /* File size */
356
+ " FROM mlink, event, blob"
356357
 " WHERE mlink.fnid=%d"
357
- " AND event.objid=mlink.mid",
358
+ " AND event.objid=mlink.mid"
359
+ " AND mlink.fid=blob.rid",
358360
 TAG_BRANCH, fnid
359361
 );
360362
 if( (zA = P("a"))!=0 ){
361363
 blob_append_sql(&sql, " AND event.mtime>=julianday('%q')", zA);
362364
 url_add_parameter(&url, "a", zA);
@@ -443,10 +445,11 @@
443445
 const char *zCkin = db_column_text(&q,7);
444446
 const char *zBgClr = db_column_text(&q, 8);
445447
 const char *zBr = db_column_text(&q, 9);
446448
 int fmid = db_column_int(&q, 10);
447449
 int pfnid = db_column_int(&q, 11);
450
+ int szFile = db_column_int(&q, 12);
448451
 int gidx;
449452
 char zTime[10];
450453
 int nParent = 0;
451454
 int aParent[GR_MAX_RAIL];
452455
@@ -522,12 +525,13 @@
522525
 hyperlink_to_uuid(zCkin);
523526
 if( fShowId ){
524527
 @ (%d(fmid))
525528
 }
526529
 @ %W(zCom) (user:
527
- hyperlink_to_user(zUser, zDate, "");
528
- @ branch: %z(href("%R/timeline?t=%T&n=200",zBr))%h(zBr)</a>)
530
+ hyperlink_to_user(zUser, zDate, ",");
531
+ @ branch: %z(href("%R/timeline?t=%T&n=200",zBr))%h(zBr)</a>,
532
+ @ size: %d(szFile))
529533
 if( g.perm.Hyperlink && zUuid ){
530534
 const char *z = zFilename;
531535
 @ %z(href("%R/annotate?filename=%h&checkin=%s",z,zCkin))
532536
 @ [annotate]</a>
533537
 @ %z(href("%R/blame?filename=%h&checkin=%s",z,zCkin))
534538
--- src/finfo.c
+++ src/finfo.c
@@ -343,20 +343,22 @@
343 " coalesce(event.ecomment, event.comment)," /* Check-in comment */
344 " coalesce(event.euser, event.user)," /* User who made chng */
345 " mlink.pid," /* Parent file rid */
346 " mlink.fid," /* File rid */
347 " (SELECT uuid FROM blob WHERE rid=mlink.pid)," /* Parent file uuid */
348 " (SELECT uuid FROM blob WHERE rid=mlink.fid)," /* Current file uuid */
349 " (SELECT uuid FROM blob WHERE rid=mlink.mid)," /* Check-in uuid */
350 " event.bgcolor," /* Background color */
351 " (SELECT value FROM tagxref WHERE tagid=%d AND tagtype>0"
352 " AND tagxref.rid=mlink.mid)," /* Branchname */
353 " mlink.mid," /* check-in ID */
354 " mlink.pfnid" /* Previous filename */
355 " FROM mlink, event"
 
356 " WHERE mlink.fnid=%d"
357 " AND event.objid=mlink.mid",
 
358 TAG_BRANCH, fnid
359 );
360 if( (zA = P("a"))!=0 ){
361 blob_append_sql(&sql, " AND event.mtime>=julianday('%q')", zA);
362 url_add_parameter(&url, "a", zA);
@@ -443,10 +445,11 @@
443 const char *zCkin = db_column_text(&q,7);
444 const char *zBgClr = db_column_text(&q, 8);
445 const char *zBr = db_column_text(&q, 9);
446 int fmid = db_column_int(&q, 10);
447 int pfnid = db_column_int(&q, 11);
 
448 int gidx;
449 char zTime[10];
450 int nParent = 0;
451 int aParent[GR_MAX_RAIL];
452
@@ -522,12 +525,13 @@
522 hyperlink_to_uuid(zCkin);
523 if( fShowId ){
524 @ (%d(fmid))
525 }
526 @ %W(zCom) (user:
527 hyperlink_to_user(zUser, zDate, "");
528 @ branch: %z(href("%R/timeline?t=%T&n=200",zBr))%h(zBr)</a>)
 
529 if( g.perm.Hyperlink && zUuid ){
530 const char *z = zFilename;
531 @ %z(href("%R/annotate?filename=%h&checkin=%s",z,zCkin))
532 @ [annotate]</a>
533 @ %z(href("%R/blame?filename=%h&checkin=%s",z,zCkin))
534
--- src/finfo.c
+++ src/finfo.c
@@ -343,20 +343,22 @@
343 " coalesce(event.ecomment, event.comment)," /* Check-in comment */
344 " coalesce(event.euser, event.user)," /* User who made chng */
345 " mlink.pid," /* Parent file rid */
346 " mlink.fid," /* File rid */
347 " (SELECT uuid FROM blob WHERE rid=mlink.pid)," /* Parent file uuid */
348 " blob.uuid," /* Current file uuid */
349 " (SELECT uuid FROM blob WHERE rid=mlink.mid)," /* Check-in uuid */
350 " event.bgcolor," /* Background color */
351 " (SELECT value FROM tagxref WHERE tagid=%d AND tagtype>0"
352 " AND tagxref.rid=mlink.mid)," /* Branchname */
353 " mlink.mid," /* check-in ID */
354 " mlink.pfnid," /* Previous filename */
355 " blob.size" /* File size */
356 " FROM mlink, event, blob"
357 " WHERE mlink.fnid=%d"
358 " AND event.objid=mlink.mid"
359 " AND mlink.fid=blob.rid",
360 TAG_BRANCH, fnid
361 );
362 if( (zA = P("a"))!=0 ){
363 blob_append_sql(&sql, " AND event.mtime>=julianday('%q')", zA);
364 url_add_parameter(&url, "a", zA);
@@ -443,10 +445,11 @@
445 const char *zCkin = db_column_text(&q,7);
446 const char *zBgClr = db_column_text(&q, 8);
447 const char *zBr = db_column_text(&q, 9);
448 int fmid = db_column_int(&q, 10);
449 int pfnid = db_column_int(&q, 11);
450 int szFile = db_column_int(&q, 12);
451 int gidx;
452 char zTime[10];
453 int nParent = 0;
454 int aParent[GR_MAX_RAIL];
455
@@ -522,12 +525,13 @@
525 hyperlink_to_uuid(zCkin);
526 if( fShowId ){
527 @ (%d(fmid))
528 }
529 @ %W(zCom) (user:
530 hyperlink_to_user(zUser, zDate, ",");
531 @ branch: %z(href("%R/timeline?t=%T&n=200",zBr))%h(zBr)</a>,
532 @ size: %d(szFile))
533 if( g.perm.Hyperlink && zUuid ){
534 const char *z = zFilename;
535 @ %z(href("%R/annotate?filename=%h&checkin=%s",z,zCkin))
536 @ [annotate]</a>
537 @ %z(href("%R/blame?filename=%h&checkin=%s",z,zCkin))
538
M src/info.c
+5 -2
--- src/info.c
+++ src/info.c
@@ -1285,11 +1285,12 @@
12851285
 "SELECT filename.name, datetime(event.mtime,toLocal()),"
12861286
 " coalesce(event.ecomment,event.comment),"
12871287
 " coalesce(event.euser,event.user),"
12881288
 " b.uuid, mlink.mperm,"
12891289
 " coalesce((SELECT value FROM tagxref"
1290
- " WHERE tagid=%d AND tagtype>0 AND rid=mlink.mid),'trunk')"
1290
+ " WHERE tagid=%d AND tagtype>0 AND rid=mlink.mid),'trunk'),"
1291
+ " a.size"
12911292
 " FROM mlink, filename, event, blob a, blob b"
12921293
 " WHERE filename.fnid=mlink.fnid"
12931294
 " AND event.objid=mlink.mid"
12941295
 " AND a.rid=mlink.fid"
12951296
 " AND b.rid=mlink.mid"
@@ -1304,10 +1305,11 @@
13041305
 const char *zCom = db_column_text(&q, 2);
13051306
 const char *zUser = db_column_text(&q, 3);
13061307
 const char *zVers = db_column_text(&q, 4);
13071308
 int mPerm = db_column_int(&q, 5);
13081309
 const char *zBr = db_column_text(&q, 6);
1310
+ int szFile = db_column_int(&q,7);
13091311
 int sameFilename = prevName!=0 && fossil_strcmp(zName,prevName)==0;
13101312
 if( sameFilename && !showDetail ){
13111313
 if( cnt==1 ){
13121314
 @ %z(href("%R/whatis/%!S",zUuid))[more...]</a>
13131315
 }
@@ -1348,11 +1350,12 @@
13481350
 }
13491351
 if( zBr && zBr[0] ){
13501352
 @ on branch %z(href("%R/timeline?r=%T",zBr))%h(zBr)</a>
13511353
 }
13521354
 @ &mdash; %!W(zCom) (user:
1353
- hyperlink_to_user(zUser,zDate,")");
1355
+ hyperlink_to_user(zUser,zDate,",");
1356
+ @ size: %d(szFile))
13541357
 if( g.perm.Hyperlink ){
13551358
 @ %z(href("%R/finfo?name=%T&ci=%!S",zName,zVers))[ancestry]</a>
13561359
 @ %z(href("%R/annotate?filename=%T&checkin=%!S",zName,zVers))
13571360
 @ [annotate]</a>
13581361
 @ %z(href("%R/blame?filename=%T&checkin=%!S",zName,zVers))
13591362
--- src/info.c
+++ src/info.c
@@ -1285,11 +1285,12 @@
1285 "SELECT filename.name, datetime(event.mtime,toLocal()),"
1286 " coalesce(event.ecomment,event.comment),"
1287 " coalesce(event.euser,event.user),"
1288 " b.uuid, mlink.mperm,"
1289 " coalesce((SELECT value FROM tagxref"
1290 " WHERE tagid=%d AND tagtype>0 AND rid=mlink.mid),'trunk')"
 
1291 " FROM mlink, filename, event, blob a, blob b"
1292 " WHERE filename.fnid=mlink.fnid"
1293 " AND event.objid=mlink.mid"
1294 " AND a.rid=mlink.fid"
1295 " AND b.rid=mlink.mid"
@@ -1304,10 +1305,11 @@
1304 const char *zCom = db_column_text(&q, 2);
1305 const char *zUser = db_column_text(&q, 3);
1306 const char *zVers = db_column_text(&q, 4);
1307 int mPerm = db_column_int(&q, 5);
1308 const char *zBr = db_column_text(&q, 6);
 
1309 int sameFilename = prevName!=0 && fossil_strcmp(zName,prevName)==0;
1310 if( sameFilename && !showDetail ){
1311 if( cnt==1 ){
1312 @ %z(href("%R/whatis/%!S",zUuid))[more...]</a>
1313 }
@@ -1348,11 +1350,12 @@
1348 }
1349 if( zBr && zBr[0] ){
1350 @ on branch %z(href("%R/timeline?r=%T",zBr))%h(zBr)</a>
1351 }
1352 @ &mdash; %!W(zCom) (user:
1353 hyperlink_to_user(zUser,zDate,")");
 
1354 if( g.perm.Hyperlink ){
1355 @ %z(href("%R/finfo?name=%T&ci=%!S",zName,zVers))[ancestry]</a>
1356 @ %z(href("%R/annotate?filename=%T&checkin=%!S",zName,zVers))
1357 @ [annotate]</a>
1358 @ %z(href("%R/blame?filename=%T&checkin=%!S",zName,zVers))
1359
--- src/info.c
+++ src/info.c
@@ -1285,11 +1285,12 @@
1285 "SELECT filename.name, datetime(event.mtime,toLocal()),"
1286 " coalesce(event.ecomment,event.comment),"
1287 " coalesce(event.euser,event.user),"
1288 " b.uuid, mlink.mperm,"
1289 " coalesce((SELECT value FROM tagxref"
1290 " WHERE tagid=%d AND tagtype>0 AND rid=mlink.mid),'trunk'),"
1291 " a.size"
1292 " FROM mlink, filename, event, blob a, blob b"
1293 " WHERE filename.fnid=mlink.fnid"
1294 " AND event.objid=mlink.mid"
1295 " AND a.rid=mlink.fid"
1296 " AND b.rid=mlink.mid"
@@ -1304,10 +1305,11 @@
1305 const char *zCom = db_column_text(&q, 2);
1306 const char *zUser = db_column_text(&q, 3);
1307 const char *zVers = db_column_text(&q, 4);
1308 int mPerm = db_column_int(&q, 5);
1309 const char *zBr = db_column_text(&q, 6);
1310 int szFile = db_column_int(&q,7);
1311 int sameFilename = prevName!=0 && fossil_strcmp(zName,prevName)==0;
1312 if( sameFilename && !showDetail ){
1313 if( cnt==1 ){
1314 @ %z(href("%R/whatis/%!S",zUuid))[more...]</a>
1315 }
@@ -1348,11 +1350,12 @@
1350 }
1351 if( zBr && zBr[0] ){
1352 @ on branch %z(href("%R/timeline?r=%T",zBr))%h(zBr)</a>
1353 }
1354 @ &mdash; %!W(zCom) (user:
1355 hyperlink_to_user(zUser,zDate,",");
1356 @ size: %d(szFile))
1357 if( g.perm.Hyperlink ){
1358 @ %z(href("%R/finfo?name=%T&ci=%!S",zName,zVers))[ancestry]</a>
1359 @ %z(href("%R/annotate?filename=%T&checkin=%!S",zName,zVers))
1360 @ [annotate]</a>
1361 @ %z(href("%R/blame?filename=%T&checkin=%!S",zName,zVers))
1362

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button