Fossil SCM

Make use of the new m= query parameter on /finfo when clicking on file links.

drh 2017-12-06 19:09 trunk
Commit 3b06d2c24cfd413366964244eac6c0ed2ca71400d2cc167440546ddc91546c1c
Parent 7dcf8c7a4507f33…
2 files changed +7 -8 +1 -1
~ src/info.c ~ src/timeline.c
M src/info.c
+7 -8
--- src/info.c
+++ src/info.c
@@ -419,19 +419,19 @@
419419
 append_diff(zOld, zNew, diffFlags, pRe);
420420
 }
421421
 }else{
422422
 if( zOld && zNew ){
423423
 if( fossil_strcmp(zOld, zNew)!=0 ){
424
- @ Modified %z(href("%R/finfo?name=%T",zName))%h(zName)</a>
424
+ @ Modified %z(href("%R/finfo?name=%T&m=%!S",zName,zNew))%h(zName)</a>
425425
 @ from %z(href("%R/artifact/%!S",zOld))[%S(zOld)]</a>
426426
 @ to %z(href("%R/artifact/%!S",zNew))[%S(zNew)]</a>.
427427
 }else if( zOldName!=0 && fossil_strcmp(zName,zOldName)!=0 ){
428428
 @ Name change
429
- @ from %z(href("%R/finfo?name=%T",zOldName))%h(zOldName)</a>
430
- @ to %z(href("%R/finfo?name=%T",zName))%h(zName)</a>.
429
+ @ from %z(href("%R/finfo?name=%T&m=%!S",zOldName,zOld))%h(zOldName)</a>
430
+ @ to %z(href("%R/finfo?name=%T&m=%!S",zName,zNew))%h(zName)</a>.
431431
 }else{
432
- @ %z(href("%R/finfo?name=%T",zName))%h(zName)</a> became
432
+ @ %z(href("%R/finfo?name=%T&m=%!S",zName,zNew))%h(zName)</a> became
433433
 if( mperm==PERM_EXE ){
434434
 @ executable with contents
435435
 }else if( mperm==PERM_LNK ){
436436
 @ a symlink with target
437437
 }else{
@@ -438,14 +438,14 @@
438438
 @ a regular file with contents
439439
 }
440440
 @ %z(href("%R/artifact/%!S",zNew))[%S(zNew)]</a>.
441441
 }
442442
 }else if( zOld ){
443
- @ Deleted %z(href("%R/finfo?name=%T",zName))%h(zName)</a>
443
+ @ Deleted %z(href("%R/finfo?name=%T&m=%!S",zName,zOld))%h(zName)</a>
444444
 @ version %z(href("%R/artifact/%!S",zOld))[%S(zOld)]</a>.
445445
 }else{
446
- @ Added %z(href("%R/finfo?name=%T",zName))%h(zName)</a>
446
+ @ Added %z(href("%R/finfo?name=%T&m=%!S",zName,zNew))%h(zName)</a>
447447
 @ version %z(href("%R/artifact/%!S",zNew))[%S(zNew)]</a>.
448448
 }
449449
 if( diffFlags ){
450450
 append_diff(zOld, zNew, diffFlags, pRe);
451451
 }else if( zOld && zNew && fossil_strcmp(zOld,zNew)!=0 ){
@@ -1330,11 +1330,11 @@
13301330
 objType |= OBJTYPE_EXE;
13311331
 }else{
13321332
 @ <li>File
13331333
 }
13341334
 objType |= OBJTYPE_CONTENT;
1335
- @ %z(href("%R/finfo?name=%T",zName))%h(zName)</a>
1335
+ @ %z(href("%R/finfo?name=%T&m=%!S",zName,zUuid))%h(zName)</a>
13361336
 tag_private_status(rid);
13371337
 if( showDetail ){
13381338
 @ <ul>
13391339
 }
13401340
 prevName = fossil_strdup(zName);
@@ -1355,11 +1355,10 @@
13551355
 }
13561356
 @ &mdash; %!W(zCom) (user:
13571357
 hyperlink_to_user(zUser,zDate,",");
13581358
 @ size: %d(szFile))
13591359
 if( g.perm.Hyperlink ){
1360
- @ %z(href("%R/finfo?name=%T&ci=%!S",zName,zVers))[ancestry]</a>
13611360
 @ %z(href("%R/annotate?filename=%T&checkin=%!S",zName,zVers))
13621361
 @ [annotate]</a>
13631362
 @ %z(href("%R/blame?filename=%T&checkin=%!S",zName,zVers))
13641363
 @ [blame]</a>
13651364
 @ %z(href("%R/timeline?n=all&uf=%!S",zUuid))[check-ins&nbsp;using]</a>
13661365
--- src/info.c
+++ src/info.c
@@ -419,19 +419,19 @@
419 append_diff(zOld, zNew, diffFlags, pRe);
420 }
421 }else{
422 if( zOld && zNew ){
423 if( fossil_strcmp(zOld, zNew)!=0 ){
424 @ Modified %z(href("%R/finfo?name=%T",zName))%h(zName)</a>
425 @ from %z(href("%R/artifact/%!S",zOld))[%S(zOld)]</a>
426 @ to %z(href("%R/artifact/%!S",zNew))[%S(zNew)]</a>.
427 }else if( zOldName!=0 && fossil_strcmp(zName,zOldName)!=0 ){
428 @ Name change
429 @ from %z(href("%R/finfo?name=%T",zOldName))%h(zOldName)</a>
430 @ to %z(href("%R/finfo?name=%T",zName))%h(zName)</a>.
431 }else{
432 @ %z(href("%R/finfo?name=%T",zName))%h(zName)</a> became
433 if( mperm==PERM_EXE ){
434 @ executable with contents
435 }else if( mperm==PERM_LNK ){
436 @ a symlink with target
437 }else{
@@ -438,14 +438,14 @@
438 @ a regular file with contents
439 }
440 @ %z(href("%R/artifact/%!S",zNew))[%S(zNew)]</a>.
441 }
442 }else if( zOld ){
443 @ Deleted %z(href("%R/finfo?name=%T",zName))%h(zName)</a>
444 @ version %z(href("%R/artifact/%!S",zOld))[%S(zOld)]</a>.
445 }else{
446 @ Added %z(href("%R/finfo?name=%T",zName))%h(zName)</a>
447 @ version %z(href("%R/artifact/%!S",zNew))[%S(zNew)]</a>.
448 }
449 if( diffFlags ){
450 append_diff(zOld, zNew, diffFlags, pRe);
451 }else if( zOld && zNew && fossil_strcmp(zOld,zNew)!=0 ){
@@ -1330,11 +1330,11 @@
1330 objType |= OBJTYPE_EXE;
1331 }else{
1332 @ <li>File
1333 }
1334 objType |= OBJTYPE_CONTENT;
1335 @ %z(href("%R/finfo?name=%T",zName))%h(zName)</a>
1336 tag_private_status(rid);
1337 if( showDetail ){
1338 @ <ul>
1339 }
1340 prevName = fossil_strdup(zName);
@@ -1355,11 +1355,10 @@
1355 }
1356 @ &mdash; %!W(zCom) (user:
1357 hyperlink_to_user(zUser,zDate,",");
1358 @ size: %d(szFile))
1359 if( g.perm.Hyperlink ){
1360 @ %z(href("%R/finfo?name=%T&ci=%!S",zName,zVers))[ancestry]</a>
1361 @ %z(href("%R/annotate?filename=%T&checkin=%!S",zName,zVers))
1362 @ [annotate]</a>
1363 @ %z(href("%R/blame?filename=%T&checkin=%!S",zName,zVers))
1364 @ [blame]</a>
1365 @ %z(href("%R/timeline?n=all&uf=%!S",zUuid))[check-ins&nbsp;using]</a>
1366
--- src/info.c
+++ src/info.c
@@ -419,19 +419,19 @@
419 append_diff(zOld, zNew, diffFlags, pRe);
420 }
421 }else{
422 if( zOld && zNew ){
423 if( fossil_strcmp(zOld, zNew)!=0 ){
424 @ Modified %z(href("%R/finfo?name=%T&m=%!S",zName,zNew))%h(zName)</a>
425 @ from %z(href("%R/artifact/%!S",zOld))[%S(zOld)]</a>
426 @ to %z(href("%R/artifact/%!S",zNew))[%S(zNew)]</a>.
427 }else if( zOldName!=0 && fossil_strcmp(zName,zOldName)!=0 ){
428 @ Name change
429 @ from %z(href("%R/finfo?name=%T&m=%!S",zOldName,zOld))%h(zOldName)</a>
430 @ to %z(href("%R/finfo?name=%T&m=%!S",zName,zNew))%h(zName)</a>.
431 }else{
432 @ %z(href("%R/finfo?name=%T&m=%!S",zName,zNew))%h(zName)</a> became
433 if( mperm==PERM_EXE ){
434 @ executable with contents
435 }else if( mperm==PERM_LNK ){
436 @ a symlink with target
437 }else{
@@ -438,14 +438,14 @@
438 @ a regular file with contents
439 }
440 @ %z(href("%R/artifact/%!S",zNew))[%S(zNew)]</a>.
441 }
442 }else if( zOld ){
443 @ Deleted %z(href("%R/finfo?name=%T&m=%!S",zName,zOld))%h(zName)</a>
444 @ version %z(href("%R/artifact/%!S",zOld))[%S(zOld)]</a>.
445 }else{
446 @ Added %z(href("%R/finfo?name=%T&m=%!S",zName,zNew))%h(zName)</a>
447 @ version %z(href("%R/artifact/%!S",zNew))[%S(zNew)]</a>.
448 }
449 if( diffFlags ){
450 append_diff(zOld, zNew, diffFlags, pRe);
451 }else if( zOld && zNew && fossil_strcmp(zOld,zNew)!=0 ){
@@ -1330,11 +1330,11 @@
1330 objType |= OBJTYPE_EXE;
1331 }else{
1332 @ <li>File
1333 }
1334 objType |= OBJTYPE_CONTENT;
1335 @ %z(href("%R/finfo?name=%T&m=%!S",zName,zUuid))%h(zName)</a>
1336 tag_private_status(rid);
1337 if( showDetail ){
1338 @ <ul>
1339 }
1340 prevName = fossil_strdup(zName);
@@ -1355,11 +1355,10 @@
1355 }
1356 @ &mdash; %!W(zCom) (user:
1357 hyperlink_to_user(zUser,zDate,",");
1358 @ size: %d(szFile))
1359 if( g.perm.Hyperlink ){
 
1360 @ %z(href("%R/annotate?filename=%T&checkin=%!S",zName,zVers))
1361 @ [annotate]</a>
1362 @ %z(href("%R/blame?filename=%T&checkin=%!S",zName,zVers))
1363 @ [blame]</a>
1364 @ %z(href("%R/timeline?n=all&uf=%!S",zUuid))[check-ins&nbsp;using]</a>
1365
M src/timeline.c
+1 -1
--- src/timeline.c
+++ src/timeline.c
@@ -990,11 +990,11 @@
990990
 );
991991
 blob_zero(&out);
992992
 while( db_step(&q)==SQLITE_ROW ){
993993
 const char *zFN = db_column_text(&q, 0);
994994
 blob_appendf(&out, "%s%z%h</a>", zSep,
995
- href("%R/finfo?name=%t", zFN), zFN);
995
+ href("%R/finfo?name=%t&m=%!S", zFN, zUuid), zFN);
996996
 zSep = " or ";
997997
 }
998998
 db_finalize(&q);
999999
 return blob_str(&out);
10001000
 }
10011001
--- src/timeline.c
+++ src/timeline.c
@@ -990,11 +990,11 @@
990 );
991 blob_zero(&out);
992 while( db_step(&q)==SQLITE_ROW ){
993 const char *zFN = db_column_text(&q, 0);
994 blob_appendf(&out, "%s%z%h</a>", zSep,
995 href("%R/finfo?name=%t", zFN), zFN);
996 zSep = " or ";
997 }
998 db_finalize(&q);
999 return blob_str(&out);
1000 }
1001
--- src/timeline.c
+++ src/timeline.c
@@ -990,11 +990,11 @@
990 );
991 blob_zero(&out);
992 while( db_step(&q)==SQLITE_ROW ){
993 const char *zFN = db_column_text(&q, 0);
994 blob_appendf(&out, "%s%z%h</a>", zSep,
995 href("%R/finfo?name=%t&m=%!S", zFN, zUuid), zFN);
996 zSep = " or ";
997 }
998 db_finalize(&q);
999 return blob_str(&out);
1000 }
1001

Keyboard Shortcuts

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