Fossil SCM
add "renamed" annotation to renamed and changed files in /info As per James Cook's report in [forum:2b857ded1b], the /info page provided no hint that a renamed and modified file had been renamed, only modified. This slightly changes the annotation to make it clear the file was also renamed. Discussed with larrybr and stephan in /chat. Slight tweak on stephan's suggested phrasing. ok stephan@
Commit
495a4d71b8a2c546e923552ed948e8be319c318e13acd082b464eb33e5e66bfa
Parent
cbd27f23a694fa4…
1 file changed
+14
-4
+14
-4
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -397,14 +397,24 @@ | ||
| 397 | 397 | append_diff(zOld, zNew, pCfg); |
| 398 | 398 | } |
| 399 | 399 | }else{ |
| 400 | 400 | if( zOld && zNew ){ |
| 401 | 401 | if( fossil_strcmp(zOld, zNew)!=0 ){ |
| 402 | - @ Modified %z(href("%R/finfo?name=%T&m=%!S&ci=%!S",zName,zNew,zCkin))\ | |
| 403 | - @ %h(zName)</a> | |
| 404 | - @ from %z(href("%R/artifact/%!S",zOld))[%S(zOld)]</a> | |
| 405 | - @ to %z(href("%R/artifact/%!S",zNew))[%S(zNew)]</a>. | |
| 402 | + if( zOldName!=0 && fossil_strcmp(zName,zOldName)!=0 ){ | |
| 403 | + @ Renamed and modified | |
| 404 | + @ %z(href("%R/finfo?name=%T&m=%!S&ci=%!S",zOldName,zOld,zCkin))\ | |
| 405 | + @ %h(zOldName)</a> | |
| 406 | + @ %z(href("%R/artifact/%!S",zOld))[%S(zOld)]</a> | |
| 407 | + @ to %z(href("%R/finfo?name=%T&m=%!S&ci=%!S",zName,zNew,zCkin))\ | |
| 408 | + @ %h(zName)</a> | |
| 409 | + @ %z(href("%R/artifact/%!S",zNew))[%S(zNew)]</a>. | |
| 410 | + }else{ | |
| 411 | + @ Modified %z(href("%R/finfo?name=%T&m=%!S&ci=%!S",zName,zNew,zCkin))\ | |
| 412 | + @ %h(zName)</a> | |
| 413 | + @ from %z(href("%R/artifact/%!S",zOld))[%S(zOld)]</a> | |
| 414 | + @ to %z(href("%R/artifact/%!S",zNew))[%S(zNew)]</a>. | |
| 415 | + } | |
| 406 | 416 | }else if( zOldName!=0 && fossil_strcmp(zName,zOldName)!=0 ){ |
| 407 | 417 | @ Name change |
| 408 | 418 | @ from %z(href("%R/finfo?name=%T&m=%!S&ci=%!S",zOldName,zOld,zCkin))\ |
| 409 | 419 | @ %h(zOldName)</a> |
| 410 | 420 | @ to %z(href("%R/finfo?name=%T&m=%!S&ci=%!S",zName,zNew,zCkin))\ |
| 411 | 421 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -397,14 +397,24 @@ | |
| 397 | append_diff(zOld, zNew, pCfg); |
| 398 | } |
| 399 | }else{ |
| 400 | if( zOld && zNew ){ |
| 401 | if( fossil_strcmp(zOld, zNew)!=0 ){ |
| 402 | @ Modified %z(href("%R/finfo?name=%T&m=%!S&ci=%!S",zName,zNew,zCkin))\ |
| 403 | @ %h(zName)</a> |
| 404 | @ from %z(href("%R/artifact/%!S",zOld))[%S(zOld)]</a> |
| 405 | @ to %z(href("%R/artifact/%!S",zNew))[%S(zNew)]</a>. |
| 406 | }else if( zOldName!=0 && fossil_strcmp(zName,zOldName)!=0 ){ |
| 407 | @ Name change |
| 408 | @ from %z(href("%R/finfo?name=%T&m=%!S&ci=%!S",zOldName,zOld,zCkin))\ |
| 409 | @ %h(zOldName)</a> |
| 410 | @ to %z(href("%R/finfo?name=%T&m=%!S&ci=%!S",zName,zNew,zCkin))\ |
| 411 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -397,14 +397,24 @@ | |
| 397 | append_diff(zOld, zNew, pCfg); |
| 398 | } |
| 399 | }else{ |
| 400 | if( zOld && zNew ){ |
| 401 | if( fossil_strcmp(zOld, zNew)!=0 ){ |
| 402 | if( zOldName!=0 && fossil_strcmp(zName,zOldName)!=0 ){ |
| 403 | @ Renamed and modified |
| 404 | @ %z(href("%R/finfo?name=%T&m=%!S&ci=%!S",zOldName,zOld,zCkin))\ |
| 405 | @ %h(zOldName)</a> |
| 406 | @ %z(href("%R/artifact/%!S",zOld))[%S(zOld)]</a> |
| 407 | @ to %z(href("%R/finfo?name=%T&m=%!S&ci=%!S",zName,zNew,zCkin))\ |
| 408 | @ %h(zName)</a> |
| 409 | @ %z(href("%R/artifact/%!S",zNew))[%S(zNew)]</a>. |
| 410 | }else{ |
| 411 | @ Modified %z(href("%R/finfo?name=%T&m=%!S&ci=%!S",zName,zNew,zCkin))\ |
| 412 | @ %h(zName)</a> |
| 413 | @ from %z(href("%R/artifact/%!S",zOld))[%S(zOld)]</a> |
| 414 | @ to %z(href("%R/artifact/%!S",zNew))[%S(zNew)]</a>. |
| 415 | } |
| 416 | }else if( zOldName!=0 && fossil_strcmp(zName,zOldName)!=0 ){ |
| 417 | @ Name change |
| 418 | @ from %z(href("%R/finfo?name=%T&m=%!S&ci=%!S",zOldName,zOld,zCkin))\ |
| 419 | @ %h(zOldName)</a> |
| 420 | @ to %z(href("%R/finfo?name=%T&m=%!S&ci=%!S",zName,zNew,zCkin))\ |
| 421 |