Fossil SCM

Rework [b824b3e7f7] to ensure the "[diff]" link or the actual inline diff is inside the <p>...</p> block.

andygoth 2015-05-17 20:45 trunk
Commit 80e7250a4eb05c6ac22934313591d0df55b044cf
Parent b824b3e7f7ec7f2…
1 file changed +19 -17
~ src/info.c
M src/info.c
+19 -17
--- src/info.c
+++ src/info.c
@@ -368,66 +368,68 @@
368368
 const char *zOldName, /* Prior name. NULL if no name change. */
369369
 u64 diffFlags, /* Flags for text_diff(). Zero to omit diffs */
370370
 ReCompiled *pRe, /* Only show diffs that match this regex, if not NULL */
371371
 int mperm /* executable or symlink permission for zNew */
372372
 ){
373
+ @ <p>
373374
 if( !g.perm.Hyperlink ){
374375
 if( zNew==0 ){
375
- @ <p>Deleted %h(zName).</p>
376
+ @ Deleted %h(zName).
376377
 }else if( zOld==0 ){
377
- @ <p>Added %h(zName).</p>
378
+ @ Added %h(zName).
378379
 }else if( zOldName!=0 && fossil_strcmp(zName,zOldName)!=0 ){
379
- @ <p>Name change from %h(zOldName) to %h(zName).</p>
380
+ @ Name change from %h(zOldName) to %h(zName).
380381
 }else if( fossil_strcmp(zNew, zOld)==0 ){
381382
 if( mperm==PERM_EXE ){
382
- @ <p>%h(zName) became executable.</p>
383
+ @ %h(zName) became executable.
383384
 }else if( mperm==PERM_LNK ){
384
- @ <p>%h(zName) became a symlink.</p>
385
+ @ %h(zName) became a symlink.
385386
 }else{
386
- @ <p>%h(zName) became a regular file.</p>
387
+ @ %h(zName) became a regular file.
387388
 }
388389
 }else{
389
- @ <p>Changes to %h(zName).</p>
390
+ @ Changes to %h(zName).
390391
 }
391392
 if( diffFlags ){
392393
 append_diff(zOld, zNew, diffFlags, pRe);
393394
 }
394395
 }else{
395396
 if( zOld && zNew ){
396397
 if( fossil_strcmp(zOld, zNew)!=0 ){
397
- @ <p>Modified %z(href("%R/finfo?name=%T",zName))%h(zName)</a>
398
+ @ Modified %z(href("%R/finfo?name=%T",zName))%h(zName)</a>
398399
 @ from %z(href("%R/artifact/%!S",zOld))[%S(zOld)]</a>
399
- @ to %z(href("%R/artifact/%!S",zNew))[%S(zNew)]</a>.</p>
400
+ @ to %z(href("%R/artifact/%!S",zNew))[%S(zNew)]</a>.
400401
 }else if( zOldName!=0 && fossil_strcmp(zName,zOldName)!=0 ){
401
- @ <p>Name change
402
+ @ Name change
402403
 @ from %z(href("%R/finfo?name=%T",zOldName))%h(zOldName)</a>
403
- @ to %z(href("%R/finfo?name=%T",zName))%h(zName)</a>.</p>
404
+ @ to %z(href("%R/finfo?name=%T",zName))%h(zName)</a>.
404405
 }else{
405
- @ <p>%z(href("%R/finfo?name=%T",zName))%h(zName)</a> became
406
+ @ %z(href("%R/finfo?name=%T",zName))%h(zName)</a> became
406407
 if( mperm==PERM_EXE ){
407408
 @ executable with contents
408409
 }else if( mperm==PERM_LNK ){
409410
 @ a symlink with target
410411
 }else{
411412
 @ a regular file with contents
412413
 }
413
- @ %z(href("%R/artifact/%!S",zNew))[%S(zNew)]</a>.</p>
414
+ @ %z(href("%R/artifact/%!S",zNew))[%S(zNew)]</a>.
414415
 }
415416
 }else if( zOld ){
416
- @ <p>Deleted %z(href("%R/finfo?name=%T",zName))%h(zName)</a>
417
- @ version %z(href("%R/artifact/%!S",zOld))[%S(zOld)]</a>.</p>
417
+ @ Deleted %z(href("%R/finfo?name=%T",zName))%h(zName)</a>
418
+ @ version %z(href("%R/artifact/%!S",zOld))[%S(zOld)]</a>.
418419
 }else{
419
- @ <p>Added %z(href("%R/finfo?name=%T",zName))%h(zName)</a>
420
- @ version %z(href("%R/artifact/%!S",zNew))[%S(zNew)]</a>.</p>
420
+ @ Added %z(href("%R/finfo?name=%T",zName))%h(zName)</a>
421
+ @ version %z(href("%R/artifact/%!S",zNew))[%S(zNew)]</a>.
421422
 }
422423
 if( diffFlags ){
423424
 append_diff(zOld, zNew, diffFlags, pRe);
424425
 }else if( zOld && zNew && fossil_strcmp(zOld,zNew)!=0 ){
425426
 @ &nbsp;&nbsp;
426427
 @ %z(href("%R/fdiff?v1=%!S&v2=%!S&sbs=1",zOld,zNew))[diff]</a>
427428
 }
428429
 }
430
+ @ </p>
429431
 }
430432
431433
 /*
432434
 ** Generate javascript to enhance HTML diffs.
433435
 */
434436
--- src/info.c
+++ src/info.c
@@ -368,66 +368,68 @@
368 const char *zOldName, /* Prior name. NULL if no name change. */
369 u64 diffFlags, /* Flags for text_diff(). Zero to omit diffs */
370 ReCompiled *pRe, /* Only show diffs that match this regex, if not NULL */
371 int mperm /* executable or symlink permission for zNew */
372 ){
 
373 if( !g.perm.Hyperlink ){
374 if( zNew==0 ){
375 @ <p>Deleted %h(zName).</p>
376 }else if( zOld==0 ){
377 @ <p>Added %h(zName).</p>
378 }else if( zOldName!=0 && fossil_strcmp(zName,zOldName)!=0 ){
379 @ <p>Name change from %h(zOldName) to %h(zName).</p>
380 }else if( fossil_strcmp(zNew, zOld)==0 ){
381 if( mperm==PERM_EXE ){
382 @ <p>%h(zName) became executable.</p>
383 }else if( mperm==PERM_LNK ){
384 @ <p>%h(zName) became a symlink.</p>
385 }else{
386 @ <p>%h(zName) became a regular file.</p>
387 }
388 }else{
389 @ <p>Changes to %h(zName).</p>
390 }
391 if( diffFlags ){
392 append_diff(zOld, zNew, diffFlags, pRe);
393 }
394 }else{
395 if( zOld && zNew ){
396 if( fossil_strcmp(zOld, zNew)!=0 ){
397 @ <p>Modified %z(href("%R/finfo?name=%T",zName))%h(zName)</a>
398 @ from %z(href("%R/artifact/%!S",zOld))[%S(zOld)]</a>
399 @ to %z(href("%R/artifact/%!S",zNew))[%S(zNew)]</a>.</p>
400 }else if( zOldName!=0 && fossil_strcmp(zName,zOldName)!=0 ){
401 @ <p>Name change
402 @ from %z(href("%R/finfo?name=%T",zOldName))%h(zOldName)</a>
403 @ to %z(href("%R/finfo?name=%T",zName))%h(zName)</a>.</p>
404 }else{
405 @ <p>%z(href("%R/finfo?name=%T",zName))%h(zName)</a> became
406 if( mperm==PERM_EXE ){
407 @ executable with contents
408 }else if( mperm==PERM_LNK ){
409 @ a symlink with target
410 }else{
411 @ a regular file with contents
412 }
413 @ %z(href("%R/artifact/%!S",zNew))[%S(zNew)]</a>.</p>
414 }
415 }else if( zOld ){
416 @ <p>Deleted %z(href("%R/finfo?name=%T",zName))%h(zName)</a>
417 @ version %z(href("%R/artifact/%!S",zOld))[%S(zOld)]</a>.</p>
418 }else{
419 @ <p>Added %z(href("%R/finfo?name=%T",zName))%h(zName)</a>
420 @ version %z(href("%R/artifact/%!S",zNew))[%S(zNew)]</a>.</p>
421 }
422 if( diffFlags ){
423 append_diff(zOld, zNew, diffFlags, pRe);
424 }else if( zOld && zNew && fossil_strcmp(zOld,zNew)!=0 ){
425 @ &nbsp;&nbsp;
426 @ %z(href("%R/fdiff?v1=%!S&v2=%!S&sbs=1",zOld,zNew))[diff]</a>
427 }
428 }
 
429 }
430
431 /*
432 ** Generate javascript to enhance HTML diffs.
433 */
434
--- src/info.c
+++ src/info.c
@@ -368,66 +368,68 @@
368 const char *zOldName, /* Prior name. NULL if no name change. */
369 u64 diffFlags, /* Flags for text_diff(). Zero to omit diffs */
370 ReCompiled *pRe, /* Only show diffs that match this regex, if not NULL */
371 int mperm /* executable or symlink permission for zNew */
372 ){
373 @ <p>
374 if( !g.perm.Hyperlink ){
375 if( zNew==0 ){
376 @ Deleted %h(zName).
377 }else if( zOld==0 ){
378 @ Added %h(zName).
379 }else if( zOldName!=0 && fossil_strcmp(zName,zOldName)!=0 ){
380 @ Name change from %h(zOldName) to %h(zName).
381 }else if( fossil_strcmp(zNew, zOld)==0 ){
382 if( mperm==PERM_EXE ){
383 @ %h(zName) became executable.
384 }else if( mperm==PERM_LNK ){
385 @ %h(zName) became a symlink.
386 }else{
387 @ %h(zName) became a regular file.
388 }
389 }else{
390 @ Changes to %h(zName).
391 }
392 if( diffFlags ){
393 append_diff(zOld, zNew, diffFlags, pRe);
394 }
395 }else{
396 if( zOld && zNew ){
397 if( fossil_strcmp(zOld, zNew)!=0 ){
398 @ Modified %z(href("%R/finfo?name=%T",zName))%h(zName)</a>
399 @ from %z(href("%R/artifact/%!S",zOld))[%S(zOld)]</a>
400 @ to %z(href("%R/artifact/%!S",zNew))[%S(zNew)]</a>.
401 }else if( zOldName!=0 && fossil_strcmp(zName,zOldName)!=0 ){
402 @ Name change
403 @ from %z(href("%R/finfo?name=%T",zOldName))%h(zOldName)</a>
404 @ to %z(href("%R/finfo?name=%T",zName))%h(zName)</a>.
405 }else{
406 @ %z(href("%R/finfo?name=%T",zName))%h(zName)</a> became
407 if( mperm==PERM_EXE ){
408 @ executable with contents
409 }else if( mperm==PERM_LNK ){
410 @ a symlink with target
411 }else{
412 @ a regular file with contents
413 }
414 @ %z(href("%R/artifact/%!S",zNew))[%S(zNew)]</a>.
415 }
416 }else if( zOld ){
417 @ Deleted %z(href("%R/finfo?name=%T",zName))%h(zName)</a>
418 @ version %z(href("%R/artifact/%!S",zOld))[%S(zOld)]</a>.
419 }else{
420 @ Added %z(href("%R/finfo?name=%T",zName))%h(zName)</a>
421 @ version %z(href("%R/artifact/%!S",zNew))[%S(zNew)]</a>.
422 }
423 if( diffFlags ){
424 append_diff(zOld, zNew, diffFlags, pRe);
425 }else if( zOld && zNew && fossil_strcmp(zOld,zNew)!=0 ){
426 @ &nbsp;&nbsp;
427 @ %z(href("%R/fdiff?v1=%!S&v2=%!S&sbs=1",zOld,zNew))[diff]</a>
428 }
429 }
430 @ </p>
431 }
432
433 /*
434 ** Generate javascript to enhance HTML diffs.
435 */
436

Keyboard Shortcuts

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